From nobody Mon Nov 16 21:00:41 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 4jT0d569Clz70wJV for ; Mon, 16 Nov 2026 21:00:41 +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 4jT0d53cpBz4CTF for ; Mon, 16 Nov 2026 21:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862841; 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=1Z5vIVU8inVUKl0mjIUJ7M+AQ6+2C6KbmhNWSgj9gFU=; b=ZOFEpcdQYf4TqXuXQscCvwla/hTas5qVsQuxMui7CYp3zZFtSGU1jUHeF7YuE7vp9F52YQ j5JtG1prxQaVhn7E2oOkKq8C1H6me2P78KsTEaEN9X7G1+wP/7Yl/w86AJpHVVG99jcKdS DzZ1aWBoaE0dHIJuEDLCUYTG1ov6F1xo4+i91xl5UUX5/tBhBxJ+Qceb0LNXBe/zQ9HH6s QBKwHLLA2Q3UUpE/H/DEGs3cjWUVNOrR0CjWTZyaaXgdtOCzrcXqWZATdFVwSN8tAUuM+g LuoseXvTDCt9LZFkMA5Cp66nvPeNMz1msGVWTHO/+r4GJ1/cvd1WZmw4qSyJ4A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862841; b=ir8gZY4NZc9vbt76XtEvXWKe67fvo5bQPOEuALDfZ5TfMsk2j0J6TJM2DLR8AmDhNb+9iL tiIUPOR6MlUo6VvSO8tNIKokx5m5umZK3j5Hzwy9pXqAwNEDISbQxXyTBxTcHDE9TYTzoK hGWMcKm6WHasE2E6J98vW+TvnxjgdHNLaY03j+c5gKZkpnMBU+o60LwEyGqddvXi4pVwkQ SKwns1zQM5fS7X6hoM9R9iWKK7s4qlSlNyOs0iwuSSStw0j625lDMYdky0pgQ0/xfwbS1K ERQIpLtrcmCCiX319bxt1e5+6DyOhKWcLN1ECmzeh5ncPE0A3U2MDjOMY9l26Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862841; 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=1Z5vIVU8inVUKl0mjIUJ7M+AQ6+2C6KbmhNWSgj9gFU=; b=FECicfwxueImtZmrgqBhkU9KAX0ARsxeyjzJIrtBDlV66fR1t4Vjp6N58Up8F6LWqiel/b P8va1zi3Y1190oHK7mNRdy18HL1W+3qnZRh8qius+zPRttiwfYiFoh4EtOyuViYxlalfcP czYWufc5CWtx6BLfn88mmw0aH2qsqV6PsIDYOs5EDXLsUyfUVKgHzlyB6QSFx5qAHicIVe fnNmUVvo49R14TwRLOkAQrWjNtT6OLEfDuXluhEm5QLNg8xA94PaGUYn4/A7MXw12GGt1o Z9z658slxo5Ue86ZUlO69u4m3f2eG3HPgE94cjSM5p1VTBsFRyuoJldhY7eo3w== 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 4jT0d53HGLz19HY for ; Mon, 16 Nov 2026 21:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 7e70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 78470b4a8068 - stable/15 - nvme: Fix the data length in the Reservation Report command builder 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: 78470b4a806859868aa5a6667464b3abe4ae0069 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:41 +0000 Message-Id: <6afb6ef9.7e70.1b4fa82d@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=78470b4a806859868aa5a6667464b3abe4ae0069 commit 78470b4a806859868aa5a6667464b3abe4ae0069 Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:46:58 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 16:12:38 +0000 nvme: Fix the data length in the Reservation Report command builder nvme_ns_resv_report_cmd() put its length argument, which callers supply in bytes, directly into cdw10. The NUMD field is a 0's based count of dwords, so the command asked the controller to transfer nearly four times the size of the supplied data buffer. In practice controllers limit the transfer to the length described by the PRP entries, which is why this worked in testing, but the command was incorrect. Convert the byte count to a 0's based dword count in the builder. Reported by: llm-postcr Fixes: 7a9e4375316b MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 (cherry picked from commit 86b9d629c68f6dc63543b9c0a6da6c96c857f3bc) --- sys/dev/nvme/nvme.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 0c6886fde275..31b00fb2bdca 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -2205,7 +2205,8 @@ void nvme_ns_resv_report_cmd(struct nvme_command *cmd, uint32_t nsid, { cmd->opc = NVME_OPC_RESERVATION_REPORT; cmd->nsid = htole32(nsid); - cmd->cdw10 = htole32(length); + /* NUMD is a 0's based count of dwords; length is in bytes. */ + cmd->cdw10 = htole32(length / 4 - 1); cmd->cdw11 = htole32(report_type); }