Zone descriptor extension data is host definied data that is
associated with each zone. Add zone descriptor extensions
to zonedmeta struct.
Signed-off-by: Sam Li <faithilike...@gmail.com>
---
block/qcow2.c | 70 +++++++++++++++++++++++++++++---
block/qcow2.h | 2 +
include/block/block_int-common.h | 6 +++
qapi/block-core.json | 4 ++
4 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index db28585b82..5098edf656 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -448,9 +448,9 @@ qcow2_refresh_zonedmeta(BlockDriverState *bs)
{
int ret;
BDRVQcow2State *s = bs->opaque;
- uint64_t wps_size = s->zoned_header.zonedmeta_size;
+ uint64_t wps_size = s->zoned_header.zonedmeta_size -
+ s->zded_size;
g_autofree uint64_t *temp;
-
temp = g_new(uint64_t, wps_size);
ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset,
wps_size, temp, 0);
@@ -459,7 +459,17 @@ qcow2_refresh_zonedmeta(BlockDriverState *bs)
return ret;
}
+ g_autofree uint8_t *zded = NULL;
+ zded = g_try_malloc0(s->zded_size);
+ ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset + wps_size,
+ s->zded_size, zded, 0);
+ if (ret < 0) {
+ error_report("Can not read zded");
+ return ret;
+ }
+
memcpy(bs->wps->wp, temp, wps_size);
+ memcpy(bs->zd_extensions, zded, s->zded_size);
return 0;
}
@@ -520,6 +530,19 @@ qcow2_check_zone_options(Qcow2ZonedHeaderExtension
*zone_opt)
zone_opt->max_open_zones = sequential_zones;
}
+ if (zone_opt->zd_extension_size) {
+ if (zone_opt->zd_extension_size & 0x3f) {
+ error_report("zone descriptor extension size must be a "
+ "multiple of 64B");
+ return false;
+ }
+
+ if ((zone_opt->zd_extension_size >> 6) > 0xff) {
+ error_report("Zone descriptor extension size is too large");
+ return false;
+ }
+ }
+
return true;
}
return false;
@@ -784,6 +807,8 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t
start_offset,
zoned_ext.conventional_zones =
be32_to_cpu(zoned_ext.conventional_zones);
zoned_ext.nr_zones = be32_to_cpu(zoned_ext.nr_zones);
+ zoned_ext.zd_extension_size =
+ be32_to_cpu(zoned_ext.zd_extension_size);
zoned_ext.max_open_zones = be32_to_cpu(zoned_ext.max_open_zones);
zoned_ext.max_active_zones =
be32_to_cpu(zoned_ext.max_active_zones);
@@ -794,7 +819,8 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t
start_offset,
zoned_ext.zonedmeta_size = be64_to_cpu(zoned_ext.zonedmeta_size);
s->zoned_header = zoned_ext;
bs->wps = g_malloc(sizeof(BlockZoneWps)
- + s->zoned_header.zonedmeta_size);
+ + zoned_ext.zonedmeta_size - s->zded_size);
+ bs->zd_extensions = g_malloc0(s->zded_size);
ret = qcow2_refresh_zonedmeta(bs);
if (ret < 0) {
return ret;
@@ -2370,6 +2396,7 @@ static void qcow2_refresh_limits(BlockDriverState *bs,
Error **errp)
bs->bl.zone_size = s->zoned_header.zone_size;
bs->bl.zone_capacity = s->zoned_header.zone_capacity;
bs->bl.write_granularity = BDRV_SECTOR_SIZE;
+ bs->bl.zd_extension_size = s->zoned_header.zd_extension_size;
}
static int GRAPH_UNLOCKED
@@ -3621,6 +3648,8 @@ int qcow2_update_header(BlockDriverState *bs)
.conventional_zones =
cpu_to_be32(s->zoned_header.conventional_zones),
.nr_zones = cpu_to_be32(s->zoned_header.nr_zones),
+ .zd_extension_size =
+ cpu_to_be32(s->zoned_header.zd_extension_size),
.max_open_zones = cpu_to_be32(s->zoned_header.max_open_zones),
.max_active_zones =
cpu_to_be32(s->zoned_header.max_active_zones),
@@ -4373,6 +4402,15 @@ qcow2_co_create(BlockdevCreateOptions *create_options,
Error **errp)
}
s->zoned_header.max_append_bytes = zone_host_managed->max_append_bytes;
+ uint64_t zded_size = 0;
+ if (zone_host_managed->has_descriptor_extension_size) {
+ s->zoned_header.zd_extension_size =
+ zone_host_managed->descriptor_extension_size;
+ zded_size = s->zoned_header.zd_extension_size *
+ bs->bl.nr_zones;
+ }
+ s->zded_size = zded_size;
+
if (!qcow2_check_zone_options(&s->zoned_header)) {
s->zoned_header.zoned = BLK_Z_NONE;
ret = -EINVAL;
@@ -4380,7 +4418,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options,
Error **errp)
}
uint32_t nrz = s->zoned_header.nr_zones;
- zoned_meta_size = sizeof(uint64_t) * nrz;
+ zoned_meta_size = sizeof(uint64_t) * nrz + zded_size;
g_autofree uint64_t *meta = NULL;
meta = g_new0(uint64_t, nrz);
@@ -4412,12 +4450,25 @@ qcow2_co_create(BlockdevCreateOptions *create_options,
Error **errp)
error_setg_errno(errp, -ret, "Could not zero fill zoned metadata");
goto unlock;
}
- ret = bdrv_pwrite(blk_bs(blk)->file, offset, zoned_meta_size, meta, 0);
+
+ ret = bdrv_pwrite(blk_bs(blk)->file, offset,
+ zoned_meta_size - zded_size, meta, 0);
if (ret < 0) {
error_setg_errno(errp, -ret, "Could not write zoned metadata "
"to disk");
goto unlock;
}
+
+ if (zone_host_managed->has_descriptor_extension_size) {
+ /* Initialize zone descriptor extensions */
+ ret = bdrv_co_pwrite_zeroes(blk_bs(blk)->file, offset + zded_size,
+ zded_size, 0);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Could not write zone descriptor"
+ "extensions to disk");
+ goto unlock;
+ }
+ }
} else {
s->zoned_header.zoned = BLK_Z_NONE;
}
@@ -4562,6 +4613,7 @@ qcow2_co_create_opts(BlockDriver *drv, const char
*filename, QemuOpts *opts,
{ BLOCK_OPT_MAX_OPEN_ZONES, "zone.max-open-zones" },
{ BLOCK_OPT_MAX_ACTIVE_ZONES, "zone.max-active-zones" },
{ BLOCK_OPT_MAX_APPEND_BYTES, "zone.max-append-bytes" },
+ { BLOCK_OPT_ZD_EXT_SIZE, "zone.descriptor-extension-size" },
{ NULL, NULL },
};
@@ -7126,7 +7178,13 @@ static QemuOptsList qcow2_create_opts = {
.name = BLOCK_OPT_MAX_OPEN_ZONES, \
.type = QEMU_OPT_NUMBER, \
.help = "max open zones", \
- },
+ }, \
+ { \
+ .name = BLOCK_OPT_ZD_EXT_SIZE, \
+ .type = QEMU_OPT_SIZE, \
+ .help = "zone descriptor extension size (defaults " \
+ "to 0, must be a multiple of 64 bytes)", \
+ }, \
QCOW_COMMON_OPTIONS,
{ /* end of list */ }
}
diff --git a/block/qcow2.h b/block/qcow2.h
index 7f37bb4034..b7a8f4f4b6 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -249,6 +249,7 @@ typedef struct Qcow2ZonedHeaderExtension {
uint32_t max_append_bytes;
uint64_t zonedmeta_size;
uint64_t zonedmeta_offset;
+ uint32_t zd_extension_size; /* must be multiple of 64 B */
} QEMU_PACKED Qcow2ZonedHeaderExtension;
typedef struct Qcow2ZoneListEntry {
@@ -456,6 +457,7 @@ typedef struct BDRVQcow2State {
uint32_t nr_zones_exp_open;
uint32_t nr_zones_imp_open;
uint32_t nr_zones_closed;
+ uint64_t zded_size;
} BDRVQcow2State;
typedef struct Qcow2COWRegion {
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index d48486f344..825b8dac55 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -64,6 +64,7 @@
#define BLOCK_OPT_MAX_APPEND_BYTES "zone.max_append_bytes"
#define BLOCK_OPT_MAX_ACTIVE_ZONES "zone.max_active_zones"
#define BLOCK_OPT_MAX_OPEN_ZONES "zone.max_open_zones"
+#define BLOCK_OPT_ZD_EXT_SIZE "zd_extension_size"
#define BLOCK_PROBE_BUF_SIZE 512
@@ -912,6 +913,9 @@ typedef struct BlockLimits {
uint32_t max_active_zones;
uint32_t write_granularity;
+
+ /* size of data that is associated with a zone in bytes */
+ uint32_t zd_extension_size;
} BlockLimits;
typedef struct BdrvOpBlocker BdrvOpBlocker;
@@ -1268,6 +1272,8 @@ struct BlockDriverState {
/* array of write pointers' location of each zone in the zoned device. */
BlockZoneWps *wps;
+
+ uint8_t *zd_extensions;
};
struct BlockBackendRootState {
diff --git a/qapi/block-core.json b/qapi/block-core.json
index e2e0ec21a5..485533546a 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -5077,12 +5077,16 @@
# append request that can be issued to the device. It must be
# 512-byte aligned and less than the zone capacity.
#
+# @descriptor-extension-size: The size of zone descriptor extension
+# data. Must be a multiple of 64 bytes (default 0)
+#
# Since 8.2
##
{ 'struct': 'Qcow2ZoneHostManaged',
'data': { '*size': 'size',
'*capacity': 'size',
'*conventional-zones': 'uint32',
+ '*descriptor-extension-size': 'size',
'*max-open-zones': 'uint32',
'*max-active-zones': 'uint32',
'*max-append-bytes': 'size' } }
--
2.40.1
