Merge tag 'mm-stable-2023-02-20-13-37' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 29300fc1289a8375188853a07edb64d69df634e0..dabc2a671fc6f7ffc5da481a3b7a9574500cdb0a 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -220,7 +220,6 @@ static inline void fixup_objfreelist_debug(struct kmem_cache *cachep,
 static inline void fixup_slab_list(struct kmem_cache *cachep,
                                struct kmem_cache_node *n, struct slab *slab,
                                void **list);
-static int slab_early_init = 1;
 
 #define INDEX_NODE kmalloc_index(sizeof(struct kmem_cache_node))
 
@@ -1249,8 +1248,6 @@ void __init kmem_cache_init(void)
        slab_state = PARTIAL_NODE;
        setup_kmalloc_cache_index_table();
 
-       slab_early_init = 0;
-
        /* 5) Replace the bootstrap kmem_cache_node */
        {
                int nid;
@@ -1373,7 +1370,7 @@ static struct slab *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
        /* Make the flag visible before any changes to folio->mapping */
        smp_wmb();
        /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
-       if (sk_memalloc_socks() && page_is_pfmemalloc(folio_page(folio, 0)))
+       if (sk_memalloc_socks() && folio_is_pfmemalloc(folio))
                slab_set_pfmemalloc(slab);
 
        return slab;
@@ -1389,7 +1386,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct slab *slab)
 
        BUG_ON(!folio_test_slab(folio));
        __slab_clear_pfmemalloc(slab);
-       page_mapcount_reset(folio_page(folio, 0));
+       page_mapcount_reset(&folio->page);
        folio->mapping = NULL;
        /* Make the mapping reset visible before clearing the flag */
        smp_wmb();
@@ -1398,7 +1395,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct slab *slab)
        if (current->reclaim_state)
                current->reclaim_state->reclaimed_slab += 1 << order;
        unaccount_slab(slab, order, cachep);
-       __free_pages(folio_page(folio, 0), order);
+       __free_pages(&folio->page, order);
 }
 
 static void kmem_rcu_free(struct rcu_head *head)
@@ -1413,13 +1410,10 @@ static void kmem_rcu_free(struct rcu_head *head)
 }
 
 #if DEBUG
-static bool is_debug_pagealloc_cache(struct kmem_cache *cachep)
+static inline bool is_debug_pagealloc_cache(struct kmem_cache *cachep)
 {
-       if (debug_pagealloc_enabled_static() && OFF_SLAB(cachep) &&
-               (cachep->size % PAGE_SIZE) == 0)
-               return true;
-
-       return false;
+       return debug_pagealloc_enabled_static() && OFF_SLAB(cachep) &&
+                       ((cachep->size % PAGE_SIZE) == 0);
 }
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
@@ -3479,14 +3473,15 @@ cache_alloc_debugcheck_after_bulk(struct kmem_cache *s, gfp_t flags,
 int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
                          void **p)
 {
-       size_t i;
        struct obj_cgroup *objcg = NULL;
+       unsigned long irqflags;
+       size_t i;
 
        s = slab_pre_alloc_hook(s, NULL, &objcg, size, flags);
        if (!s)
                return 0;
 
-       local_irq_disable();
+       local_irq_save(irqflags);
        for (i = 0; i < size; i++) {
                void *objp = kfence_alloc(s, s->object_size, flags) ?:
                             __do_cache_alloc(s, flags, NUMA_NO_NODE);
@@ -3495,7 +3490,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
                        goto error;
                p[i] = objp;
        }
-       local_irq_enable();
+       local_irq_restore(irqflags);
 
        cache_alloc_debugcheck_after_bulk(s, flags, size, p, _RET_IP_);
 
@@ -3508,7 +3503,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
        /* FIXME: Trace call missing. Christoph would like a bulk variant */
        return size;
 error:
-       local_irq_enable();
+       local_irq_restore(irqflags);
        cache_alloc_debugcheck_after_bulk(s, flags, i, p, _RET_IP_);
        slab_post_alloc_hook(s, objcg, flags, i, p, false, s->object_size);
        kmem_cache_free_bulk(s, i, p);
@@ -3610,8 +3605,9 @@ EXPORT_SYMBOL(kmem_cache_free);
 
 void kmem_cache_free_bulk(struct kmem_cache *orig_s, size_t size, void **p)
 {
+       unsigned long flags;
 
-       local_irq_disable();
+       local_irq_save(flags);
        for (int i = 0; i < size; i++) {
                void *objp = p[i];
                struct kmem_cache *s;
@@ -3621,9 +3617,9 @@ void kmem_cache_free_bulk(struct kmem_cache *orig_s, size_t size, void **p)
 
                        /* called via kfree_bulk */
                        if (!folio_test_slab(folio)) {
-                               local_irq_enable();
+                               local_irq_restore(flags);
                                free_large_kmalloc(folio, objp);
-                               local_irq_disable();
+                               local_irq_save(flags);
                                continue;
                        }
                        s = folio_slab(folio)->slab_cache;
@@ -3640,7 +3636,7 @@ void kmem_cache_free_bulk(struct kmem_cache *orig_s, size_t size, void **p)
 
                __cache_free(s, objp, _RET_IP_);
        }
-       local_irq_enable();
+       local_irq_restore(flags);
 
        /* FIXME: add tracing */
 }