From nobody Tue Sep 08 00:21:17 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 4hf4Nt2PdXz6r3Vr for ; Tue, 08 Sep 2026 00:21:18 +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 4hf4Ns359pz3y4q for ; Tue, 08 Sep 2026 00:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788826877; 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=mSNlVMqHUnXQT1lBh7eNRQkcxjH3KixwuSDGgpYQivs=; b=cr58Kbn7j9nFE/VAYG92FfB/1+U6zknQMWE5LclaqUmLVCy/HhFclEYW91HuosLz+P7N6d Z7z0DMtt7PmXuimkSpTl8S+aA2g2CTdjedYObQJrbgcRgaS2/LnicuSokWj0n0AYkjcUGr 3yo7VPzpcOEPrywcyKbqI0KZo91hCaMn3sUkcP7nJUbtaM3CJ2gQpF9ubMTTJvFz7Tk1O7 cCPgDIZ7g80QGe4eHldaxDtFqS4zjlLKiob1tIPZ8eXRhUHlMc+A8Cv/IucYLQRmV2alQx fcfUjFy9Zp5mXjV9tn8s6pfwoU65TtBOk3NLjIxs4RX68i25W7x9w3g/Yh0KFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788826877; a=rsa-sha256; cv=none; b=N7KqswClwbgzowpABPWRZNcVCHl3Ghbr3bO/sPh8eY8Lsl0KD0bvHUy+QE/6j5H0K2PNXY EGYDOQiEMTZcn/MHiXm1i9uIkuS09nYSBD/KANNXH61bOzUWdI11GFOVBbrRp61cLtjGOp +w34dOx+V9mMPWTVhtUciy45lWoVOY3RcS9yz7Or9eg2itvWBrpDPRqyhrxZFmDC+3aoF+ LAgduxJrCKvmm6Waw/ETxuiWyrpxlXib2oNK7uXPlGG0i8BvMxOzIeX/UgJzGuHG+7vwUQ cffi1iF0GvbIX7g7ZCrb4XlenBUUbwXigsmo/ZK+XimxukCdmxCu9RHzdbJjrg== 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=1788826877; 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=mSNlVMqHUnXQT1lBh7eNRQkcxjH3KixwuSDGgpYQivs=; b=Z6WawOkvc67k+JH3vSDINbgRTFk2o/ggbDDxpJcc+PzemnIO8nHI6GDDNFiBMf22hOZCO9 KmeTFIc31rR1PpnEPmbKsGuE5Vb/eH2g7NQ4tfxG6jlgGTV8FpYrt5W422gr1au26JxTCq qoRmHWDoMRJHV+vCUSyYNRwriy7qyEZQQGwauz03TbNV7EYY2dDatyr7YMgbqQXHO/Q2Gi 0TNRwcrTk13dnlDoSD5mpLxPNtIcIsZkg14LIiCiOaARnFVG66KxoeQg9JI1uBXsucKS9j cpzYMlRkRbQI5SR6uXICclXVSRA+BbV+M82OCd38nWb83ApB9w5FH3zMelVSxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hf4Ns1qGzzhwr for ; Tue, 08 Sep 2026 00:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3394f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 08 Sep 2026 00:21:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: f195b9f3f6f7 - main - nvme: limit I/O queue trackers to Identify MAXCMD 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f195b9f3f6f768ff2ae1e4523cab59a305666491 Auto-Submitted: auto-generated Date: Tue, 08 Sep 2026 00:21:17 +0000 Message-Id: <6a9f54fd.3394f.7a74de09@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=f195b9f3f6f768ff2ae1e4523cab59a305666491 commit f195b9f3f6f768ff2ae1e4523cab59a305666491 Author: Abdelkader Boudih AuthorDate: 2026-09-08 00:20:53 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-08 00:20:53 +0000 nvme: limit I/O queue trackers to Identify MAXCMD MAXCMD is the maximum number of commands the controller processes at one time for a particular I/O queue. Allocating more trackers than that only queues commands inside the controller. Controllers reporting 0 are unaffected. Approved by: ngie (co-mentor) Reviewed by: ngie, imp Differential Revision: https://reviews.freebsd.org/D59154 --- sys/dev/nvme/nvme_ctrlr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 5c90e252b748..a8d8d1b99647 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -191,6 +191,13 @@ nvme_ctrlr_construct_io_qpairs(struct nvme_controller *ctrlr) */ num_trackers = min(num_trackers, (num_entries-1)); + if (ctrlr->cdata.maxcmd != 0 && num_trackers > ctrlr->cdata.maxcmd) { + nvme_printf(ctrlr, + "limiting trackers per I/O queue to MAXCMD (%u -> %u)\n", + num_trackers, ctrlr->cdata.maxcmd); + num_trackers = ctrlr->cdata.maxcmd; + } + if (ctrlr->quirks & QUIRK_APPLE_SHARED_CID_SPACE) num_trackers = min(num_trackers, NVME_ADMIN_ENTRIES - ctrlr->adminq.num_trackers);