Skip to contentSkip to conversation

mm/slab.c: use 'ac' from the caller

PATCH In review Yejune Deng 3 participants 3 messages Apr 21, 2021 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/slab.c: use 'ac' from the caller

It can use 'ac' from ____cache_alloc() in cache_alloc_refill(). This saves call cpu_cache_get() twice.

---
 mm/slab.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
mm/slab.c +3 -9
index d0f725637663..4b2dc8f8cc37 100644
@@ -2896,11 +2896,11 @@ static __always_inline int alloc_block(struct kmem_cache *cachep,
 	return batchcount;
 }
 
-static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags)
+static void *cache_alloc_refill(struct kmem_cache *cachep, struct array_cache *ac, gfp_t flags)
 {
 	int batchcount;
 	struct kmem_cache_node *n;
-	struct array_cache *ac, *shared;
+	struct array_cache *shared;
 	int node;
 	void *list = NULL;
 	struct page *page;
@@ -2908,7 +2908,6 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags)
 	check_irq_off();
 	node = numa_mem_id();
 
-	ac = cpu_cache_get(cachep);
 	batchcount = ac->batchcount;
 	if (!ac->touched && batchcount > BATCHREFILL_LIMIT) {
 		/*
@@ -3045,12 +3044,7 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 	}
 
 	STATS_INC_ALLOCMISS(cachep);
-	objp = cache_alloc_refill(cachep, flags);
-	/*
-	 * the 'ac' may be updated by cache_alloc_refill(),
-	 * and kmemleak_erase() requires its correct value.
-	 */
-	ac = cpu_cache_get(cachep);
+	objp = cache_alloc_refill(cachep, ac, flags);
 
 out:
 	/*
Signature · 1 line
2.29.0
#1 lore raw

mm/slab.c static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) · line 3047

Quoted 11 lines · Yejune Deng
mm/slab.c +1 -6
@@ -3045,12 +3044,7 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 	}
 
 	STATS_INC_ALLOCMISS(cachep);
-	objp = cache_alloc_refill(cachep, flags);
-	/*
-	 * the 'ac' may be updated by cache_alloc_refill(),
-	 * and kmemleak_erase() requires its correct value.
-	 */
-	ac = cpu_cache_get(cachep);
+	objp = cache_alloc_refill(cachep, ac, flags);

I think passing 'ac' in is fine (probably? I don't know this code deeply), but deleting this call to 'ac' is clearly wrong. The comment even tells you that! I just verified the code, and the comment is correct.

#2 lore raw
Quoted 4 lines · Matthew Wilcox
Quoted 3 lines · Yejune Deng
(quoted diff) +0 -0
@@ -3045,12 +3044,7 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 	}
 
Quoted 13 lines

mm/slab.c static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) · line 3047

Quoted 8 lines
mm/slab.c +1 -6
 	STATS_INC_ALLOCMISS(cachep);
-	objp = cache_alloc_refill(cachep, flags);
-	/*
-	 * the 'ac' may be updated by cache_alloc_refill(),
-	 * and kmemleak_erase() requires its correct value.
-	 */
-	ac = cpu_cache_get(cachep);
+	objp = cache_alloc_refill(cachep, ac, flags);

I think passing 'ac' in is fine (probably? I don't know this code deeply), but deleting this call to 'ac' is clearly wrong. The comment even tells you that! I just verified the code, and the comment is correct.

Yep the delete of the ac assignment is wrong.

But even without that issue: There is no point to passing ac to cache_alloc_refill since cpu_cache_get is rather trivial and does not even require memory access since "cachep" is usually in some register.