From: Axel Rasmussen Date: Wed, 14 Aug 2024 21:50:37 +0000 (-0700) Subject: mm, slub: print CPU id (and its node) on slab OOM X-Git-Tag: v6.12-rc1~162^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf6b9e9ba0861c92b08c77edbd5d602063443c5f;p=thirdparty%2Fkernel%2Flinux.git mm, slub: print CPU id (and its node) on slab OOM Depending on how remote_node_defrag_ratio is configured, allocations can end up in this path as a result of the local node being OOM, despite the allocation overall being unconstrained (node == -1). When we print a warning, printing the current CPU makes that situation more clear (i.e., you can immediately see which node's OOM status matters for the allocation at hand). Acked-by: David Rientjes Signed-off-by: Axel Rasmussen Signed-off-by: Vlastimil Babka --- diff --git a/mm/slub.c b/mm/slub.c index c9d8a2497fd65..3088260bf75d4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3416,14 +3416,15 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid) { static DEFINE_RATELIMIT_STATE(slub_oom_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); + int cpu = raw_smp_processor_id(); int node; struct kmem_cache_node *n; if ((gfpflags & __GFP_NOWARN) || !__ratelimit(&slub_oom_rs)) return; - pr_warn("SLUB: Unable to allocate memory on node %d, gfp=%#x(%pGg)\n", - nid, gfpflags, &gfpflags); + pr_warn("SLUB: Unable to allocate memory on CPU %u (of node %d) on node %d, gfp=%#x(%pGg)\n", + cpu, cpu_to_node(cpu), nid, gfpflags, &gfpflags); pr_warn(" cache: %s, object size: %u, buffer size: %u, default order: %u, min order: %u\n", s->name, s->object_size, s->size, oo_order(s->oo), oo_order(s->min));