Commit 4fa3d991 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvmf: don't start the association timer poller for vfio-user 



When users remove kernel NVMe driver in the VM, after 120 seconds,
SPDK NVMf target will disconnect ADMIN queue pair due to association
timer timeout, and for vfio-user transport, the ADMIN queue pair
connection is associated with the socket connection, so when probing
the NVMe controller again, because there is no active ADMIN connection
for fabric register R/W commands, it will cause segment fault.

Here we set the association timeout value to 0 for vfio-user transport,
so that the ADMIN connection will not be disconnected when shutdown the
controller, the ADMIN queue pair will be disconnected when the socket
connection breaks.

Change-Id: I3613169229bae384405889653e50f581d30d7c07
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8557


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>
parent d5102d37

lib/nvmf/ctrlr.c

+8 −4
Original line number Diff line number Diff line
@@ -920,8 +920,10 @@ nvmf_ctrlr_cc_shn_done(struct spdk_io_channel_iter *i, int status) 
		SPDK_DEBUGLOG(nvmf, "Association timer already set\n");

		nvmf_ctrlr_stop_association_timer(ctrlr);

	}

	if (ctrlr->association_timeout) {

		ctrlr->association_timer = SPDK_POLLER_REGISTER(nvmf_ctrlr_association_remove, ctrlr,

					   ctrlr->association_timeout * 1000);

	}

	ctrlr->disconnect_in_progress = false;

}
@@ -945,8 +947,10 @@ nvmf_ctrlr_cc_reset_done(struct spdk_io_channel_iter *i, int status) 
		SPDK_DEBUGLOG(nvmf, "Association timer already set\n");

		nvmf_ctrlr_stop_association_timer(ctrlr);

	}

	if (ctrlr->association_timeout) {

		ctrlr->association_timer = SPDK_POLLER_REGISTER(nvmf_ctrlr_association_remove, ctrlr,

					   ctrlr->association_timeout * 1000);

	}

	ctrlr->disconnect_in_progress = false;

}

lib/nvmf/vfio_user.c

+1 −0
Original line number Diff line number Diff line
@@ -2491,6 +2491,7 @@ nvmf_vfio_user_opts_init(struct spdk_nvmf_transport_opts *opts) 
	opts->max_aq_depth =		NVMF_VFIO_USER_DEFAULT_AQ_DEPTH;

	opts->num_shared_buffers =	0;

	opts->buf_cache_size =		0;

	opts->association_timeout =	0;

	opts->transport_specific =      NULL;

}