Re: [PATCH v7 48/48] nvme: make lba data size configurable

[Philippe Mathieu-Daudé]

On 4/15/20 7:51 AM, Klaus Jensen wrote:
> From: Klaus Jensen <address@hidden>
>
> Signed-off-by: Klaus Jensen <address@hidden>
> Acked-by: Keith Busch <address@hidden>
> Reviewed-by: Maxim Levitsky <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   hw/block/nvme-ns.c | 7 ++++++-
>   hw/block/nvme-ns.h | 4 +++-
>   hw/block/nvme.c    | 1 +
>   3 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
> index bd64d4a94632..d34b6b2439f1 100644
> --- a/hw/block/nvme-ns.c
> +++ b/hw/block/nvme-ns.c
> @@ -18,7 +18,7 @@ static int nvme_ns_init(NvmeNamespace *ns)
>   {
>       NvmeIdNs *id_ns = &ns->id_ns;
>   
> -    id_ns->lbaf[0].ds = BDRV_SECTOR_BITS;
> +    id_ns->lbaf[0].ds = ns->params.lbads;
>       id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns));
>   
>       /* no thin provisioning */
> @@ -78,6 +78,11 @@ static int nvme_ns_check_constraints(NvmeNamespace *ns, 
> Error **errp)
>           return -1;
>       }
>   
> +    if (ns->params.lbads < 9 || ns->params.lbads > 12) {
> +        error_setg(errp, "unsupported lbads (supported: 9-12)");
> +        return 1;
> +    }
> +
>       return 0;
>   }
>   
> diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
> index 3c3651d485d0..43b78f8b8d9c 100644
> --- a/hw/block/nvme-ns.h
> +++ b/hw/block/nvme-ns.h
> @@ -7,10 +7,12 @@
>   
>   #define DEFINE_NVME_NS_PROPERTIES(_state, _props) \
>       DEFINE_PROP_DRIVE("drive", _state, blk), \
> -    DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0)
> +    DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0), \
> +    DEFINE_PROP_UINT8("lbads", _state, _props.lbads, BDRV_SECTOR_BITS)
>   
>   typedef struct NvmeNamespaceParams {
>       uint32_t nsid;
> +    uint8_t  lbads;
>   } NvmeNamespaceParams;
>   
>   typedef struct NvmeNamespace {
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 40a400333828..dd2759a4ce2e 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -2690,6 +2690,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
>       if (n->namespace.blk) {
>           ns = &n->namespace;
>           ns->params.nsid = 1;
> +        ns->params.lbads = BDRV_SECTOR_BITS;
>   
>           if (nvme_ns_setup(n, ns, errp)) {
>               return;