From nobody Fri Apr 24 17:56:01 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 4g2LH70kpfz6ZxKw for ; Fri, 24 Apr 2026 17:56:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LH537h2z3pyt for ; Fri, 24 Apr 2026 17:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053361; 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=63BQgOmxDW+tSa/+fXGTG3vY2ST/UHvc8OTIGX0Yacc=; b=FtVcBg4+MOhEjPrfdYkotXVzFQICrQ93iiG/vxUbSFw4d3m8GPNBev9ldESTAqTQOY2dVS RY+Z1viwhmqAdwxAEMYNWqhvB01hQKcoCVx6IjmlpQ4XNIPD6g0tC5ro+FMg0b0GwUk4Sq 4bDmYiwpJY1RkozwlOUb+oCIRbYGhUPtSB3tpjaGPO0m/4kB9ov34PbkHD+GJd2HYho4Rv ib8GjOqcV1esFxlLYFlgWkzfGisB/B+u74Z4pOa3CC3EHCCOb98wKp9ed9Mq10G9b08Q5f PQBqKBYFMbJ3R9+k5Wp9f5bFF998ZWhT/HdzRilnTEOwHIf8ymbMJoPk7dyAog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053361; a=rsa-sha256; cv=none; b=LUSuGOpXBZ+BQ1tvETVhRmek5BeFqApm/EW+AODqZm0WKN36cKHwk76L8lvPa+XVMhljGT HMKEtv4CQJTVnek3qrdJMEJiZNpaucX1N7nTsFgipJt/6HCJFOz/Bnunah6AN165C1WxQy zWzVyi7z8uvys0y3qQNv3qAfpyW4l9Oy9mGUgT8TZOMGd4sGRMSFt6b3C8JQPiWW32xSJU ftor0dYHgC9u9dQUsbrLSNsy/0Pm4izKUuq2k7VHrEgjZ0A2zcEYyi+s+Mtz+TNnaqg3R3 Marsrx/uCY/Vrza1j2XDuUnKGgEJJoZCq7RslpyctL1muxoRfwqKZMJOvLhB8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053361; 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=63BQgOmxDW+tSa/+fXGTG3vY2ST/UHvc8OTIGX0Yacc=; b=rmbFMqKgPrPRATnEjyuW22t791WdXkYkqyze+FVxBjmfX1dERUkQ5Xvc4NpQ8453zZNnER MCIcjGZbUsjTXP0Loa0aIekdj5N6Xfu6urw0L/x8t936k7URFhMBzHDuyX244jG42h/bco oRwlSUj4J9WtYTRVX7H6h4YcI80nzjJD0hw0ZD5OvNPJJfUNV1AKEgVkS0ob+3+3dVT61Q vzrFA2dmrjoh/+sGohVSfncU04CPKjNxY7577IFV8bFvOHbDmUGOIMT/+6ksVaUN1jeRwQ ylzFxjZ7+SLMo7mGNwIgas5ZHsh1a7vH5tm3HeEuqsolCLl2e4pHRBeYP9voiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LH52jSWz1CZ1 for ; Fri, 24 Apr 2026 17:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dda3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7e7745666352 - stable/15 - ctld: Honor the default maximum I/O queue size for NVMeoF controllers 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 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: 7e7745666352714c8ff33c98bf861c4ebf67962c Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:01 +0000 Message-Id: <69ebaeb1.1dda3.40298863@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7e7745666352714c8ff33c98bf861c4ebf67962c commit 7e7745666352714c8ff33c98bf861c4ebf67962c Author: John Baldwin AuthorDate: 2026-02-20 18:56:00 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:39:51 +0000 ctld: Honor the default maximum I/O queue size for NVMeoF controllers exports a constant to set the default maximum I/O queue size which is used by ctl(4) if an explicit size is not set. This value was chosen to match Linux's default, but it also avoids excessive resource usage for I/O queues. ctld was using the absolute maxium size as the default instead. Sponsored by: Chelsio Communications (cherry picked from commit 0788e7c40ddbeedfd9713842440a8db2a8f7ea2f) --- usr.sbin/ctld/nvmf.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/ctld/nvmf.cc b/usr.sbin/ctld/nvmf.cc index eb116903f5c1..e1ecf8ccc552 100644 --- a/usr.sbin/ctld/nvmf.cc +++ b/usr.sbin/ctld/nvmf.cc @@ -165,7 +165,7 @@ nvmf_portal::prepare() "max_admin_qsize", NVME_MAX_ADMIN_ENTRIES, NVME_MIN_ADMIN_ENTRIES, NVME_MAX_ADMIN_ENTRIES); p_aparams.max_io_qsize = parse_number(nvl.get(), "max_io_qsize", - NVME_MAX_IO_ENTRIES, NVME_MIN_IO_ENTRIES, + NVMF_MAX_IO_ENTRIES, NVME_MIN_IO_ENTRIES, NVME_MAX_IO_ENTRIES); p_aparams.tcp.pda = 0; break; @@ -334,9 +334,6 @@ nvmf_port::kernel_create_port() nvlist_add_string(nvl.get(), "ctld_transport_group_name", pg->name()); nvlist_add_stringf(nvl.get(), "portid", "%u", pg->tag()); - if (!nvlist_exists_string(nvl.get(), "max_io_qsize")) - nvlist_add_stringf(nvl.get(), "max_io_qsize", "%u", - NVME_MAX_IO_ENTRIES); return ctl_create_port("nvmf", nvl.get(), &p_ctl_port); }