[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/14] hw/block/nvme: move zoned constraints checks
From: |
Klaus Jensen |
Subject: |
[PATCH 13/14] hw/block/nvme: move zoned constraints checks |
Date: |
Mon, 19 Apr 2021 21:28:00 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Validation of the max_active and max_open zoned parameters are
independent of any other state, so move them to the early
nvme_ns_check_constraints parameter checks.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme-ns.c | 52 +++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index 2041d8138420..861b87f22bd8 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -210,30 +210,6 @@ 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,
- "zone descriptor extension size must be a multiple of 64B");
- return -1;
- }
- if ((ns->params.zd_extension_size >> 6) > 0xff) {
- error_setg(errp, "zone descriptor extension size is too large");
- return -1;
- }
- }
-
return 0;
}
@@ -403,6 +379,34 @@ static int nvme_ns_check_constraints(NvmeCtrl *n,
NvmeNamespace *ns,
}
}
+ if (ns->params.zoned) {
+ 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, "zone descriptor extension size must be a "
+ "multiple of 64B");
+ return -1;
+ }
+ if ((ns->params.zd_extension_size >> 6) > 0xff) {
+ error_setg(errp,
+ "zone descriptor extension size is too large");
+ return -1;
+ }
+ }
+ }
+
return 0;
}
--
2.31.1
- [PATCH 12/14] hw/block/nvme: remove irrelevant zone resource checks, (continued)
- [PATCH 12/14] hw/block/nvme: remove irrelevant zone resource checks, Klaus Jensen, 2021/04/19
- [PATCH 07/14] hw/block/nvme: replace nvme_ns_status, Klaus Jensen, 2021/04/19
- [PATCH 06/14] hw/block/nvme: remove non-shared defines from header file, Klaus Jensen, 2021/04/19
- [PATCH 05/14] hw/block/nvme: cleanup includes, Klaus Jensen, 2021/04/19
- [PATCH 04/14] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/04/19
- [PATCH 10/14] hw/block/nvme: streamline namespace array indexing, Klaus Jensen, 2021/04/19
- [PATCH 08/14] hw/block/nvme: cache lba and ms sizes, Klaus Jensen, 2021/04/19
- [PATCH 11/14] hw/block/nvme: remove num_namespaces member, Klaus Jensen, 2021/04/19
- [PATCH 14/14] hw/nvme: move nvme emulation out of hw/block, Klaus Jensen, 2021/04/19
- [PATCH 13/14] hw/block/nvme: move zoned constraints checks,
Klaus Jensen <=
- [PATCH 09/14] hw/block/nvme: add metadata offset helper, Klaus Jensen, 2021/04/19
- Re: [PATCH 00/14] hw(/block/)nvme: spring cleaning, Keith Busch, 2021/04/20
- Re: [PATCH 00/14] hw(/block/)nvme: spring cleaning, Klaus Jensen, 2021/04/26