From nobody Tue Jun 28 18:15:25 2022 X-Original-To: dev-commits-src-branches@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 E17D2877CF8; Tue, 28 Jun 2022 18:15:25 +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 4LXXnn3P11z3Lvv; Tue, 28 Jun 2022 18:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656440125; 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=X97cMSS7uff9jkANlOyfLlmxNFdED1NRPvoS2c9zHo8=; b=aIp66FaCROQHeTBLdwSxfBC02XI7MiPlvDx4FpAH2Wz0buklVlVBLJB1ImdZAItzUtYw3p JEWw68VFzo1kXfhmgLUAfw3hK0SmOv/ClAUqzinyMOlvZcfQxvVpkeGa20CuC/A/2nc8Di VNDn3fRJwDEUjD61hj2sM2tCTNd8RP0XRDm6nwIscBaNHLq/QZyIGGOIsRqTsvKdQ6V6j7 8CSnAEVPHEHAodzE65H3GvjyEK90UqILSEKsqCPaKso/t6m2Te3NS0tMg8HueUM0NIsX5S XobkI8s++KfxBfiQ6lI9zjrfCVd+Y5nzdsNDvJDQw+T7IBLgw/rsVd4YJjdsqQ== 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 5494522186; Tue, 28 Jun 2022 18:15:25 +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 25SIFPVk068574; Tue, 28 Jun 2022 18:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SIFPBn068573; Tue, 28 Jun 2022 18:15:25 GMT (envelope-from git) Date: Tue, 28 Jun 2022 18:15:25 GMT Message-Id: <202206281815.25SIFPBn068573@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: 5dc091a1b2a1 - stable/12 - CTL: Fix double command completions on HA failover. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 5dc091a1b2a1ba4eb3f5d54acd41f0fb326dc080 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656440125; 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=X97cMSS7uff9jkANlOyfLlmxNFdED1NRPvoS2c9zHo8=; b=qfSg8B9UVxuuSvtdcTNWfMjzMdTUGsK6W6+g76XRT6nBNPVI0AJTaEFXurcrWNahu6KqAe 4ZrLMLTugf26iUU+ErH2Nr19XXzubeJ0pMCj1/vkTBkgfPxcxua2XzdxvkIfquzuqvdc8L gOLCIhsDIbJ4N7zTZWvTpmG+Lf+EhUCrHLZJA7xXYPTX4l7f8MNgoir43fkftOMDa2wn5T KQH7LULAgJ4hv0alyY2Ki9LJ1VV2NOUppqMrHGdcjt88lueQezvS+at2dDGe3eZqORf92G BfkwHtKTsNsXCO0DL63mmBD6sF6i/C2griM425mP6jc2O6f+YQxVM7C3/QL2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656440125; a=rsa-sha256; cv=none; b=JnsUDUpElQGCKKTF1xFppIEmvyX6o8It2NvnmJkEri70z9XpP5hknAj0FHKiVtJNBtRur0 Bjc8xRzAOT+69Vm33Yljzm+wAGRU1L7QlglCkl24D0ej2KUkfy3sPkaVja0HcbPXNLtIn5 VGexEegH/FGpymjSVfaIpXQhsOAdpdGJF3L8glIAKMVHlFFWkKhIObIUbWHF6gA/mo2omJ PRYQsCEaq6W5T/7JRWzgBXQfJtDcQulZj113ShQ/LfZcRRVjUG8YXoAAJsXOrFvCsPlcLh hINlS4EQnlQJxIPzJlLRYLMbyZExnTdA5QG0zFCQBUYChU8cxcbgbUdZPJiR2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=5dc091a1b2a1ba4eb3f5d54acd41f0fb326dc080 commit 5dc091a1b2a1ba4eb3f5d54acd41f0fb326dc080 Author: Alexander Motin AuthorDate: 2022-06-14 04:24:39 +0000 Commit: Alexander Motin CommitDate: 2022-06-28 18:15:19 +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 8439b837a01e..e909ccf70406 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; @@ -11596,6 +11597,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;