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

Configure Feed

Select the types of activity you want to include in your feed.

mm: memcontrol: rename mem_cgroup_from_slab_obj()

In addition to slab objects, this function is used for resolving non-slab
kernel pointers. This has caused confusion in recent refactoring work.
Rename it to mem_cgroup_from_virt(), sticking with terminology established
by the virt_to_<foo>() converters.

Link: https://lore.kernel.org/linux-mm/20251113161424.GB3465062@cmpxchg.org/
Link: https://lkml.kernel.org/r/20251210154301.720133-1-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Johannes Weiner and committed by
Andrew Morton 16cc8b93 055059ed

+6 -6
+2 -2
include/linux/memcontrol.h
··· 1723 1723 return memcg ? memcg->kmemcg_id : -1; 1724 1724 } 1725 1725 1726 - struct mem_cgroup *mem_cgroup_from_slab_obj(void *p); 1726 + struct mem_cgroup *mem_cgroup_from_virt(void *p); 1727 1727 1728 1728 static inline void count_objcg_events(struct obj_cgroup *objcg, 1729 1729 enum vm_event_item idx, ··· 1795 1795 return -1; 1796 1796 } 1797 1797 1798 - static inline struct mem_cgroup *mem_cgroup_from_slab_obj(void *p) 1798 + static inline struct mem_cgroup *mem_cgroup_from_virt(void *p) 1799 1799 { 1800 1800 return NULL; 1801 1801 }
+2 -2
mm/list_lru.c
··· 187 187 188 188 if (list_lru_memcg_aware(lru)) { 189 189 rcu_read_lock(); 190 - ret = list_lru_add(lru, item, nid, mem_cgroup_from_slab_obj(item)); 190 + ret = list_lru_add(lru, item, nid, mem_cgroup_from_virt(item)); 191 191 rcu_read_unlock(); 192 192 } else { 193 193 ret = list_lru_add(lru, item, nid, NULL); ··· 224 224 225 225 if (list_lru_memcg_aware(lru)) { 226 226 rcu_read_lock(); 227 - ret = list_lru_del(lru, item, nid, mem_cgroup_from_slab_obj(item)); 227 + ret = list_lru_del(lru, item, nid, mem_cgroup_from_virt(item)); 228 228 rcu_read_unlock(); 229 229 } else { 230 230 ret = list_lru_del(lru, item, nid, NULL);
+2 -2
mm/memcontrol.c
··· 806 806 struct lruvec *lruvec; 807 807 808 808 rcu_read_lock(); 809 - memcg = mem_cgroup_from_slab_obj(p); 809 + memcg = mem_cgroup_from_virt(p); 810 810 811 811 /* 812 812 * Untracked pages have no memcg, no lruvec. Update only the ··· 2614 2614 * The caller must ensure the memcg lifetime, e.g. by taking rcu_read_lock(), 2615 2615 * cgroup_mutex, etc. 2616 2616 */ 2617 - struct mem_cgroup *mem_cgroup_from_slab_obj(void *p) 2617 + struct mem_cgroup *mem_cgroup_from_virt(void *p) 2618 2618 { 2619 2619 struct slab *slab; 2620 2620