From dd3460582bef4b514e06b30df263f9735b936b26 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 28 Mar 2022 11:06:42 +0900 Subject: [PATCH] bdev/nvme: Rename check_multipath_params by check_io_error_resiliency_params These checked parameters are necessary themselves even for single path configuration. Signed-off-by: Shuhei Matsumoto Change-Id: Ie1eb2f51eeec1dbc634c6bae462a41d4c209d6ac Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12052 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Dong Yi Community-CI: Mellanox Build Bot --- module/bdev/nvme/bdev_nvme.c | 20 ++++----- .../lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c | 42 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 659dca730..46025744b 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -4287,7 +4287,7 @@ bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts) *opts = g_opts; } -static bool bdev_nvme_check_multipath_params(int32_t ctrlr_loss_timeout_sec, +static bool bdev_nvme_check_io_error_resiliency_params(int32_t ctrlr_loss_timeout_sec, uint32_t reconnect_delay_sec, uint32_t fast_io_fail_timeout_sec); @@ -4305,9 +4305,9 @@ bdev_nvme_validate_opts(const struct spdk_bdev_nvme_opts *opts) return -EINVAL; } - if (!bdev_nvme_check_multipath_params(opts->ctrlr_loss_timeout_sec, - opts->reconnect_delay_sec, - opts->fast_io_fail_timeout_sec)) { + if (!bdev_nvme_check_io_error_resiliency_params(opts->ctrlr_loss_timeout_sec, + opts->reconnect_delay_sec, + opts->fast_io_fail_timeout_sec)) { return -EINVAL; } @@ -4606,9 +4606,9 @@ bdev_nvme_async_poll(void *arg) } static bool -bdev_nvme_check_multipath_params(int32_t ctrlr_loss_timeout_sec, - uint32_t reconnect_delay_sec, - uint32_t fast_io_fail_timeout_sec) +bdev_nvme_check_io_error_resiliency_params(int32_t ctrlr_loss_timeout_sec, + uint32_t reconnect_delay_sec, + uint32_t fast_io_fail_timeout_sec) { if (ctrlr_loss_timeout_sec < -1) { SPDK_ERRLOG("ctrlr_loss_timeout_sec can't be less than -1.\n"); @@ -4670,9 +4670,9 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, } if (bdev_opts != NULL && - !bdev_nvme_check_multipath_params(bdev_opts->ctrlr_loss_timeout_sec, - bdev_opts->reconnect_delay_sec, - bdev_opts->fast_io_fail_timeout_sec)) { + !bdev_nvme_check_io_error_resiliency_params(bdev_opts->ctrlr_loss_timeout_sec, + bdev_opts->reconnect_delay_sec, + bdev_opts->fast_io_fail_timeout_sec)) { return -EINVAL; } diff --git a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c index 674613c3c..a545c479f 100644 --- a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c +++ b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c @@ -4867,30 +4867,30 @@ test_retry_io_for_ana_error(void) } static void -test_check_multipath_params(void) +test_check_io_error_resiliency_params(void) { /* 1st parameter is ctrlr_loss_timeout_sec, 2nd parameter is reconnect_delay_sec, and * 3rd parameter is fast_io_fail_timeout_sec. */ - CU_ASSERT(bdev_nvme_check_multipath_params(-2, 1, 0) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, 0, 0) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(1, 0, 0) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(1, 2, 0) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(0, 1, 0) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, 1, 0) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(2, 2, 0) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(2, 1, 0) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(INT32_MAX, INT32_MAX, 0) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, UINT32_MAX, 0) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(0, 0, 1) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, 2, 1) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(3, 2, 4) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(3, 2, 1) == false); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, 1, 1) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(2, 1, 2) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(2, 1, 1) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(INT32_MAX, INT32_MAX, INT32_MAX) == true); - CU_ASSERT(bdev_nvme_check_multipath_params(-1, UINT32_MAX, UINT32_MAX) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-2, 1, 0) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, 0, 0) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(1, 0, 0) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(1, 2, 0) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(0, 1, 0) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, 1, 0) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(2, 2, 0) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(2, 1, 0) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(INT32_MAX, INT32_MAX, 0) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, UINT32_MAX, 0) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(0, 0, 1) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, 2, 1) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(3, 2, 4) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(3, 2, 1) == false); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, 1, 1) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(2, 1, 2) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(2, 1, 1) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(INT32_MAX, INT32_MAX, INT32_MAX) == true); + CU_ASSERT(bdev_nvme_check_io_error_resiliency_params(-1, UINT32_MAX, UINT32_MAX) == true); } static void @@ -6069,7 +6069,7 @@ main(int argc, const char **argv) CU_ADD_TEST(suite, test_retry_io_count); CU_ADD_TEST(suite, test_concurrent_read_ana_log_page); CU_ADD_TEST(suite, test_retry_io_for_ana_error); - CU_ADD_TEST(suite, test_check_multipath_params); + CU_ADD_TEST(suite, test_check_io_error_resiliency_params); CU_ADD_TEST(suite, test_retry_io_if_ctrlr_is_resetting); CU_ADD_TEST(suite, test_reconnect_ctrlr); CU_ADD_TEST(suite, test_retry_failover_ctrlr);