lib/bdev: return error when failing to get resource
To fix issue: 2719 Change-Id: I983ef607fad154608fff9bb9355645968caf0c5a Signed-off-by: GangCao <gang.cao@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14746 Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
This commit is contained in:
parent
8878c1735f
commit
8afb3d0037
@ -1382,34 +1382,6 @@ spdk_bdev_subsystem_config_json(struct spdk_json_write_ctx *w)
|
|||||||
spdk_json_write_array_end(w);
|
spdk_json_write_array_end(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
bdev_mgmt_channel_create(void *io_device, void *ctx_buf)
|
|
||||||
{
|
|
||||||
struct spdk_bdev_mgmt_channel *ch = ctx_buf;
|
|
||||||
struct spdk_bdev_io *bdev_io;
|
|
||||||
uint32_t i;
|
|
||||||
|
|
||||||
STAILQ_INIT(&ch->need_buf_small);
|
|
||||||
STAILQ_INIT(&ch->need_buf_large);
|
|
||||||
|
|
||||||
STAILQ_INIT(&ch->per_thread_cache);
|
|
||||||
ch->bdev_io_cache_size = g_bdev_opts.bdev_io_cache_size;
|
|
||||||
|
|
||||||
/* Pre-populate bdev_io cache to ensure this thread cannot be starved. */
|
|
||||||
ch->per_thread_cache_count = 0;
|
|
||||||
for (i = 0; i < ch->bdev_io_cache_size; i++) {
|
|
||||||
bdev_io = spdk_mempool_get(g_bdev_mgr.bdev_io_pool);
|
|
||||||
assert(bdev_io != NULL);
|
|
||||||
ch->per_thread_cache_count++;
|
|
||||||
STAILQ_INSERT_HEAD(&ch->per_thread_cache, bdev_io, internal.buf_link);
|
|
||||||
}
|
|
||||||
|
|
||||||
TAILQ_INIT(&ch->shared_resources);
|
|
||||||
TAILQ_INIT(&ch->io_wait_queue);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bdev_mgmt_channel_destroy(void *io_device, void *ctx_buf)
|
bdev_mgmt_channel_destroy(void *io_device, void *ctx_buf)
|
||||||
{
|
{
|
||||||
@ -1434,6 +1406,39 @@ bdev_mgmt_channel_destroy(void *io_device, void *ctx_buf)
|
|||||||
assert(ch->per_thread_cache_count == 0);
|
assert(ch->per_thread_cache_count == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
bdev_mgmt_channel_create(void *io_device, void *ctx_buf)
|
||||||
|
{
|
||||||
|
struct spdk_bdev_mgmt_channel *ch = ctx_buf;
|
||||||
|
struct spdk_bdev_io *bdev_io;
|
||||||
|
uint32_t i;
|
||||||
|
|
||||||
|
STAILQ_INIT(&ch->need_buf_small);
|
||||||
|
STAILQ_INIT(&ch->need_buf_large);
|
||||||
|
|
||||||
|
STAILQ_INIT(&ch->per_thread_cache);
|
||||||
|
ch->bdev_io_cache_size = g_bdev_opts.bdev_io_cache_size;
|
||||||
|
|
||||||
|
/* Pre-populate bdev_io cache to ensure this thread cannot be starved. */
|
||||||
|
ch->per_thread_cache_count = 0;
|
||||||
|
for (i = 0; i < ch->bdev_io_cache_size; i++) {
|
||||||
|
bdev_io = spdk_mempool_get(g_bdev_mgr.bdev_io_pool);
|
||||||
|
if (bdev_io == NULL) {
|
||||||
|
SPDK_ERRLOG("You need to increase bdev_io_pool_size using bdev_set_options RPC.\n");
|
||||||
|
assert(false);
|
||||||
|
bdev_mgmt_channel_destroy(io_device, ctx_buf);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
ch->per_thread_cache_count++;
|
||||||
|
STAILQ_INSERT_HEAD(&ch->per_thread_cache, bdev_io, internal.buf_link);
|
||||||
|
}
|
||||||
|
|
||||||
|
TAILQ_INIT(&ch->shared_resources);
|
||||||
|
TAILQ_INIT(&ch->io_wait_queue);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bdev_init_complete(int rc)
|
bdev_init_complete(int rc)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user