From nobody Wed Jan 15 02:48:59 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 4YXr6g6HC9z5kmxB; Wed, 15 Jan 2025 02:48:59 +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 4YXr6g5ZYGz3hQd; Wed, 15 Jan 2025 02:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736909339; 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=4pVxIFIKx2Z3BVUbatJOU4q2mMYN5ovMQF3F40tctZk=; b=byqSaLi/nsIJib0+W/nJftcpBZ2KcajZHwLZ4HtsnzYfA9guYgXd81UmM0x0c443VkUmZE PTmrsDDpnxNvx3oDGlkxTIynOv91WRdWCtHOo+gpC6vbl0lKJMChXe3jrPoOKq1Le0/j4P NPX2q2m+4xtqmvivkVj6uP3PkDLNtONL9b5fUoOnFR+s2US7Hs/qDEnz3PsYDZVnoRkk4J GZAdZW3DSEH3UF7EBLNGiCg4lj85QJZ0td/xFtlgNTtgrOhZSVnXzLU0BzvlImIvYcFLeO c+FseMP/Qf2305wwfzQb8MKCNb175TRfcNen9HwYogAaVxBsSHN/d24EUsZeYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736909339; 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=4pVxIFIKx2Z3BVUbatJOU4q2mMYN5ovMQF3F40tctZk=; b=FDUgm+BQrx+araZuu58eVSFQn/WVMO8FsnqfuZiBSWV64Rlgdppd0JrZl/Awc9FY2maBaa Yctr/nUeZs22dlqTrvwCLygScgeKR9XtswlzkiAXfiVPjZgMTdfG/PxOuKkoFJW0qzmVXG sl77/s+mYv/MaMJQZ65Jv2uKOxO1DbqNVwuRagbD6QBSaSIHYhMyQBs/CfSEAX5HwZSSof UolFev8yjaDc2N8gvr8ML9U1IeUAmDRFtc6SMTw5k2AAZ5NR/GAYvqcf4L1iPn0jhnoU5K WL8y1FS/UvdRqIi3JG44HFd3P9WX1JHfPk/cSgbBVVA1aWKmWoTbsg0dTaGbOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736909339; a=rsa-sha256; cv=none; b=ELank1lhhXrp12YiIjdy/sh4MKOxqcv47Gp7sEv5N/mIYzk3Ws2C2LCDzmd9/HqIgJop51 iUU6Cr+y2IT4J7O0MUEiurEER14VNwt097xaslhSMBfK7r31lSD2psTmUw6zxJDY8K/qXi nPJqKv8yzCkzb1bhcNK5XjrHA9l7lwum9c787MnffO2Mf2lP3aQGF9G7nYz4xkGWMSKqEo Z/JBVYGwoikHt/+MI1RRvEQ7qvaHIm+IBW+GcovQ5k3JP0reUdWnpwHueoFeMLDWPHnVv3 8672FXAnIoyGwCYabpHwQz1hDNUh25rumdzyoLXw7gNXPOo7wgtt7MIUG4ua1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXr6g4tc7zCPV; Wed, 15 Jan 2025 02:48:59 +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 50F2mx6q067201; Wed, 15 Jan 2025 02:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50F2mx1H067198; Wed, 15 Jan 2025 02:48:59 GMT (envelope-from git) Date: Wed, 15 Jan 2025 02:48:59 GMT Message-Id: <202501150248.50F2mx1H067198@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: ff911710de34 - stable/14 - isp: Fix abort issue introduced by previous commit 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff911710de34864cd748141b460c498e9217904d Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=ff911710de34864cd748141b460c498e9217904d commit ff911710de34864cd748141b460c498e9217904d Author: Alexander Motin AuthorDate: 2025-01-08 18:23:26 +0000 Commit: Alexander Motin CommitDate: 2025-01-15 02:48:41 +0000 isp: Fix abort issue introduced by previous commit Aborting ATIO while its CTIOs are in progress makes impossible to handle their completions, making them stuck forever. Detect this case by checking ctcnt counter and if so instead of aborting just mark the ATIO as dead to block any new CTIOs. It is not perfect since the task id can not be reused for some more time, but not as bad as the task stuck forever. MFC after: 1 week (cherry picked from commit 2c48a8f161c91bf7020122697d064a25287097a3) --- sys/dev/isp/isp_freebsd.c | 19 +++++++++++++++++-- sys/dev/isp/isp_freebsd.h | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index d5aa7a54142e..b496eae1b466 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -986,6 +986,16 @@ isp_target_start_ctio(ispsoftc_t *isp, union ccb *ccb, enum Start_Ctio_How how) continue; } + /* + * Is this command a dead duck? + */ + if (atp->dead) { + isp_prt(isp, ISP_LOGERR, "%s: [0x%x] not sending a CTIO for a dead command", __func__, cso->tag_id); + ccb->ccb_h.status = CAM_REQ_ABORTED; + xpt_done(ccb); + continue; + } + /* * Check to make sure we're still in target mode. */ @@ -2503,14 +2513,19 @@ isp_action(struct cam_sim *sim, union ccb *ccb) } /* - * Target should abort all affected CCBs before ACK-ing INOT, + * Target should abort all affected tasks before ACK-ing INOT, * but if/since it doesn't, add this hack to allow tag reuse. + * We can not do it if some CTIOs are in progress, or we won't + * handle the completions. In such case just block new ones. */ uint32_t rsp = (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0; if (ntp->nt.nt_ncode == NT_ABORT_TASK && (rsp & 0xff) == 0 && (atp = isp_find_atpd(isp, XS_CHANNEL(ccb), ccb->cna2.seq_id)) != NULL) { - if (isp_abort_atpd(isp, XS_CHANNEL(ccb), atp) == 0) + if (atp->ctcnt == 0 && + isp_abort_atpd(isp, XS_CHANNEL(ccb), atp) == 0) isp_put_atpd(isp, XS_CHANNEL(ccb), atp); + else + atp->dead = 1; } if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, rsp)) { diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 5bb3dd43b6de..73390fa14769 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -104,8 +104,9 @@ typedef struct atio_private_data { uint16_t ctcnt; /* number of CTIOs currently active */ uint8_t seqno; /* CTIO sequence number */ uint8_t cdb0; - uint8_t srr_notify_rcvd : 1, + uint16_t srr_notify_rcvd : 1, sendst : 1, + dead : 1, tattr : 3, state : 3; void * ests;