From nobody Tue Oct 06 07:51:32 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 4hzT3S6Nypz6cWJT for ; Tue, 06 Oct 2026 07:51:32 +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 4hzT3S3Mvfz4HFR for ; Tue, 06 Oct 2026 07:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273092; 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=jwdTYawxyby3Hk9R0f+L4NR3DCM1lut0ZGC72tMh9BU=; b=mpmn0OJtY4+aT9z9nCfw7kJga2aD+5O82080H6TJyHGIQeh4qeYrEgcr7uShV0n1qcK+Sc XBdGSC9JlNLzwCJepXn4qx4TnXKk+o9x5g8iXDMsqbIt9PTkgyBHQg7foDDBb1YMeZMCuE UXqCUi68XtRGGMVcFFcZophf/KrV/vJ9W6dXItRbjeqidU2VU/FeeVaTcPFd5N+AU5xwSO eW7Ou10j3P/WqumxMHMj7yBRI8pPF1IxZ6bJ7/apmvADjpcleZYU1oFIKJJgDxAc1PBAsG AczsEfDmaGSbyDjd051Rf36wdi6zilJrqI6mbqC/VGNHXCie/VObNImbE1lfRw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273092; b=jKput8/YfI3kWYqC3mNtDxStZsP8k46uEgRUmSOvt/uZdNPripVLw0S7s5mVGlaSnRHcDh VaAPSQ5TzMkskS5ph65aG8u+FJy44hO8YRa3Q7HnOJdQ488OoF9X6ymxc+Td+W5Gm8Ps6Y reodBUr3l7mF6V3I2fAbWBBA5uyhRdEqY0VFFmiAywgy1hDBDWHAI30v0zGeOaF8oEzso0 G7szxQ87rCw3hMmFpAllSA0IysMk0EYp+IQdS0TxFJ3NZ2esbo8QLnTAEyfnFfaqEqBGqL Fmi7VXuWn1itizb+sM2QbGa7rGQrS01xfXh0UtOYoP2azVL1liO2bcwZLu7wmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273092; 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=jwdTYawxyby3Hk9R0f+L4NR3DCM1lut0ZGC72tMh9BU=; b=yYZuUlxi3O+saH5X7yuWhVFjIBCUaRAmGEvXtbDDOQiTSyB3/Lr2mr5C7b3yC89RfHpTrk grh8xFuV4U28X3zJb8H5x2QxiBAFrKH40WaUCkvEbf/QZbdSONo+YbnM0qYTIdqIbLaHJj J52E1GiyJnhoXt21Hyt7qf7jtpqUX67Q30srF2YdZ4noKSmud6yNFywZRy8vribeN5B2XB qetrFqDE4Y4Iesd06CV899hxtHH3vJ7nZJA9Ud1/ELRqiCkHerm+4SFWYTAWR7M5akqEOU wWm25x80v9RGgrsJmgA9RkDFtbn85SQ8IwsbmkVzNnnpRzF1NnP1pabpaHBvIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzT3S2LrPzxpP for ; Tue, 06 Oct 2026 07:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1879c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 3e6ff534b634 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e6ff534b634831cbc5faeda22cb3bbe77979fcb Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:32 +0000 Message-Id: <6ac4a884.1879c.4ec64527@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6ff534b634831cbc5faeda22cb3bbe77979fcb commit 3e6ff534b634831cbc5faeda22cb3bbe77979fcb Author: Jaeyoon Choi AuthorDate: 2026-08-27 05:04:11 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:28:06 +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 (cherry picked from commit 3ecee9314d88e2bb277b365d9413e219fd9a1283) --- 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");