Merge branch 'akpm' (patches from Andrew)

torvalds · torvalds · commit 104e2a6f8b3d · 2015-11-22T15:21:40.000-08:00
Merge slub bulk allocator updates from Andrew Morton: "This missed the merge window because I was waiting for some repairs to come in. Nothing actually uses the bulk allocator yet and the changes to other code paths are pretty small. And the net guys are waiting for this so they can start merging the client code" More comments from Jesper Dangaard Brouer: "The kmem_cache_alloc_bulk() call, in mm/slub.c, were included in previous kernel. The present version contains a bug. Vladimir Davydov noticed it contained a bug, when kernel is compiled with CONFIG_MEMCG_KMEM (see commit 03ec0ed: "slub: fix kmem cgroup bug in kmem_cache_alloc_bulk"). Plus the mem cgroup counterpart in kmem_cache_free_bulk() were missing (see commit 0337451 "slub: add missing kmem cgroup support to kmem_cache_free_bulk"). I don't consider the fix stable-material because there are no in-tree users of the API. But with known bugs (for memcg) I cannot start using the API in the net-tree" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: slab/slub: adjust kmem_cache_alloc_bulk API slub: add missing kmem cgroup support to kmem_cache_free_bulk slub: fix kmem cgroup bug in kmem_cache_alloc_bulk slub: optimize bulk slowpath free by detached freelist slub: support for bulk free with SLUB freelists
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

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);`