mempool: add @gfp_mask to mempool_create_node()
mempool_create_node() currently assumes %GFP_KERNEL. Its only user, blk_init_free_list(), is about to be updated to use other allocation flags - add @gfp_mask argument to the function. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
159749937a
commit
a91a5ac685
|
@ -531,8 +531,8 @@ static int blk_init_free_list(struct request_queue *q)
|
||||||
init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]);
|
init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]);
|
||||||
|
|
||||||
rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
|
rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
|
||||||
mempool_free_slab, request_cachep, q->node);
|
mempool_free_slab, request_cachep,
|
||||||
|
GFP_KERNEL, q->node);
|
||||||
if (!rl->rq_pool)
|
if (!rl->rq_pool)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,8 @@ typedef struct mempool_s {
|
||||||
extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
|
extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
|
||||||
mempool_free_t *free_fn, void *pool_data);
|
mempool_free_t *free_fn, void *pool_data);
|
||||||
extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
|
extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
|
||||||
mempool_free_t *free_fn, void *pool_data, int nid);
|
mempool_free_t *free_fn, void *pool_data,
|
||||||
|
gfp_t gfp_mask, int nid);
|
||||||
|
|
||||||
extern int mempool_resize(mempool_t *pool, int new_min_nr, gfp_t gfp_mask);
|
extern int mempool_resize(mempool_t *pool, int new_min_nr, gfp_t gfp_mask);
|
||||||
extern void mempool_destroy(mempool_t *pool);
|
extern void mempool_destroy(mempool_t *pool);
|
||||||
|
|
12
mm/mempool.c
12
mm/mempool.c
|
@ -63,19 +63,21 @@ EXPORT_SYMBOL(mempool_destroy);
|
||||||
mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
|
mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
|
||||||
mempool_free_t *free_fn, void *pool_data)
|
mempool_free_t *free_fn, void *pool_data)
|
||||||
{
|
{
|
||||||
return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,-1);
|
return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,
|
||||||
|
GFP_KERNEL, NUMA_NO_NODE);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(mempool_create);
|
EXPORT_SYMBOL(mempool_create);
|
||||||
|
|
||||||
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
|
mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
|
||||||
mempool_free_t *free_fn, void *pool_data, int node_id)
|
mempool_free_t *free_fn, void *pool_data,
|
||||||
|
gfp_t gfp_mask, int node_id)
|
||||||
{
|
{
|
||||||
mempool_t *pool;
|
mempool_t *pool;
|
||||||
pool = kmalloc_node(sizeof(*pool), GFP_KERNEL | __GFP_ZERO, node_id);
|
pool = kmalloc_node(sizeof(*pool), gfp_mask | __GFP_ZERO, node_id);
|
||||||
if (!pool)
|
if (!pool)
|
||||||
return NULL;
|
return NULL;
|
||||||
pool->elements = kmalloc_node(min_nr * sizeof(void *),
|
pool->elements = kmalloc_node(min_nr * sizeof(void *),
|
||||||
GFP_KERNEL, node_id);
|
gfp_mask, node_id);
|
||||||
if (!pool->elements) {
|
if (!pool->elements) {
|
||||||
kfree(pool);
|
kfree(pool);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -93,7 +95,7 @@ mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,
|
||||||
while (pool->curr_nr < pool->min_nr) {
|
while (pool->curr_nr < pool->min_nr) {
|
||||||
void *element;
|
void *element;
|
||||||
|
|
||||||
element = pool->alloc(GFP_KERNEL, pool->pool_data);
|
element = pool->alloc(gfp_mask, pool->pool_data);
|
||||||
if (unlikely(!element)) {
|
if (unlikely(!element)) {
|
||||||
mempool_destroy(pool);
|
mempool_destroy(pool);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Reference in New Issue