[PATCH] nvme: verify MNAN value if ANA is enabled
From: Daniel Wagner
Date: Mon May 31 2021 - 06:37:00 EST
The controller is required to have a non-zero MNAN value if it supports
ANA:
If the controller supports Asymmetric Namespace Access Reporting, then
this field shall be set to a non-zero value that is less than or equal
to the NN value.
Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
---
This is a follow up to the discussion in
https://lore.kernel.org/linux-nvme/20210521144734.90044-1-dwagner@xxxxxxx/
drivers/nvme/host/core.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index cb1a76a3d42a..4c412adc9e14 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2972,6 +2972,16 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl)
if (ret < 0)
goto out_free;
+#ifdef CONFIG_NVME_MULTIPATH
+ if (ctrl->ana_log_buf && (!ctrl->max_namespaces ||
+ ctrl->max_namespaces > le32_to_cpu(id->nn))) {
+ dev_err(ctrl->device,
+ "Invalid MNAN value %u\n", ctrl->max_namespaces);
+ ret = -EINVAL;
+ goto out_free;
+ }
+#endif
+
if (ctrl->apst_enabled && !prev_apst_enabled)
dev_pm_qos_expose_latency_tolerance(ctrl->device);
else if (!ctrl->apst_enabled && prev_apst_enabled)
--
2.29.2