From 264a611c49186757052a499b55225ef0402d7567 Mon Sep 17 00:00:00 2001 From: GangCao Date: Wed, 16 Aug 2017 22:01:54 -0400 Subject: [PATCH] bdev: add the PID to the mempool allocation Change-Id: I6c8c50639e31f79e2ec5fd560db20011c975484b Signed-off-by: GangCao Reviewed-on: https://review.gerrithub.io/374610 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/bdev/bdev.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index e0a93076f..bb3a0f5ab 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -424,6 +424,7 @@ spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg, { int cache_size; int rc = 0; + char mempool_name[32]; assert(cb_fn != NULL); @@ -433,7 +434,9 @@ spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg, g_bdev_mgr.start_poller_fn = start_poller_fn; g_bdev_mgr.stop_poller_fn = stop_poller_fn; - g_bdev_mgr.bdev_io_pool = spdk_mempool_create("bdev_io", + snprintf(mempool_name, sizeof(mempool_name), "bdev_io_%d", getpid()); + + g_bdev_mgr.bdev_io_pool = spdk_mempool_create(mempool_name, SPDK_BDEV_IO_POOL_SIZE, sizeof(struct spdk_bdev_io) + spdk_bdev_module_get_max_ctx_size(), @@ -452,7 +455,9 @@ spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg, * to account for. */ cache_size = BUF_SMALL_POOL_SIZE / (2 * spdk_env_get_core_count()); - g_bdev_mgr.buf_small_pool = spdk_mempool_create("buf_small_pool", + snprintf(mempool_name, sizeof(mempool_name), "buf_small_pool_%d", getpid()); + + g_bdev_mgr.buf_small_pool = spdk_mempool_create(mempool_name, BUF_SMALL_POOL_SIZE, SPDK_BDEV_SMALL_BUF_MAX_SIZE + 512, cache_size, @@ -464,7 +469,9 @@ spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg, } cache_size = BUF_LARGE_POOL_SIZE / (2 * spdk_env_get_core_count()); - g_bdev_mgr.buf_large_pool = spdk_mempool_create("buf_large_pool", + snprintf(mempool_name, sizeof(mempool_name), "buf_large_pool_%d", getpid()); + + g_bdev_mgr.buf_large_pool = spdk_mempool_create(mempool_name, BUF_LARGE_POOL_SIZE, SPDK_BDEV_LARGE_BUF_MAX_SIZE + 512, cache_size,