ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev_nvme: use INFOLOG for discovery messages

Browse Source 
This is not in the fast path, so using INFOLOG
instead of DEBUGLOG allows these messages to be
enabled in release builds.

While here, set this flag in the discovery.sh
test script so that we get better information if
there are test failures.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I1c0d087b5c0cb40118691f4a1bc16adc2fdaad9c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11932
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jim Harris 2022-03-10 18:50:44 +00:00 committed by Tomasz Zawadzki
parent 999f0362ab
commit 002b25cc5a
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
module/bdev/nvme/bdev_nvme.c
View File

@ -4117,8 +4117,8 @@ bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)
return rc;
}
#define DISCOVERY_DEBUGLOG(ctx, format, ...) \
SPDK_DEBUGLOG(bdev_nvme, "Discovery[%s:%s] " format, ctx->trid.traddr, ctx->trid.trsvcid, ##__VA_ARGS__);
#define DISCOVERY_INFOLOG(ctx, format, ...) \
SPDK_INFOLOG(bdev_nvme, "Discovery[%s:%s] " format, ctx->trid.traddr, ctx->trid.trsvcid, ##__VA_ARGS__);
#define DISCOVERY_ERRLOG(ctx, format, ...) \
SPDK_ERRLOG("Discovery[%s:%s] " format, ctx->trid.traddr, ctx->trid.trsvcid, ##__VA_ARGS__);
@ -4244,7 +4244,7 @@ discovery_remove_controllers(struct discovery_ctx *ctx)
for (i = 0; i < numrec; i++) {
new_entry = &log_page->entries[i];
if (!memcmp(old_entry, new_entry, sizeof(*old_entry))) {
DISCOVERY_DEBUGLOG(ctx, "NVM %s:%s:%s found again\n",
DISCOVERY_INFOLOG(ctx, "NVM %s:%s:%s found again\n",
old_trid.subnqn, old_trid.traddr, old_trid.trsvcid);
found = true;
break;
@ -4253,7 +4253,7 @@ discovery_remove_controllers(struct discovery_ctx *ctx)
if (!found) {
struct nvme_path_id path = {};
DISCOVERY_DEBUGLOG(ctx, "NVM %s:%s:%s not found\n",
DISCOVERY_INFOLOG(ctx, "NVM %s:%s:%s not found\n",
old_trid.subnqn, old_trid.traddr, old_trid.trsvcid);
path.trid = entry_ctx->trid;
@ -4273,7 +4273,7 @@ discovery_attach_controller_done(void *cb_ctx, size_t bdev_count, int rc)
struct discovery_entry_ctx *entry_ctx = cb_ctx;
struct discovery_ctx *ctx = entry_ctx->ctx;;
DISCOVERY_DEBUGLOG(ctx, "attach %s done\n", entry_ctx->name);
DISCOVERY_INFOLOG(ctx, "attach %s done\n", entry_ctx->name);
ctx->attach_in_progress--;
if (ctx->attach_in_progress == 0) {
discovery_remove_controllers(ctx);
@ -4350,12 +4350,12 @@ discovery_log_page_cb(void *cb_arg, int rc, const struct spdk_nvme_cpl *cpl,
build_trid_from_log_page_entry(&new_ctx->trid, new_entry);
if (subnqn_ctx) {
snprintf(new_ctx->name, sizeof(new_ctx->name), "%s", subnqn_ctx->name);
DISCOVERY_DEBUGLOG(ctx, "NVM %s:%s:%s new path for %s\n",
DISCOVERY_INFOLOG(ctx, "NVM %s:%s:%s new path for %s\n",
new_ctx->trid.subnqn, new_ctx->trid.traddr, new_ctx->trid.trsvcid,
new_ctx->name);
} else {
snprintf(new_ctx->name, sizeof(new_ctx->name), "%s%d", ctx->name, ctx->index++);
DISCOVERY_DEBUGLOG(ctx, "NVM %s:%s:%s new subsystem %s\n",
DISCOVERY_INFOLOG(ctx, "NVM %s:%s:%s new subsystem %s\n",
new_ctx->trid.subnqn, new_ctx->trid.traddr, new_ctx->trid.trsvcid,
new_ctx->name);
}
@ -4389,7 +4389,7 @@ get_discovery_log_page(struct discovery_ctx *ctx)
if (rc != 0) {
DISCOVERY_ERRLOG(ctx, "could not get discovery log page\n");
}
DISCOVERY_DEBUGLOG(ctx, "sent discovery log page command\n");
DISCOVERY_INFOLOG(ctx, "sent discovery log page command\n");
}
static void
@ -4408,7 +4408,7 @@ discovery_aer_cb(void *arg, const struct spdk_nvme_cpl *cpl)
return;
}
DISCOVERY_DEBUGLOG(ctx, "got aer\n");
DISCOVERY_INFOLOG(ctx, "got aer\n");
if (ctx->in_progress) {
ctx->pending = true;
return;
@ -4422,7 +4422,7 @@ start_discovery_done(void *cb_ctx)
{
struct discovery_ctx *ctx = cb_ctx;
DISCOVERY_DEBUGLOG(ctx, "start discovery done\n");
DISCOVERY_INFOLOG(ctx, "start discovery done\n");
ctx->start_cb_fn(ctx->cb_ctx, ctx->rc);
if (ctx->rc != 0) {
DISCOVERY_ERRLOG(ctx, "could not connect to discovery ctrlr\n");
@ -4440,7 +4440,7 @@ discovery_attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
ctx = SPDK_CONTAINEROF(user_opts, struct discovery_ctx, drv_opts);
DISCOVERY_DEBUGLOG(ctx, "discovery ctrlr attached\n");
DISCOVERY_INFOLOG(ctx, "discovery ctrlr attached\n");
ctx->probe_ctx = NULL;
ctx->ctrlr = ctrlr;
spdk_nvme_ctrlr_register_aer_callback(ctx->ctrlr, discovery_aer_cb, ctx);
@ -4476,7 +4476,7 @@ discovery_poller(void *arg)
} else if (ctx->probe_ctx) {
rc = spdk_nvme_probe_poll_async(ctx->probe_ctx);
if (rc != -EAGAIN) {
DISCOVERY_DEBUGLOG(ctx, "discovery ctrlr connected\n");
DISCOVERY_INFOLOG(ctx, "discovery ctrlr connected\n");
ctx->rc = rc;
spdk_thread_send_msg(ctx->calling_thread, start_discovery_done, ctx);
if (rc == 0) {

1
test/nvmf/host/discovery.sh
View File

@ -46,6 +46,7 @@ waitforlisten $hostpid $HOST_SOCK
trap 'process_shm --id $NVMF_APP_SHM_ID; kill $hostpid; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
$rpc_py -s $HOST_SOCK log_set_flag bdev_nvme
$rpc_py -s $HOST_SOCK bdev_nvme_start_discovery -b nvme -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \
-s $DISCOVERY_PORT -f ipv4 -q $HOST_NQN