[PATCH v3 5/5] nvme: raise FDP placement handle cap to U8_MAX and warn on overflow
Guixin Liu
kanie at linux.alibaba.com
Mon Aug 3 19:19:01 PDT 2026
The RUH status buffer and the placement-handle clamp used S8_MAX - 1
(126) as the maximum descriptor count. That value was picked only so the
io-mgmt-receive result fit in a page, not because of any protocol or
driver restriction.
The meaningful upper bound is U8_MAX: write hints (bio->bi_write_stream)
are u8, so placement handles beyond U8_MAX can never be selected. Size
the buffer and clamp nr_plids to U8_MAX, and emit a dev_warn() when the
device reports more handles than the driver tracks so the truncation is
observable.
Suggested-by: Kanchan Joshi <joshi.k at samsung.com>
Signed-off-by: Guixin Liu <kanie at linux.alibaba.com>
Reviewed-by: Kanchan Joshi <joshi.k at samsung.com>
---
drivers/nvme/host/core.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b1f444cd3daf..14832be67779 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -33,6 +33,13 @@
#define NVME_MINORS (1U << MINORBITS)
+/*
+ * Write hints (bio->bi_write_stream) are u8, so FDP placement handles beyond
+ * U8_MAX can never be selected. Cap the handle count to bound both the RUH
+ * status buffer and the per-head plids array.
+ */
+#define NVME_MAX_PLIDS U8_MAX
+
struct nvme_ns_info {
struct nvme_ns_ids ids;
u32 nsid;
@@ -2342,7 +2349,7 @@ static int nvme_query_fdp_info(struct nvme_ns *ns, struct nvme_ns_info *info)
if (!info->runs)
return ret;
- size = struct_size(ruhs, ruhsd, S8_MAX - 1);
+ size = struct_size(ruhs, ruhsd, NVME_MAX_PLIDS);
ruhs = kzalloc(size, GFP_KERNEL);
if (!ruhs)
return -ENOMEM;
@@ -2358,10 +2365,16 @@ static int nvme_query_fdp_info(struct nvme_ns *ns, struct nvme_ns_info *info)
}
head->nr_plids = le16_to_cpu(ruhs->nruhsd);
- head->nr_plids = min_t(u16, head->nr_plids, S8_MAX - 1);
if (!head->nr_plids)
goto free;
+ if (head->nr_plids > NVME_MAX_PLIDS) {
+ dev_warn(ctrl->device,
+ "FDP RUH status reports %u placement handles, capping at %u\n",
+ head->nr_plids, NVME_MAX_PLIDS);
+ head->nr_plids = NVME_MAX_PLIDS;
+ }
+
head->plids = kcalloc(head->nr_plids, sizeof(*head->plids),
GFP_KERNEL);
if (!head->plids) {
--
2.43.7
More information about the Linux-nvme
mailing list