slab/slub: adjust kmem_cache_alloc_bulk API

netoptimizer · torvalds · commit 865762a8119e · 2015-11-22T11:58:44.000-08:00
Adjust kmem_cache_alloc_bulk API before we have any real users.

Adjust API to return type 'int' instead of previously type 'bool'.  This
is done to allow future extension of the bulk alloc API.

A future extension could be to allow SLUB to stop at a page boundary, when
specified by a flag, and then return the number of objects.

The advantage of this approach, would make it easier to make bulk alloc
run without local IRQs disabled.  With an approach of cmpxchg "stealing"
the entire c-&gt;freelist or page-&gt;freelist.  To avoid overshooting we would
stop processing at a slab-page boundary.  Else we always end up returning
some objects at the cost of another cmpxchg.

To keep compatible with future users of this API linking against an older
kernel when using the new flag, we need to return the number of allocated
objects with this API change.

Signed-off-by: Jesper Dangaard Brouer &lt;brouer@redhat.com&gt;
Cc: Vladimir Davydov &lt;vdavydov@virtuozzo.com&gt;
Acked-by: Christoph Lameter &lt;cl@linux.com&gt;
Cc: Pekka Enberg &lt;penberg@kernel.org&gt;
Cc: David Rientjes &lt;rientjes@google.com&gt;
Cc: Joonsoo Kim &lt;iamjoonsoo.kim@lge.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/linux/slab.h b/include/linux/slab.h
@@ -316,7 +316,7 @@ void kmem_cache_free(struct kmem_cache *, void *);
  * Note that interrupts must be enabled when calling these functions.
  */
 void kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
-bool kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
+int kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
 
 #ifdef CONFIG_NUMA
 void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment;
diff --git a/mm/slab.c b/mm/slab.c
@@ -3419,7 +3419,7 @@ void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p)
 }
 EXPORT_SYMBOL(kmem_cache_free_bulk);
 
-bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
 								void **p)
 {
 	return __kmem_cache_alloc_bulk(s, flags, size, p);
diff --git a/mm/slab.h b/mm/slab.h
@@ -170,7 +170,7 @@ ssize_t slabinfo_write(struct file *file, const char __user *buffer,
  * may be allocated or freed using these operations.
  */
 void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
-bool __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
+int __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
 
 #ifdef CONFIG_MEMCG_KMEM
 /*
diff --git a/mm/slab_common.c b/mm/slab_common.c
@@ -112,7 +112,7 @@ void __kmem_cache_free_bulk(struct kmem_cache *s, size_t nr, void **p)
 		kmem_cache_free(s, p[i]);
 }
 
-bool __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,
+int __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,
 								void **p)
 {
 	size_t i;
@@ -121,10 +121,10 @@ bool __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,
 		void *x = p[i] = kmem_cache_alloc(s, flags);
 		if (!x) {
 			__kmem_cache_free_bulk(s, i, p);
-			return false;
+			return 0;
 		}
 	}
-	return true;
+	return i;
 }
 
 #ifdef CONFIG_MEMCG_KMEM
diff --git a/mm/slob.c b/mm/slob.c
@@ -617,7 +617,7 @@ void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p)
 }
 EXPORT_SYMBOL(kmem_cache_free_bulk);
 
-bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
 								void **p)
 {
 	return __kmem_cache_alloc_bulk(s, flags, size, p);
diff --git a/mm/slub.c b/mm/slub.c
@@ -2909,8 +2909,8 @@ void kmem_cache_free_bulk(struct kmem_cache *orig_s, size_t size, void **p)
 EXPORT_SYMBOL(kmem_cache_free_bulk);
 
 /* Note that interrupts must be enabled when calling this function. */
-bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
-			   void **p)
+int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+			  void **p)
 {
 	struct kmem_cache_cpu *c;
 	int i;
@@ -2959,12 +2959,12 @@ bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
 
 	/* memcg and kmem_cache debug support */
 	slab_post_alloc_hook(s, flags, size, p);
-	return true;
+	return i;
 error:
 	local_irq_enable();
 	slab_post_alloc_hook(s, flags, i, p);
 	__kmem_cache_free_bulk(s, i, p);
-	return false;
+	return 0;
 }
 EXPORT_SYMBOL(kmem_cache_alloc_bulk);
 

Original file line number	Diff line number	Diff line change
`@@ -3419,7 +3419,7 @@ void kmem_cache_free_bulk(struct kmem_cache s, size_t size, void *p)`
`3419`	`3419`	`}`
`3420`	`3420`	`EXPORT_SYMBOL(kmem_cache_free_bulk);`
`3421`	`3421`
`3422`		`-bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,`
	`3422`	`+int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,`
`3423`	`3423`	`void **p)`
`3424`	`3424`	`{`
`3425`	`3425`	`return __kmem_cache_alloc_bulk(s, flags, size, p);`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void __kmem_cache_free_bulk(struct kmem_cache s, size_t nr, void *p)`
`112`	`112`	`kmem_cache_free(s, p[i]);`
`113`	`113`	`}`
`114`	`114`
`115`		`-bool __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,`
	`115`	`+int __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,`
`116`	`116`	`void **p)`
`117`	`117`	`{`
`118`	`118`	`size_t i;`
`@@ -121,10 +121,10 @@ bool __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,`
`121`	`121`	`void *x = p[i] = kmem_cache_alloc(s, flags);`
`122`	`122`	`if (!x) {`
`123`	`123`	`__kmem_cache_free_bulk(s, i, p);`
`124`		`- return false;`
	`124`	`+ return 0;`
`125`	`125`	`}`
`126`	`126`	`}`
`127`		`- return true;`
	`127`	`+ return i;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`#ifdef CONFIG_MEMCG_KMEM`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ void kmem_cache_free_bulk(struct kmem_cache s, size_t size, void *p)`
`617`	`617`	`}`
`618`	`618`	`EXPORT_SYMBOL(kmem_cache_free_bulk);`
`619`	`619`
`620`		`-bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,`
	`620`	`+int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,`
`621`	`621`	`void **p)`
`622`	`622`	`{`
`623`	`623`	`return __kmem_cache_alloc_bulk(s, flags, size, p);`