From 2e6dbe7539e2946615a06854577409e63eaf4acb Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 21 Mar 2019 03:32:30 -0400 Subject: [PATCH] nvme: reduce default Admin timeout to 30 seconds 120 seconds is too long for controllers which can't be setup during initialization, because this value is only used for Admin commands so also rename as it is. Change-Id: I0a3d3192252c0f6fc0bef4d8b868eaef2ae40fe3 Signed-off-by: Changpeng Liu Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448601 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- lib/nvme/nvme_ctrlr.c | 2 +- lib/nvme/nvme_internal.h | 2 +- test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 35467e1d0..2615bd982 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -151,7 +151,7 @@ spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t } if (FIELD_OK(admin_timeout_ms)) { - opts->admin_timeout_ms = NVME_MAX_TIMEOUT_PERIOD * 1000; + opts->admin_timeout_ms = NVME_MAX_ADMIN_TIMEOUT_IN_SECS * 1000; } if (FIELD_OK(header_digest)) { diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 241d6ae6f..ca35f03b7 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -125,7 +125,7 @@ extern pid_t g_spdk_nvme_pid; #define NVME_MAX_ASYNC_EVENTS (8) -#define NVME_MAX_TIMEOUT_PERIOD (120) +#define NVME_MAX_ADMIN_TIMEOUT_IN_SECS (30) /* Maximum log page size to fetch for AERs. */ #define NVME_MAX_AER_LOG_SIZE (4096) diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c index 156789644..0bffa35ff 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c +++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c @@ -1547,7 +1547,7 @@ test_ctrlr_get_default_ctrlr_opts(void) sizeof(opts.extended_host_id)) == 0); CU_ASSERT(strlen(opts.src_addr) == 0); CU_ASSERT(strlen(opts.src_svcid) == 0); - CU_ASSERT_EQUAL(opts.admin_timeout_ms, NVME_MAX_TIMEOUT_PERIOD * 1000); + CU_ASSERT_EQUAL(opts.admin_timeout_ms, NVME_MAX_ADMIN_TIMEOUT_IN_SECS * 1000); } static void