From nobody Thu Oct 08 15:25:00 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 4j0v1n0QMGz6vp6x 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 4j0v1m6mqbz4sLQ 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=1791473101; 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=Cqr06KINa01tA4BgMBlB3emN9sQKIzUSjnng9nGICwQS2OSRRBk/PqnrQ09D+Alg7sUPGV I+ARx3D1JSa4vHEJb3QBVbrryhDBaQgjb87I+BCZQfP57BaZktcOfsqM29CAczAxUVKcUh Xxus0j4WTEj1GvS42T5RWhfUDd3wER5PQckIJkgjPFg5a5bLmVjTERUM7T6Yh7SjPDThOz hnYV2oCnoCmEubqAPLh2qFhNHk2gVBbhG490a8uX4mNfv5e3bx3aAmcmHJEPgXk6/fWvTB sbDc7H1emXvzoNzZvNMoLeaLq9+GlsNiHpF0mwnLIdN30b3HdRsC+FwMx5Jb0Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791473101; b=I0P+aAHia2VpxqPaRAh2rZ7OdjZntnqQZ0q56fE+uYobpzX9qcc+Wj8TWlGrdMxliQfjlH Yk9z//PKj2qSRNjPWg0CB3DUjeVuDBeE72JIoG2L46+eL6+xKEoOV7HYcmZcAHzkUW7WDT xsRSSNXOuwrMZ9dOyogZGhx0hKsC2oMQezZoaIGMmg1GYBOYSLn1imGhTO5q+FjGBkXcNT JTrFExiIA6x2wnyJ0FMl9uckXGN1rUEoBTIiQVdicjhAUx6912W0t5AxL/Z6QxMszwFbkC Ut1wFxAFVHsL+mXt0D+ECv1DV0hbokeLcWNGoIkNjywUkkLLtMRzHsuyT19OhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791473101; 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=wROIV4fTaCNyZbQSopxnP/y4Z5jT5k8YwR+yPpXoLxzyNSvoAa2SEFAokAo4ibqr0ZU/gF I4wepqkpajFErzrCDQcTIV5Oc1Za5WlakxfW0LWfD/0f+M5ruUbcChWIr/DvyenZZr2fFK OWpbt1LygiTFZRZ+Yl2Tq71UbkqUpON+D70uziodcIW0Sk6W/VzNc9paH61I6QtARYtSum xLfEb7KAqbHKb0jT81TSSA8t14PcVNRDQrBJwYYWSZxWHA5tRsXjXf8myunA5AFYiOUKP1 Jj7zhoH8rCj9El3rdnkfounsxHeP1Fs3f0HOMYpl+XMMkNEmqUCBN/AmpYJeLA== 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 4j0v1m5l0wzlyj 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 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 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