diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2021-05-11 12:45:48 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2021-09-04 01:12:20 +0200 |
| commit | 2a904905ae041504aefaf8fc7144d31b940443e0 (patch) | |
| tree | 0f757b1c1703dc743b9fdc707a33bfb50041df9e /mm | |
| parent | 976b805c782a57256e08aeaab45a64536b8887cf (diff) | |
| download | linux-2a904905ae041504aefaf8fc7144d31b940443e0.tar.gz linux-2a904905ae041504aefaf8fc7144d31b940443e0.tar.bz2 linux-2a904905ae041504aefaf8fc7144d31b940443e0.zip | |
mm, slub: extract get_partial() from new_slab_objects()
The later patches will need more fine grained control over individual actions
in ___slab_alloc(), the only caller of new_slab_objects(), so this is a first
preparatory step with no functional change.
This adds a goto label that appears unnecessary at this point, but will be
useful for later changes.
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Christoph Lameter <cl@linux.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/slub.c b/mm/slub.c index 79e53303844c..cd6aeeec4417 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2613,17 +2613,12 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid) static inline void *new_slab_objects(struct kmem_cache *s, gfp_t flags, int node, struct kmem_cache_cpu **pc) { - void *freelist; + void *freelist = NULL; struct kmem_cache_cpu *c = *pc; struct page *page; WARN_ON_ONCE(s->ctor && (flags & __GFP_ZERO)); - freelist = get_partial(s, flags, node, c); - - if (freelist) - return freelist; - page = new_slab(s, flags, node); if (page) { c = raw_cpu_ptr(s->cpu_slab); @@ -2787,6 +2782,10 @@ new_slab: goto redo; } + freelist = get_partial(s, gfpflags, node, c); + if (freelist) + goto check_new_page; + freelist = new_slab_objects(s, gfpflags, node, &c); if (unlikely(!freelist)) { @@ -2794,6 +2793,7 @@ new_slab: return NULL; } +check_new_page: page = c->page; if (likely(!kmem_cache_debug(s) && pfmemalloc_match(page, gfpflags))) goto load_freelist; |