zs_create_pool() currently takes a gfp flags argument that is used when growing the memory pool. However it is not used in allocating the metadata for the pool itself. That is currently hardcoded to GFP_KERNEL.
zswap calls zs_create_pool() at swapon time which is done in atomic context, resulting in a "might sleep" warning. This patch changes the meaning of the flags argument in zs_create_pool() to mean the flags for the metadata allocation, and adds a flags argument to zs_malloc that will be used for memory pool growth if required. Signed-off-by: Seth Jennings <[email protected]> --- drivers/staging/zcache/zcache-main.c | 4 ++-- drivers/staging/zram/zram_drv.c | 4 ++-- drivers/staging/zsmalloc/zsmalloc-main.c | 9 +++------ drivers/staging/zsmalloc/zsmalloc.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 52b43b7..674c754 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -711,7 +711,7 @@ static unsigned long zv_create(struct zs_pool *pool, uint32_t pool_id, BUG_ON(!irqs_disabled()); BUG_ON(chunks >= NCHUNKS); - handle = zs_malloc(pool, size); + handle = zs_malloc(pool, size, ZCACHE_GFP_MASK); if (!handle) goto out; atomic_inc(&zv_curr_dist_counts[chunks]); @@ -982,7 +982,7 @@ int zcache_new_client(uint16_t cli_id) goto out; cli->allocated = 1; #ifdef CONFIG_FRONTSWAP - cli->zspool = zs_create_pool("zcache", ZCACHE_GFP_MASK); + cli->zspool = zs_create_pool("zcache", GFP_KERNEL); if (cli->zspool == NULL) goto out; idr_init(&cli->tmem_pools); diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index fb4a7c9..13e9b4b 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -336,7 +336,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, clen = PAGE_SIZE; } - handle = zs_malloc(zram->mem_pool, clen); + handle = zs_malloc(zram->mem_pool, clen, GFP_NOIO | __GFP_HIGHMEM); if (!handle) { pr_info("Error allocating memory for compressed " "page: %u, size=%zu\n", index, clen); @@ -576,7 +576,7 @@ int zram_init_device(struct zram *zram) /* zram devices sort of resembles non-rotational disks */ queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue); - zram->mem_pool = zs_create_pool("zram", GFP_NOIO | __GFP_HIGHMEM); + zram->mem_pool = zs_create_pool("zram", GFP_KERNEL); if (!zram->mem_pool) { pr_err("Error creating memory pool\n"); ret = -ENOMEM; diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c index 09a9d35..6ff380e 100644 --- a/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/drivers/staging/zsmalloc/zsmalloc-main.c @@ -205,8 +205,6 @@ struct link_free { struct zs_pool { struct size_class size_class[ZS_SIZE_CLASSES]; - - gfp_t flags; /* allocation flags used when growing pool */ const char *name; }; @@ -807,7 +805,7 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags) return NULL; ovhd_size = roundup(sizeof(*pool), PAGE_SIZE); - pool = kzalloc(ovhd_size, GFP_KERNEL); + pool = kzalloc(ovhd_size, flags); if (!pool) return NULL; @@ -827,7 +825,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags) } - pool->flags = flags; pool->name = name; return pool; @@ -863,7 +860,7 @@ EXPORT_SYMBOL_GPL(zs_destroy_pool); * otherwise 0. * Allocation requests with size > ZS_MAX_ALLOC_SIZE will fail. */ -unsigned long zs_malloc(struct zs_pool *pool, size_t size) +unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags) { unsigned long obj; struct link_free *link; @@ -885,7 +882,7 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size) if (!first_page) { spin_unlock(&class->lock); - first_page = alloc_zspage(class, pool->flags); + first_page = alloc_zspage(class, flags); if (unlikely(!first_page)) return 0; diff --git a/drivers/staging/zsmalloc/zsmalloc.h b/drivers/staging/zsmalloc/zsmalloc.h index de2e8bf..907ff03 100644 --- a/drivers/staging/zsmalloc/zsmalloc.h +++ b/drivers/staging/zsmalloc/zsmalloc.h @@ -31,7 +31,7 @@ struct zs_pool; struct zs_pool *zs_create_pool(const char *name, gfp_t flags); void zs_destroy_pool(struct zs_pool *pool); -unsigned long zs_malloc(struct zs_pool *pool, size_t size); +unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags); void zs_free(struct zs_pool *pool, unsigned long obj); void *zs_map_object(struct zs_pool *pool, unsigned long handle, -- 1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
