From nobody Wed Oct 22 15:41:05 2025 X-Original-To: dev-commits-src-main@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 4csD0K3Gsyz6ClFS; Wed, 22 Oct 2025 15:41:05 +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 4csD0K27g4z3L9w; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; 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=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=af/l0gqsqJ/svvL8xhpqe4qUqAhWgYbnsVBYrfG411978aSVFQqmU/iWO8XcHg5ACAIf3i QKmbR98jTkDUbN7j1Wg/Ma0SnVJvZgXMowLyh4MjZbW7IWS1l2n+EdiK1//VGG8/WpujCy HBqL0mROLB0VFf7Z5dBfAjdOSZr/2eLsSEnBeUhWV3RpqH34HLvkLipMpXbLbIjsbniwJS ZCx0ft0xHCi5ODXSHJ9Lu2Ww1o9oZ1erND3huSGel5L3fn45RyL6CN3DAfJRZMq19SeTon Ge0BJrbujthNYtCkvQ2vgvskqSnqxET0qyfvx+3zA/+XN/8uy5TXMeOdyLP90Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; 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=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=ln+E38DNglxl3BJ2EgUeHEbzYtCeXE3Yi/Szdj0xg/g5dnlxpLAkcGrFi6dTB1u7MUBRN3 Gogr6OuM/TJEln0hQWTigLZ3v3RqjtJwwvdSE1w9tmNwWkvurCW6Uh4qTSboAo6XOLrTHz OtH6AYY6EFnGZTzDUM9rcc2MMMPPXFWSeF8Z5BfXznSM1O48F6w3QDe0qtYXAYnxInDScd BFspeRWLNneNpodECep2Qdzmt2IkUqaoheu5t2ZqRvzDQHBsw0W2QXt/OQK/VvEVf8wk2l FTzTpwCX6iMElg7en5LkPJjNy4EC0ln9+5DZaJi7TF10jQhr3u3muuLSKgZifg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761147665; a=rsa-sha256; cv=none; b=xZKhVM1ee9m/soMOPwzmhdKNTb9WQaO0k8A+uu2euCqR9Wazs4FGWWL/WVVkYp7+bqdvlw lSxAVa2suQ5j/A/VTWGTG546Q2DNpnSb0MfpzQ5rQsF/Ss4Wr2tVuiknIPEJrzdM/LL3eZ dUmtC6hN8gsbJdOOhWg9qWwh2bu70M/7Eqdse23Tf4cQtq1JeLPmg1eTLL2ge7HquqnfcR p9KUZXyu5dc3fb2VHDDgFoauonw+3xBJRUwJ5qHA+ZoAQwhUGY3m4L1EIPasDDDlXm6mpV /5T2QX3iJd+WRSHqDSNYF8sZYS5+XMNPtsen6bPRz7a62uYHcMyjVRp6uJ/RDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD0K1VYszZsq; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFf5RK013921; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFf599013918; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:41:05 GMT Message-Id: <202510221541.59MFf599013918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6d0001d44490 - main - nvme: add support for DIOCGIDENT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6d0001d44490becdd20d627ce663c72a30b9aac3 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6d0001d44490becdd20d627ce663c72a30b9aac3 commit 6d0001d44490becdd20d627ce663c72a30b9aac3 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-10-22 15:39:35 +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 MFC after: 2 weeks Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 --- 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 3a1894bf754d..f212759a5500 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 @@ -1253,6 +1254,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 @@ -1495,6 +1514,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 e84d2066930e..a759181a8c16 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 52e9fcbbebcd..04a47d799350 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -563,6 +563,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);