From 5d21943624f55395916d79d46867f35fdc627bed Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 16 Aug 2016 13:27:51 -0700 Subject: [PATCH] nvmf: Allow cores not handling subsystems to go idle. Use the event framework's new delay parameter to allow for idle cores to sleep for up to 1ms at a time. Change-Id: I665f38e590c07338418892afe0e75b0b2c79706e Signed-off-by: Ben Walker --- app/nvmf_tgt/nvmf_tgt.c | 3 ++- lib/nvmf/subsystem.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c index 5329f93f5..ca9dc3e74 100644 --- a/app/nvmf_tgt/nvmf_tgt.c +++ b/app/nvmf_tgt/nvmf_tgt.c @@ -57,7 +57,7 @@ struct rte_mempool *request_mempool; #define SPDK_NVMF_BUILD_ETC "/usr/local/etc/nvmf" #define SPDK_NVMF_DEFAULT_CONFIG SPDK_NVMF_BUILD_ETC "/nvmf.conf" -#define ACCEPT_TIMEOUT_US 1000 /* 1ms */ +#define ACCEPT_TIMEOUT_US 10000 /* 10ms */ static struct spdk_poller *g_acceptor_poller = NULL; @@ -197,6 +197,7 @@ main(int argc, char **argv) opts.name = "nvmf"; opts.config_file = SPDK_NVMF_DEFAULT_CONFIG; + opts.max_delay_us = 1000; /* 1 ms */ while ((ch = getopt(argc, argv, "c:de:i:l:m:n:p:qs:t:DH")) != -1) { switch (ch) { diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 44db04f25..e8a092f9f 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -111,7 +111,8 @@ nvmf_create_subsystem(int num, const char *name, return NULL; } - SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_create_subsystem: allocated subsystem %p\n", subsystem); + SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_create_subsystem: allocated subsystem %p on lcore 0x%x\n", + subsystem, lcore); subsystem->num = num; subsystem->subtype = subtype;