Commit 963cb003 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: disconnected_qpair_cb gets NOTICELOG only when disconnection was unexpected 



After the change that the NVMe bdev module disconnects qpair asynchronously,
disconnected_qpair_cb() got NOTICELOG always when a qpair was disconnected
and freed. This was very noisy.

We have three cases that disconnected_qpair_cb() is called now, 1) qpair
was destroyed in a full ctrlr reset sequence, 2) the upper layer closed
I/O channel, and 3) qpair detected error, and was disconnected and freed.
Get NOTICELOG for 3) but get DEBUGLOG for 1) and 2) with some rewording.

Additionally, to improve readability, change if-else ordering.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ib63bcfd4b72a82a13d3cda208c71cdb40a42fd6b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12085


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 1ca04a1d

module/bdev/nvme/bdev_nvme.c

+26 −24
Original line number Diff line number Diff line
@@ -1147,13 +1147,11 @@ bdev_nvme_disconnected_qpair_cb(struct spdk_nvme_qpair *qpair, void *poll_group_ 
	struct nvme_qpair *nvme_qpair;

	struct nvme_ctrlr_channel *ctrlr_ch;



	SPDK_NOTICELOG("qpair %p is disconnected, free the qpair and reset controller.\n", qpair);



	/*

	 * Free the I/O qpair and reset the nvme_ctrlr.

	 */

	nvme_qpair = nvme_poll_group_get_qpair(group, qpair);

	if (nvme_qpair != NULL) {

	if (nvme_qpair == NULL) {

		return;

	}



	if (nvme_qpair->qpair != NULL) {

		spdk_nvme_ctrlr_free_io_qpair(nvme_qpair->qpair);

		nvme_qpair->qpair = NULL;
@@ -1168,17 +1166,21 @@ bdev_nvme_disconnected_qpair_cb(struct spdk_nvme_qpair *qpair, void *poll_group_ 
			/* If we are already in a full reset sequence, we do not have

			 * to restart it. Just move to the next ctrlr_channel.

			 */

			SPDK_DEBUGLOG(bdev_nvme, "qpair %p was disconnected and freed in a reset ctrlr sequence.\n",

				      qpair);

			spdk_for_each_channel_continue(ctrlr_ch->reset_iter, 0);

			ctrlr_ch->reset_iter = NULL;

		} else {

			/* qpair was disconnected unexpectedly. Reset controller for recovery. */

			SPDK_NOTICELOG("qpair %p was disconnected and freed. reset controller.\n", qpair);

			bdev_nvme_reset(nvme_qpair->ctrlr);

		}

	} else {

		/* In this case, ctrlr_channel is already deleted. */

		SPDK_DEBUGLOG(bdev_nvme, "qpair %p was disconnected and freed. delete nvme_qpair.\n", qpair);

		nvme_qpair_delete(nvme_qpair);

	}

}

}



static void

bdev_nvme_check_io_qpairs(struct nvme_poll_group *group)