From nobody Mon Nov 16 21:00:42 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 4jT0d71j0mz70wRS for ; Mon, 16 Nov 2026 21:00:43 +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 4jT0d640D9z4CZb for ; Mon, 16 Nov 2026 21:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862842; 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=oS4oqBrZvXKfCrjS364Ew04v0lGENklu72nkw40QBGc=; b=KhFFJ185BAZ11Mk6lCQA4bSqARNgQiPhd91uXNbAeZ55f4XKjfJecQWNbvQ8xoOfHoOjZC t6XLHv3VPKfD8cdneAbIZKmbnBMHT6+nFQUAyNhFtIlrimLxcNowbiWFMZwcu6+rhIo9kp V8+m43m9nd8TU1vcq75V9306VCEMjPc4KdxHWAwTbrexRFlscBRQQ7mNTkM00b/xWZuRdC HWsOpXurWUoWH0UVQlgF7ZWRbNEdOrKOkk2B63XI7LxwrLnT51bTfyljYiQCsN02w52gCK Nk8kmnPmi3vnsrQaTWJ1tSDCmDBeKwEo85lF1Eh13r7HDeWx4MH1FlyfeJopfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862842; b=giJ7aQTS0H8gmXBOtB9nY7JaKB043w4QWXb7KL2AkIoOIqXpWOuKe63+biWlA/GMp8TZp0 tWTE3syh9+ryAI7jpRUrcJocAEsL9rlj1fkYMqQYkwX49YvJWltBy+1TI4Zy+lohWuVjjP NU1zHAF3XqF8dsYrrl8JrI/G0I+6gxPsT93AovEM06YDzcKQgHWLTXmVZXLnDpOCW9Spwy XtU3acwtrsWIKD+ek8CtCr52Q8fggY/caabbV+VWvMxGaDLDDumZQpoQpYWCqDIHlGckXZ oZaEin60Z+3ayikYIhh2fT9EkwRseK1H5cDEb0Ce23bLrQtBwLZpMgGGqjeX4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862842; 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=oS4oqBrZvXKfCrjS364Ew04v0lGENklu72nkw40QBGc=; b=nvrvs0HKu1PYbKOY+Uc/eRBBAYL5aMOxZljYIct+vdWi0vZ97zNPwCzRkdeNn9slQTaEyD dor4YtPHuAm/O+VR20471mkEex4QdUfuYI8xuhiOvUhgmTJrBFmzzoKV2jWLL89uWB45YT 8KXV6i3yYMkKroY1h9vSe0KN9IZw7oRfkUDfFJ1Ia+HNlWdl4tABS5IyBHJf6G2tblluyN 799+tgAPGECquCKn0nDErjDVlz3yj06Res9WIjbRQvb7mtlnaetrAUn41MPwh46fR7TCHu 7NS/3Hoq+IGf5klX3dFxOaf59cV6Mlis9OKUx1iz7fBqlCxVpV9l+JXRvcouYw== 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 4jT0d63crcz19QM for ; Mon, 16 Nov 2026 21:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 68ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 97a9a62d0ffe - stable/15 - nvme: Restore the host memory buffer size calculation 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 97a9a62d0ffeed4c2d0a22ef649daed2b9b8b154 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:42 +0000 Message-Id: <6afb6efa.68ff.1845e500@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=97a9a62d0ffeed4c2d0a22ef649daed2b9b8b154 commit 97a9a62d0ffeed4c2d0a22ef649daed2b9b8b154 Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:46:59 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 16:12:40 +0000 nvme: Restore the host memory buffer size calculation When the nvme_ctrlr_cmd_set_feature() call in nvme_ctrlr_hmb_enable() was rewritten for the widened Set Features API, the HSIZE calculation reverted to dividing by a hard coded 4096 instead of the controller page size, undoing commit 3740a8db13ba. The Host Memory Buffer Size field is in units of the current memory page size (CC.MPS), so the wrong size would be programmed on controllers configured with a page size other than 4KB. Reported by: llm-postcr Fixes: 7a9e4375316b MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 (cherry picked from commit f262bdcf24f1f946edcd01f5eb5dfa2910da9e7b) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index cb88b8b1c28c..7c467b01f2f8 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -972,7 +972,7 @@ nvme_ctrlr_hmb_enable(struct nvme_controller *ctrlr, bool enable, bool memret) cdw11 |= 2; status.done = 0; nvme_ctrlr_cmd_set_feature(ctrlr, 0, 0, NVME_FEAT_HOST_MEMORY_BUFFER, - cdw11, ctrlr->hmb_nchunks * ctrlr->hmb_chunk / 4096, + cdw11, ctrlr->hmb_nchunks * ctrlr->hmb_chunk / ctrlr->page_size, ctrlr->hmb_desc_paddr, ctrlr->hmb_desc_paddr >> 32, ctrlr->hmb_nchunks, NULL, 0, nvme_completion_poll_cb, &status); nvme_completion_poll(&status);