From nobody Fri Dec 5 23:18:21 2025 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 4dNS3d5bMMz6JfCN for ; Fri, 05 Dec 2025 23:18:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNS3d2bzdz4HdQ for ; Fri, 05 Dec 2025 23:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976701; 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=E197d8TzeUZAfsi9gcuUcVLLhfMLV3ojNqmnfkXryiY=; b=uCv98e/Tiw60jwpxPhrKYGQ7zSz7kJZsRRjUN/KGZHCu1nqqBGFE8W+vbYB1WE/Ha7qRnQ Qoow9GzscK9nHzd6q2eLe49Txi1KdOu6uhuoaI/OO+IFDALB1Cp6J+p6xO6UNh+FxoyhjP NHSL6RQW1b0FUZIARfGqxz3/9Tuo4G76KHxvbq0NePjrmYPl7DeHCsJNwq9bKCgscI8Vp2 kLPoumJ3ocE+svR8/3nm80Ca4YVyumjAGMaRNXBElip2vMcEWm57uSGmUKCqGUZzeIeWTC mp5NYnM0tD0G3kGs7br0P+CKWMVZq5KZ8TfqcLaNJYVBXKyehFM4dDIr2IZetA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976701; 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=E197d8TzeUZAfsi9gcuUcVLLhfMLV3ojNqmnfkXryiY=; b=LeHOMm+Z+ckb+lD72O2RVwwL310Pc9QvNwmS+PwwljcZcKdxzuRvFL2sPUU45HLuHBFdDq aFdHptswbEUDHN2vUimZOFYjGALSe+SOrfnWWklDpdctnZPhkVtrgtULAr3rKExX+mvf5M TGTvvU8PLdnof1/+P2pAU+MvxuX2JJrCqKoC6EncvIH+fb8FC9iD6wqLUA1ye0FehvNgDs +R6CEQ494N9Nh540lUMddmUj2FENmw0dyDjqoL75AkahmMCNHkh2+/SaVG9gPTaDSOCVJQ n6f6q3yV9SbaM03vSoXXcwSr/rGaI5LPrx5xYJ+Nde5SZJEEYCUp9YacmI34bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764976701; a=rsa-sha256; cv=none; b=ldeFDwDWeLTSJFR8bbbv6AxokLPPj2Aie8JqQC1rqpYjA1OsJszW7uyu0YtlmDzQpk28/Q Cyznn+uZXjYJWRpBp05SDRFykgtQjT3EJ1rO3+NJH9oECEonKl9r75vyUA5FSe6Me5eeHf +v24kzjcKxp7LVo3IUe1H8oePRkMyOhsr8Rr69YMam2goGgI01xzC9FE1/+QTh0YF4rsw7 g0fSmeBc6OgCjFbLsD+yCnkbaBtvegnKsqbQUUxKBbEhz2/9YOOf3qflTZlqyTLK+reFaY WceXVpaNw/WQZCCBYQNnf2p02OqWuX0rU2NT+skDyNFVx6nJcwntiIKutaH3Hg== 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 4dNS3d1YtVzVl3 for ; Fri, 05 Dec 2025 23:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 23:18:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f5b812331db5 - main - nvme: Improve error message for invalid format value 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5b812331db52783292e89192a04195031132c23 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 23:18:21 +0000 Message-Id: <6933683d.3cf21.3a4aef29@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b812331db52783292e89192a04195031132c23 commit f5b812331db52783292e89192a04195031132c23 Author: Warner Losh AuthorDate: 2025-12-05 23:17:40 +0000 Commit: Warner Losh CommitDate: 2025-12-05 23:18:12 +0000 nvme: Improve error message for invalid format value Improve the wording of the invalid namespace value. Reword the comment and move a line of code to the block it logically belongs to. No functional changes intended. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D51393 --- sys/dev/nvme/nvme_ns.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 4ebcc03c4f04..b6611161a2b4 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -563,16 +563,14 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); } - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); - /* - * Note: format is a 0-based value, so > is appropriate here, - * not >=. + * Check the validity of the format specified. Note: format is a 0-based + * value, so > is appropriate here, not >=. */ + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); if (flbas_fmt > ns->data.nlbaf) { - nvme_printf(ctrlr, - "lba format %d exceeds number supported (%d)\n", - flbas_fmt, ns->data.nlbaf + 1); + nvme_printf(ctrlr, "nsid %d lba format %d invalid (> %d)\n", + id, flbas_fmt, ns->data.nlbaf + 1); return (ENXIO); }