From nobody Sat Nov 22 17:58:47 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 4dDKZv39cZz6HY5G for ; Sat, 22 Nov 2025 17:58:47 +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 4dDKZv2VSLz3gxp for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; 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=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=GLQsoPwb+8aBSXo9IPnw4UZhsq8lniHmjgv4wAdsVk/fRNS6YwtYlH/fTM/Rikx4lOO/Cm 1jn7gyL4Ns7P7/53GSvVhVG5Ch0GdWpGXb+rewYG/obW5tNCr3abygj27WKVext6vBlJKk VLtaq8e7jVmiY/O4CCJIljgAgpioYwg6jVRKfDgQKZVMRktYskuqjuLI9zi7B08GCar1Ek j/mCuMftXP7VsDk29slu/2gCEfNU4RV198N6rXemhKlnro5/CnmrKQdOkpm/RxniEJyFHS EMJcaTUQIZ0Qf65PYmGj9YZY04FCxGfliyzss7EK8TlpJ1bD9kqFXIJjhUpjJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; 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=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=WLGo4oE5Nsr/n6/DNXjn+beZrUmusaBx9YQa4LlTwu/DcD4bwsyYB89V3Pz1A5qZ+tjI4n PBCOVM7jxcbpPgPrvk+crkIT/4be74/Hp3pcCrG2lu7p7fulBJfzP/QWyRru8tdUmC+x2L 3entHn6RNV4MACdwzFli6Dk9/8ie3XQEOikBeBTJZxzkW5nbK104kSPimtc+5f0GRVYeR5 FYGzulYD1M2OJbyDKoAo7c/zE1xj1PWCnhVDFzGcu9nBaZ2uo/OOPuI1VOH2VWkOvuH/OO mg5HgyLb/LKiZyCjLSDDIlAhzuPAJqYx0/KG4Ctav/GYGdnXIFxs4Szwk6VeFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763834327; a=rsa-sha256; cv=none; b=w3BQy5yUmofpx05tRMWhq66REG9xDQiU+jO+dPWX4JJBqX+0FCZ9K8+TBl4l9P3VaJc6VR v4Ts+OdW2ccQaZi1Gdnp1w96kjOFmykeNeOAHa96loAlXCULMstjQDm23tkRHR/2W9sEAB IsLgHMuvec16QyOgXhrPVjMtaHVhb8H97oia4NNYk9cWdXNHRfHP9kqbO3GP5arnWZCBHe wUrP5+cqzgbnPmf6lHNcEUSI0EcvR0eMqPJ8bow578ZpxHloA+lt89uWVKTE/AX0w1ejuj MFO6qMtdOjDYx8hc1FC5SNXutnVC8SjJIrNaQbxLs9EULAhWyCzTCpGvqfeelw== 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 4dDKZv1Xc3z17r2 for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c111 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:58:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1b5cc3c48cb8 - stable/15 - nvme: add support for DIOCGIDENT 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:58:47 +0000 Message-Id: <6921f9d7.c111.6272f36@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e commit 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 17:54:42 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 (cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3) --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 63b8643d97d7..12b39ce3b3ac 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1263,6 +1264,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1513,6 +1532,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, &ctrlr->cdata, sizeof(ctrlr->cdata)); break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } /* Linux Compatible (see nvme_linux.h) */ case NVME_IOCTL_ID: td->td_retval[0] = 0xfffffffful; diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 21d7965bf7a6..17f6c205752b 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -88,6 +88,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index a425a6a5ad62..dd45e1acd0aa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -565,6 +565,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr);