From nobody Sat Oct 14 15:29:21 2023 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 4S76js4TWFz4wv65; Sat, 14 Oct 2023 15:29:21 +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 4S76js3z2Jz4Frr; Sat, 14 Oct 2023 15:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697297361; 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=19ppHn09ObctkRyIRGSjB7BQkm9s6iNjB8FP/+0h9NU=; b=tbS1Huyl4WLAM3AlWVK9q7sBegBGSaJrS0mganQ4tTFrxIj06J3h1XBm7Ozw20aUeUcbdi sqb4Y/DvRwTHEek+Jo6ZvVeyZTY9tIfz6fcrZCpbYyz05PW7aoBc0NCu4OvjYoilC5/wyB F0UimP4mVFeY6riQK5LpOvNNVdk/qXjHNZaEfUg/qo27xk+e5VJznxS9RV2VhN3680H8W/ lOwRI1362QQWqA2Vdy75yL2cZgD6KJ3TvCjpAVZTkTcSfgygSVObsfkub+dZB4RiK5clSN mu8iDKLzkQynDmRMZAAZllIUJeXKxLOmiUt3qLc6UzFgLA+xGAUhfceQHwIsRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697297361; a=rsa-sha256; cv=none; b=jCnXJueaCrgx1QhpmlpBU0rY0F29DlZ9z3EloyyisWnL92c6Ok/hSwQYxx9usfQa5R4ps6 tWS2zN6OUihhqb4omBrRVdfQimIRZNA9i9BeWflYCe/AHd2FA6Zu8b6UvByqSFa9W/42a+ YH4wxHWsNvMiToV+MeAk2yMkD9oz/s7QNHngg4JTj9bqoLSzbJY0dmaI9VcNeAWetYSf/5 41qKzkgwZw8+KbCLeZF8DsToFbFhbceGRqeMEqhLtHHHlPi5TYWrCEi7CCoUDbcL3WveIX 3hSGVm0sENpIs6M9uKPHET4bJovxEvYdjoYWOnjQnmx5AuNiDu/wD8pwMj0Jfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697297361; 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=19ppHn09ObctkRyIRGSjB7BQkm9s6iNjB8FP/+0h9NU=; b=q/SaxUtpuS48futp66IazZqH+orlYYRseTa2sEUTO/tr080yuJHGMpEGDE/SjcJ7eh0P/p CPlQ5UPNVAfEO10LhH1PqJPwJSfpdqfisOu6xz3cT4JPLWFSeDzFAMf/7qz01jECbTMF5r elBDBonM8AMNJFdprao1sat1tTxRyiijHurvZP+TsXT1vq0dUm8ZCcexvpyY4fV2PwvfJl BuY7THuQOTz1iTUvIl1WD0yU6whAwHq7wU4OZAnnkUMtsri4T08KAWDS5BTTxsOzi1UJWH OSR1GunQfCkWQMqUvzSvEj7tVHeBao6kdCKA2r0h7g4eJthi5OjM/N7j5apDgw== 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 4S76js325czc4n; Sat, 14 Oct 2023 15:29:21 +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 39EFTLIa080340; Sat, 14 Oct 2023 15:29:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EFTLR4080337; Sat, 14 Oct 2023 15:29:21 GMT (envelope-from git) Date: Sat, 14 Oct 2023 15:29:21 GMT Message-Id: <202310141529.39EFTLR4080337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 29de7af6ee47 - stable/14 - mrsas: Fix callout locking in mrsas_complete_cmd() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29de7af6ee47a3a251763e4220203a0d960ea532 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=29de7af6ee47a3a251763e4220203a0d960ea532 commit 29de7af6ee47a3a251763e4220203a0d960ea532 Author: Mark Johnston AuthorDate: 2023-10-07 00:31:03 +0000 Commit: Mark Johnston CommitDate: 2023-10-14 15:29:11 +0000 mrsas: Fix callout locking in mrsas_complete_cmd() callout_stop() requires the associated lock to be held. This is a bit hacky, but I believe it's safe since the subsequent mrsas_cmd_done() call will also acquire the SIM lock to stop a different callout. PR: 265484 Reviewed by: imp Tested by: Jérémie Jourdin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39559 (cherry picked from commit 4640df1b0a49697840b81f6bcd269a483514c6aa) --- sys/dev/mrsas/mrsas.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 1241f44761c4..e362d4b455fc 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -1732,11 +1732,13 @@ mrsas_complete_cmd(struct mrsas_softc *sc, u_int32_t MSIxIndex) data_length = r1_cmd->io_request->DataLength; sense = r1_cmd->sense; } + mtx_lock(&sc->sim_lock); r1_cmd->ccb_ptr = NULL; if (r1_cmd->callout_owner) { callout_stop(&r1_cmd->cm_callout); r1_cmd->callout_owner = false; } + mtx_unlock(&sc->sim_lock); mrsas_release_mpt_cmd(r1_cmd); mrsas_atomic_dec(&sc->fw_outstanding); mrsas_map_mpt_cmd_status(cmd_mpt, cmd_mpt->ccb_ptr, status,