From nobody Mon Apr 28 03:25:23 2025 X-Original-To: dev-commits-src-main@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 4Zm83819s9z5tknM; Mon, 28 Apr 2025 03:25:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zm8373lZDz3cmp; Mon, 28 Apr 2025 03:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745810723; 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=NYatj9mP6IbDgevjT3n7VtyraEur1EljkI5afhpyRiQ=; b=H4zdXi3qxQ///7S12b37M9BBOw43X0eOExRMHFMXVpN+Sjam/LQF2UzHwbhaPuRKEy1Ijc ka05CEuHcFKgg92Ryj3ryoxOvh0lQRFo5Ma9fTuBJQmcCQfp5PcTX52Nj+ex8ZOTTs7hrk SQ0xOb+w6CL7fdHWsPzw/qgWIGQkiwdVH/4IKdx5GJeefU4txiRpC4evyZ4dRUh7uLlBcm IdhDh5ktbEk6ZGrgA/i/wF5psZEJaKqBnNi3khO6BHt1cXryBWhiPKQV0NnqOawcc2lzld HpzcNjHZMu27E+3uQXDpcHuTX/ED5Xk8R3QUgapd/lK0achFeNmFLs3K2e5REA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745810723; a=rsa-sha256; cv=none; b=TCjZDhi4G2c/oe/L2XZv5hVehXvIDZbbx+fxcYSewpN135XjaoRKU91BlpqbyVWtlrBWHb oOlhdQRdoJyv75kIXX0FO8MTHIDvx0BC7wvhae0P8daHZaisZjovAe/Rqn2NYteIUnlEbt U3AIVHupFjf5JD2BP8T6RNmeluJ0frx+oqpZ9AUmm7TD41wyAppD0ONatNwy18djdazBM1 PTahqY7BaYfON4XZ3G6NfLkNLr2lasxpJ1HxzV40x3ZQnO1lIQCNYCoVcBh/GTPVUkGLfW jVuPTaE3MT9igmX/W6TSurpsK8x2uUgmOxmpaD4PilSu43XQYfEcVPZdGgPKbw== 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=1745810723; 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=NYatj9mP6IbDgevjT3n7VtyraEur1EljkI5afhpyRiQ=; b=x0i8NUPLWT4FBVJZegPWWYELw2hkDoLt4SczaZJc07y6dXxxjhGiTderFZyMNaVX20SMTw J/pg+9gX7hCsjX2dhtviVbV+B1lvVrnaMsiKPL7FXSfFmX2bho+G+r8pUgAwlxDe6h+WmG TFu23WiT9sR+KEFZEbD62iD4i3bzx2oUD6MRXhYTqat49kIqh36S/j4cXJZFW5srW9Hp5R gAjPg0vMEaFmQNalzerNk68zWA+YQgkZbtBf3j3YyLSwc26b59VvdQlPx7IQcwqQyKD+AB MX3MpP6WPkLA/84CXLRklgdUJlWtzJ1E3Dy2Jfm3+ttC6zehzm7tiQWLcIXwzg== 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 4Zm837316vz3C5; Mon, 28 Apr 2025 03:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53S3PNdU014810; Mon, 28 Apr 2025 03:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53S3PNZm014807; Mon, 28 Apr 2025 03:25:23 GMT (envelope-from git) Date: Mon, 28 Apr 2025 03:25:23 GMT Message-Id: <202504280325.53S3PNZm014807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 49445b54638f - main - mpi3mr: Block I/Os While Task Management is in Progress List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49445b54638f7b2d45942edd61c70fe0baa28f37 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=49445b54638f7b2d45942edd61c70fe0baa28f37 commit 49445b54638f7b2d45942edd61c70fe0baa28f37 Author: Chandrakanth patil AuthorDate: 2025-04-27 23:39:43 +0000 Commit: Warner Losh CommitDate: 2025-04-28 03:22:56 +0000 mpi3mr: Block I/Os While Task Management is in Progress The driver previously blocked I/Os only for OS-initiated task management commands. This patch extends the behavior to also block I/Os during application-initiated task management operations (excluding Task Abort). Before submitting such commands to the firmware, I/O submissions are paused for the respective device. Once the command completes, I/O operations are resumed. This ensures safe and consistent task management handling. [[ Note: Warner landed this with the pending suggestion since this change is good enough for 14.3, but chs' suggestion for better atomics needs to be implemented soon ]] Discussed with: imp, chs Differential Revision: https://reviews.freebsd.org/D49749 --- sys/dev/mpi3mr/mpi3mr_app.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 7cd3f13e4117..3a8cf7044d26 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -797,6 +797,8 @@ mpi3mr_app_mptcmds(struct cdev *dev, u_long cmd, void *uarg, struct mpi3mr_ioctl_mpt_dma_buffer *dma_buffers = NULL, *dma_buff = NULL; struct mpi3mr_ioctl_mpirepbuf *mpirepbuf = NULL; struct mpi3mr_ioctl_mptcmd *karg = (struct mpi3mr_ioctl_mptcmd *)uarg; + struct mpi3mr_target *tgtdev = NULL; + Mpi3SCSITaskMgmtRequest_t *tm_req = NULL; sc = mpi3mr_app_get_adp_instance(karg->mrioc_id); @@ -1060,6 +1062,18 @@ mpi3mr_app_mptcmds(struct cdev *dev, u_long cmd, void *uarg, } } + if (mpi_header->Function == MPI3_FUNCTION_SCSI_TASK_MGMT) { + tm_req = (Mpi3SCSITaskMgmtRequest_t *)mpi_request; + if (tm_req->TaskType != MPI3_SCSITASKMGMT_TASKTYPE_ABORT_TASK) { + tgtdev = mpi3mr_find_target_by_dev_handle(sc->cam_sc, tm_req->DevHandle); + if (!tgtdev) { + rval = ENODEV; + goto out; + } + mpi3mr_atomic_inc(&tgtdev->block_io); + } + } + sc->ioctl_cmds.state = MPI3MR_CMD_PENDING; sc->ioctl_cmds.is_waiting = 1; sc->ioctl_cmds.callback = NULL; @@ -1178,6 +1192,9 @@ mpi3mr_app_mptcmds(struct cdev *dev, u_long cmd, void *uarg, sc->mpi3mr_aen_triggered = 0; out_failed: + if (tgtdev) + mpi3mr_atomic_dec(&tgtdev->block_io); + sc->ioctl_cmds.is_senseprst = 0; sc->ioctl_cmds.sensebuf = NULL; sc->ioctl_cmds.state = MPI3MR_CMD_NOTUSED;