diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2021-05-10 16:30:01 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2021-09-04 01:12:21 +0200 |
| commit | 6c1dbb674c5cf76d23381160577d34bead60b76b (patch) | |
| tree | db4270c4e7ea19a060f811043e1d6bac3805eafd /mm | |
| parent | fa417ab7506f9234100e249938d13e94a8c404e8 (diff) | |
| download | linux-6c1dbb674c5cf76d23381160577d34bead60b76b.tar.bz2 | |
mm, slub: restore irqs around calling new_slab()
allocate_slab() currently re-enables irqs before calling to the page allocator.
It depends on gfpflags_allow_blocking() to determine if it's safe to do so.
Now we can instead simply restore irq before calling it through new_slab().
The other caller early_kmem_cache_node_alloc() is unaffected by this.
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mm/slub.c b/mm/slub.c index 4d1f3e4a5951..7798ba1c614f 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1809,9 +1809,6 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) flags &= gfp_allowed_mask; - if (gfpflags_allow_blocking(flags)) - local_irq_enable(); - flags |= s->allocflags; /* @@ -1870,8 +1867,6 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) page->frozen = 1; out: - if (gfpflags_allow_blocking(flags)) - local_irq_disable(); if (!page) return NULL; @@ -2812,16 +2807,17 @@ new_objects: goto check_new_page; } + local_irq_restore(flags); put_cpu_ptr(s->cpu_slab); page = new_slab(s, gfpflags, node); c = get_cpu_ptr(s->cpu_slab); if (unlikely(!page)) { - local_irq_restore(flags); slab_out_of_memory(s, gfpflags, node); return NULL; } + local_irq_save(flags); if (c->page) flush_slab(s, c); |