From nobody Wed Apr 30 17:21:54 2025 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 4ZnkWR3H9Zz5tj2X; Wed, 30 Apr 2025 17:21:55 +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 4ZnkWR0Y5Jz3Mft; Wed, 30 Apr 2025 17:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033715; 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=ixoQQnSJtsyS+M6L+eNh5YWXRU4LZ/bGMljHV3dHoPg=; b=U7sVB8dwzey5tttJBLJLqkm/m39ZgPArNGkUIhITMSKcln4kB0gWRWpDFlF7dzBHY8DOu5 lRYcefYLBnMYFPIIpTsn9HTRjnbCuq9CD7KEOvE3hbkxDrUIyC5mWp6UXlNhQE8DHM9kWt 3XqRuvjUyv11ISo47ymd14+m5QNV1NSUrpc/bOVm+lasFOnKEI9iWs89WzYNwgktFqJPIh pYlC+zfoFHVi1S0IIsfsP0mXIAcue4ksaRaFusjAsvfY2xk2phwbnjdIwLB/Ov8ZXUhzLT I2Mj1720sLRqwewmUIm9Su3VY2PoxjxfBUhFWmYq/Hi+Cl49zB2vI2miqtN+Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033715; a=rsa-sha256; cv=none; b=S2qrCwRaEtsrwzCWIoyOfe5klG6Yx8mfcu0pyVAMK/Wc0eaHs6DfqrQ9IjtYZKX1asYWNm rsndUb4KRUWLs6/tsLsXqDFvOfvuCEoaKGEzt0gZhs/QsVH2IiU1cTGulFUThC9UMuWTER 925riYaUmd0SfFaneZ5ydzkYESJYQdwo3eEGgbILmbuV+5Qf4u+Y4DLJw1xL+CJyfB3QHL EXn7djor7kN1kqa7TLbNa93kUR2Xi48fE6/vvHJa0aK2wImoC2qMlLI/c605zEyFezwQ9s tkaV/ZSOWDO9VYL+aPTyyLLeigIp1MFqMmq2HK/wOUKfzmWjUhPwA+soX2ZLcg== 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=1746033715; 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=ixoQQnSJtsyS+M6L+eNh5YWXRU4LZ/bGMljHV3dHoPg=; b=GgmkTNJDeS2YqBdn5iR7MDUps6iF+0yGx+rwyLFf2ERD3f1Y33L04RL0MbX9i6qCRwZd4+ 38VXFLl2t9gd6K6EYPTjUn2fzflY1UegOgQyI5JwtznTgQg/sLpziZ8lrnoub/FHMXZ1wM PlpY70RROmnDksNkKeMHq3vQ0y9WVzTQe5poPusruJgXeMrd1LSsrqVsbnnPT71NrkYPvM f6/Kb+w0hBMNgnU3aXH2ruZCG7g43rlXCZJM41zs/2G5l8iTmRx6luHYVVracks7uqGv4I Ka52aSQ4vxEZ7zmgYxgnl/bA8sN4/aDEuKmfeg3Ilz/TLr/DZOtAcqGIpGJxRA== 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 4ZnkWR08tlzmR; Wed, 30 Apr 2025 17:21:55 +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 53UHLsDJ095395; Wed, 30 Apr 2025 17:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHLsBi095392; Wed, 30 Apr 2025 17:21:54 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:21:54 GMT Message-Id: <202504301721.53UHLsBi095392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9980fb4d87ae - stable/14 - mpi3mr: Block I/Os While Task Management is in Progress 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9980fb4d87ae68a48554444b8c4048dd73194c70 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9980fb4d87ae68a48554444b8c4048dd73194c70 commit 9980fb4d87ae68a48554444b8c4048dd73194c70 Author: Chandrakanth patil AuthorDate: 2025-04-27 23:39:43 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:05:53 +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 (cherry picked from commit 49445b54638f7b2d45942edd61c70fe0baa28f37) --- 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 e98c6e2e942c..6d056e96109c 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -798,6 +798,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); @@ -1061,6 +1063,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; @@ -1179,6 +1193,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;