From nobody Tue Sep 15 22:50:22 2026 X-Original-To: dev-commits-src-branches@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 4hky0G5sqyz6rhqX for ; Tue, 15 Sep 2026 22:50:22 +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 4hky0G3m0gz4blh for ; Tue, 15 Sep 2026 22:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789512622; 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=+wMC/7LidgyQlMh8dJX7Q0H9xwrIQXzytQhrHKFvmVE=; b=c2iLO9nSktCRQ5PRLBcxKpEiR9cFAfhc9t9I5J25hwlGBXoyXhCETRj6FvfNaaa3W+2x5W isaJ4Ao3B5/K+9qArmZipu6tyWk5iehRMFc1ff39DzisOMYxDY+AXDT8y/I8VhaLq6SzrV fOOX4pzhJnwukrLAm3IJnjKwDl9deIU5qWZ4VBYI6jthtlsCZEFsc0NaXfOVWGDckbL4dG GuY0IkoyCSKhQOHZA/yBxskqw639ZXpDGITnj8sD3LpIH+VM7M/yCy+GhI7yeghynJ6vcI ptQN+VqIHqMah16jFKpkA7D2AI/INnXRyPzifOrDN1yBUTy/RZqzB/UgYJ+mEQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789512622; b=Ytav+FuC6sBoXczYa044APUE+bHjK0SyLtn5JbYi//km9qi1VWuQv3OU//0faTNZjeV/YI v2093UzGJTX2DPvlmvGfJbMf+WasrKEmjSFaEnp5spCwfhmQVhP3xo3eqBTSqXxXW3Jaa3 lr29kpZ0MjQx7vMA1edc95TBvd7sGyPhXgPu/P/aKaZ8C4GrbP0bxatnaVuHe04KCZGtec VoOXzQ6ePaCDDMmtArfGntoMeWlddkbSWomk2lQWIRvLT+c6KBzmFCA3D5SQs6t6bcNOeT D1Kg6+V5qZtfS9sMU9faFR0CNJgtHrk9if11p24F258WLRfzjmi62ROMuOuOjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789512622; 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=+wMC/7LidgyQlMh8dJX7Q0H9xwrIQXzytQhrHKFvmVE=; b=E0BF2POT+FGrNUDn/R6LKq+VjFox6WQwGjXJJrJuI3B/YrrxXO7qL76T+JDo+sG2f3fB9W TtsSi+SN/L8C3Cq1jCf+KsJjjc190UUGGzO7g2SkT1PevJXNAJtADR6j+aS3lcYMIprnbO +nse0ogtnQ6SrAEJlXo2nX1uRmAuZxV8pG6oPC2o4QggtuwvMTOBeOu3vn7eQUeJ9hEdhP +rwwrvOzY1vv/7RU4ePt6lkSSeffLmDa1Q4HAbzuStaKZb+mVtBnbqPPo7DMBJbjrGKfLk r95dpXy7owsSq1xg1o9XRLfE6e5BVl4kdNBOH2L/vCw43XCtXyKA4XSf4Sr8Qw== 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 4hky0G2XTVzJwM for ; Tue, 15 Sep 2026 22:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 194fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 15 Sep 2026 22:50:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7cbc2604282f - stable/15 - nvme: Add quirk for broken namespace-change log List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7cbc2604282f2a96c138305f3727a3064c1b5ed7 Auto-Submitted: auto-generated Date: Tue, 15 Sep 2026 22:50:22 +0000 Message-Id: <6aa9cbae.194fc.e619331@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7cbc2604282f2a96c138305f3727a3064c1b5ed7 commit 7cbc2604282f2a96c138305f3727a3064c1b5ed7 Author: Colin Percival AuthorDate: 2026-07-14 17:41:03 +0000 Commit: Colin Percival CommitDate: 2026-09-15 22:49:41 +0000 nvme: Add quirk for broken namespace-change log Add a QUIRK_EMPTY_NAMESPACE_CHANGED_LOG quirk which indicates that the nvme controller may not properly populate the namespace-changed log page. If we receive a NVME_LOG_CHANGED_NAMESPACE page for a device with this quirk and the page is empty, probe all of the namespaces rather than none of them. Reviewed by: imp MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D58231 (cherry picked from commit 954098103ee287f39ecbf5d3144bcdfd16e7c41d) --- sys/dev/nvme/nvme_ctrlr.c | 10 ++++++++++ sys/dev/nvme/nvme_private.h | 1 + 2 files changed, 11 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 9fb5b4d9eb9e..54158d29243b 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1244,6 +1244,16 @@ nvme_ctrlr_aer_task(void *arg, int pending) nvme_notify_ns(ctrlr, id); ns->flags &= ~NVME_NS_CHANGED; } + if (nsl->ns[0] == 0 && ctrlr->quirks & QUIRK_EMPTY_NAMESPACE_CHANGED_LOG) { + for (int i = 0; i < min(ctrlr->cdata.nn, NVME_MAX_NAMESPACES); i++) { + struct nvme_namespace * ns = &ctrlr->ns[i]; + + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, i + 1, ctrlr); + nvme_notify_ns(ctrlr, i + 1); + ns->flags &= ~NVME_NS_CHANGED; + } + } } /* diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 20c13373a90d..f839e1b9a618 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -232,6 +232,7 @@ struct nvme_controller { #define QUIRK_APPLE_SHARED_CID_SPACE 0x20 /* Admin/IO share a single CID table */ #define QUIRK_APPLE_NO_ASYNC_EVENT 0x40 /* Skip NVMe async event requests */ #define QUIRK_APPLE_SINGLE_VECTOR 0x80 /* Single MSI vector, one IO queue */ +#define QUIRK_EMPTY_NAMESPACE_CHANGED_LOG 0x100 /* Change Namespace List Log is always empty */ int resource_id; struct resource *resource;