Skip to content

Commit

Permalink
mm, mempool: disallow mempools based on slab caches with constructors
Browse files Browse the repository at this point in the history
All occurrences of mempools based on slab caches with object constructors
have been removed from the tree, so disallow creating them.

We can only dereference mem->ctor in mm/mempool.c without including
mm/slab.h in include/linux/mempool.h.  So simply note the restriction,
just like the comment restricting usage of __GFP_ZERO, and warn on kernels
with CONFIG_DEBUG_VM() if such a mempool is allocated from.

We don't want to incur this check on every element allocation, so use
VM_BUG_ON().

Signed-off-by: David Rientjes <[email protected]>
Cc: Dave Kleikamp <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Sebastian Ott <[email protected]>
Cc: Mikulas Patocka <[email protected]>
Cc: Catalin Marinas <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rientjes authored and torvalds committed Apr 15, 2015
1 parent ee14624 commit e244c9e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/linux/mempool.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ extern void mempool_free(void *element, mempool_t *pool);

/*
* A mempool_alloc_t and mempool_free_t that get the memory from
* a slab that is passed in through pool_data.
* a slab cache that is passed in through pool_data.
* Note: the slab cache may not have a ctor function.
*/
void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data);
void mempool_free_slab(void *element, void *pool_data);
Expand Down
2 changes: 2 additions & 0 deletions mm/mempool.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/mempool.h>
#include <linux/blkdev.h>
#include <linux/writeback.h>
#include "slab.h"

static void add_element(mempool_t *pool, void *element)
{
Expand Down Expand Up @@ -334,6 +335,7 @@ EXPORT_SYMBOL(mempool_free);
void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data)
{
struct kmem_cache *mem = pool_data;
VM_BUG_ON(mem->ctor);
return kmem_cache_alloc(mem, gfp_mask);
}
EXPORT_SYMBOL(mempool_alloc_slab);
Expand Down

0 comments on commit e244c9e

Please sign in to comment.