From nobody Sat Nov 22 15:00:20 2025 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 4dDFd56xzSz6HGrQ for ; Sat, 22 Nov 2025 15:00:25 +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 4dDFd56PfZz49Nx for ; Sat, 22 Nov 2025 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823625; 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=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=bQuUMCyMIX1X9RY3vfu3gse0oS96eh6DycpYEBueMWmR8gmmo25/7MnBGiBUR2URl15nKj HDiB7a5UhWK53iWkeUCSNVlrq2bWJzm7ONFp/qgR/W7lKA5Ttoh3r0OFtbMAsWZiRzD3yH ihJctbzUi6XZSEkCHm9KQ8fbsVyR8urZyr6zTBi246QquhUZQCbssPtYFXDuT0u1rH49tI 7cAsQjDtW9Mdy/6C6EfO8pZRbUGR22AqfDcnjPmpbduRIHAGBHnubwa57IW6LKkkK2BQEa DexcJNAI86PsV3o1Oojv9fpXwzSLax2YBg6WF3KNun5imaiKVVNODGTi2/RbtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823625; 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=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=c7TBqOOjwmS2Oj3PvyH5jrXCORlnpr58scaD88gsi1CqWlcPtcuUj1CNU2GnyEbAcpGI0M ajzXvcvg7aH61z+xRbE/0X1LmnOoUthOw+kQk+XsyRt1co0Md0g1qO+eirafF5vBKW4OU/ QMRIQqtahEoVGlVgLerz0H/WjLWzDjdFBm5ZzymqD5v1BPutZ5t3e2MvbLBEPpjUxS2fSA EFKuNstIyXxOGAbItOj+7LLFoOj6xkTL+EI0X9ftYGZ+RHw03IAWl1NFVFB52YskxnaNL1 7Fn8lsuSxPk89vUjzduWwVpVW+yZpiVtKslaAnabr83ElTcUOi69dLWenDVNcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823625; a=rsa-sha256; cv=none; b=T5IkPFYgaLuTyJGY+F+00qbO/TQb4kzBSqGRBrOJe+AGI3bPUJFyttvysVuClXRzXN34x9 DDYVUTZ+Mqqq+K+EhAQ3dD2UJ9i1/4X8b0ct/+xFgCEWOATgJHf6Dxvaqa51rcWE4D1WOV K4LLBDXi2A1BfxIYB1iMwoArOvUKza1X2J8keaYj01oIpZovHwZHN/lYS3k8iAzYgQ3/Pm cGI8RZhBxbf2E4Pb/fZIUvCYELdTqfPZ4BtQmRZBVXL1PYwGWPz2Q8SlAvevjwpBoK3AXZ SHkiMex72yXSFZHhZDRKWrfkLaPV9qDKG6tShe+ZTq/PxWpwM4H4L0DwtueBsw== 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 4dDFd55pxZz12rk for ; Sat, 22 Nov 2025 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33221 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 15:00:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 465c30c4f202 - stable/14 - nvme: add support for DIOCGIDENT 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 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/14 X-Git-Reftype: branch X-Git-Commit: 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 15:00:20 +0000 Message-Id: <6921d004.33221.6c2c3e53@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=465c30c4f202b02cd9cb12f12d9ea856c84c5203 commit 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:59:24 +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 ce203e2869fd..19fd4e70666e 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -1229,6 +1230,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 @@ -1367,6 +1386,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_MAX_XFER_SIZE: *(uint64_t *)arg = ctrlr->max_xfer_size; break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } default: return (ENOTTY); } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 9eb808f81a48..1e9c5360f15c 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -89,6 +89,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 93833672674a..3039dcf40373 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -561,6 +561,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);