From nobody Wed Nov 19 04:13:22 2025 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 4dB7Pt3B4bz6HCdt for ; Wed, 19 Nov 2025 04:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pt1rM8z3grt for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=qgfSvZzUif/w4D9nHRt2Lx9OqifMlHWBFHTLA7fJYwYTWcsd7ZJPKZ5ihUq9urFrQGrpew oiDvcUZguUK3KLyFv2gHAYFhwityyEk/cA9EUsxMEXtRMH0C8z6sedQAksE3I//JtV4QBc 2oKC3Gf0wRnNGaW6WVj72e+dCG0dp5ZahmkbsU33b8kxC6YQfOG97nOo5s23QfqZtedVef vIxJ2FGwO35mKPRn05xZ8m2VQhfu5at7maaJ+xBAYEEXeRD9pxP6i7pplW7qXETB+CvmPI KOb6TVmkWLk67yC8zBYVXyZGi5pT++k9ssMZiLIW6v9eO9sZlcHQ7437pjhqdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=ablsZ94h+DQJLQSkKobMgWq5Sf6CVSNGebFsk0A2wRtHrbyRcCBUtrbjhfoYztvjNGdXNa 27ivD3mQviKw+yLPmu10IsBbqCmDKhe0VHR6XSxPnGbkDhBSeIRW1PutCfti4/flo7NOCU aUli1vl3uQx+Zti/Gh6Sjx0hyz2P67aLrcxCQ8oQUVVObLqQxTsMUEYvQLMzHvtJcwyICo 5hHrVAJOA98IbOfmj+nU60qag2Uj7/bG4G93sSalEPSh6KMbFRxp5pegTYoSolERywTTLm b8Fd5GcoAX81G2F2I2vZdJBchyajpCfZXE3hvSLwfDOI7GTZ1TC5k+2JZQZoZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525602; a=rsa-sha256; cv=none; b=QhaGCR4ciGzzf5ulZGnoEeR1wskt7eeoQfnKm6EerhLDOMCXrayCMdGuy8S5JevTJWH24M 5ECzAQxqbofhb2SKkv07MdganeUGdM98qwgJwwplGcRtiiV78uTmW+BjMNQCvLboGAxifD xJj1OEypvXNFQhUs1jrMNJ5/7BcDkxU6X9PfVfykxaD64Vj6oOPSibWMQo5n3bRI6xJrT/ Gyz7Qgf0PIk0UmCax11qYjCFOTtMx8I3tVZt75zh8rrnjPSnn7JyJSPF0OnHoF+mfTi96l RLXgVkFeaM+fJakv0BUTysi1y3uFQiC9YR/CEEAe5MpQD17xBA3vK3I8QNE1+A== 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 4dB7Pt0rd6z8By for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8593 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: fe6ee00d174e - stable/15 - nvme: Notify namespace changes better 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 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/15 X-Git-Reftype: branch X-Git-Commit: fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:22 +0000 Message-Id: <691d43e2.8593.68367ce7@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6ee00d174e0d7f4c7a38db9af7b94c56579054 commit fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 20e94950c54e398049396647da36b9e2c3b639c1) --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..8e69c0ffe339 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1930,8 +1930,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 07c1bcdfbf08..63b8643d97d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..21d7965bf7a6 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -557,8 +557,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -622,6 +624,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); }