mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 05:12:49 +00:00
mm: memcontrol: remove unnecessary memcg argument from soft limit functions
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: Jianyu Zhan <nasa4836@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e231875ba7
commit
cf2c81279e
1 changed files with 14 additions and 20 deletions
|
@ -713,11 +713,9 @@ soft_limit_tree_from_page(struct page *page)
|
||||||
return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid];
|
return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid];
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_zone *mz,
|
||||||
__mem_cgroup_insert_exceeded(struct mem_cgroup *memcg,
|
struct mem_cgroup_tree_per_zone *mctz,
|
||||||
struct mem_cgroup_per_zone *mz,
|
unsigned long long new_usage_in_excess)
|
||||||
struct mem_cgroup_tree_per_zone *mctz,
|
|
||||||
unsigned long long new_usage_in_excess)
|
|
||||||
{
|
{
|
||||||
struct rb_node **p = &mctz->rb_root.rb_node;
|
struct rb_node **p = &mctz->rb_root.rb_node;
|
||||||
struct rb_node *parent = NULL;
|
struct rb_node *parent = NULL;
|
||||||
|
@ -747,10 +745,8 @@ __mem_cgroup_insert_exceeded(struct mem_cgroup *memcg,
|
||||||
mz->on_tree = true;
|
mz->on_tree = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void __mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz,
|
||||||
__mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
|
struct mem_cgroup_tree_per_zone *mctz)
|
||||||
struct mem_cgroup_per_zone *mz,
|
|
||||||
struct mem_cgroup_tree_per_zone *mctz)
|
|
||||||
{
|
{
|
||||||
if (!mz->on_tree)
|
if (!mz->on_tree)
|
||||||
return;
|
return;
|
||||||
|
@ -758,13 +754,11 @@ __mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
|
||||||
mz->on_tree = false;
|
mz->on_tree = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz,
|
||||||
mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
|
struct mem_cgroup_tree_per_zone *mctz)
|
||||||
struct mem_cgroup_per_zone *mz,
|
|
||||||
struct mem_cgroup_tree_per_zone *mctz)
|
|
||||||
{
|
{
|
||||||
spin_lock(&mctz->lock);
|
spin_lock(&mctz->lock);
|
||||||
__mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
__mem_cgroup_remove_exceeded(mz, mctz);
|
||||||
spin_unlock(&mctz->lock);
|
spin_unlock(&mctz->lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -791,12 +785,12 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
|
||||||
spin_lock(&mctz->lock);
|
spin_lock(&mctz->lock);
|
||||||
/* if on-tree, remove it */
|
/* if on-tree, remove it */
|
||||||
if (mz->on_tree)
|
if (mz->on_tree)
|
||||||
__mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
__mem_cgroup_remove_exceeded(mz, mctz);
|
||||||
/*
|
/*
|
||||||
* Insert again. mz->usage_in_excess will be updated.
|
* Insert again. mz->usage_in_excess will be updated.
|
||||||
* If excess is 0, no tree ops.
|
* If excess is 0, no tree ops.
|
||||||
*/
|
*/
|
||||||
__mem_cgroup_insert_exceeded(memcg, mz, mctz, excess);
|
__mem_cgroup_insert_exceeded(mz, mctz, excess);
|
||||||
spin_unlock(&mctz->lock);
|
spin_unlock(&mctz->lock);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -812,7 +806,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)
|
||||||
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
|
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
|
||||||
mz = &memcg->nodeinfo[nid]->zoneinfo[zid];
|
mz = &memcg->nodeinfo[nid]->zoneinfo[zid];
|
||||||
mctz = soft_limit_tree_node_zone(nid, zid);
|
mctz = soft_limit_tree_node_zone(nid, zid);
|
||||||
mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
mem_cgroup_remove_exceeded(mz, mctz);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -835,7 +829,7 @@ __mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
|
||||||
* we will to add it back at the end of reclaim to its correct
|
* we will to add it back at the end of reclaim to its correct
|
||||||
* position in the tree.
|
* position in the tree.
|
||||||
*/
|
*/
|
||||||
__mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
|
__mem_cgroup_remove_exceeded(mz, mctz);
|
||||||
if (!res_counter_soft_limit_excess(&mz->memcg->res) ||
|
if (!res_counter_soft_limit_excess(&mz->memcg->res) ||
|
||||||
!css_tryget(&mz->memcg->css))
|
!css_tryget(&mz->memcg->css))
|
||||||
goto retry;
|
goto retry;
|
||||||
|
@ -4586,7 +4580,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
|
||||||
break;
|
break;
|
||||||
} while (1);
|
} while (1);
|
||||||
}
|
}
|
||||||
__mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
|
__mem_cgroup_remove_exceeded(mz, mctz);
|
||||||
excess = res_counter_soft_limit_excess(&mz->memcg->res);
|
excess = res_counter_soft_limit_excess(&mz->memcg->res);
|
||||||
/*
|
/*
|
||||||
* One school of thought says that we should not add
|
* One school of thought says that we should not add
|
||||||
|
@ -4597,7 +4591,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
|
||||||
* term TODO.
|
* term TODO.
|
||||||
*/
|
*/
|
||||||
/* If excess == 0, no tree ops */
|
/* If excess == 0, no tree ops */
|
||||||
__mem_cgroup_insert_exceeded(mz->memcg, mz, mctz, excess);
|
__mem_cgroup_insert_exceeded(mz, mctz, excess);
|
||||||
spin_unlock(&mctz->lock);
|
spin_unlock(&mctz->lock);
|
||||||
css_put(&mz->memcg->css);
|
css_put(&mz->memcg->css);
|
||||||
loop++;
|
loop++;
|
||||||
|
|
Loading…
Reference in a new issue