From nobody Fri Jan 19 17:17:33 2024 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 4TGmWy0VMLz56xbq; Fri, 19 Jan 2024 17:17:34 +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 4TGmWx5250z4MVK; Fri, 19 Jan 2024 17:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684653; 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=jAQLWN8b9maP0ti1l+KJGLGQae6rrnLuVP06DoSVLPU=; b=CvAO1FMqykjNX4Po/RX45vrqIYRTZT4vSvW3IrjRxDTdgOmu97aKb+vIpOYaV0EckCuQiE YvnygthD3eduQz98f2lAy3+vDrzO+k1fVmcHu0Nfz1d0181Ui2iQAW6h44pXlxNK1uwiCi /Ql+7Niw3DXghJsZyrVZT5MXjicMkTuj48JsHkh29hTQIvBLtJIYOmhH71pVLkATp22cH1 F711bEH7QYZLMeuqiy4chjealPXd9cR7fxgojRMiE+xkvvDXwQegBx7XBtEPHFl57h00eh c6X3UrPBBiHmtz7lF1jG16/neLX4tgH2sdymyZCDy9gHD0O7gCxaVdtq289F6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684653; 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=jAQLWN8b9maP0ti1l+KJGLGQae6rrnLuVP06DoSVLPU=; b=JmFX6ITS2MKjJN5Qm8wsJ2qZd7SW16IojpFtXvuxtjPNlB6I1kNhvL5hY2af1RPLhX35QS VkSpvda3ZXWDqbXJ+nVDOzmi6vse11xVGM9YwoWce29K12gznynB+8InJdzjTHYbUH+nms kbp9zE3kKW2cf5DXLEabsMKyVxcqgoTejI6C5hNotpHjeNbuxJ8A0FyHMYUQqBux7OWqKI 9m2aHvlkLSobZ0NynC5pA+8ez8Wq6hnZOtVhiFsfnuqAWeZf/4oA3k/U/HelOb38Q7Xtrz tJ03sle6h1GOLA4+NhTfwgftHshrd3JNgpIcf61//1Eoflp5bVRHexawBH1ojQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705684653; a=rsa-sha256; cv=none; b=m5jjEmUW5ejEGciq+I8Szd6iiUalpRBFYYxAKOh1vqSNiM2WHOZUyeJzZJWnjTSrEKEf7h kNaHhkWEunUXpZgiy3+/N2l8Hk5VedhP+0/cN0VUSnaZKeJy12gBVgMBj8hbOL2BVX+jpF cZ70MEy26ylVtAcIzIgp0pi9lFcCBjWim21NkKvLt03NplIHCQBg36TpQi7kWNAzIZa7sL XFjbAd605wjJgNQ4LAa5Vz0/oQAZm1d98is0svJnr/8B1N4ByzNrduIWHMXqbNtqyeY3c+ 4FXs82bqM0d9y5dU3gF9SR5I2VXdeug2cDSeQLtfsvwAmt1vhxUvqXgsbiPZLQ== 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 4TGmWx3wdnz103x; Fri, 19 Jan 2024 17:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JHHXWa096959; Fri, 19 Jan 2024 17:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JHHXOr096956; Fri, 19 Jan 2024 17:17:33 GMT (envelope-from git) Date: Fri, 19 Jan 2024 17:17:33 GMT Message-Id: <202401191717.40JHHXOr096956@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: c351a6ec918e - stable/14 - mpi3mr: Only set callout_owned when we create a timeout 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/14 X-Git-Reftype: branch X-Git-Commit: c351a6ec918ea33e2abdc012deeb7b77d3a90e5f Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c351a6ec918ea33e2abdc012deeb7b77d3a90e5f commit c351a6ec918ea33e2abdc012deeb7b77d3a90e5f Author: Warner Losh AuthorDate: 2023-11-29 01:49:24 +0000 Commit: Alexander Motin CommitDate: 2024-01-19 17:16:49 +0000 mpi3mr: Only set callout_owned when we create a timeout Since we assume there's a timeout to cancel when this is true, only set it true when we set the timeout. Otherwise we may try to cancel a timeout when there's been an error in submission. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D42541 (cherry picked from commit 1cfd01111eb6a28ca5043e928aa8e9099064177a) --- sys/dev/mpi3mr/mpi3mr_cam.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 9b85ee8301dd..44b613ad7915 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1223,15 +1223,15 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) mpi3mr_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL); xpt_done(ccb); } else { - callout_reset_sbt(&cm->callout, SBT_1S * 90 , 0, - mpi3mr_scsiio_timeout, cm, 0); + callout_reset_sbt(&cm->callout, mstosbt(ccb->ccb_h.timeout), 0, + mpi3mr_scsiio_timeout, cm, 0); + cm->callout_owner = true; mpi3mr_atomic_inc(&sc->fw_outstanding); mpi3mr_atomic_inc(&targ->outstanding); if (mpi3mr_atomic_read(&sc->fw_outstanding) > sc->io_cmds_highwater) sc->io_cmds_highwater++; } - cm->callout_owner = true; return; }