From nobody Thu Aug 27 05:12:50 2026 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 4hVqQp5WR2z6qRxw for ; Thu, 27 Aug 2026 05:12:50 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hVqQp1nK5z3gfB for ; Thu, 27 Aug 2026 05:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787807570; 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=h2nGWNS1lKbMQQk5ZpT3MqueExvK60qfD7vWHQVP2HM=; b=e0McfctDlm1dTsn0oks6iEZBYwPutfa9ELhuXGKBHrUg/cF6ydCJBNC6yjzX2UQGVrvYGs EkVXrfPJU8QK/MwK2aK8WiWeqhk4WIxX5iCbelBNCBb+vBsZDtkuMpXaKzrNISo3eHJWFt yhE+DEFsx55Z6mFNmYmRZDrjjZe+B69iaiUxaGgFB73gi/CW92gbD/n1tUCbGu1CHcHHxK PXcug06gSuy+oWat22727kOqYY9uJIColb/Jhbe3nrtDruogQWEi6/8aRdS+aUuxXOn6fn LOlaAp7r44ntUCzQyH8DyNlhCGk4JnSnAbdj672ZmrzmOu5PtepYOr7SlydlbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787807570; a=rsa-sha256; cv=none; b=ZOjxzEA4Zqzb1ZlDMmoCQHhL+44zT8kgZ+6u6FWKwD64I/yEV3HzWASTAIyxUiLluoFMvS dYC+Unkz4fksU/HX3g+Qih+jyIZlICZZW1P+EInBrRRKUmqzH6hcAsOwfKJ/6hrk6/M/uq DV7WwHtxGrLWPqPM+vLIk8q+BjQdnoz0tjWVdz1Ii+mmUcvnEQ789DmZWY8FdtDPbzX0ch 9gCXRlz9ixZCCdugarHqw06tP/sCLLWCvXoKrc2xkhzsz1pIdwAECMeFc3IATEl2WfxNlY 6m+rocqb15VGJACBZWHeTe1cTbrdwEZUptbhG/cd27TLNyuW8Lre3fsuu63j5g== 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=1787807570; 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=h2nGWNS1lKbMQQk5ZpT3MqueExvK60qfD7vWHQVP2HM=; b=W2AaIqPKgKdT7bqbym/Ri5m4m6Olg8VqaE86fQ1W/HjkGjLDRJ4cQiNTC7AeUiXAJGfsIr yrfG/lSXP9BPnPtF0nafVUjzxiNgSf8tIKGFg+sRDFCgV0tffg0ZLCjLSLFLusbXTv+jqC 5JZzOppCbRyD5byf2kTVa4pw0V/ueWsO4h4s0ekBPkfpe0dIs24EZNTqBY461AJRu5sP// wiXapAvcFwmPe5oBozrjfY5FpJdvcF7K7jt250xJ6Z9Q9C0et0LdG514O20ZmJEdYtWWK0 G9gy9YD1jg8RrOsYxyKmkLyBUju7HFcr+m7gm0C+dhQmMRqWB8ANlbFJ9dAAXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVqQp0ZSbz18V7 for ; Thu, 27 Aug 2026 05:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42857 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 05:12:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 3ecee9314d88 - main - ufshci: reject new requests on a failed controller 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ecee9314d88e2bb277b365d9413e219fd9a1283 Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 05:12:50 +0000 Message-Id: <6a8fc752.42857.69344675@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=3ecee9314d88e2bb277b365d9413e219fd9a1283 commit 3ecee9314d88e2bb277b365d9413e219fd9a1283 Author: Jaeyoon Choi AuthorDate: 2026-08-27 05:04:11 +0000 Commit: Jaeyoon Choi CommitDate: 2026-08-27 05:08:38 +0000 ufshci: reject new requests on a failed controller A failed controller accepted new requests, but nothing ever completed them, so the caller waited forever. The admin retry path could also resubmit a request to a dead queue. Reject new submits and admin retries on a failed controller. The submit check runs under the queue lock, so it cannot race with the queue walk in the fail path. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D58948 --- sys/dev/ufshci/ufshci_req_queue.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/ufshci/ufshci_req_queue.c b/sys/dev/ufshci/ufshci_req_queue.c index 2e13d244daef..886cf9aff77f 100644 --- a/sys/dev/ufshci/ufshci_req_queue.c +++ b/sys/dev/ufshci/ufshci_req_queue.c @@ -270,8 +270,8 @@ ufshci_req_queue_complete_tracker(struct ufshci_tracker *tr) error = ufshci_req_queue_response_is_error(req_queue, ocs, &cpl.response_upiu); - /* Retry for admin commands */ - retriable = req->is_admin; + /* Retry for admin commands. A failed controller must not retry. */ + retriable = req->is_admin && !req_queue->ctrlr->is_failed; retry = error && retriable && req->retries < req_queue->ctrlr->retry_count; if (retry) @@ -765,6 +765,9 @@ _ufshci_req_queue_submit_request(struct ufshci_req_queue *req_queue, mtx_assert(&req_queue->qops.get_hw_queue(req_queue)->qlock, MA_OWNED); + if (req_queue->ctrlr->is_failed) + return (ENXIO); + error = req_queue->qops.reserve_slot(req_queue, &tr); if (error != 0) { ufshci_printf(req_queue->ctrlr, "Failed to get tracker");