2021-05-31 10:39:21

by Daniel Wagner

Subject: [PATCH] nvme: verify MNAN value if ANA is enabled

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 <[email protected]>
---
This is a follow up to the discussion in

https://lore.kernel.org/linux-nvme/[email protected]/

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

2021-05-31 17:01:08

by Hannes Reinecke

Subject: Re: [PATCH] nvme: verify MNAN value if ANA is enabled

On 5/31/21 12:36 PM, Daniel Wagner wrote:
> 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 <[email protected]>
> ---
> This is a follow up to the discussion in
>
> https://lore.kernel.org/linux-nvme/[email protected]/
>
> 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)
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
[email protected] +49 911 74053 688
SUSE Software Solutions Germany GmbH, 90409 Nürnberg
GF: F. Imendörffer, HRB 36809 (AG Nürnberg)

2021-06-01 17:30:22

by Chaitanya Kulkarni

Subject: Re: [PATCH] nvme: verify MNAN value if ANA is enabled

On 5/31/21 03:43, Daniel Wagner wrote:
> 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 <[email protected]>


Looks good.

Reviewed-by: Chaitanya Kulkarni <[email protected]>

2021-06-03 07:18:16

by Christoph Hellwig

Subject: Re: [PATCH] nvme: verify MNAN value if ANA is enabled

> @@ -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

Please move the check into nvme_mpath_init_identify, where we can avoid
the ifdef and the ana_log_buf check, which won't trigger for the first
initialization.