Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg()

We can get memcg directly form vmpr instead of vmpr->memcg->css->memcg, so
add a new func helper vmpressure_to_memcg(). And no code will use
vmpressure_to_css(), so delete it.

Link: https://lkml.kernel.org/r/20210630112146.455103-1-suhui@zeku.com
Signed-off-by: Hui Su <suhui@zeku.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Chris Down <chris@chrisdown.name>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Hui Su and committed by
Linus Torvalds
9647875b 20b51af1

+4 -5
+1 -1
include/linux/vmpressure.h
··· 37 37 extern void vmpressure_init(struct vmpressure *vmpr); 38 38 extern void vmpressure_cleanup(struct vmpressure *vmpr); 39 39 extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg); 40 - extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr); 40 + extern struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr); 41 41 extern int vmpressure_register_event(struct mem_cgroup *memcg, 42 42 struct eventfd_ctx *eventfd, 43 43 const char *args);
+2 -2
mm/memcontrol.c
··· 256 256 return &memcg->vmpressure; 257 257 } 258 258 259 - struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr) 259 + struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr) 260 260 { 261 - return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; 261 + return container_of(vmpr, struct mem_cgroup, vmpressure); 262 262 } 263 263 264 264 #ifdef CONFIG_MEMCG_KMEM
+1 -2
mm/vmpressure.c
··· 74 74 75 75 static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr) 76 76 { 77 - struct cgroup_subsys_state *css = vmpressure_to_css(vmpr); 78 - struct mem_cgroup *memcg = mem_cgroup_from_css(css); 77 + struct mem_cgroup *memcg = vmpressure_to_memcg(vmpr); 79 78 80 79 memcg = parent_mem_cgroup(memcg); 81 80 if (!memcg)