On Thu, Jan 24, 2019 at 02:41:00PM -0500, Chris Down wrote:
> memcg has a significant number of files exposed to kernfs where their
> value is either exposed directly or is "max" in the case of
> PAGE_COUNTER_MAX.
>
> This patch makes this generic by providing a single function to do this
> work. In combination with the previous patch adding mem_cgroup_from_seq,
> this makes all of the seq_show feeder functions significantly more
> simple.
>
> Signed-off-by: Chris Down <chris@xxxxxxxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
> Cc: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Roman Gushchin <guro@xxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: cgroups@xxxxxxxxxxxxxxx
> Cc: linux-mm@xxxxxxxxx
> Cc: kernel-team@xxxxxx
> ---
> mm/memcontrol.c | 64 +++++++++++++++----------------------------------
> 1 file changed, 19 insertions(+), 45 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 98aad31f5226..81b6f752471a 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -5375,6 +5375,16 @@ static void mem_cgroup_bind(struct cgroup_subsys_state *root_css)
> root_mem_cgroup->use_hierarchy = false;
> }
>
> +static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
> +{
> + if (value == PAGE_COUNTER_MAX)
> + seq_puts(m, "max\n");
> + else
> + seq_printf(m, "%llu\n", (u64)value * PAGE_SIZE);
> +
> + return 0;
> +}
> +
> static u64 memory_current_read(struct cgroup_subsys_state *css,
> struct cftype *cft)
> {
> @@ -5385,15 +5395,8 @@ static u64 memory_current_read(struct cgroup_subsys_state *css,
>
> static int memory_min_show(struct seq_file *m, void *v)
> {
> - struct mem_cgroup *memcg = mem_cgroup_from_seq(m);
> - unsigned long min = READ_ONCE(memcg->memory.min);
> -
> - if (min == PAGE_COUNTER_MAX)
> - seq_puts(m, "max\n");
> - else
> - seq_printf(m, "%llu\n", (u64)min * PAGE_SIZE);
> -
> - return 0;
> + return seq_puts_memcg_tunable(m,
> + READ_ONCE(mem_cgroup_from_seq(m)->memory.min));
> }
Thanks for doing this.
The main thing that bugged me about the macro is that the data lookup
was split into two places:
DEFINE_MEMCG_THING(seq, memory_min_show, memory.min);
where memory.min is just a fragment of a designator and you have to
look at the macro to find out what exactly it gets turned into.
With this patch it's obvious, and you don't have to look at the
implementation of seq_puts_memcg_tunable() to understand what's being
printed out.
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
