Commit 44090079 authored by Michael Haeuptle's avatar Michael Haeuptle Committed by Tomasz Zawadzki
Browse files

nvmf: Fixes double triggering of association timer 



Fixes issue #1635.

Under rare circumstances, the CC.en and CC.shn are both set
which then results in setting the association timer twice.
This scenario was observed during hot plug testing when the
initiator tries to reset the subsystem that contains the
removed device.
The end result is that when the ctrlr is destructed, then
one of the timers can still fire and access freed memory.

Change-Id: Ie5880ab325a28f19361f73712bdeb5b58894ee68
Signed-off-by: default avatarMichael Haeuptle <michael.haeuptle@hpe.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4935


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent c4c37f1c

lib/nvmf/ctrlr.c

+8 −0
Original line number Diff line number Diff line
@@ -814,6 +814,10 @@ nvmf_ctrlr_cc_shn_done(struct spdk_io_channel_iter *i, int status) 


	/* After CC.EN transitions to 0 (due to shutdown or reset), the association

	 * between the host and controller shall be preserved for at least 2 minutes */

	if (ctrlr->association_timer) {

		SPDK_DEBUGLOG(nvmf, "Association timer already set\n");

		nvmf_ctrlr_stop_association_timer(ctrlr);

	}

	ctrlr->association_timer = SPDK_POLLER_REGISTER(nvmf_ctrlr_association_remove, ctrlr,

				   ctrlr->admin_qpair->transport->opts.association_timeout * 1000);

}
@@ -834,6 +838,10 @@ nvmf_ctrlr_cc_reset_done(struct spdk_io_channel_iter *i, int status) 


	/* After CC.EN transitions to 0 (due to shutdown or reset), the association

	 * between the host and controller shall be preserved for at least 2 minutes */

	if (ctrlr->association_timer) {

		SPDK_DEBUGLOG(nvmf, "Association timer already set\n");

		nvmf_ctrlr_stop_association_timer(ctrlr);

	}

	ctrlr->association_timer = SPDK_POLLER_REGISTER(nvmf_ctrlr_association_remove, ctrlr,

				   ctrlr->admin_qpair->transport->opts.association_timeout * 1000);

}