mm: fork: fix kernel_stack memcg stats for various stack implementations
Subsystems (7)
PATCH 1/1 mm: fork: fix kernel_stack memcg stats for various stack implementations
Depending on CONFIG_VMAP_STACK and the THREAD_SIZE / PAGE_SIZE ratio the space for task stacks can be allocated using __vmalloc_node_range(), alloc_pages_node() and kmem_cache_alloc_node(). In the first and the second cases page->mem_cgroup pointer is set, but in the third it's
not: memcg membership of a slab page should be determined using the memcg_from_slab_page() function, which looks at page->slab_cache->memcg_params.memcg . In this case, using mod_memcg_page_state() (as in account_kernel_stack()) is incorrect:page->mem_cgroup pointer is NULL even for pages charged to a non-root memory cgroup.
It can lead to kernel_stack per-memcg counters permanently showing 0 on some architectures (depending on the configuration).
In order to fix it, let's introduce a mod_memcg_obj_state() helper, which takes a pointer to a kernel object as a first argument, uses mem_cgroup_from_obj() to get a RCU-protected memcg pointer and calls mod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACK and various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics into fork.c .
Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
--- include/linux/memcontrol.h | 5 +++++ kernel/fork.c | 4 ++-- mm/memcontrol.c | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-)
include/linux/memcontrol.h +5 -0
@@ -695,6 +695,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec,void __mod_lruvec_state (struct lruvec *lruvec,enum node_stat_item idx,int val);void __mod_lruvec_slab_state (void *p,enum node_stat_item idx,int val); +void mod_memcg_obj_state (void *p,int idx,int val);static inline void mod_lruvec_state (struct lruvec *lruvec,enum node_stat_item idx,int val)
@@ -1129,6 +1130,10 @@ static inline void __mod_lruvec_slab_state(void *p, enum node_stat_item idx,__mod_node_page_state (page_pgdat (page), idx, val); } +static inline void mod_memcg_obj_state (void *p,int idx,int val) +{ +} + static inline unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, gfp_t gfp_mask,
kernel/fork.c +2 -2
@@ -404,8 +404,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)mod_zone_page_state (page_zone (first_page),NR_KERNEL_STACK_KB ,THREAD_SIZE /1024 * account); -mod_memcg_page_state (first_page,MEMCG_KERNEL_STACK_KB , - account * (THREAD_SIZE /1024 )); +mod_memcg_obj_state (stack,MEMCG_KERNEL_STACK_KB , + account * (THREAD_SIZE /1024 )); } }
mm/memcontrol.c +11 -0
@@ -776,6 +776,17 @@ void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)rcu_read_unlock (); } +void mod_memcg_obj_state (void *p,int idx,int val) +{ +struct mem_cgroup *memcg; + +rcu_read_lock (); + memcg =mem_cgroup_from_obj (p); +if (memcg) +mod_memcg_state (memcg, idx, val); +rcu_read_unlock (); +} +/** * __count_memcg_events - account VM events in a cgroup * @memcg: the memory cgroup
Signature · 1 line
2.24.1
Quoted 22 lines · Roman Gushchin
Depending on
CONFIG_VMAP_STACKand theTHREAD_SIZE/PAGE_SIZEratio the space for task stacks can be allocated using__vmalloc_node_range(),alloc_pages_node()andkmem_cache_alloc_node(). In the first and the second casespage->mem_cgrouppointer is set, but in the third it's
not: memcg membership of a slab page should be determined using thememcg_from_slab_page()function, which looks atpage->slab_cache->memcg_params.memcg. In this case, usingmod_memcg_page_state()(as inaccount_kernel_stack()) is incorrect:page->mem_cgrouppointer is NULL even for pages charged to a non-root memory cgroup.It can lead to
kernel_stackper-memcg counters permanently showing 0 on some architectures (depending on the configuration).In order to fix it, let's introduce a
mod_memcg_obj_state()helper, which takes a pointer to a kernel object as a first argument, usesmem_cgroup_from_obj()to get a RCU-protected memcg pointer and callsmod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACKand various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics intofork.c.
Quoted 8 lines
Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
Fixes 4d96ba353075 ("mm: memcg/slab: stop setting page->mem_cgroup pointer for slab pages")Signed-off-by Roman Gushchin <[email protected]>
Quoted 27 lines · Roman Gushchin
Depending on
CONFIG_VMAP_STACKand theTHREAD_SIZE/PAGE_SIZEratio the space for task stacks can be allocated using__vmalloc_node_range(),alloc_pages_node()andkmem_cache_alloc_node(). In the first and the second casespage->mem_cgrouppointer is set, but in the third it's
not: memcg membership of a slab page should be determined using thememcg_from_slab_page()function, which looks atpage->slab_cache->memcg_params.memcg. In this case, usingmod_memcg_page_state()(as inaccount_kernel_stack()) is incorrect:page->mem_cgrouppointer is NULL even for pages charged to a non-root memory cgroup.It can lead to
kernel_stackper-memcg counters permanently showing 0 on some architectures (depending on the configuration).In order to fix it, let's introduce a
mod_memcg_obj_state()helper, which takes a pointer to a kernel object as a first argument, usesmem_cgroup_from_obj()to get a RCU-protected memcg pointer and callsmod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACKand various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics intofork.c.Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
Quoted 3 lines
Fixes 4d96ba353075 ("mm: memcg/slab: stop setting page->mem_cgroup pointer for slab pages")Signed-off-by Roman Gushchin <[email protected]>
Thanks for pointing out the user impact.
Andrew Morton
maintainerQuoted 21 lines · On Tue, 3 Mar 2020 15:35:50 -0800 Roman Gushchin <[email protected]> wrote:
Depending on
CONFIG_VMAP_STACKand theTHREAD_SIZE/PAGE_SIZEratio the space for task stacks can be allocated using__vmalloc_node_range(),alloc_pages_node()andkmem_cache_alloc_node(). In the first and the second casespage->mem_cgrouppointer is set, but in the third it's
not: memcg membership of a slab page should be determined using thememcg_from_slab_page()function, which looks atpage->slab_cache->memcg_params.memcg. In this case, usingmod_memcg_page_state()(as inaccount_kernel_stack()) is incorrect:page->mem_cgrouppointer is NULL even for pages charged to a non-root memory cgroup.It can lead to
kernel_stackper-memcg counters permanently showing 0 on some architectures (depending on the configuration).In order to fix it, let's introduce a
mod_memcg_obj_state()helper, which takes a pointer to a kernel object as a first argument, usesmem_cgroup_from_obj()to get a RCU-protected memcg pointer and callsmod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACKand various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics intofork.c.
Quoted 5 lines
Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
Actually, it isn't a standalone patch.
Quoted 6 lines
mm/memcontrol.c +0
-0@@ -776,6 +776,17 @@ void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)rcu_read_unlock (); }
mm/memcontrol.c void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val) · line 788
Quoted 10 lines
mm/memcontrol.c +10
-0+void mod_memcg_obj_state (void *p,int idx,int val) +{ +struct mem_cgroup *memcg; + +rcu_read_lock (); + memcg =mem_cgroup_from_obj (p); +if (memcg) +mod_memcg_state (memcg, idx, val); +rcu_read_unlock (); +}
mem_cgroup_from_obj() is later added by
http://lkml.kernel.org/r/[email protected]
We could merge both mm-memcg-slab-introduce-mem_cgroup_from_obj.patch and this patch, but that's a whole lot of stuff to backport into -stable.
Are you able to come up with a simpler suitable-for-stable fix?
Quoted 23 lines · Andrew Morton
Quoted 21 lines · On Tue, 3 Mar 2020 15:35:50 -0800 Roman Gushchin <[email protected]> wrote:
Depending on
CONFIG_VMAP_STACKand theTHREAD_SIZE/PAGE_SIZEratio the space for task stacks can be allocated using__vmalloc_node_range(),alloc_pages_node()andkmem_cache_alloc_node(). In the first and the second casespage->mem_cgrouppointer is set, but in the third it's
not: memcg membership of a slab page should be determined using thememcg_from_slab_page()function, which looks atpage->slab_cache->memcg_params.memcg. In this case, usingmod_memcg_page_state()(as inaccount_kernel_stack()) is incorrect:page->mem_cgrouppointer is NULL even for pages charged to a non-root memory cgroup.It can lead to
kernel_stackper-memcg counters permanently showing 0 on some architectures (depending on the configuration).In order to fix it, let's introduce a
mod_memcg_obj_state()helper, which takes a pointer to a kernel object as a first argument, usesmem_cgroup_from_obj()to get a RCU-protected memcg pointer and callsmod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACKand various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics intofork.c.
Quoted 7 lines
Quoted 5 lines
Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
Actually, it isn't a standalone patch.
It's true. I only meant it doesn't have to be a part of the slab accounting rework patchset.
Quoted 21 lines
Quoted 7 lines
mm/memcontrol.c +0
-0@@ -776,6 +776,17 @@ void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)rcu_read_unlock (); }mm/memcontrol.c void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val) · line 788
Quoted 10 lines
mm/memcontrol.c +10
-0+void mod_memcg_obj_state (void *p,int idx,int val) +{ +struct mem_cgroup *memcg; + +rcu_read_lock (); + memcg =mem_cgroup_from_obj (p); +if (memcg) +mod_memcg_state (memcg, idx, val); +rcu_read_unlock (); +}
mem_cgroup_from_obj()is later added by
http://lkml.kernel.org/r/[email protected]
Quoted 5 lines
We could merge both mm-memcg-slab-introduce-mem_cgroup_from_obj.patch and this patch, but that's a whole lot of stuff to backport into -stable.
Are you able to come up with a simpler suitable-for-stable fix?
I'll try.
Thank you!
Quoted 51 lines · Andrew Morton
Quoted 21 lines · On Tue, 3 Mar 2020 15:35:50 -0800 Roman Gushchin <[email protected]> wrote:
Depending on
CONFIG_VMAP_STACKand theTHREAD_SIZE/PAGE_SIZEratio the space for task stacks can be allocated using__vmalloc_node_range(),alloc_pages_node()andkmem_cache_alloc_node(). In the first and the second casespage->mem_cgrouppointer is set, but in the third it's
not: memcg membership of a slab page should be determined using thememcg_from_slab_page()function, which looks atpage->slab_cache->memcg_params.memcg. In this case, usingmod_memcg_page_state()(as inaccount_kernel_stack()) is incorrect:page->mem_cgrouppointer is NULL even for pages charged to a non-root memory cgroup.It can lead to
kernel_stackper-memcg counters permanently showing 0 on some architectures (depending on the configuration).In order to fix it, let's introduce a
mod_memcg_obj_state()helper, which takes a pointer to a kernel object as a first argument, usesmem_cgroup_from_obj()to get a RCU-protected memcg pointer and callsmod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACKand various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics intofork.c.Quoted 5 lines
Note: this patch has been first posted as a part of the new slab controller patchset. This is a slightly updated version: the fixes tag has been added and the commit log was extended by the advice of Johannes Weiner. Because it's a fix that makes sense by itself, I'm re-posting it as a standalone patch.
Actually, it isn't a standalone patch.
Quoted 6 lines
mm/memcontrol.c +0
-0@@ -776,6 +776,17 @@ void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)rcu_read_unlock (); }mm/memcontrol.c void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val) · line 788
Quoted 10 lines
mm/memcontrol.c +10
-0+void mod_memcg_obj_state (void *p,int idx,int val) +{ +struct mem_cgroup *memcg; + +rcu_read_lock (); + memcg =mem_cgroup_from_obj (p); +if (memcg) +mod_memcg_state (memcg, idx, val); +rcu_read_unlock (); +}
mem_cgroup_from_obj()is later added by
http://lkml.kernel.org/r/[email protected]
Quoted 5 lines
We could merge both mm-memcg-slab-introduce-mem_cgroup_from_obj.patch and this patch, but that's a whole lot of stuff to backport into -stable.
Are you able to come up with a simpler suitable-for-stable fix?
How about this one? I've merged them into one and stripped it a little bit.
Thanks!
--
From 1b8b039b05d49945aaf34a0600b04ea616fe0ba2 Mon Sep 17 00:00:00 2001
From: Roman Gushchin <[email protected]>
Date: Sat, 21 Mar 2020 23:05:42 +0000
Subject: [PATCH] mm: fork: fix kernel_stack memcg stats for various stack
implementations
Depending on CONFIG_VMAP_STACK and the THREAD_SIZE / PAGE_SIZE ratio the space for task stacks can be allocated using __vmalloc_node_range(), alloc_pages_node() and kmem_cache_alloc_node(). In the first and the second cases page->mem_cgroup pointer is set, but in the third it's not:
memcg membership of a slab page should be determined using the memcg_from_slab_page() function, which looks at page->slab_cache->memcg_params.memcg . In this case, using mod_memcg_page_state() (as in account_kernel_stack()) is incorrect:page->mem_cgroup pointer is NULL even for pages charged to a non-root memory cgroup.
It can lead to kernel_stack per-memcg counters permanently showing 0 on some architectures (depending on the configuration).
In order to fix it, let's introduce a mod_memcg_obj_state() helper, which takes a pointer to a kernel object as a first argument, uses mem_cgroup_from_obj() to get a RCU-protected memcg pointer and calls mod_memcg_state(). It allows to handle all possible configurations (CONFIG_VMAP_STACK and various THREAD_SIZE/PAGE_SIZE values) without spilling any memcg/kmem specifics into fork.c .
Note: This is a special version of the patch created for stable backports. It contains code from the following two patches:
- mm: memcg/slab: introduce mem_cgroup_from_obj()
- mm: fork: fix kernel_stack memcg stats for various stack implementations
--- include/linux/memcontrol.h | 12 ++++++++++++ kernel/fork.c | 4 ++-- mm/memcontrol.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-)
include/linux/memcontrol.h +12 -0
@@ -695,6 +695,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec,void __mod_lruvec_state (struct lruvec *lruvec,enum node_stat_item idx,int val);void __mod_lruvec_slab_state (void *p,enum node_stat_item idx,int val); +void mod_memcg_obj_state (void *p,int idx,int val);static inline void mod_lruvec_state (struct lruvec *lruvec,enum node_stat_item idx,int val)
@@ -1123,6 +1124,10 @@ static inline void __mod_lruvec_slab_state(void *p, enum node_stat_item idx,__mod_node_page_state (page_pgdat (page), idx, val); } +static inline void mod_memcg_obj_state (void *p,int idx,int val) +{ +} + static inline unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, gfp_t gfp_mask,
@@ -1427,6 +1432,8 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg) return memcg ? memcg->kmemcg_id : -1; } +struct mem_cgroup *mem_cgroup_from_obj (void *p); +#else static inline int memcg_kmem_charge (struct page *page,gfp_t gfp,int order)
@@ -1468,6 +1475,11 @@ static inline void memcg_put_cache_ids(void) { } +static inline struct mem_cgroup *mem_cgroup_from_obj (void *p) +{ +return NULL ; +} +#endif /* CONFIG_MEMCG_KMEM */ #endif /* _LINUX_MEMCONTROL_H */
kernel/fork.c +2 -2
@@ -397,8 +397,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)mod_zone_page_state (page_zone (first_page),NR_KERNEL_STACK_KB ,THREAD_SIZE /1024 * account); -mod_memcg_page_state (first_page,MEMCG_KERNEL_STACK_KB , - account * (THREAD_SIZE /1024 )); +mod_memcg_obj_state (stack,MEMCG_KERNEL_STACK_KB , + account * (THREAD_SIZE /1024 )); } }
mm/memcontrol.c +38 -0
@@ -775,6 +775,17 @@ void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)rcu_read_unlock (); } +void mod_memcg_obj_state (void *p,int idx,int val) +{ +struct mem_cgroup *memcg; + +rcu_read_lock (); + memcg =mem_cgroup_from_obj (p); +if (memcg) +mod_memcg_state (memcg, idx, val); +rcu_read_unlock (); +} +/** * __count_memcg_events - account VM events in a cgroup * @memcg: the memory cgroup
@@ -2636,6 +2647,33 @@ static void commit_charge(struct page *page, struct mem_cgroup *memcg, }#ifdef CONFIG_MEMCG_KMEM +/* +* Returns a pointer to the memory cgroup to which the kernel object is charged. +* +* The caller must ensure the memcg lifetime, e.g. by taking rcu_read_lock(), +* cgroup_mutex, etc. +*/ +struct mem_cgroup *mem_cgroup_from_obj (void *p) +{ +struct page *page; + +if (mem_cgroup_disabled ()) +return NULL ; + + page =virt_to_head_page (p); + +/* +* Slab pages don't have page->mem_cgroup set because corresponding +* kmem caches can be reparented during the lifetime. That's why +* memcg_from_slab_page() should be used instead. +*/ +if (PageSlab (page)) +return memcg_from_slab_page (page); + +/* All other pages use page->mem_cgroup */ +return page->mem_cgroup; +} +static int memcg_alloc_cache_id (void ) {int id, size;
Signature · 1 line
2.25.1
Andrew Morton
maintainerQuoted 4 lines · On Mon, 23 Mar 2020 17:42:21 -0700 Roman Gushchin <[email protected]> wrote:
How about this one? I've merged them into one and stripped it a little bit.
Thanks!
Yes, that looks good. Here's the delta from the previously reviewed version. I think it's valid to retain those acks and revewed-by's.
From: Roman Gushchin <[email protected]>
Subject: mm: fork: fix kernel_stack memcg stats for various stack implementations
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-fork-fix-kernel_stack-memcg-stats-for-various-stack-implementations-v2 +7 -0
@@ -1432,6 +1432,8 @@ static inline int memcg_cache_id(struct return memcg ? memcg->kmemcg_id : -1; } +struct mem_cgroup *mem_cgroup_from_obj (void *p); +#else static inline int memcg_kmem_charge (struct page *page,gfp_t gfp,int order)
@@ -1473,6 +1475,11 @@ static inline void memcg_put_cache_ids(v { } +static inline struct mem_cgroup *mem_cgroup_from_obj (void *p) +{ +return NULL ; +} +#endif /* CONFIG_MEMCG_KMEM */ #endif /* _LINUX_MEMCONTROL_H */
mm/memcontrol.c renamed from mm/memcontrol.c~mm-fork-fix-kernel_stack-memcg-stats-for-various-stack-implementations-v2 +27 -0
@@ -2672,6 +2672,33 @@ static void commit_charge(struct page *p }#ifdef CONFIG_MEMCG_KMEM +/* +* Returns a pointer to the memory cgroup to which the kernel object is charged. +* +* The caller must ensure the memcg lifetime, e.g. by taking rcu_read_lock(), +* cgroup_mutex, etc. +*/ +struct mem_cgroup *mem_cgroup_from_obj (void *p) +{ +struct page *page; + +if (mem_cgroup_disabled ()) +return NULL ; + + page =virt_to_head_page (p); + +/* +* Slab pages don't have page->mem_cgroup set because corresponding +* kmem caches can be reparented during the lifetime. That's why +* memcg_from_slab_page() should be used instead. +*/ +if (PageSlab (page)) +return memcg_from_slab_page (page); + +/* All other pages use page->mem_cgroup */ +return page->mem_cgroup; +} +static int memcg_alloc_cache_id (void ) {int id, size;
_
Quoted 11 lines · On Mon, 23 Mar 2020 18:03:58 -0700 Andrew Morton <[email protected]>…
Quoted 4 lines · On Mon, 23 Mar 2020 17:42:21 -0700 Roman Gushchin <[email protected]> wrote:
How about this one? I've merged them into one and stripped it a little bit.
Thanks!
Yes, that looks good. Here's the delta from the previously reviewed version. I think it's valid to retain those acks and revewed-by's.
And here's the altered "mm: memcg/slab: introduce mem_cgroup_from_obj()", which I have renamed to "mm: memcg/slab: use mem_cgroup_from_obj()":
The end result is slightly different - mem_cgroup_from_obj() will now end up inside #ifdef CONFIG_MEMCG_KMEM. Should I undo that?
From: Roman Gushchin <[email protected]>
Subject: mm: memcg/slab: use mem_cgroup_from_obj()
Sometimes we need to get a memcg pointer from a charged kernel object. The right way to get it depends on whether it's a proper slab object or it's backed by raw pages (e.g. it's a vmalloc alloction). In the first case the kmem_cache->memcg_params.memcg indirection should be used; in other cases it's just page->mem_cgroup.
To simplify this task and hide the implementation details let's use the mem_cgroup_from_obj() helper, which takes a pointer to any kernel object and returns a valid memcg pointer or NULL.
Passing a kernel address rather than a pointer to a page will allow to use this helper for per-object (rather than per-page) tracked objects in the future.
The caller is still responsible to ensure that the returned memcg isn't going away underneath: take the rcu read lock, cgroup mutex etc; depending on the context.
mem_cgroup_from_kmem() defined in mm/list_lru.c is now obsolete and can be removed.
---
mm/list_lru.c | 12 +----------- mm/memcontrol.c | 5 ++--- 2 files changed, 3 insertions(+), 14 deletions(-)
mm/list_lru.c renamed from mm/list_lru.c~mm-memcg-slab-introduce-mem_cgroup_from_obj +1 -11
@@ -57,16 +57,6 @@ list_lru_from_memcg_idx(struct list_lru_return &nlru->lru; } -static __always_inline struct mem_cgroup *mem_cgroup_from_kmem(void *ptr) -{ -struct page *page; - -if (!memcg_kmem_enabled ()) -return NULL ; - page =virt_to_head_page (ptr); -return memcg_from_slab_page (page); -} -static inline struct list_lru_one *list_lru_from_kmem (struct list_lru_node *nlru,void *ptr,struct mem_cgroup **memcg_ptr)
@@ -77,7 +67,7 @@ list_lru_from_kmem(struct list_lru_nodeif (!nlru->memcg_lrus) goto out; - memcg =mem_cgroup_from_kmem (ptr); + memcg =mem_cgroup_from_obj (ptr);if (!memcg) goto out;
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-slab-introduce-mem_cgroup_from_obj +2 -3
@@ -759,13 +759,12 @@ void __mod_lruvec_state(struct lruvec *lvoid __mod_lruvec_slab_state (void *p,enum node_stat_item idx,int val) { -struct page *page =virt_to_head_page (p); -pg_data_t *pgdat =page_pgdat (page); +pg_data_t *pgdat =page_pgdat (virt_to_page (p));struct mem_cgroup *memcg;struct lruvec *lruvec;rcu_read_lock (); - memcg =memcg_from_slab_page (page); + memcg =mem_cgroup_from_obj (p);/* Untracked pages have no memcg, no lruvec. Update only the node */ if (!memcg || memcg == root_mem_cgroup) {
_
Andrew Morton
maintainerQuoted 6 lines · On Mon, 23 Mar 2020 18:06:33 -0700 Andrew Morton <[email protected]>…
And here's the altered "mm: memcg/slab: introduce
mem_cgroup_from_obj()", which I have renamed to "mm: memcg/slab: usemem_cgroup_from_obj()":The end result is slightly different -
mem_cgroup_from_obj()will now end up inside #ifdefCONFIG_MEMCG_KMEM. Should I undo that?
err, no, we've just fed forward the build fixes in mm-memcg-slab-introduce-mem_cgroup_from_obj-v2.patch so I think we're all good.