From nobody Thu Nov 19 16:04:59 2026 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 4jVjwW6nnXz71KVY for ; Thu, 19 Nov 2026 16:04:59 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVjwW5gLZz3MRF for ; Thu, 19 Nov 2026 16:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104299; 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=RCDsNL7Ls+NgZSTTCokXAAua62FPDO5R1x0e7cSB29Q=; b=VcSXj0q7BiK4vkiCAdsp6zcRhgcfJSa06tI+V8cjD0pnRmvopW+sYQ7R4a2hqdPLiNCnKU C87A1wz0fvM7NmF7KbWy6xBnCKl6sDueA67tBFJTROgEwDZB1jz4aepwkJK5YGU3UNFIU9 b7BWvfo5gnmdEFz7/CpjTXNPe9FG7joh0115p3VR25oCHsaEmsoo0NREK4B2lFlRLdmyWF 3W7w9uF/RDxbW5+jrWJOY4egIEGA24LExof7mmMcqMKepI6EgUG3NmMdLygYfohmfgIXly Eq2UPlAOjZBOTDVBzlLcNH7WFIEwlGgNvthf7twO4csriQ9hPEYS3TQfXpAgZw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795104299; b=TkAJKVztOTxMmxFkmxBNlhI4HhtY5sJ6tTr+FFnPls14B2j6hCK19i8soplAwEDYuMoTnS 7kMjgCkQOz0oBFLGxxs6n/04GL27ctYr9RxJ/XaI49Y9KJZa+84+MWFVDa1zIfXMzdQQkZ UbH+Qu1GY5xHi0troD5eJLQmXU/oLT1I1Tb5JDrM3YzsWX0+I+dRMXXQsWYCAttMY2G5AZ /Utn7FZF13aeJP55ptp5bjee+D8M3IeZx+ykQSruIHa+bpmOwYhQk3A9BuV12d8hrN/b2o PSW6PMSRnSw5eMYAjAe0MtjI4fj3PosnMCYOmupkZPfqS88LPcNbspfslzNR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104299; 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=RCDsNL7Ls+NgZSTTCokXAAua62FPDO5R1x0e7cSB29Q=; b=N3tLdlWlzUYFChypsMiQXG5NP7cgPp4pAMXjREb4+DLMWWRjGzutnpW1Hby8u5sShP5zY2 ePT3PO9wrR7+GlV9sxXa8W/2hhId8uj+sYSnJGCaV3s6gsBy8vqntCm8QYHgrK/KspQvVs Ngg0BPbmCOAP7jEvMF9h1WJ7pTGynz+0EOD/K4jKdJdxJpE9q2qsABqHwvzkifSwhzaGcA QUfFpCY8PJLP6KZlHBIguT1YA2t7pWsi33oGGX6Yk7DjRTdt7HFYPmi/MaRJySW1Tf2W1H OVUqbBKqgOn6Iif1mmbPqBb7KsfJRQXNOsEG21gh7FusFE1KtL34/3b/A01Mww== 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 4jVjwW5L5sz16sQ for ; Thu, 19 Nov 2026 16:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eb42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 16:04:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Colin Percival Subject: git: 38c1b30fdb59 - releng/15.2 - ctld: Fix namespace IDs for exported NVMe namespaces List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 38c1b30fdb59d062984d7aacfaf5a7da76ebb9c9 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 16:04:59 +0000 Message-Id: <6aff1e2b.eb42.1ba9e875@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=38c1b30fdb59d062984d7aacfaf5a7da76ebb9c9 commit 38c1b30fdb59d062984d7aacfaf5a7da76ebb9c9 Author: John Baldwin AuthorDate: 2026-10-08 15:24:45 +0000 Commit: Colin Percival CommitDate: 2026-11-19 16:04:28 +0000 ctld: Fix namespace IDs for exported NVMe namespaces NVMe namespace IDs are 1-based, but CTL LUN IDs are 0-based. The in-kernel NVMe ctl(4) target accounts for this by adding one to the LUN ID to compute a namespace ID. ctld was attempting to handle this by translating namespace IDs from config files to internal LUN IDs, but it did this incorrectly resulting in the namespace configured for as namespace N actually showing up as namespace N + 1. Approved by: re (cperciva) Fixes: 66b5296f1b29 ("ctld: Add support for NVMe over Fabrics") Sponsored by: Chelsio Communications (cherry picked from commit 9c8be6518e2e5f396055ecdab8098ce19c4b2218) (cherry picked from commit 033c0cd3e89ba87f3d66ceea6436cf2a37148051) --- usr.sbin/ctld/nvmf.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/nvmf.cc b/usr.sbin/ctld/nvmf.cc index e1ecf8ccc552..a596d32d660c 100644 --- a/usr.sbin/ctld/nvmf.cc +++ b/usr.sbin/ctld/nvmf.cc @@ -371,8 +371,8 @@ nvmf_controller::add_namespace(u_int id, const char *lun_name) return false; } - std::string lun_label = "namespace ID " + std::to_string(id - 1); - return target::add_lun(id, lun_label.c_str(), lun_name); + std::string lun_label = "namespace ID " + std::to_string(id); + return target::add_lun(id - 1, lun_label.c_str(), lun_name); } bool