From nobody Thu Nov 19 15:42:40 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 4jVjQn0LJMz71Gdk for ; Thu, 19 Nov 2026 15:42:41 +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 4jVjQm3Xq8z3C3D for ; Thu, 19 Nov 2026 15:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102960; 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=w/8lEepDuGIY9WEHglMv2NexDGqBfLOhzVeTRk4mjHI=; b=Pdmx5TZ3Xzs8kFN3ciHWSQYZBeXUl98jnYNgcOmPhO3s/Y6V74oqzxBBKoeCUgRABEx5pf SusSLisB7dCvE9yLxzG/H2EQTefHMrjvnixY0W4rCgcPLsuXNrLoayu1LXNV75S2lzc2nO zl8JXt3UhUO4QDYA2+5KSSFNi3OJQHfKTD2uPfi/GyWCOXyDxvnfJMChXizqtaMSJoBd/1 pKwRX59W7SO4VaVYR7YGWtkmt7hkRJrwu6rROnL1nHcLeCyoWSclI8GGoeqAGnxaiPWSQt cRjadpHYci7iGx/u8An2Xq2Kd/KhOezj3S3i2rCLweo1bZuBA7Wte67vxupP0A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102960; b=hdoV19nacTqLTHjWLV7rT+uDAlQ6zf97vZdQXRH+zaAUWSVXgiC9UaoCiZm4ErSa3EAjZb tiMVjmJyJdyMeorYmuzuUw2N5ZJqaNRG+yF4hwDWV8fk2Y1qkg6Wh8w33prpw4NpYek9wf sdoitp9/WOMmbfa0oAI+U3BIAeHE5YG+YyNeAb9dWtnkHE+3KYL9rxSEiH/XYFdbrjku8V T8KA7NkWu3R0m+c993rgrYjZcjzMFrG/NVkL9JGlUDl0w8qzwGkXOqz6espTgA+LpGkQOB QJt+hoqgBx2T0okGDgUG853I3wGOJtn4a5rQiSUYuHIz/fm72CcSLU+3p3uFIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102960; 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=w/8lEepDuGIY9WEHglMv2NexDGqBfLOhzVeTRk4mjHI=; b=tRVvoGOxiOHND6PlUCws/OoYXF83oJtSeb4nZtfqStqxhny5E6CvGN+FKuEjP5sFc0zib9 GS7lRB8fJJVsfrH61lAr54zHrQQyR4PbmoLkkSWL2wQe1sTPpJBF9I+OUjA8lcGCwlnOLL EMUw0PBusPpe+i6yuGscUxxdKoL11gxDBoIpkdr6+bewR/2tI2G7PSNwLW+Y9c/Ozd3o91 HDtjiNNmuJ18g3DDmvCiNoTf9nhckvDFl69Rni1FLfagzpqXPxRseQS20gYpqsPsPsv0mV N8Pz7zGdXRmAeE4eFc/I+nwD3GHbibH101h9it91oX3Nxigfa04yEj+FzWuuAA== 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 4jVjQm3Cqvz16MH for ; Thu, 19 Nov 2026 15:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dc1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:42:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 033c0cd3e89b - stable/15 - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 033c0cd3e89ba87f3d66ceea6436cf2a37148051 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:42:40 +0000 Message-Id: <6aff18f0.dc1f.2d3b9c32@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=033c0cd3e89ba87f3d66ceea6436cf2a37148051 commit 033c0cd3e89ba87f3d66ceea6436cf2a37148051 Author: John Baldwin AuthorDate: 2026-10-08 15:24:45 +0000 Commit: John Baldwin CommitDate: 2026-11-19 15:42:20 +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. Fixes: 66b5296f1b29 ("ctld: Add support for NVMe over Fabrics") Sponsored by: Chelsio Communications (cherry picked from commit 9c8be6518e2e5f396055ecdab8098ce19c4b2218) --- 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