d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf: remove min number of admin queue entries from spec file

Browse Source 
It was probably miss-interpretation of description from discovery log
page which refers to min admin max sq size.

Signed-off-by: Jacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I575bf7fd6beb904b3a38a07616b76a34f8365643
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1222
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@mellanox.com>
This commit is contained in:
Jacek Kalwas 2020-03-11 11:40:05 +01:00 committed by Tomasz Zawadzki
parent daa8f941e4
commit 67befd4756
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdk/nvmf_spec.h
View File

@ -46,9 +46,6 @@
#pragma pack(push, 1) #pragma pack(push, 1)
/* Minimum number of admin queue entries defined by NVMe over Fabrics spec */
#define SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES 32
struct spdk_nvmf_capsule_cmd { struct spdk_nvmf_capsule_cmd {
uint8_t opcode; uint8_t opcode;
uint8_t reserved1; uint8_t reserved1;
@ -391,6 +388,8 @@ union spdk_nvmf_transport_specific_address_subtype {
SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address_subtype) == 256, SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address_subtype) == 256,
"Incorrect size"); "Incorrect size");
#define SPDK_NVMF_MIN_ADMIN_MAX_SQ_SIZE 32
/** /**
* Discovery Log Page entry * Discovery Log Page entry
*/ */

6
lib/nvmf/transport.c
View File

@ -120,6 +120,12 @@ spdk_nvmf_transport_create(const char *transport_name, struct spdk_nvmf_transpor
return NULL; return NULL;
} }
if (opts->max_aq_depth < SPDK_NVMF_MIN_ADMIN_MAX_SQ_SIZE) {
SPDK_ERRLOG("max_aq_depth %u is less than minimum defined by NVMf spec, use min value\n",
opts->max_aq_depth);
opts->max_aq_depth = SPDK_NVMF_MIN_ADMIN_MAX_SQ_SIZE;
}
transport = ops->create(opts); transport = ops->create(opts);
if (!transport) { if (!transport) {
SPDK_ERRLOG("Unable to create new transport of type %s\n", transport_name); SPDK_ERRLOG("Unable to create new transport of type %s\n", transport_name);