From nobody Mon Nov 16 21:00:58 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 4jT0dQ4hstz70wRx for ; Mon, 16 Nov 2026 21:00:58 +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 4jT0dQ3LDNz4CwR for ; Mon, 16 Nov 2026 21:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54tj8z/9uZOQ4iylIBvPMVYsxmZhVhCi6mtc7BzoJAY=; b=vY0iAT+AXATxt/puZcvsKwTJj5DKfq7LKpK0S8rKc1LtEr06ATTv/6Kyxz6T4pDMPVynR0 bJDICCZHdiHhg68fcMhDbFD8AdwZnza0NZpjk6oDrxszwXIK4BHfn6AKBZYkiPPXOCnpLy rsIJ6/4QxuW3Q6Ym/pnIqd+j+Lj2kTJvpKf+7Ijw3+X4S7dg8EjhDx593vnd6nCMYhCDZO McCvmFQWJbRhIC3jzVqgMCPTEigAEoTL1Y+SdeEfcD7KaNQ8RkztEhT0supHU9um2ydFWj aN/mfVak2CRbaWlknPLZJxF2PO6uHrlGz0g2kCGNFXhSBcXVRtdduA1FSzQ8/w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862858; b=XobDtzzwcJkU7JwV+FY0RR3NgfNZvuC94ccJbNZUQvavtL2fV9Mf3uSdxN1JW1RsGp5HeY Nhqf9oyZsb2jb9G7FJnntj6+TQUmr9EtgeWY2+qDb6cIou/KTESO5EUd36kq8hS4YVsz22 eHJwi3woG9tA8wKrrGi8vcGS3588fqGtbQytcWM1P0NbBafDmCEQZxpzto54iNl2oA3o9c tjji76mhHFCRgSe+4cHwyHpFCeL8fQ8GsE8JDwTTlV1bRciqtBvLMz9CUBPlDlF8Bwz4e5 yzCYFyprmavichpo+YL/KPjS+K1mpS7ylCp7AXgTkZQN1FnzrGwPk57qdXVtVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54tj8z/9uZOQ4iylIBvPMVYsxmZhVhCi6mtc7BzoJAY=; b=pfpWC3YZnggoaepRQv0F/0Zv0u2OWpVyBOIwhXNbHzeDn+rUaBczNor59YANWoXXR00dW4 2R2PnSZOclFASpvtoaXFeKyrlvZTvf5XtSu34DwEn0T3ZiQHAQTTAh/XmRiyGtU6c4bGDn aXB1CjiPtdHccAxCi/6HeY/FDSPaR9JxBZWCum0aJU2lB5O05Hxkp20jWK8WQTWR87yrl4 /w0Yz6aXNR0h8VtyvcT/zztTjWCP1s0V6ubPJZARsSjjQFM3WCQc13xP+/oN/KFQLBgV0U gLGvny8ePpsUIyhi/78V8WOJDGdwt53SlLOTQYA8XH+X8rbkFdo14/pESZu4Wg== 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 4jT0dQ22Mbz191N for ; Mon, 16 Nov 2026 21:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9cf7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:00:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kenneth D. Merry Subject: git: 8af3223a5042 - stable/14 - nvme: honor FLBAS Format Index Upper when selecting the LBA format 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/14 X-Git-Reftype: branch X-Git-Commit: 8af3223a50422581e65a5d91c706cea467a33f07 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:00:58 +0000 Message-Id: <6afb6f0a.9cf7.12ebe5d9@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=8af3223a50422581e65a5d91c706cea467a33f07 commit 8af3223a50422581e65a5d91c706cea467a33f07 Author: Abdelkader Boudih AuthorDate: 2026-09-24 14:19:51 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 21:00:04 +0000 nvme: honor FLBAS Format Index Upper when selecting the LBA format Added nvme_ns_data_format_index() in the nvme, nda, and nvmf host paths as well as nvmecontrol and camdd. Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D59627 (cherry picked from commit 2c41f7d8a034ee64a0aaa69a1aa5cb07748a1a32) --- sbin/nvmecontrol/devlist.c | 2 +- sbin/nvmecontrol/format.c | 2 +- sbin/nvmecontrol/identify.c | 2 +- sys/cam/nvme/nvme_da.c | 2 +- sys/dev/nvme/nvme.h | 18 ++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 ++--- usr.sbin/camdd/camdd.c | 2 +- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index b5e95b38937e..701f489dcc4d 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -83,7 +83,7 @@ ns_get_sector_size(struct nvme_namespace_data *nsdata) { uint8_t flbas_fmt, lbads; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata->flbas); + flbas_fmt = nvme_ns_data_format_index(nsdata); lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsdata->lbaf[flbas_fmt]); return (1 << lbads); diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index ea1e7877dc34..a507ddd78ffb 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -178,7 +178,7 @@ format(const struct cmd *f, int argc, char *argv[]) if (read_namespace_data(fd, nsid, &nsd)) errx(EX_IOERR, "Identify request failed"); if (lbaf < 0) - lbaf = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd.flbas); + lbaf = nvme_ns_data_format_index(&nsd); if (lbaf > nsd.nlbaf) errx(EX_USAGE, "LBA format is out of range"); if (ms < 0) diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c index d02ae51d72ee..509cb2be3f9f 100644 --- a/sbin/nvmecontrol/identify.c +++ b/sbin/nvmecontrol/identify.c @@ -69,7 +69,7 @@ print_namespace(struct nvme_namespace_data *nsdata) thin_prov = NVMEV(NVME_NS_DATA_NSFEAT_THIN_PROV, nsdata->nsfeat); - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata->flbas); + flbas_fmt = nvme_ns_data_format_index(nsdata); printf("Size: %lld blocks\n", (long long)nsdata->nsze); diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 33efbc66773c..0e55501fc7ab 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -912,7 +912,7 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + flbas_fmt = nvme_ns_data_format_index(nsd); lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); disk->d_sectorsize = 1 << lbads; disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17a59d70d9fa..64b48da191e7 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -523,6 +523,11 @@ enum nvme_psdt { #define NVME_NS_DATA_FLBAS_FORMAT_MASK (0xF) #define NVME_NS_DATA_FLBAS_EXTENDED_SHIFT (4) #define NVME_NS_DATA_FLBAS_EXTENDED_MASK (0x1) +#define NVME_NS_DATA_FLBAS_FORMAT_MSB_SHIFT (5) +#define NVME_NS_DATA_FLBAS_FORMAT_MSB_MASK (0x3) +/* FIDXL width, and the format count below which FIDXU is reserved. */ +#define NVME_NS_DATA_FLBAS_FIDXL_BITS (4) +#define NVME_NS_DATA_LBAF_BASE_COUNT (16) /** metadata capabilities */ /* metadata can be transferred as part of data prp list */ @@ -2002,6 +2007,19 @@ extern int nvme_use_nvd; #endif /* _KERNEL */ +static inline uint8_t +nvme_ns_data_format_index(const struct nvme_namespace_data *nsdata) +{ + uint8_t fmt; + + fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata->flbas); + /* FIDXU is valid only above the base count; NLBAF is 0's based. */ + if (nsdata->nlbaf + 1 > NVME_NS_DATA_LBAF_BASE_COUNT) + fmt |= NVMEV(NVME_NS_DATA_FLBAS_FORMAT_MSB, nsdata->flbas) << + NVME_NS_DATA_FLBAS_FIDXL_BITS; + return (fmt); +} + /* Endianess conversion functions for NVMe structs */ static inline void nvme_completion_swapbytes(struct nvme_completion *s __unused) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 2f5170a59994..3ea956211dca 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -186,7 +186,7 @@ nvme_ns_get_sector_size(struct nvme_namespace *ns) { uint8_t flbas_fmt, lbads; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); + flbas_fmt = nvme_ns_data_format_index(&ns->data); lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, ns->data.lbaf[flbas_fmt]); return (1 << lbads); @@ -555,12 +555,11 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, if (ns->data.nsze == 0) return (ENXIO); - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); - /* * Note: format is a 0-based value, so > is appropriate here, * not >=. */ + flbas_fmt = nvme_ns_data_format_index(&ns->data); if (flbas_fmt > ns->data.nlbaf) { nvme_printf(ctrlr, "lba format %d exceeds number supported (%d)\n", diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index 1f067113c562..3f36704646e3 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -1430,7 +1430,7 @@ camdd_probe_pass_nvme(struct cam_device *cam_dev, union ccb *ccb, *maxsector = nsdata.nsze; /* The LBA Data Size (LBADS) is reported as a power of 2 */ - format = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata.flbas); + format = nvme_ns_data_format_index(&nsdata); lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsdata.lbaf[format]); *block_len = 1 << lbads;