From nobody Thu Oct 08 15:25:00 2026 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 4j0v1n0K23z6vp9P for ; Thu, 08 Oct 2026 15:25:01 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0v1m6hdmz4sJ0 for ; Thu, 08 Oct 2026 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791473100; 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=F9wooYg92dGM2Qv7TfLgoVuhy6IoyH1z4nPXxnTYDy4=; b=QsSc1yeBz9G5RcG5NkZiL+OrJhEerQyOF5O4Ay1jElaJjS1+Zo8sVfV1XfKsbg1oTS/2VX pyDYAEd58lm2d5+kdF54+1+Q3eQURHsOyS7EtsUTFHA3DkAtLHsjQp0HGnm4cihp21/MqS JI4KPXstkMF6JFhW82zMKsulCC77H6oRh5UOrMFyAh/Ku8nJ7roAqGSPzs0N/BJ3AD5bxu IPWkDL9AqDVO6gadGvGh8nktky2G6gU3qRPAI63F+jqh670bCb2zRjoFOxCWrBcne56stE qwi8TyUbV7Zhq30mlH4qKdbPJ5rGO0EU8JCNQpjhIXHbnnq+zgsBUSsXhpwrOg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791473101; b=BEoazOqZBjDnUzYLFywO5D349qYcDXFJtZbqDO4Ar8fg/aGGuic4Sux/I5Hege83fE2ADt yTR2I0ZjgVC620we+sqruo8IYQ+Nf42wpq1yDQ/mF22YxhAE/Up0N1RnOd8C4guCDlXmzs mQ+z9KqWf8zkark6RYYtTe2H2JZPFmavnOvsshUCZKAe0AEaNAhz/WffW3OFftoafRn+Wc yW2JMTPD8z8H98G80Um1TdQJqZPQjauugk9OY8X4CAXlRlZM/uNvGpM9tGLJznBd7cRvqP ujGE04DFwICxAlIlE94BGs0We4DMaG1NSzz6N4cXHghJ8g1vMJgPueydJVYH8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791473100; 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=F9wooYg92dGM2Qv7TfLgoVuhy6IoyH1z4nPXxnTYDy4=; b=R5+b2uPtENISqPW4WyfJLAmXR+Cuv8Zkj58rw8yMKERxFXyAnx1eD+0bAlLZO0L8HES0Hf ivI1pOCd35vGhHOJq1g4cqa9/vujDyHbalihXoZbG6jO8GUAJezNdx1cQs/0rsJmYMSgtx fxK1P7wqfcRlwVm4GQ3G8n+BLdbBtDcOgfRBPEppefQ+4QYHZ9O27fWrXna8CJJSfHE2TW gbLeaFXinj9BY8rWzvIJxBui8dPYAtpsCXLM8vtyCMkjX0HvNhwtj69KQ/eYfT3MKxiNWm vCUd9fGEaAlS+/iOt4rVNSxcnJlJ8SEtEh3ALWCmrmrHoP+ZpregXDtXHanFrA== 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 4j0v1m5k9MzmFg for ; Thu, 08 Oct 2026 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39bfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 15:25:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9c8be6518e2e - main - ctld: Fix namespace IDs for exported NVMe namespaces 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 9c8be6518e2e5f396055ecdab8098ce19c4b2218 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 15:25:00 +0000 Message-Id: <6ac7b5cc.39bfb.45415e55@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c8be6518e2e5f396055ecdab8098ce19c4b2218 commit 9c8be6518e2e5f396055ecdab8098ce19c4b2218 Author: John Baldwin AuthorDate: 2026-10-08 15:24:45 +0000 Commit: John Baldwin CommitDate: 2026-10-08 15:24:45 +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 --- 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