From c34f224f565696c2df12fba20c513c5c392f3bbf Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Tue, 21 Apr 2020 23:41:47 +0800 Subject: [PATCH] nvme/cmb_copy: disable submission queue in CMB Recent CMB changes disable using the CMB copy and submission queue at the same time, so disable use_cmb_sqs by default. Also spdk_nvme_ctrlr_map_cmb() changed the "size" parameter used as size of buffer that was mapped, so change it here too. Change-Id: If957674042b7f4a08e272bf5f9f2ee29f50805cb Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1955 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- examples/nvme/cmb_copy/cmb_copy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/nvme/cmb_copy/cmb_copy.c b/examples/nvme/cmb_copy/cmb_copy.c index c82d259ab..50eedcbba 100644 --- a/examples/nvme/cmb_copy/cmb_copy.c +++ b/examples/nvme/cmb_copy/cmb_copy.c @@ -121,7 +121,7 @@ cmb_copy(void) /* Allocate a buffer from our CMB */ buf = spdk_nvme_ctrlr_map_cmb(g_config.cmb.ctrlr, &sz); - if (buf == NULL || sz != g_config.copy_size) { + if (buf == NULL || sz < g_config.copy_size) { printf("ERROR: buffer allocation failed\n"); printf("Are you sure %s has a valid CMB?\n", g_config.cmb.trid.traddr); @@ -183,6 +183,8 @@ probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, return 0; } + opts->use_cmb_sqs = false; + printf("%s - probed %s!\n", __func__, trid->traddr); return 1; }