* [PATCH] memcg: fix slab accounting in refill_obj_stock() trylock path
@ 2026-02-26 11:51 Hao Li
2026-02-26 13:39 ` Shakeel Butt
0 siblings, 1 reply; 3+ messages in thread
From: Hao Li @ 2026-02-26 11:51 UTC (permalink / raw)
To: hannes, mhocko, roman.gushchin, shakeel.butt
Cc: vbabka, harry.yoo, muchun.song, akpm, cgroups, linux-mm,
linux-kernel, Hao Li, stable
In the trylock path of refill_obj_stock(), mod_objcg_mlstate() should
use the real alloc/free bytes (i.e., nr_acct) for accounting, rather
than nr_bytes.
Fixes: 200577f69f29 ("memcg: objcg stock trylock without irq disabling")
Cc: stable@vger.kernel.org
Signed-off-by: Hao Li <hao.li@linux.dev>
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2d6dfba540d4..683f9f9bf47e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3060,7 +3060,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes,
if (!local_trylock(&obj_stock.lock)) {
if (pgdat)
- mod_objcg_mlstate(objcg, pgdat, idx, nr_bytes);
+ mod_objcg_mlstate(objcg, pgdat, idx, nr_acct);
nr_pages = nr_bytes >> PAGE_SHIFT;
nr_bytes = nr_bytes & (PAGE_SIZE - 1);
atomic_add(nr_bytes, &objcg->nr_charged_bytes);
--
2.50.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] memcg: fix slab accounting in refill_obj_stock() trylock path
2026-02-26 11:51 [PATCH] memcg: fix slab accounting in refill_obj_stock() trylock path Hao Li
@ 2026-02-26 13:39 ` Shakeel Butt
2026-02-26 13:44 ` Vlastimil Babka
0 siblings, 1 reply; 3+ messages in thread
From: Shakeel Butt @ 2026-02-26 13:39 UTC (permalink / raw)
To: Hao Li
Cc: hannes, mhocko, roman.gushchin, vbabka, harry.yoo, muchun.song,
akpm, cgroups, linux-mm, linux-kernel, stable
On Thu, Feb 26, 2026 at 07:51:37PM +0800, Hao Li wrote:
> In the trylock path of refill_obj_stock(), mod_objcg_mlstate() should
> use the real alloc/free bytes (i.e., nr_acct) for accounting, rather
> than nr_bytes.
>
> Fixes: 200577f69f29 ("memcg: objcg stock trylock without irq disabling")
> Cc: stable@vger.kernel.org
> Signed-off-by: Hao Li <hao.li@linux.dev>
Thanks for the fix.
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] memcg: fix slab accounting in refill_obj_stock() trylock path
2026-02-26 13:39 ` Shakeel Butt
@ 2026-02-26 13:44 ` Vlastimil Babka
0 siblings, 0 replies; 3+ messages in thread
From: Vlastimil Babka @ 2026-02-26 13:44 UTC (permalink / raw)
To: Shakeel Butt, Hao Li
Cc: hannes, mhocko, roman.gushchin, vbabka, harry.yoo, muchun.song,
akpm, cgroups, linux-mm, linux-kernel, stable
On 2/26/26 14:39, Shakeel Butt wrote:
> On Thu, Feb 26, 2026 at 07:51:37PM +0800, Hao Li wrote:
>> In the trylock path of refill_obj_stock(), mod_objcg_mlstate() should
>> use the real alloc/free bytes (i.e., nr_acct) for accounting, rather
>> than nr_bytes.
>>
>> Fixes: 200577f69f29 ("memcg: objcg stock trylock without irq disabling")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Hao Li <hao.li@linux.dev>
>
> Thanks for the fix.
>
> Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
What are the user-visible effects of the bug?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-26 13:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-26 11:51 [PATCH] memcg: fix slab accounting in refill_obj_stock() trylock path Hao Li
2026-02-26 13:39 ` Shakeel Butt
2026-02-26 13:44 ` Vlastimil Babka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox