Commit fbfe86e6 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

bdev/nvme: Extract clearing pending_failover from check_op_after_reset 



As mentioned in the previous patch, it was confusing that a check
function changed states. But, it is still desirable that the check and
update are done under nvme_ctrlr->mutex.

Hence, move clearing nvme_ctrlr->pending_failover from
bdev_nvme_check_op_after_reset() to bdev_nvme_reset_ctrlr_complete() and
bdev_nvme_disable_ctrlr_complete().

If reset failed, bdev_nvme_reset_ctrlr_complete() already has a special
operation to try the next alternate trid. Hence, we can clear
pending_resets at the top of bdev_nvme_reset_ctrlr_complete().

Before this patch, bdev_nvme_disable_ctrlr_complete() ignored
OP_FAILOVER. This change will be helpful for clarification.

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


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
parent 8662aad6

module/bdev/nvme/bdev_nvme.c

+11 −5
Original line number Diff line number Diff line
@@ -2172,13 +2172,13 @@ enum bdev_nvme_op_after_reset { 
typedef enum bdev_nvme_op_after_reset _bdev_nvme_op_after_reset;



static _bdev_nvme_op_after_reset

bdev_nvme_check_op_after_reset(struct nvme_ctrlr *nvme_ctrlr, bool success)

bdev_nvme_check_op_after_reset(struct nvme_ctrlr *nvme_ctrlr, bool success,

			       bool pending_failover)

{

	if (nvme_ctrlr_can_be_unregistered(nvme_ctrlr)) {

		/* Complete pending destruct after reset completes. */

		return OP_COMPLETE_PENDING_DESTRUCT;

	} else if (nvme_ctrlr->pending_failover) {

		nvme_ctrlr->pending_failover = false;

	} else if (pending_failover) {

		nvme_ctrlr->reset_start_tsc = 0;

		return OP_FAILOVER;

	} else if (success || nvme_ctrlr->opts.reconnect_delay_sec == 0) {
@@ -2248,11 +2248,16 @@ bdev_nvme_reset_ctrlr_complete(struct nvme_ctrlr *nvme_ctrlr, bool success) 
{

	bdev_nvme_ctrlr_op_cb ctrlr_op_cb_fn = nvme_ctrlr->ctrlr_op_cb_fn;

	void *ctrlr_op_cb_arg = nvme_ctrlr->ctrlr_op_cb_arg;

	bool pending_failover;

	enum bdev_nvme_op_after_reset op_after_reset;



	assert(nvme_ctrlr->thread == spdk_get_thread());



	pthread_mutex_lock(&nvme_ctrlr->mutex);



	pending_failover = nvme_ctrlr->pending_failover;

	nvme_ctrlr->pending_failover = false;



	if (!success) {

		/* Connecting the active trid failed. Set the next alternate trid to the

		 * active trid if it exists.
@@ -2301,7 +2306,7 @@ bdev_nvme_reset_ctrlr_complete(struct nvme_ctrlr *nvme_ctrlr, bool success) 
	nvme_ctrlr->ctrlr_op_cb_fn = NULL;

	nvme_ctrlr->ctrlr_op_cb_arg = NULL;



	op_after_reset = bdev_nvme_check_op_after_reset(nvme_ctrlr, success);

	op_after_reset = bdev_nvme_check_op_after_reset(nvme_ctrlr, success, pending_failover);

	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	/* Delay callbacks when the next operation is a failover. */
@@ -2689,8 +2694,9 @@ bdev_nvme_disable_ctrlr_complete(struct nvme_ctrlr *nvme_ctrlr) 


	nvme_ctrlr->resetting = false;

	nvme_ctrlr->dont_retry = false;

	nvme_ctrlr->pending_failover = false;



	op_after_disable = bdev_nvme_check_op_after_reset(nvme_ctrlr, true);

	op_after_disable = bdev_nvme_check_op_after_reset(nvme_ctrlr, true, false);



	nvme_ctrlr->disabled = true;

	spdk_poller_pause(nvme_ctrlr->adminq_timer_poller);