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: memcg: fix unit conversion for K() macro in OOM log

The commit bc8e51c05ad5 ("mm: memcg: dump memcg protection info on oom or
alloc failures") added functionality to dump memcg protections on OOM or
allocation failures. It uses K() macro to dump the information and passes
bytes to the macro. However the macro take number of pages instead of
bytes. It is defined as:

#define K(x) ((x) << (PAGE_SHIFT-10))

Let's fix this.

Link: https://lkml.kernel.org/r/20251216212054.484079-1-shakeel.butt@linux.dev
Fixes: bc8e51c05ad5 ("mm: memcg: dump memcg protection info on oom or alloc failures")
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
Reported-by: Chris Mason <clm@fb.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Shakeel Butt and committed by
Andrew Morton
6db12d5c e6dbcb7c

+2 -2
+2 -2
mm/memcontrol.c
··· 5638 5638 memcg = root_mem_cgroup; 5639 5639 5640 5640 pr_warn("Memory cgroup min protection %lukB -- low protection %lukB", 5641 - K(atomic_long_read(&memcg->memory.children_min_usage)*PAGE_SIZE), 5642 - K(atomic_long_read(&memcg->memory.children_low_usage)*PAGE_SIZE)); 5641 + K(atomic_long_read(&memcg->memory.children_min_usage)), 5642 + K(atomic_long_read(&memcg->memory.children_low_usage))); 5643 5643 }