Commit 31176c78 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: clean up memory.events counting function 

We only ever count single events, drop the @nr parameter.  Rename the
function accordingly.  Remove low-information kerneldoc.

Link: http://lkml.kernel.org/r/20170404220148.28338-1-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarVladimir Davydov <vdavydov.dev@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a2e4885

include/linux/memcontrol.h

+5 −13
Original line number Diff line number Diff line
@@ -287,17 +287,10 @@ static inline bool mem_cgroup_disabled(void) 
	return !cgroup_subsys_enabled(memory_cgrp_subsys);

}



/**

 * mem_cgroup_events - count memory events against a cgroup

 * @memcg: the memory cgroup

 * @idx: the event index

 * @nr: the number of events to account for

 */

static inline void mem_cgroup_events(struct mem_cgroup *memcg,

		       enum mem_cgroup_events_index idx,

		       unsigned int nr)

static inline void mem_cgroup_event(struct mem_cgroup *memcg,

				    enum mem_cgroup_events_index idx)

{

	this_cpu_add(memcg->stat->events[idx], nr);

	this_cpu_inc(memcg->stat->events[idx]);

	cgroup_file_notify(&memcg->events_file);

}
@@ -614,9 +607,8 @@ static inline bool mem_cgroup_disabled(void) 
	return true;

}



static inline void mem_cgroup_events(struct mem_cgroup *memcg,

				     enum mem_cgroup_events_index idx,

				     unsigned int nr)

static inline void mem_cgroup_event(struct mem_cgroup *memcg,

				    enum mem_cgroup_events_index idx)

{

}

mm/memcontrol.c

+4 −4
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ static void reclaim_high(struct mem_cgroup *memcg, 
	do {

		if (page_counter_read(&memcg->memory) <= memcg->high)

			continue;

		mem_cgroup_events(memcg, MEMCG_HIGH, 1);

		mem_cgroup_event(memcg, MEMCG_HIGH);

		try_to_free_mem_cgroup_pages(memcg, nr_pages, gfp_mask, true);

	} while ((memcg = parent_mem_cgroup(memcg)));

}
@@ -1916,7 +1916,7 @@ retry: 
	if (!gfpflags_allow_blocking(gfp_mask))

		goto nomem;



	mem_cgroup_events(mem_over_limit, MEMCG_MAX, 1);

	mem_cgroup_event(mem_over_limit, MEMCG_MAX);



	nr_reclaimed = try_to_free_mem_cgroup_pages(mem_over_limit, nr_pages,

						    gfp_mask, may_swap);
@@ -1959,7 +1959,7 @@ retry: 
	if (fatal_signal_pending(current))

		goto force;



	mem_cgroup_events(mem_over_limit, MEMCG_OOM, 1);

	mem_cgroup_event(mem_over_limit, MEMCG_OOM);



	mem_cgroup_oom(mem_over_limit, gfp_mask,

		       get_order(nr_pages * PAGE_SIZE));
@@ -5142,7 +5142,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of, 
			continue;

		}



		mem_cgroup_events(memcg, MEMCG_OOM, 1);

		mem_cgroup_event(memcg, MEMCG_OOM);

		if (!mem_cgroup_out_of_memory(memcg, GFP_KERNEL, 0))

			break;

	}

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -2526,7 +2526,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) 
					sc->memcg_low_skipped = 1;

					continue;

				}

				mem_cgroup_events(memcg, MEMCG_LOW, 1);

				mem_cgroup_event(memcg, MEMCG_LOW);

			}



			reclaimed = sc->nr_reclaimed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE