From nobody Tue Jun 28 18:14:56 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 523F1877B10; Tue, 28 Jun 2022 18:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LXXnF1qfGz3M7d; Tue, 28 Jun 2022 18:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656440097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPNK/FW68E0YpAiUkcCzH9od5cnM7hUoabF3OTOzCUE=; b=B34mXfFvrRQQJnjwmZ1CQbIA2KMyhPWXHGrFz27uhhBlibVzpcrfGMjniRtsBiJO3pdWyp +6P2GZrbhYyxJ6Y/Rq8UUzq89tnf2a0RZyr3gGcGRaX56uzcg6ihaYK+bIsV80r5QBwfjW jriQLvuPs6Hxe9sY9mVXK8E/2J/wUWW72D4b+yHSINI0QQg++by+iD1x8o3qb6ByMBsBAq TuWmLQ9xlGGpIG/l0nW1kpprjXyr0GJinXM6Xh55u05tZq7fZ+4E0tV4jaH8fwN6aUKyKL JgEHxgkLNxIZIGBW5Bu908IHiflzHIFjZmnw8cpKqinY9nvIOBb1lnWu/nkq4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BA0622085; Tue, 28 Jun 2022 18:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25SIEuT0068423; Tue, 28 Jun 2022 18:14:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SIEuSQ068422; Tue, 28 Jun 2022 18:14:56 GMT (envelope-from git) Date: Tue, 28 Jun 2022 18:14:56 GMT Message-Id: <202206281814.25SIEuSQ068422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 0e897d87f736 - stable/13 - CTL: Fix double command completions on HA failover. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e897d87f7367f6674dde7a6612a7124db0d2713 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656440097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPNK/FW68E0YpAiUkcCzH9od5cnM7hUoabF3OTOzCUE=; b=JA8zRDmyFxO6kpUueY5xjTs0Atdj2KptN+Kv7zgPVWejNL8s71Tp//0/63qtGemzG/WZn1 wUf7pfi8Y0V0KTGdbVs5KjetxHG2alnuW+12kZjJVC3ybWzhPD+C3s7D7rrz0yO66tTESp PHjNP1EAAZA1T7DoM4K1HbVxbTBKjA1ds98mrTpQ8MSERXflMNSsiYocaYcBHLlnevoK0Y yl8Q+HUbtKAG/zroTFTSrxgwgDhOjP53458vWFKD1JKtOJxsYgwHnfYl3miwLK+GVayNd8 MEPwGPl61t0T26n3r20OTblxl15yigg5xtOd0Te83/TkvtBeyZymcSMnNlRh5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656440097; a=rsa-sha256; cv=none; b=K4hqp/DZWPw5IVRMXmJ9fJUcMSM3C4oOkdHALKLyX5k+W73injYLIj64Js46PfCv40H1dQ uaTTNrxKtjJHU8gMpPoUt5+7fsCJwJd4+Egnyg331Pyad0WYSIGV4oXRZ0MCFNKS6UWQoU JjcBza0hrPpEq8JaDmqET9mHoGPKZV6wY4Jtu3wx+qjGlVPGdCdZCfqT1IVlBLgzlOB4Ej fwIKTsVIoJ0bXBoZqwaYAeBR3vdp8sPH1uwSUkxXgAfF2USTU03v+7DnzB611P6wStSDyU KBUd00erZ3eDtxqkLiWsUp28Lu5wpICq2SvK6jIVofta105aHVNRRayEtWWrcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=0e897d87f7367f6674dde7a6612a7124db0d2713 commit 0e897d87f7367f6674dde7a6612a7124db0d2713 Author: Alexander Motin AuthorDate: 2022-06-14 04:24:39 +0000 Commit: Alexander Motin CommitDate: 2022-06-28 18:14:42 +0000 CTL: Fix double command completions on HA failover. I've found couple cases when CTL_FLAG_SENT_2OTHER_SC flags were not cleared on commands return from active node or the send failure. It created races when ctl_failover_lun() call before ctl_process_done() could cause second ctl_done() and ctl_process_done() calls, causing all sorts of problems. MFC after: 2 weeks Sponsored by: iXsystems, Inc. (cherry picked from commit 3b0e3e8d2a6fab953a0ce537b6131330ccf36170) --- sys/cam/ctl/ctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 72f8597355ec..2083059c6aee 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -800,6 +800,7 @@ ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc, } ctsio = &msg_info->hdr.original_sc->scsiio; + ctsio->io_hdr.flags &= ~CTL_FLAG_SENT_2OTHER_SC; ctsio->io_hdr.flags |= CTL_FLAG_IO_ACTIVE; ctsio->io_hdr.msg_type = CTL_MSG_FINISH_IO; ctsio->io_hdr.status = msg_info->hdr.status; @@ -11658,6 +11659,8 @@ ctl_scsiio_precheck(struct ctl_scsiio *ctsio) if ((isc_retval = ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg_info, sizeof(msg_info.scsi) - sizeof(msg_info.scsi.sense_data), M_WAITOK)) > CTL_HA_STATUS_SUCCESS) { + ctsio->io_hdr.flags &= ~CTL_FLAG_SENT_2OTHER_SC; + ctsio->io_hdr.flags |= CTL_FLAG_IO_ACTIVE; ctl_set_busy(ctsio); ctl_done((union ctl_io *)ctsio); return;