slub: use a folio in __kmalloc_large_node
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 28 Dec 2023 08:57:46 +0000 (08:57 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 5 Jan 2024 18:17:46 +0000 (10:17 -0800)
Mirror the code in free_large_kmalloc() and alloc_pages_node() and use a
folio directly.  Avoid the use of folio_alloc() as that will set up an
rmappable folio which we do not want here.

Link: https://lkml.kernel.org/r/20231228085748.1083901-5-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: David Rientjes <rientjes@google.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/slab_common.c

index 66f0b35318000a26feae5275b2b067218c14a283..c4a7507df321c34a5b8909845282ea941995ad1d 100644 (file)
@@ -1137,7 +1137,7 @@ gfp_t kmalloc_fix_flags(gfp_t flags)
 
 static void *__kmalloc_large_node(size_t size, gfp_t flags, int node)
 {
-       struct page *page;
+       struct folio *folio;
        void *ptr = NULL;
        unsigned int order = get_order(size);
 
@@ -1145,10 +1145,10 @@ static void *__kmalloc_large_node(size_t size, gfp_t flags, int node)
                flags = kmalloc_fix_flags(flags);
 
        flags |= __GFP_COMP;
-       page = alloc_pages_node(node, flags, order);
-       if (page) {
-               ptr = page_address(page);
-               mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B,
+       folio = (struct folio *)alloc_pages_node(node, flags, order);
+       if (folio) {
+               ptr = folio_address(folio);
+               lruvec_stat_mod_folio(folio, NR_SLAB_UNRECLAIMABLE_B,
                                      PAGE_SIZE << order);
        }