ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/nvme: Set multipath policy correctly when creating nvme_bdev_channel

Browse Source 
bdev_nvme_create_bdev_channel_cb() did not initialized the multipath
policy of the newly created channel. 0 was active-passive and hence
multipath policy was always initialized to active-passive.

Fix the bug and add unit tests for verification.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I6e44108740da4b9ff72311ae4b5500558c65c5c3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14225
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Shuhei Matsumoto 2022-08-26 13:06:48 +09:00 committed by Tomasz Zawadzki
parent db75f4b678
commit 03f8da8819
2 changed files with 119 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/bdev/nvme/bdev_nvme.c
View File

@ -645,6 +645,9 @@ bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf)
TAILQ_INIT(&nbdev_ch->retry_io_list); TAILQ_INIT(&nbdev_ch->retry_io_list);
pthread_mutex_lock(&nbdev->mutex); pthread_mutex_lock(&nbdev->mutex);
nbdev_ch->mp_policy = nbdev->mp_policy;
TAILQ_FOREACH(nvme_ns, &nbdev->nvme_ns_list, tailq) { TAILQ_FOREACH(nvme_ns, &nbdev->nvme_ns_list, tailq) {
rc = _bdev_nvme_add_io_path(nbdev_ch, nvme_ns); rc = _bdev_nvme_add_io_path(nbdev_ch, nvme_ns);
if (rc != 0) { if (rc != 0) {

116
test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
View File

@ -5915,6 +5915,121 @@ test_disable_auto_failback(void)
g_opts.disable_auto_failback = false; g_opts.disable_auto_failback = false;
} }
static void
ut_set_multipath_policy_done(void *cb_arg, int rc)
{
int *done = cb_arg;
SPDK_CU_ASSERT_FATAL(done != NULL);
*done = rc;
}
static void
test_set_multipath_policy(void)
{
struct nvme_path_id path1 = {}, path2 = {};
struct nvme_ctrlr_opts opts = {};
struct spdk_nvme_ctrlr *ctrlr1, *ctrlr2;
struct nvme_bdev_ctrlr *nbdev_ctrlr;
const int STRING_SIZE = 32;
const char *attached_names[STRING_SIZE];
struct nvme_bdev *bdev;
struct spdk_io_channel *ch;
struct nvme_bdev_channel *nbdev_ch;
struct spdk_uuid uuid1 = { .u.raw = { 0x1 } };
int done;
int rc;
memset(attached_names, 0, sizeof(char *) * STRING_SIZE);
ut_init_trid(&path1.trid);
ut_init_trid2(&path2.trid);
g_ut_attach_ctrlr_status = 0;
g_ut_attach_bdev_count = 1;
g_opts.disable_auto_failback = true;
opts.ctrlr_loss_timeout_sec = -1;
opts.reconnect_delay_sec = 1;
set_thread(0);
ctrlr1 = ut_attach_ctrlr(&path1.trid, 1, true, true);
SPDK_CU_ASSERT_FATAL(ctrlr1 != NULL);
ctrlr1->ns[0].uuid = &uuid1;
rc = bdev_nvme_create(&path1.trid, "nvme0", attached_names, STRING_SIZE,
attach_ctrlr_done, NULL, NULL, &opts, true);
CU_ASSERT(rc == 0);
spdk_delay_us(1000);
poll_threads();
spdk_delay_us(g_opts.nvme_adminq_poll_period_us);
poll_threads();
ctrlr2 = ut_attach_ctrlr(&path2.trid, 1, true, true);
SPDK_CU_ASSERT_FATAL(ctrlr2 != NULL);
ctrlr2->ns[0].uuid = &uuid1;
rc = bdev_nvme_create(&path2.trid, "nvme0", attached_names, STRING_SIZE,
attach_ctrlr_done, NULL, NULL, &opts, true);
CU_ASSERT(rc == 0);
spdk_delay_us(1000);
poll_threads();
spdk_delay_us(g_opts.nvme_adminq_poll_period_us);
poll_threads();
nbdev_ctrlr = nvme_bdev_ctrlr_get_by_name("nvme0");
SPDK_CU_ASSERT_FATAL(nbdev_ctrlr != NULL);
bdev = nvme_bdev_ctrlr_get_bdev(nbdev_ctrlr, 1);
SPDK_CU_ASSERT_FATAL(bdev != NULL);
/* If multipath policy is updated before getting any I/O channel,
* an new I/O channel should have the update.
*/
done = -1;
bdev_nvme_set_multipath_policy(bdev->disk.name, BDEV_NVME_MP_POLICY_ACTIVE_ACTIVE,
ut_set_multipath_policy_done, &done);
poll_threads();
CU_ASSERT(done == 0);
CU_ASSERT(bdev->mp_policy == BDEV_NVME_MP_POLICY_ACTIVE_ACTIVE);
ch = spdk_get_io_channel(bdev);
SPDK_CU_ASSERT_FATAL(ch != NULL);
nbdev_ch = spdk_io_channel_get_ctx(ch);
CU_ASSERT(nbdev_ch->mp_policy == BDEV_NVME_MP_POLICY_ACTIVE_ACTIVE);
/* If multipath policy is updated while a I/O channel is active,
* the update should be applied to the I/O channel immediately.
*/
done = -1;
bdev_nvme_set_multipath_policy(bdev->disk.name, BDEV_NVME_MP_POLICY_ACTIVE_PASSIVE,
ut_set_multipath_policy_done, &done);
poll_threads();
CU_ASSERT(done == 0);
CU_ASSERT(bdev->mp_policy == BDEV_NVME_MP_POLICY_ACTIVE_PASSIVE);
CU_ASSERT(nbdev_ch->mp_policy == BDEV_NVME_MP_POLICY_ACTIVE_PASSIVE);
spdk_put_io_channel(ch);
poll_threads();
rc = bdev_nvme_delete("nvme0", &g_any_path);
CU_ASSERT(rc == 0);
poll_threads();
spdk_delay_us(1000);
poll_threads();
CU_ASSERT(nvme_ctrlr_get_by_name("nvme0") == NULL);
}
int int
main(int argc, const char **argv) main(int argc, const char **argv)
{ {
@ -5964,6 +6079,7 @@ main(int argc, const char **argv)
CU_ADD_TEST(suite, test_set_preferred_path); CU_ADD_TEST(suite, test_set_preferred_path);
CU_ADD_TEST(suite, test_find_next_io_path); CU_ADD_TEST(suite, test_find_next_io_path);
CU_ADD_TEST(suite, test_disable_auto_failback); CU_ADD_TEST(suite, test_disable_auto_failback);
CU_ADD_TEST(suite, test_set_multipath_policy);
CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_set_mode(CU_BRM_VERBOSE);