Skip to content

Commit 72835c8

Browse files
Johannes Weinertorvalds
Johannes Weiner
authored and
torvalds
committed
mm: unify remaining mem_cont, mem, etc. variable names to memcg
Signed-off-by: Johannes Weiner <[email protected]> Acked-by: David Rientjes <[email protected]> Acked-by: KAMEZAWA Hiroyuki <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Balbir Singh <[email protected]> Cc: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent ec0fffd commit 72835c8

File tree

8 files changed

+78
-75
lines changed

8 files changed

+78
-75
lines changed

‎include/linux/memcontrol.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ extern int mem_cgroup_newpage_charge(struct page *page, struct mm_struct *mm,
5454
gfp_t gfp_mask);
5555
/* for swap handling */
5656
extern int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
57-
struct page *page, gfp_t mask, struct mem_cgroup **ptr);
57+
struct page *page, gfp_t mask, struct mem_cgroup **memcgp);
5858
extern void mem_cgroup_commit_charge_swapin(struct page *page,
59-
struct mem_cgroup *ptr);
60-
extern void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *ptr);
59+
struct mem_cgroup *memcg);
60+
extern void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg);
6161

6262
extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
6363
gfp_t gfp_mask);
@@ -101,7 +101,7 @@ extern struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *memcg);
101101

102102
extern int
103103
mem_cgroup_prepare_migration(struct page *page,
104-
struct page *newpage, struct mem_cgroup **ptr, gfp_t gfp_mask);
104+
struct page *newpage, struct mem_cgroup **memcgp, gfp_t gfp_mask);
105105
extern void mem_cgroup_end_migration(struct mem_cgroup *memcg,
106106
struct page *oldpage, struct page *newpage, bool migration_ok);
107107

@@ -186,17 +186,17 @@ static inline int mem_cgroup_cache_charge(struct page *page,
186186
}
187187

188188
static inline int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
189-
struct page *page, gfp_t gfp_mask, struct mem_cgroup **ptr)
189+
struct page *page, gfp_t gfp_mask, struct mem_cgroup **memcgp)
190190
{
191191
return 0;
192192
}
193193

194194
static inline void mem_cgroup_commit_charge_swapin(struct page *page,
195-
struct mem_cgroup *ptr)
195+
struct mem_cgroup *memcg)
196196
{
197197
}
198198

199-
static inline void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *ptr)
199+
static inline void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
200200
{
201201
}
202202

@@ -275,7 +275,7 @@ static inline struct cgroup_subsys_state
275275

276276
static inline int
277277
mem_cgroup_prepare_migration(struct page *page, struct page *newpage,
278-
struct mem_cgroup **ptr, gfp_t gfp_mask)
278+
struct mem_cgroup **memcgp, gfp_t gfp_mask)
279279
{
280280
return 0;
281281
}

‎include/linux/oom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ enum oom_constraint {
4343
extern void compare_swap_oom_score_adj(int old_val, int new_val);
4444
extern int test_set_oom_score_adj(int new_val);
4545

46-
extern unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
46+
extern unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
4747
const nodemask_t *nodemask, unsigned long totalpages);
4848
extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
4949
extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);

‎include/linux/rmap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static inline void page_dup_rmap(struct page *page)
158158
* Called from mm/vmscan.c to handle paging out
159159
*/
160160
int page_referenced(struct page *, int is_locked,
161-
struct mem_cgroup *cnt, unsigned long *vm_flags);
161+
struct mem_cgroup *memcg, unsigned long *vm_flags);
162162
int page_referenced_one(struct page *, struct vm_area_struct *,
163163
unsigned long address, unsigned int *mapcount, unsigned long *vm_flags);
164164

@@ -236,7 +236,7 @@ int rmap_walk(struct page *page, int (*rmap_one)(struct page *,
236236
#define anon_vma_link(vma) do {} while (0)
237237

238238
static inline int page_referenced(struct page *page, int is_locked,
239-
struct mem_cgroup *cnt,
239+
struct mem_cgroup *memcg,
240240
unsigned long *vm_flags)
241241
{
242242
*vm_flags = 0;

‎mm/memcontrol.c

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,12 +2844,12 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
28442844
*/
28452845
int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
28462846
struct page *page,
2847-
gfp_t mask, struct mem_cgroup **ptr)
2847+
gfp_t mask, struct mem_cgroup **memcgp)
28482848
{
28492849
struct mem_cgroup *memcg;
28502850
int ret;
28512851

2852-
*ptr = NULL;
2852+
*memcgp = NULL;
28532853

28542854
if (mem_cgroup_disabled())
28552855
return 0;
@@ -2867,27 +2867,27 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
28672867
memcg = try_get_mem_cgroup_from_page(page);
28682868
if (!memcg)
28692869
goto charge_cur_mm;
2870-
*ptr = memcg;
2871-
ret = __mem_cgroup_try_charge(NULL, mask, 1, ptr, true);
2870+
*memcgp = memcg;
2871+
ret = __mem_cgroup_try_charge(NULL, mask, 1, memcgp, true);
28722872
css_put(&memcg->css);
28732873
return ret;
28742874
charge_cur_mm:
28752875
if (unlikely(!mm))
28762876
mm = &init_mm;
2877-
return __mem_cgroup_try_charge(mm, mask, 1, ptr, true);
2877+
return __mem_cgroup_try_charge(mm, mask, 1, memcgp, true);
28782878
}
28792879

28802880
static void
2881-
__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
2881+
__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,
28822882
enum charge_type ctype)
28832883
{
28842884
if (mem_cgroup_disabled())
28852885
return;
2886-
if (!ptr)
2886+
if (!memcg)
28872887
return;
2888-
cgroup_exclude_rmdir(&ptr->css);
2888+
cgroup_exclude_rmdir(&memcg->css);
28892889

2890-
__mem_cgroup_commit_charge_lrucare(page, ptr, ctype);
2890+
__mem_cgroup_commit_charge_lrucare(page, memcg, ctype);
28912891
/*
28922892
* Now swap is on-memory. This means this page may be
28932893
* counted both as mem and swap....double count.
@@ -2897,21 +2897,22 @@ __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
28972897
*/
28982898
if (do_swap_account && PageSwapCache(page)) {
28992899
swp_entry_t ent = {.val = page_private(page)};
2900+
struct mem_cgroup *swap_memcg;
29002901
unsigned short id;
2901-
struct mem_cgroup *memcg;
29022902

29032903
id = swap_cgroup_record(ent, 0);
29042904
rcu_read_lock();
2905-
memcg = mem_cgroup_lookup(id);
2906-
if (memcg) {
2905+
swap_memcg = mem_cgroup_lookup(id);
2906+
if (swap_memcg) {
29072907
/*
29082908
* This recorded memcg can be obsolete one. So, avoid
29092909
* calling css_tryget
29102910
*/
2911-
if (!mem_cgroup_is_root(memcg))
2912-
res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
2913-
mem_cgroup_swap_statistics(memcg, false);
2914-
mem_cgroup_put(memcg);
2911+
if (!mem_cgroup_is_root(swap_memcg))
2912+
res_counter_uncharge(&swap_memcg->memsw,
2913+
PAGE_SIZE);
2914+
mem_cgroup_swap_statistics(swap_memcg, false);
2915+
mem_cgroup_put(swap_memcg);
29152916
}
29162917
rcu_read_unlock();
29172918
}
@@ -2920,13 +2921,14 @@ __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
29202921
* So, rmdir()->pre_destroy() can be called while we do this charge.
29212922
* In that case, we need to call pre_destroy() again. check it here.
29222923
*/
2923-
cgroup_release_and_wakeup_rmdir(&ptr->css);
2924+
cgroup_release_and_wakeup_rmdir(&memcg->css);
29242925
}
29252926

2926-
void mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr)
2927+
void mem_cgroup_commit_charge_swapin(struct page *page,
2928+
struct mem_cgroup *memcg)
29272929
{
2928-
__mem_cgroup_commit_charge_swapin(page, ptr,
2929-
MEM_CGROUP_CHARGE_TYPE_MAPPED);
2930+
__mem_cgroup_commit_charge_swapin(page, memcg,
2931+
MEM_CGROUP_CHARGE_TYPE_MAPPED);
29302932
}
29312933

29322934
void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
@@ -3255,14 +3257,14 @@ static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
32553257
* page belongs to.
32563258
*/
32573259
int mem_cgroup_prepare_migration(struct page *page,
3258-
struct page *newpage, struct mem_cgroup **ptr, gfp_t gfp_mask)
3260+
struct page *newpage, struct mem_cgroup **memcgp, gfp_t gfp_mask)
32593261
{
32603262
struct mem_cgroup *memcg = NULL;
32613263
struct page_cgroup *pc;
32623264
enum charge_type ctype;
32633265
int ret = 0;
32643266

3265-
*ptr = NULL;
3267+
*memcgp = NULL;
32663268

32673269
VM_BUG_ON(PageTransHuge(page));
32683270
if (mem_cgroup_disabled())
@@ -3313,10 +3315,10 @@ int mem_cgroup_prepare_migration(struct page *page,
33133315
if (!memcg)
33143316
return 0;
33153317

3316-
*ptr = memcg;
3317-
ret = __mem_cgroup_try_charge(NULL, gfp_mask, 1, ptr, false);
3318+
*memcgp = memcg;
3319+
ret = __mem_cgroup_try_charge(NULL, gfp_mask, 1, memcgp, false);
33183320
css_put(&memcg->css);/* drop extra refcnt */
3319-
if (ret || *ptr == NULL) {
3321+
if (ret || *memcgp == NULL) {
33203322
if (PageAnon(page)) {
33213323
lock_page_cgroup(pc);
33223324
ClearPageCgroupMigration(pc);

‎mm/oom_kill.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ struct task_struct *find_lock_task_mm(struct task_struct *p)
152152

153153
/* return true if the task is not adequate as candidate victim task. */
154154
static bool oom_unkillable_task(struct task_struct *p,
155-
const struct mem_cgroup *mem, const nodemask_t *nodemask)
155+
const struct mem_cgroup *memcg, const nodemask_t *nodemask)
156156
{
157157
if (is_global_init(p))
158158
return true;
159159
if (p->flags & PF_KTHREAD)
160160
return true;
161161

162162
/* When mem_cgroup_out_of_memory() and p is not member of the group */
163-
if (mem && !task_in_mem_cgroup(p, mem))
163+
if (memcg && !task_in_mem_cgroup(p, memcg))
164164
return true;
165165

166166
/* p may not have freeable memory in nodemask */
@@ -179,12 +179,12 @@ static bool oom_unkillable_task(struct task_struct *p,
179179
* predictable as possible. The goal is to return the highest value for the
180180
* task consuming the most memory to avoid subsequent oom failures.
181181
*/
182-
unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
182+
unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
183183
const nodemask_t *nodemask, unsigned long totalpages)
184184
{
185185
long points;
186186

187-
if (oom_unkillable_task(p, mem, nodemask))
187+
if (oom_unkillable_task(p, memcg, nodemask))
188188
return 0;
189189

190190
p = find_lock_task_mm(p);
@@ -308,7 +308,7 @@ static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
308308
* (not docbooked, we don't want this one cluttering up the manual)
309309
*/
310310
static struct task_struct *select_bad_process(unsigned int *ppoints,
311-
unsigned long totalpages, struct mem_cgroup *mem,
311+
unsigned long totalpages, struct mem_cgroup *memcg,
312312
const nodemask_t *nodemask)
313313
{
314314
struct task_struct *g, *p;
@@ -320,7 +320,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
320320

321321
if (p->exit_state)
322322
continue;
323-
if (oom_unkillable_task(p, mem, nodemask))
323+
if (oom_unkillable_task(p, memcg, nodemask))
324324
continue;
325325

326326
/*
@@ -364,7 +364,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
364364
}
365365
}
366366

367-
points = oom_badness(p, mem, nodemask, totalpages);
367+
points = oom_badness(p, memcg, nodemask, totalpages);
368368
if (points > *ppoints) {
369369
chosen = p;
370370
*ppoints = points;
@@ -387,14 +387,14 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
387387
*
388388
* Call with tasklist_lock read-locked.
389389
*/
390-
static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask)
390+
static void dump_tasks(const struct mem_cgroup *memcg, const nodemask_t *nodemask)
391391
{
392392
struct task_struct *p;
393393
struct task_struct *task;
394394

395395
pr_info("[ pid ] uid tgid total_vm rss cpu oom_adj oom_score_adj name\n");
396396
for_each_process(p) {
397-
if (oom_unkillable_task(p, mem, nodemask))
397+
if (oom_unkillable_task(p, memcg, nodemask))
398398
continue;
399399

400400
task = find_lock_task_mm(p);
@@ -417,7 +417,7 @@ static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask)
417417
}
418418

419419
static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
420-
struct mem_cgroup *mem, const nodemask_t *nodemask)
420+
struct mem_cgroup *memcg, const nodemask_t *nodemask)
421421
{
422422
task_lock(current);
423423
pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, "
@@ -427,10 +427,10 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
427427
cpuset_print_task_mems_allowed(current);
428428
task_unlock(current);
429429
dump_stack();
430-
mem_cgroup_print_oom_info(mem, p);
430+
mem_cgroup_print_oom_info(memcg, p);
431431
show_mem(SHOW_MEM_FILTER_NODES);
432432
if (sysctl_oom_dump_tasks)
433-
dump_tasks(mem, nodemask);
433+
dump_tasks(memcg, nodemask);
434434
}
435435

436436
#define K(x) ((x) << (PAGE_SHIFT-10))
@@ -484,7 +484,7 @@ static int oom_kill_task(struct task_struct *p)
484484

485485
static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
486486
unsigned int points, unsigned long totalpages,
487-
struct mem_cgroup *mem, nodemask_t *nodemask,
487+
struct mem_cgroup *memcg, nodemask_t *nodemask,
488488
const char *message)
489489
{
490490
struct task_struct *victim = p;
@@ -493,7 +493,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
493493
unsigned int victim_points = 0;
494494

495495
if (printk_ratelimit())
496-
dump_header(p, gfp_mask, order, mem, nodemask);
496+
dump_header(p, gfp_mask, order, memcg, nodemask);
497497

498498
/*
499499
* If the task is already exiting, don't alarm the sysadmin or kill
@@ -524,7 +524,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
524524
/*
525525
* oom_badness() returns 0 if the thread is unkillable
526526
*/
527-
child_points = oom_badness(child, mem, nodemask,
527+
child_points = oom_badness(child, memcg, nodemask,
528528
totalpages);
529529
if (child_points > victim_points) {
530530
victim = child;
@@ -561,7 +561,7 @@ static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
561561
}
562562

563563
#ifdef CONFIG_CGROUP_MEM_RES_CTLR
564-
void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
564+
void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask)
565565
{
566566
unsigned long limit;
567567
unsigned int points = 0;
@@ -578,14 +578,14 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
578578
}
579579

580580
check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, 0, NULL);
581-
limit = mem_cgroup_get_limit(mem) >> PAGE_SHIFT;
581+
limit = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT;
582582
read_lock(&tasklist_lock);
583583
retry:
584-
p = select_bad_process(&points, limit, mem, NULL);
584+
p = select_bad_process(&points, limit, memcg, NULL);
585585
if (!p || PTR_ERR(p) == -1UL)
586586
goto out;
587587

588-
if (oom_kill_process(p, gfp_mask, 0, points, limit, mem, NULL,
588+
if (oom_kill_process(p, gfp_mask, 0, points, limit, memcg, NULL,
589589
"Memory cgroup out of memory"))
590590
goto retry;
591591
out:

0 commit comments

Comments
 (0)