From: Xiongwei Song <xiongwei.song@xxxxxxxxxxxxx>
Remove the check of !kmem_cache_has_cpu_partial() because it is always
false, we've known this by calling kmem_cache_debug() before calling
remove_partial(), so we can remove the check.
Meanwhile, redo filling cpu partial and add comment to improve the
readability.
Signed-off-by: Xiongwei Song <xiongwei.song@xxxxxxxxxxxxx>
---
mm/slub.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index a3ab096c38c0..62388f2a0ac7 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2620,19 +2620,21 @@ static struct slab *get_partial_node(struct kmem_cache *s,
if (!partial) {
partial = slab;
stat(s, ALLOC_FROM_PARTIAL);
- } else {
+
+ /* Fill cpu partial if needed from next iteration, or break */
+ if (IS_ENABLED(CONFIG_SLUB_CPU_PARTIAL))
+ continue;
+ else
+ break;
+ }
+
+ if (IS_ENABLED(CONFIG_SLUB_CPU_PARTIAL)) {
put_cpu_partial(s, slab, 0);
stat(s, CPU_PARTIAL_NODE);
- partial_slabs++;
- }
-#ifdef CONFIG_SLUB_CPU_PARTIAL
- if (!kmem_cache_has_cpu_partial(s)
- || partial_slabs > s->cpu_partial_slabs / 2)
- break;
-#else
- break;
-#endif
+ if (++partial_slabs > s->cpu_partial_slabs/2)
+ break;
+ }
}
spin_unlock_irqrestore(&n->list_lock, flags);
return partial;
--
2.34.1
