diff options
| author | Klaus Jensen | 2021-01-26 12:32:29 +0100 |
|---|---|---|
| committer | Klaus Jensen | 2021-03-09 11:00:57 +0100 |
| commit | 9ae390046164e8b62fbdc48d2c6de8ee6fbd3cdc (patch) | |
| tree | e66725487e3dba069f56e4b73dd4c41677f533c6 | |
| parent | hw/block/nvme: fix Close Zone (diff) | |
| download | qemu-9ae390046164e8b62fbdc48d2c6de8ee6fbd3cdc.tar.gz qemu-9ae390046164e8b62fbdc48d2c6de8ee6fbd3cdc.tar.xz qemu-9ae390046164e8b62fbdc48d2c6de8ee6fbd3cdc.zip | |
hw/block/nvme: add missing mor/mar constraint checks
Firstly, if zoned.max_active is non-zero, zoned.max_open must be less
than or equal to zoned.max_active.
Secondly, if only zones.max_active is set, we have to explicitly set
zones.max_open or we end up with an invalid MAR/MOR configuration. This
is an artifact of the parameters not being zeroes-based like in the
spec.
Cc: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Reported-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
| -rw-r--r-- | hw/block/nvme-ns.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index fd73d03211..0e87600204 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -163,6 +163,18 @@ static int nvme_ns_zoned_check_calc_geometry(NvmeNamespace *ns, Error **errp) return -1; } + if (ns->params.max_active_zones) { + if (ns->params.max_open_zones > ns->params.max_active_zones) { + error_setg(errp, "max_open_zones (%u) exceeds max_active_zones (%u)", + ns->params.max_open_zones, ns->params.max_active_zones); + return -1; + } + + if (!ns->params.max_open_zones) { + ns->params.max_open_zones = ns->params.max_active_zones; + } + } + if (ns->params.zd_extension_size) { if (ns->params.zd_extension_size & 0x3f) { error_setg(errp, |