mm, slub: restructure new page checks in ___slab_alloc()

When we allocate slab object from a newly acquired page (from node's
partial list or page allocator), we usually also retain the page as a new
percpu slab.  There are two exceptions - when pfmemalloc status of the
page doesn't match our gfp flags, or when the cache has debugging enabled.

The current code for these decisions is not easy to follow, so restructure
it and add comments.  The new structure will also help with the following
changes.  No functional change.

Link: https://lkml.kernel.org/r/20210805152000.12817-11-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/slub.c b/mm/slub.c
index fd9f5481b422dce7c13c79f4d9e1cb8aa063a866..b13424444caef03ac690ad763d4383382bd2f901 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2768,13 +2768,29 @@ new_slab:
        c->page = page;
 
 check_new_page:
-       if (likely(!kmem_cache_debug(s) && pfmemalloc_match(page, gfpflags)))
-               goto load_freelist;
 
-       /* Only entered in the debug case */
-       if (kmem_cache_debug(s) &&
-                       !alloc_debug_processing(s, page, freelist, addr))
-               goto new_slab;  /* Slab failed checks. Next slab needed */
+       if (kmem_cache_debug(s)) {
+               if (!alloc_debug_processing(s, page, freelist, addr))
+                       /* Slab failed checks. Next slab needed */
+                       goto new_slab;
+               else
+                       /*
+                        * For debug case, we don't load freelist so that all
+                        * allocations go through alloc_debug_processing()
+                        */
+                       goto return_single;
+       }
+
+       if (unlikely(!pfmemalloc_match(page, gfpflags)))
+               /*
+                * For !pfmemalloc_match() case we don't load freelist so that
+                * we don't make further mismatched allocations easier.
+                */
+               goto return_single;
+
+       goto load_freelist;
+
+return_single:
 
        deactivate_slab(s, page, get_freepointer(s, freelist), c);
        return freelist;