* [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver
@ 2026-05-10 17:50 Sam Li
2026-05-10 17:50 ` [PATCH v10 1/4] docs/qcow2: add the zoned format feature Sam Li
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Sam Li @ 2026-05-10 17:50 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, Stefan Hajnoczi, qemu-block, dlemoal,
Eric Blake, Michael S. Tsirkin, hare, Hanna Reitz, Sam Li
This patch series add a new extension - zoned format - to the
qcow2 driver thereby allowing full zoned storage emulation on
the qcow2 img file. Users can attach such a qcow2 file to the
guest as a zoned device.
Write pointer are preserved in the zoned metadata. It will be
recovered after power cycle. Meanwhile, any open (implicit or
explicit) zone will show up as closed.
Zone states are in memory. Read-only and offline states are
device-internal events, which are not considerred in qcow2
emulation for simplicity. The other zone states
(closed, empty, full) can be inferred from write poiner
values, presistent across QEMU reboots. The open states are
kept in memory using open zone lists.
To create a qcow2 file with zoned format, use command like this:
Then add it to the QEMU command line:
-blockdev node-name=drive1,driver=qcow2,file.driver=file,file.filename=../qemu/test.qcow2 \
-device virtio-blk-pci,drive=drive1 \
v9->v10:
- add cross-boundary constraint for merging writes on zoned devices
- extract call from assert() to fix image creation crash
v8->v9:
- fix compilation err after modifying types
v7->v8:
- sets default values for zoned img confurations [Markus, Damien]
- changes the type of zone_size, zone_capacity from uint32_t to uint64_t [Stefan]
- fix docs [Stefan]
- modify append writes to increase concurrency [Damien, Stefan]
- use tailqueue to track active zones [Stefan]
- fix undefined behavior of ranges_overlap()
- fix the iotest of case 2(1)
v6->v7:
- modify zone resource managemant (style) [Damien]
- fix accessing list with negative index err
- add some tests for zrm in iotests
- address review comments [Markus]
v5->v6:
- fix docs and specs [Eric, Markus, Stefan]
- add general sanity checks for zoned device configurations while creation and opening [Eric]
- fix LRU when implicitly open a zone for a long time [Stefan]
v4->v5:
- add incompatible bit for zoned format [Eric]
- fix and manage zone resources via LRU [Damien]
- renaming functions and fields, spec changes [Markus, Damien]
- add closed zone list
- make qemu iotests for zoned device consecutive [Stefan]
v3->v4:
- use QLIST for implicit, explicit open zones management [Stefan]
- keep zone states in memory and drop state bits in wp metadata structure [Damien, Stefan]
- change zone resource management and iotests accordingly
- add tracing for number of implicit zones
- address review comments [Stefan, Markus]:
* documentation, config, style
v2->v3:
- drop zoned_profile option [Klaus]
- reformat doc comments of qcow2 [Markus]
- add input validation and checks for zoned information [Stefan]
- code style: format, comments, documentation, naming [Stefan]
- add tracing function for wp tracking [Stefan]
- reconstruct io path in check_zone_resources [Stefan]
v1->v2:
- add more tests to qemu-io zoned commands
- make zone append change state to full when wp reaches end
- add documentation to qcow2 zoned extension header
- address review comments (Stefan):
* fix zoned_mata allocation size
* use bitwise or than addition
* fix wp index overflow and locking
* cleanups: comments, naming
Sam Li (4):
docs/qcow2: add the zoned format feature
qcow2: add configurations for zoned format extension
qcow2: add zoned emulation capability
iotests: test the zoned format feature for qcow2 file
block/file-posix.c | 2 +-
block/qcow2.c | 1113 +++++++++++++++++++++-
block/qcow2.h | 39 +-
block/trace-events | 2 +
docs/interop/qcow2.rst | 110 ++-
docs/system/qemu-block-drivers.rst.inc | 42 +
hw/block/virtio-blk.c | 22 +-
include/block/block_int-common.h | 15 +-
include/qemu/queue.h | 1 +
include/qemu/range.h | 4 +
qapi/block-core.json | 70 +-
tests/qemu-iotests/tests/zoned-qcow2 | 150 +++
tests/qemu-iotests/tests/zoned-qcow2.out | 173 ++++
13 files changed, 1730 insertions(+), 13 deletions(-)
create mode 100755 tests/qemu-iotests/tests/zoned-qcow2
create mode 100644 tests/qemu-iotests/tests/zoned-qcow2.out
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v10 1/4] docs/qcow2: add the zoned format feature
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
@ 2026-05-10 17:50 ` Sam Li
2026-05-14 18:47 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 2/4] qcow2: add configurations for zoned format extension Sam Li
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Sam Li @ 2026-05-10 17:50 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, Stefan Hajnoczi, qemu-block, dlemoal,
Eric Blake, Michael S. Tsirkin, hare, Hanna Reitz, Sam Li
Add the specs for the zoned format feature of the qcow2 driver.
The qcow2 file then can emulate real zoned devices, either passed
through by virtio-blk device or NVMe ZNS drive to the guest
given zoned information.
Signed-off-by: Sam Li <faithilikerun@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
docs/system/qemu-block-drivers.rst.inc | 42 ++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-block-drivers.rst.inc
index 384e95ba76..5066c943d5 100644
--- a/docs/system/qemu-block-drivers.rst.inc
+++ b/docs/system/qemu-block-drivers.rst.inc
@@ -172,6 +172,48 @@ This section describes each format and the options that are supported for it.
filename`` to check if the NOCOW flag is set or not (Capital 'C' is
NOCOW flag).
+ .. option:: zone.mode
+ If this is set to ``host-managed``, the image is an emulated zoned
+ block device. This option is only valid to emulated zoned device files.
+
+ .. option:: zone.size
+
+ The size of a zone in bytes. The device is divided into zones of this
+ size with the exception of the last zone, which may be smaller.
+
+ .. option:: zone.capacity
+
+ The initial capacity value, in bytes, for all zones. The capacity must
+ be less than or equal to zone size. If the last zone is smaller, then
+ its capacity is capped.
+
+ The zone capacity is per zone and may be different between zones in real
+ devices. QCow2 sets all zones to the same capacity.
+
+ .. option:: zone.conventional_zones
+
+ The number of conventional zones of the zoned device.
+
+ .. option:: zone.max_active_zones
+
+ The limit of the zones with implicit open, explicit open or closed state.
+
+ The max active zones must be less or equal to the number of SWR
+ (sequential write required) zones of the device.
+
+ .. option:: zone.max_open_zones
+
+ The maximal allowed open zones. The max open zones must not be larger than
+ the max active zones.
+
+ If the limits of open zones or active zones are equal to the number of
+ SWR zones, then it is the same as having no limits.
+
+ .. option:: zone.max_append_bytes
+
+ The number of bytes in a zone append request that can be issued to the
+ device. It must be 512-byte aligned and less than the zone capacity.
+
.. program:: image-formats
.. option:: qed
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v10 2/4] qcow2: add configurations for zoned format extension
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
2026-05-10 17:50 ` [PATCH v10 1/4] docs/qcow2: add the zoned format feature Sam Li
@ 2026-05-10 17:50 ` Sam Li
2026-05-14 19:49 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 3/4] qcow2: add zoned emulation capability Sam Li
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Sam Li @ 2026-05-10 17:50 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, Stefan Hajnoczi, qemu-block, dlemoal,
Eric Blake, Michael S. Tsirkin, hare, Hanna Reitz, Sam Li
To configure the zoned format feature on the qcow2 driver, it
requires settings as: the device size, zone model, zone size,
zone capacity, number of conventional zones, limits on zone
resources (max append bytes, max open zones, and max_active_zones).
To create a qcow2 image with zoned format feature, use command like
this:
qemu-img create -f qcow2 zbc.qcow2 -o size=768M \
-o zone.size=64M -o zone.capacity=64M -o zone.conventional_zones=0 \
-o zone.max_append_bytes=4096 -o zone.max_open_zones=6 \
-o zone.max_active_zones=8 -o zone.mode=host-managed
Signed-off-by: Sam Li <faithilikerun@gmail.com>
---
block/file-posix.c | 2 +-
block/qcow2.c | 264 ++++++++++++++++++++++++++++++-
block/qcow2.h | 32 +++-
docs/interop/qcow2.rst | 110 ++++++++++++-
include/block/block_int-common.h | 15 +-
qapi/block-core.json | 70 +++++++-
6 files changed, 485 insertions(+), 8 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index e49b13d6ab..14278785b9 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -3607,7 +3607,7 @@ raw_co_zone_append(BlockDriverState *bs,
if (*offset & zone_size_mask) {
error_report("sector offset %" PRId64 " is not aligned to zone size "
- "%" PRId32 "", *offset / 512, bs->bl.zone_size / 512);
+ "%" PRId64 "", *offset / 512, bs->bl.zone_size / 512);
return -EINVAL;
}
diff --git a/block/qcow2.c b/block/qcow2.c
index 81fd299b4c..b543bcf3e3 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -73,6 +73,7 @@ typedef struct {
#define QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77
#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875
#define QCOW2_EXT_MAGIC_DATA_FILE 0x44415441
+#define QCOW2_EXT_MAGIC_ZONED_FORMAT 0x007a6264
static int coroutine_fn
qcow2_co_preadv_compressed(BlockDriverState *bs,
@@ -194,6 +195,74 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *fmt, Error **errp)
return cryptoopts_qdict;
}
+/*
+ * Passing by the zoned device configurations by a zoned_header struct, check
+ * if the zone device options are under constraints. Return false when some
+ * option is invalid
+ */
+static inline bool
+qcow2_check_zone_options(Qcow2ZonedHeaderExtension *zone_opt, Error **errp)
+{
+ if (zone_opt) {
+ uint32_t sequential_zones;
+
+ if (zone_opt->zone_size == 0) {
+ error_setg(errp, "Zoned extension header zone_size field "
+ "can not be 0");
+ return false;
+ }
+
+ if (zone_opt->zone_capacity > zone_opt->zone_size) {
+ error_setg(errp, "zone capacity %" PRIu64 "B exceeds zone size "
+ "%" PRIu64 "B", zone_opt->zone_capacity,
+ zone_opt->zone_size);
+ return false;
+ }
+
+ if (zone_opt->max_append_bytes + BDRV_SECTOR_SIZE >=
+ zone_opt->zone_capacity) {
+ error_setg(errp, "max append bytes %" PRIu64 "B exceeds zone "
+ "capacity %" PRIu32 "B by more than block size",
+ zone_opt->zone_capacity,
+ zone_opt->max_append_bytes);
+ return false;
+ }
+
+ if (zone_opt->conventional_zones >= zone_opt->nr_zones) {
+ error_setg(errp, "Conventional_zones %" PRIu32 " exceeds "
+ "nr_zones %" PRIu32 ".",
+ zone_opt->conventional_zones, zone_opt->nr_zones);
+ return false;
+ }
+
+ if (zone_opt->max_active_zones > zone_opt->nr_zones) {
+ error_setg(errp, "Max_active_zones %" PRIu32 " exceeds "
+ "nr_zones %" PRIu32 ". Set it to nr_zones.",
+ zone_opt->max_active_zones, zone_opt->nr_zones);
+ zone_opt->max_active_zones = zone_opt->nr_zones;
+ }
+
+ sequential_zones = zone_opt->nr_zones - zone_opt->conventional_zones;
+ if (zone_opt->max_open_zones > sequential_zones) {
+ error_setg(errp, "Max_open_zones field can not be larger than"
+ "the number of SWR zones. Set it to number of SWR"
+ "zones %" PRIu32 ".", sequential_zones);
+ zone_opt->max_open_zones = sequential_zones;
+ }
+ if (zone_opt->max_open_zones > zone_opt->max_active_zones) {
+ error_setg(errp, "Max_open_zones %" PRIu32 " exceeds "
+ "max_active_zones %" PRIu32 ". Set it to "
+ "max_active_zones.",
+ zone_opt->max_open_zones,
+ zone_opt->max_active_zones);
+ zone_opt->max_open_zones = zone_opt->max_active_zones;
+ }
+
+ return true;
+ }
+ return false;
+}
+
/*
* read qcow2 extension and fill bs
* start reading from start_offset
@@ -211,6 +280,7 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
uint64_t offset;
int ret;
Qcow2BitmapHeaderExt bitmaps_ext;
+ Qcow2ZonedHeaderExtension zoned_ext;
if (need_update_header != NULL) {
*need_update_header = false;
@@ -432,6 +502,51 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
break;
}
+ case QCOW2_EXT_MAGIC_ZONED_FORMAT:
+ {
+ if (ext.len < sizeof(zoned_ext)) {
+ /* Missing fields */
+ error_setg(errp, "zoned_ext: len=%" PRIu32 " too small "
+ "(<%zu)", ext.len, sizeof(zoned_ext));
+ return -EINVAL;
+ }
+ ret = bdrv_pread(bs->file, offset, ext.len, &zoned_ext, 0);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "zoned_ext: "
+ "Could not read ext header");
+ return ret;
+ }
+
+ zoned_ext.zone_size = be64_to_cpu(zoned_ext.zone_size);
+ zoned_ext.zone_capacity = be64_to_cpu(zoned_ext.zone_capacity);
+ zoned_ext.conventional_zones =
+ be32_to_cpu(zoned_ext.conventional_zones);
+ zoned_ext.nr_zones = be32_to_cpu(zoned_ext.nr_zones);
+ 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);
+ zoned_ext.max_append_bytes =
+ be32_to_cpu(zoned_ext.max_append_bytes);
+ s->zoned_header = zoned_ext;
+
+ /* refuse to open broken images */
+ if (zoned_ext.nr_zones != DIV_ROUND_UP(bs->total_sectors *
+ BDRV_SECTOR_SIZE, zoned_ext.zone_size)) {
+ error_setg(errp, "Zoned extension header nr_zones field "
+ "is wrong");
+ return -EINVAL;
+ }
+ if (!qcow2_check_zone_options(&zoned_ext, errp)) {
+ return -EINVAL;
+ }
+
+#ifdef DEBUG_EXT
+ printf("Qcow2: Got zoned format extension: "
+ "offset=%" PRIu32 "\n", offset);
+#endif
+ break;
+ }
+
default:
/* unknown magic - save it in case we need to rewrite the header */
/* If you add a new feature, make sure to also update the fast
@@ -2068,6 +2183,15 @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
}
bs->bl.pwrite_zeroes_alignment = s->subcluster_size;
bs->bl.pdiscard_alignment = s->cluster_size;
+ bs->bl.zoned = s->zoned_header.zoned;
+ bs->bl.nr_zones = s->zoned_header.nr_zones;
+ bs->bl.max_append_sectors = s->zoned_header.max_append_bytes
+ >> BDRV_SECTOR_BITS;
+ bs->bl.max_active_zones = s->zoned_header.max_active_zones;
+ bs->bl.max_open_zones = s->zoned_header.max_open_zones;
+ 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;
}
static int GRAPH_UNLOCKED
@@ -3170,6 +3294,11 @@ int qcow2_update_header(BlockDriverState *bs)
.bit = QCOW2_INCOMPAT_EXTL2_BITNR,
.name = "extended L2 entries",
},
+ {
+ .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,
+ .bit = QCOW2_INCOMPAT_ZONED_FORMAT_BITNR,
+ .name = "zoned format",
+ },
{
.type = QCOW2_FEAT_TYPE_COMPATIBLE,
.bit = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
@@ -3215,6 +3344,31 @@ int qcow2_update_header(BlockDriverState *bs)
buflen -= ret;
}
+ /* Zoned devices header extension */
+ if (s->zoned_header.zoned == BLK_Z_HM) {
+ Qcow2ZonedHeaderExtension zoned_header = {
+ .zoned = s->zoned_header.zoned,
+ .zone_size = cpu_to_be64(s->zoned_header.zone_size),
+ .zone_capacity = cpu_to_be64(s->zoned_header.zone_capacity),
+ .conventional_zones =
+ cpu_to_be32(s->zoned_header.conventional_zones),
+ .nr_zones = cpu_to_be32(s->zoned_header.nr_zones),
+ .max_open_zones = cpu_to_be32(s->zoned_header.max_open_zones),
+ .max_active_zones =
+ cpu_to_be32(s->zoned_header.max_active_zones),
+ .max_append_bytes =
+ cpu_to_be32(s->zoned_header.max_append_bytes)
+ };
+ ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT,
+ &zoned_header, sizeof(zoned_header),
+ buflen);
+ if (ret < 0) {
+ goto fail;
+ }
+ buf += ret;
+ buflen -= ret;
+ }
+
/* Keep unknown header extensions */
QLIST_FOREACH(uext, &s->unknown_header_ext, next) {
ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);
@@ -3589,6 +3743,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
ERRP_GUARD();
BlockdevCreateOptionsQcow2 *qcow2_opts;
QDict *options;
+ Qcow2ZoneCreateOptions *zone_struct;
+ Qcow2ZoneHostManaged *zone_host_managed;
/*
* Open the image file and write a minimal qcow2 header.
@@ -3615,6 +3771,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);
qcow2_opts = &create_options->u.qcow2;
+ zone_struct = create_options->u.qcow2.zone;
+ zone_host_managed = &create_options->u.qcow2.zone->u.host_managed;
bs = bdrv_co_open_blockdev_ref(qcow2_opts->file, errp);
if (bs == NULL) {
@@ -3828,6 +3986,14 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
header->incompatible_features |=
cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE);
}
+ if (zone_struct && zone_struct->mode == QCOW2_ZONE_MODEL_HOST_MANAGED) {
+ /*
+ * The incompatible bit must be set when the zone model is
+ * host-managed
+ */
+ header->incompatible_features |=
+ cpu_to_be64(QCOW2_INCOMPAT_ZONED_FORMAT);
+ }
if (qcow2_opts->data_file_raw) {
header->autoclear_features |=
cpu_to_be64(QCOW2_AUTOCLEAR_DATA_FILE_RAW);
@@ -3885,10 +4051,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
bdrv_graph_co_rdlock();
ret = qcow2_alloc_clusters(blk_bs(blk), 3 * cluster_size);
if (ret < 0) {
- bdrv_graph_co_rdunlock();
error_setg_errno(errp, -ret, "Could not allocate clusters for qcow2 "
"header and refcount table");
- goto out;
+ goto unlock;
} else if (ret != 0) {
error_report("Huh, first cluster in empty image is already in use?");
@@ -3896,11 +4061,62 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
}
/* Set the external data file if necessary */
+ BDRVQcow2State *s = blk_bs(blk)->opaque;
if (data_bs) {
- BDRVQcow2State *s = blk_bs(blk)->opaque;
s->image_data_file = g_strdup(data_bs->filename);
}
+ if (zone_struct && zone_struct->mode == QCOW2_ZONE_MODEL_HOST_MANAGED) {
+ s->zoned_header.zoned = BLK_Z_HM;
+
+ if (!zone_host_managed->has_size) {
+ s->zoned_header.zone_size = DEFAULT_ZONE_SIZE;
+ } else {
+ s->zoned_header.zone_size = zone_host_managed->size;
+ }
+ s->zoned_header.nr_zones = DIV_ROUND_UP(qcow2_opts->size,
+ s->zoned_header.zone_size);
+
+ if (zone_host_managed->has_capacity) {
+ s->zoned_header.zone_capacity = zone_host_managed->capacity;
+ } else {
+ s->zoned_header.zone_capacity = s->zoned_header.zone_size;
+ }
+
+ if (zone_host_managed->has_conventional_zones) {
+ s->zoned_header.conventional_zones =
+ zone_host_managed->conventional_zones;
+ }
+
+ if (zone_host_managed->has_max_active_zones) {
+ s->zoned_header.max_active_zones =
+ zone_host_managed->max_active_zones;
+
+ if (zone_host_managed->has_max_open_zones) {
+ s->zoned_header.max_open_zones =
+ zone_host_managed->max_open_zones;
+ } else {
+ s->zoned_header.max_open_zones =
+ zone_host_managed->max_active_zones;
+ }
+ }
+
+ if (zone_host_managed->has_max_append_bytes) {
+ s->zoned_header.max_append_bytes =
+ zone_host_managed->max_append_bytes;
+ } else {
+ s->zoned_header.max_append_bytes = DEFAULT_MAX_APPEND_BYTES;
+ }
+
+ if (!qcow2_check_zone_options(&s->zoned_header, errp)) {
+ s->zoned_header.zoned = BLK_Z_NONE;
+ ret = -EINVAL;
+ goto unlock;
+ }
+ } else {
+ s->zoned_header.zoned = BLK_Z_NONE;
+ }
+
/* Create a full header (including things like feature table) */
ret = qcow2_update_header(blk_bs(blk));
bdrv_graph_co_rdunlock();
@@ -3974,6 +4190,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
}
ret = 0;
+ goto out;
+unlock:
+ bdrv_graph_co_rdunlock();
out:
blk_co_unref(blk);
bdrv_co_unref(bs);
@@ -4052,6 +4271,10 @@ qcow2_co_create_opts(BlockDriver *drv, const char *filename, QemuOpts *opts,
{ BLOCK_OPT_COMPAT_LEVEL, "version" },
{ BLOCK_OPT_DATA_FILE_RAW, "data-file-raw" },
{ BLOCK_OPT_COMPRESSION_TYPE, "compression-type" },
+ { BLOCK_OPT_CONVENTIONAL_ZONES, "zone.conventional-zones" },
+ { 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" },
{ NULL, NULL },
};
@@ -6265,6 +6488,41 @@ static QemuOptsList qcow2_create_opts = {
.type = QEMU_OPT_BOOL, \
.help = "Assume the external data file already exists and " \
"do not overwrite it" \
+ }, \
+ { \
+ .name = BLOCK_OPT_ZONE_MODEL, \
+ .type = QEMU_OPT_STRING, \
+ .help = "zone model modes, mode choice: host-managed", \
+ }, \
+ { \
+ .name = BLOCK_OPT_ZONE_SIZE, \
+ .type = QEMU_OPT_SIZE, \
+ .help = "zone size", \
+ }, \
+ { \
+ .name = BLOCK_OPT_ZONE_CAPACITY, \
+ .type = QEMU_OPT_SIZE, \
+ .help = "zone capacity", \
+ }, \
+ { \
+ .name = BLOCK_OPT_CONVENTIONAL_ZONES, \
+ .type = QEMU_OPT_NUMBER, \
+ .help = "numbers of conventional zones", \
+ }, \
+ { \
+ .name = BLOCK_OPT_MAX_APPEND_BYTES, \
+ .type = QEMU_OPT_SIZE, \
+ .help = "max append bytes", \
+ }, \
+ { \
+ .name = BLOCK_OPT_MAX_ACTIVE_ZONES, \
+ .type = QEMU_OPT_NUMBER, \
+ .help = "max active zones", \
+ }, \
+ { \
+ .name = BLOCK_OPT_MAX_OPEN_ZONES, \
+ .type = QEMU_OPT_NUMBER, \
+ .help = "max open zones", \
},
QCOW_COMMON_OPTIONS,
{ /* end of list */ }
diff --git a/block/qcow2.h b/block/qcow2.h
index 192a45d596..743f2e3e79 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -129,6 +129,9 @@
#define DEFAULT_CLUSTER_SIZE 65536
+#define DEFAULT_ZONE_SIZE (256 * MiB)
+#define DEFAULT_MAX_APPEND_BYTES (64 * KiB)
+
#define QCOW2_OPT_DATA_FILE "data-file"
#define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
#define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"
@@ -237,6 +240,27 @@ typedef struct Qcow2CryptoHeaderExtension {
uint64_t length;
} QEMU_PACKED Qcow2CryptoHeaderExtension;
+typedef struct Qcow2ZonedHeaderExtension {
+ /* Zoned device attributes */
+ uint8_t zoned;
+ uint8_t reserved[3];
+ uint64_t zone_size;
+ uint64_t zone_capacity;
+ uint32_t conventional_zones;
+ uint32_t nr_zones;
+ uint32_t max_active_zones;
+ uint32_t max_open_zones;
+ uint32_t max_append_bytes;
+ uint64_t zonedmeta_size;
+ uint64_t zonedmeta_offset;
+} QEMU_PACKED Qcow2ZonedHeaderExtension;
+
+typedef struct Qcow2ZoneListEntry {
+ QLIST_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
+ QLIST_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
+ QLIST_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
+} Qcow2ZoneListEntry;
+
typedef struct Qcow2UnknownHeaderExtension {
uint32_t magic;
uint32_t len;
@@ -257,17 +281,20 @@ enum {
QCOW2_INCOMPAT_DATA_FILE_BITNR = 2,
QCOW2_INCOMPAT_COMPRESSION_BITNR = 3,
QCOW2_INCOMPAT_EXTL2_BITNR = 4,
+ QCOW2_INCOMPAT_ZONED_FORMAT_BITNR = 5,
QCOW2_INCOMPAT_DIRTY = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
QCOW2_INCOMPAT_CORRUPT = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
QCOW2_INCOMPAT_DATA_FILE = 1 << QCOW2_INCOMPAT_DATA_FILE_BITNR,
QCOW2_INCOMPAT_COMPRESSION = 1 << QCOW2_INCOMPAT_COMPRESSION_BITNR,
QCOW2_INCOMPAT_EXTL2 = 1 << QCOW2_INCOMPAT_EXTL2_BITNR,
+ QCOW2_INCOMPAT_ZONED_FORMAT = 1 << QCOW2_INCOMPAT_ZONED_FORMAT_BITNR,
QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY
| QCOW2_INCOMPAT_CORRUPT
| QCOW2_INCOMPAT_DATA_FILE
| QCOW2_INCOMPAT_COMPRESSION
- | QCOW2_INCOMPAT_EXTL2,
+ | QCOW2_INCOMPAT_EXTL2
+ | QCOW2_INCOMPAT_ZONED_FORMAT,
};
/* Compatible feature bits */
@@ -426,6 +453,9 @@ typedef struct BDRVQcow2State {
* is to convert the image with the desired compression type set.
*/
Qcow2CompressionType compression_type;
+
+ /* States of zoned device */
+ Qcow2ZonedHeaderExtension zoned_header;
} BDRVQcow2State;
typedef struct Qcow2COWRegion {
diff --git a/docs/interop/qcow2.rst b/docs/interop/qcow2.rst
index 5948591107..7bf3a00e77 100644
--- a/docs/interop/qcow2.rst
+++ b/docs/interop/qcow2.rst
@@ -128,7 +128,26 @@ the next fields through ``header_length``.
allows subcluster-based allocation. See the
Extended L2 Entries section for more details.
- Bits 5-63: Reserved (set to 0)
+ Bit 5: Zoned extension bit. If this bit is set then
+ the file is an emulated zoned device. The
+ zoned extension must be present.
+ Implementations that do not support zoned
+ emulation cannot open this file because it
+ generally only make sense to interpret the
+ data along with the zone information and
+ write pointers.
+
+ It is unsafe when any qcow2 user without
+ knowing the zoned extension reads or edits
+ a file with the zoned extension. The write
+ pointer tracking can be corrupted when a
+ writer edits a file, like overwriting beyond
+ the write pointer locations. Or a reader tries
+ to access a file without knowing write
+ pointers where the software setup will cause
+ invalid reads.
+
+ Bits 6-63: Reserved (set to 0)
80 - 87: compatible_features
Bitmask of compatible features. An implementation can
@@ -259,6 +278,7 @@ be stored. Each extension has a structure like the following::
0x23852875 - Bitmaps extension
0x0537be77 - Full disk encryption header pointer
0x44415441 - External data file name string
+ 0x007a6264 - Zoned extension
other - Unknown header extension, can be safely
ignored
@@ -344,6 +364,94 @@ The fields of the bitmaps extension are::
Offset into the image file at which the bitmap directory
starts. Must be aligned to a cluster boundary.
+Zoned extension
+---------------
+
+The zoned extension must be present if the incompatible bit is set, and
+omitted when the incompatible bit is clear. It contains fields for
+emulating the zoned storage model (https://zonedstorage.io/). When the
+zone model mode is not host-managed, it is regarded as incompatible
+and reports an error to users.
+
+The write pointers for each zone are stored in an area called zonedmeta
+clusters. It is 8 bytes per zone. The offset and size of the zonedmeta
+are kept in the zoned extension header.
+
+The fields of the zoned extension are::
+
+ Byte 0: zoned
+ The byte represents the zoned model of the device. 0 is for
+ a non-zoned device (all other information in this header
+ is ignored). 1 is for a host-managed device, which only
+ allows for sequential writes within each zone. Other
+ values may be added later, the implementation must refuse
+ to open a device containing an unknown zone model.
+
+ 1 - 3: Reserved, must be zero.
+
+ 4 - 11: zone_size
+ Total size of each zone, in bytes. The 64-bit field is to
+ satisfy the virtio-blk zone_size range and emulate a read
+ zoned device, whose maximum zone size can be as large as
+ 2TB.
+
+ The value must be power of 2. Linux currently requires
+ the zone size to be a power of 2 number of LBAs. Qcow2
+ following this is mainly to allow emulating a real
+ ZNS drive configuration. It is not relevant to the cluster
+ size.
+
+ 12 - 19: zone_capacity
+ The number of writable bytes within the zones. The bytes
+ between zone capacity and zone size are unusable: reads
+ will return 0s and writes will fail.
+
+ A zone capacity is always smaller or equal to the zone
+ size. It is for emulating a real ZNS drive configuration,
+ which has the constraint of aligning to some hardware erase
+ block size.
+
+ 20 - 23: conventional_zones
+ The number of conventional zones. The conventional zones
+ allow sequential writes and random writes. While the
+ sequential zones only allow sequential writes.
+
+ 24 - 27: nr_zones
+ The number of zones. It is the sum of conventional zones
+ and sequential zones. The maximum value for nr_zones is
+ (2^32 - 1)/8 = 536870911.
+
+ 28 - 31: max_active_zones
+ The number of the zones that can be in the implicit open,
+ explicit open or closed state. The max active zones cannot
+ be larger than the max open zones.
+
+ 32 - 35: max_open_zones
+ The maximal number of open (implicitly open or explicitly
+ open) zones. It cannot be larger than the number of SWR
+ zones of the device.
+
+ If the limits of open zones or active zones are equal to
+ the total number of SWR zones, then it's the same as having
+ no limits therefore max open zones and max active zones are
+ set to 0.
+
+ 36 - 39: max_append_bytes
+ The number of bytes of a zone append request that can be
+ issued to the device. It must be 512-byte aligned and less
+ than the zone capacity.
+
+ 40 - 47: zonedmeta_size
+ The size of zoned metadata in bytes. It contains no more
+ than 4GB. The zoned metadata structure is the write
+ pointers for each zone whose size is the number of zones
+ multiplied by the zone size.
+
+ 48 - 55: zonedmeta_offset
+ The offset of zoned metadata structure in the contained
+ image, in bytes.
+
+
Full disk encryption header pointer
-----------------------------------
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index 147c08155f..349876bc65 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -57,6 +57,13 @@
#define BLOCK_OPT_COMPRESSION_TYPE "compression_type"
#define BLOCK_OPT_EXTL2 "extended_l2"
#define BLOCK_OPT_KEEP_DATA_FILE "keep_data_file"
+#define BLOCK_OPT_ZONE_MODEL "zone.mode"
+#define BLOCK_OPT_ZONE_SIZE "zone.size"
+#define BLOCK_OPT_ZONE_CAPACITY "zone.capacity"
+#define BLOCK_OPT_CONVENTIONAL_ZONES "zone.conventional_zones"
+#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_PROBE_BUF_SIZE 512
@@ -901,7 +908,13 @@ typedef struct BlockLimits {
BlockZoneModel zoned;
/* zone size expressed in bytes */
- uint32_t zone_size;
+ uint64_t zone_size;
+
+ /*
+ * The number of usable logical blocks within the zone, expressed
+ * in bytes. A zone capacity is smaller or equal to the zone size.
+ */
+ uint64_t zone_capacity;
/* total number of zones */
uint32_t nr_zones;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 508b081ac1..d771dfb4a1 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -5268,6 +5268,70 @@
{ 'enum': 'Qcow2CompressionType',
'data': [ 'zlib', { 'name': 'zstd', 'if': 'CONFIG_ZSTD' } ] }
+##
+# @Qcow2ZoneModel:
+#
+# Zoned device model used in qcow2 image file
+#
+# @host-managed: The host-managed model only allows sequential write
+# over the device zones.
+#
+# Since 11.0
+##
+{ 'enum': 'Qcow2ZoneModel',
+ 'data': [ 'host-managed'] }
+
+##
+# @Qcow2ZoneHostManaged:
+#
+# The host-managed zone model. It only allows sequential writes.
+#
+# @size: Total number of bytes within zones (default 256 MB).
+#
+# @capacity: The number of usable logical blocks within zones
+# in bytes. A zone capacity is always smaller or equal to the
+# zone size (default to zone size).
+#
+# @conventional-zones: The number of conventional zones of the
+# zoned device (default 0).
+#
+# @max-open-zones: The maximal number of open zones. It is less than
+# or equal to the number of sequential write required zones of
+# the device (default 0).
+#
+# @max-active-zones: The maximal number of zones in the implicit
+# open, explicit open or closed state. It is less than or equal
+# to the max open zones (default 0).
+#
+# @max-append-bytes: The maximal number of bytes of a zone
+# append request that can be issued to the device. It must be
+# 512-byte aligned and less than the zone capacity
+# (default 64 KB).
+#
+# Since 11.0
+##
+{ 'struct': 'Qcow2ZoneHostManaged',
+ 'data': { '*size': 'size',
+ '*capacity': 'size',
+ '*conventional-zones': 'uint32',
+ '*max-open-zones': 'uint32',
+ '*max-active-zones': 'uint32',
+ '*max-append-bytes': 'size' } }
+
+##
+# @Qcow2ZoneCreateOptions:
+#
+# The zone device model for the qcow2 image.
+#
+# @mode: The zone device model modes.
+#
+# Since 11.0
+##
+{ 'union': 'Qcow2ZoneCreateOptions',
+ 'base': { 'mode': 'Qcow2ZoneModel' },
+ 'discriminator': 'mode',
+ 'data': { 'host-managed': 'Qcow2ZoneHostManaged' } }
+
##
# @BlockdevCreateOptionsQcow2:
#
@@ -5310,6 +5374,9 @@
# @compression-type: The image cluster compression method
# (default: zlib, since 5.1)
#
+# @zone: The zone device model modes. The default is that the
+# device is not zoned. (since 11.0)
+#
# Since: 2.12
##
{ 'struct': 'BlockdevCreateOptionsQcow2',
@@ -5326,7 +5393,8 @@
'*preallocation': 'PreallocMode',
'*lazy-refcounts': 'bool',
'*refcount-bits': 'int',
- '*compression-type':'Qcow2CompressionType' } }
+ '*compression-type':'Qcow2CompressionType',
+ '*zone': 'Qcow2ZoneCreateOptions' } }
##
# @BlockdevCreateOptionsQed:
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v10 3/4] qcow2: add zoned emulation capability
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
2026-05-10 17:50 ` [PATCH v10 1/4] docs/qcow2: add the zoned format feature Sam Li
2026-05-10 17:50 ` [PATCH v10 2/4] qcow2: add configurations for zoned format extension Sam Li
@ 2026-05-10 17:50 ` Sam Li
2026-05-14 20:23 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 4/4] iotests: test the zoned format feature for qcow2 file Sam Li
2026-05-14 18:38 ` [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Stefan Hajnoczi
4 siblings, 1 reply; 9+ messages in thread
From: Sam Li @ 2026-05-10 17:50 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, Stefan Hajnoczi, qemu-block, dlemoal,
Eric Blake, Michael S. Tsirkin, hare, Hanna Reitz, Sam Li
By adding zone operations and zoned metadata, the zoned emulation
capability enables full emulation support of zoned device using
a qcow2 file. The zoned device metadata includes zone type,
zoned device state and write pointer of each zone, which is stored
to an array of unsigned integers.
Each zone of a zoned device makes state transitions following
the zone state machine. The zone state machine mainly describes
five states, IMPLICIT OPEN, EXPLICIT OPEN, FULL, EMPTY and CLOSED.
READ ONLY and OFFLINE states will generally be affected by device
internal events. The operations on zones cause corresponding state
changing.
Zoned devices have limits on zone resources, which put constraints on
write operations on zones. It is managed by active zone queues
following LRU policy.
Signed-off-by: Sam Li <faithilikerun@gmail.com>
---
block/qcow2.c | 851 +++++++++++++++++++++++++++++++++++++++++-
block/qcow2.h | 13 +-
block/trace-events | 2 +
hw/block/virtio-blk.c | 22 +-
include/qemu/queue.h | 1 +
include/qemu/range.h | 4 +
6 files changed, 884 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index b543bcf3e3..c84b67976e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -195,6 +195,293 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *fmt, Error **errp)
return cryptoopts_qdict;
}
+#define QCOW2_ZT_IS_CONV(wp) (wp & 1ULL << 59)
+#define QCOW2_GET_WP(wp) ((wp << 5) >> 5)
+
+/*
+ * To emulate a real zoned device, closed, empty and full states are
+ * preserved after a power cycle. The open states are in-memory and will
+ * be lost after closing the device. Read-only and offline states are
+ * device-internal events, which are not considered for simplicity.
+ */
+static inline BlockZoneState qcow2_get_zone_state(BlockDriverState *bs,
+ uint32_t index)
+{
+ BDRVQcow2State *s = bs->opaque;
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+ uint64_t zone_wp = bs->wps->wp[index];
+ uint64_t zone_start;
+
+ if (QCOW2_ZT_IS_CONV(zone_wp)) {
+ return BLK_ZS_NOT_WP;
+ }
+
+ if (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) {
+ return BLK_ZS_EOPEN;
+ }
+ if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) {
+ return BLK_ZS_IOPEN;
+ }
+
+ zone_start = index * bs->bl.zone_size;
+ if (zone_wp == zone_start) {
+ return BLK_ZS_EMPTY;
+ }
+ if (zone_wp >= zone_start + bs->bl.zone_capacity) {
+ return BLK_ZS_FULL;
+ }
+ if (zone_wp > zone_start) {
+ if (!QTAILQ_IN_USE(zone_entry, closed_zone_entry)) {
+ /*
+ * The number of closed zones is not always updated in time when
+ * the device is closed. However, it only matters when doing
+ * zone report. Refresh the count and list of closed zones to
+ * provide correct zone states for zone report.
+ */
+ QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_entry);
+ s->nr_zones_closed++;
+ }
+ return BLK_ZS_CLOSED;
+ }
+ return BLK_ZS_NOT_WP;
+}
+
+static void qcow2_rm_exp_open_zone(BDRVQcow2State *s,
+ uint32_t index)
+{
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+
+ QTAILQ_REMOVE(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
+ s->nr_zones_exp_open--;
+}
+
+static void qcow2_rm_imp_open_zone(BDRVQcow2State *s,
+ int32_t index)
+{
+ Qcow2ZoneListEntry *zone_entry;
+ if (index < 0) {
+ /* Apply LRU when the index is not specified. */
+ zone_entry = QTAILQ_LAST(&s->imp_open_zones);
+ } else {
+ zone_entry = &s->zone_list_entries[index];
+ }
+
+ QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
+ s->nr_zones_imp_open--;
+}
+
+static void qcow2_rm_open_zone(BDRVQcow2State *s,
+ uint32_t index)
+{
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+
+ if (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) {
+ qcow2_rm_exp_open_zone(s, index);
+ } else if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) {
+ qcow2_rm_imp_open_zone(s, index);
+ }
+}
+
+static void qcow2_rm_closed_zone(BDRVQcow2State *s,
+ uint32_t index)
+{
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+
+ QTAILQ_REMOVE(&s->closed_zones, zone_entry, closed_zone_entry);
+ s->nr_zones_closed--;
+}
+
+static void qcow2_do_imp_open_zone(BDRVQcow2State *s,
+ uint32_t index,
+ BlockZoneState zs)
+{
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+
+ switch (zs) {
+ case BLK_ZS_EMPTY:
+ break;
+ case BLK_ZS_CLOSED:
+ qcow2_rm_closed_zone(s, index);
+ break;
+ case BLK_ZS_IOPEN:
+ /*
+ * The LRU policy: update the zone that is most recently
+ * used to the head of the zone list
+ */
+ if (zone_entry == QTAILQ_FIRST(&s->imp_open_zones)) {
+ return;
+ }
+ QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
+ s->nr_zones_imp_open--;
+ break;
+ default:
+ return;
+ }
+
+ QTAILQ_INSERT_HEAD(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
+ s->nr_zones_imp_open++;
+}
+
+static void qcow2_do_exp_open_zone(BDRVQcow2State *s,
+ uint32_t index)
+{
+ Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
+
+ QTAILQ_INSERT_HEAD(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
+ s->nr_zones_exp_open++;
+}
+
+/*
+ * The list of zones is managed using an LRU policy: the last
+ * zone of the list is always the one that was least recently used
+ * for writing and is chosen as the zone to close to be able to
+ * implicitly open another zone.
+ *
+ * We can only close the open zones. The index is not specified
+ * when it is less than 0.
+ */
+static void qcow2_do_close_zone(BlockDriverState *bs,
+ int32_t index,
+ BlockZoneState zs)
+{
+ BDRVQcow2State *s = bs->opaque;
+ Qcow2ZoneListEntry *zone_entry;
+
+ if (index >= 0) {
+ zone_entry = &s->zone_list_entries[index];
+ } else {
+ /* before removal of the last implicitly open zone */
+ zone_entry = QTAILQ_LAST(&s->imp_open_zones);
+ }
+
+ if (zs == BLK_ZS_IOPEN) {
+ qcow2_rm_imp_open_zone(s, index);
+ goto close_zone;
+ }
+
+ if (index >= 0 && zs == BLK_ZS_EOPEN) {
+ qcow2_rm_exp_open_zone(s, index);
+ /*
+ * The zone state changes when the zone is removed from the list of
+ * open zones (explicitly open -> empty). The closed zone list is
+ * refreshed during get_zone_state().
+ */
+ qcow2_get_zone_state(bs, index);
+ }
+ return;
+
+close_zone:
+ QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_entry);
+ s->nr_zones_closed++;
+}
+
+/*
+ * Read/Write the new wp value to the dedicated location of the image file.
+ */
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_rw_wp_at(BlockDriverState *bs, uint64_t *wp,
+ int32_t index, bool is_write) {
+ BDRVQcow2State *s = bs->opaque;
+ g_autofree uint64_t *temp = NULL;
+ uint64_t wpv = *wp;
+ int ret;
+
+ if (is_write) {
+ ret = bdrv_pwrite(bs->file, s->zoned_header.zonedmeta_offset
+ + sizeof(uint64_t) * index, sizeof(uint64_t), wp, 0);
+ if (ret < 0) {
+ *wp = wpv;
+ goto exit;
+ }
+ } else {
+ temp = g_new(uint64_t, 1);
+ ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset
+ + sizeof(uint64_t) * index, sizeof(uint64_t), temp, 0);
+ if (ret < 0) {
+ goto exit;
+ }
+
+ *wp = *temp;
+ }
+
+ trace_qcow2_wp_tracking(index, *wp >> BDRV_SECTOR_BITS);
+ return ret;
+
+exit:
+ error_report("Failed to %s metadata to file", is_write ? "write" : "read");
+ return ret;
+}
+
+static bool qcow2_can_activate_zone(BlockDriverState *bs)
+{
+ BDRVQcow2State *s = bs->opaque;
+
+ /* When the max active zone is zero, there is no limit on active zones */
+ if (!s->zoned_header.max_active_zones) {
+ return true;
+ }
+
+ /* Active zones are zones that are open or closed */
+ return s->nr_zones_exp_open + s->nr_zones_imp_open + s->nr_zones_closed
+ < s->zoned_header.max_active_zones;
+}
+
+/*
+ * This function manages open zones under active zones limit. It checks
+ * if a zone can transition to open state while maintaining max open and
+ * active zone limits.
+ */
+static bool qcow2_can_open_zone(BlockDriverState *bs)
+{
+ BDRVQcow2State *s = bs->opaque;
+
+ /* When the max open zone is zero, there is no limit on open zones */
+ if (!s->zoned_header.max_open_zones) {
+ return true;
+ }
+
+ /*
+ * The open zones are zones with the states of explicitly and
+ * implicitly open.
+ */
+ if (s->nr_zones_imp_open + s->nr_zones_exp_open <
+ s->zoned_header.max_open_zones) {
+ return true;
+ }
+
+ /*
+ * Zones are managed one at a time. Thus, the number of implicitly open
+ * zone can never be over the open zone limit. When the active zone limit
+ * is not reached, close only one implicitly open zone.
+ */
+ if (qcow2_can_activate_zone(bs)) {
+ qcow2_do_close_zone(bs, -1, BLK_ZS_IOPEN);
+ trace_qcow2_imp_open_zones(0x23, s->nr_zones_imp_open);
+ return true;
+ }
+ return false;
+}
+
+static inline int coroutine_fn GRAPH_RDLOCK
+qcow2_refresh_zonedmeta(BlockDriverState *bs)
+{
+ int ret;
+ BDRVQcow2State *s = bs->opaque;
+ uint64_t wps_size = s->zoned_header.zonedmeta_size;
+ g_autofree uint64_t *temp = NULL;
+
+ temp = g_new(uint64_t, s->zoned_header.nr_zones);
+ ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset,
+ wps_size, temp, 0);
+ if (ret < 0) {
+ error_report("Cannot read metadata");
+ return ret;
+ }
+
+ memcpy(bs->wps->wp, temp, wps_size);
+ return 0;
+}
+
/*
* Passing by the zoned device configurations by a zoned_header struct, check
* if the zone device options are under constraints. Return false when some
@@ -527,7 +814,23 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
be32_to_cpu(zoned_ext.max_active_zones);
zoned_ext.max_append_bytes =
be32_to_cpu(zoned_ext.max_append_bytes);
+ zoned_ext.zonedmeta_offset =
+ be64_to_cpu(zoned_ext.zonedmeta_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);
+ ret = qcow2_refresh_zonedmeta(bs);
+ if (ret < 0) {
+ return ret;
+ }
+
+ s->zone_list_entries = g_new0(Qcow2ZoneListEntry,
+ zoned_ext.nr_zones);
+ QTAILQ_INIT(&s->exp_open_zones);
+ QTAILQ_INIT(&s->imp_open_zones);
+ QTAILQ_INIT(&s->closed_zones);
+ qemu_co_mutex_init(&bs->wps->colock);
/* refuse to open broken images */
if (zoned_ext.nr_zones != DIV_ROUND_UP(bs->total_sectors *
@@ -2883,21 +3186,119 @@ static coroutine_fn GRAPH_RDLOCK int qcow2_co_pwritev_task_entry(AioTask *task)
t->l2meta);
}
+/*
+ * If it is an append write request, the offset pointer needs to be updated to
+ * the wp value of that zone after the IO completion. The unique pointer is
+ * passed on to this function to prevent the value being changed in condition of
+ * multiple concurrent writes.
+ */
static int coroutine_fn GRAPH_RDLOCK
-qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
- QEMUIOVector *qiov, size_t qiov_offset,
- BdrvRequestFlags flags)
+qcow2_co_pwv_part(BlockDriverState *bs, int64_t *offset_ptr, int64_t bytes,
+ QEMUIOVector *qiov, size_t qiov_offset, bool is_append,
+ BdrvRequestFlags flags)
{
BDRVQcow2State *s = bs->opaque;
int offset_in_cluster;
int ret;
unsigned int cur_bytes; /* number of sectors in current iteration */
uint64_t host_offset;
+ int64_t offset = *offset_ptr;
QCowL2Meta *l2meta = NULL;
AioTaskPool *aio = NULL;
+ int64_t start_offset, start_bytes;
+ BlockZoneState zs;
+ int64_t end_zone, end_offset;
+ uint64_t *wp;
+ int64_t zone_size = bs->bl.zone_size;
+ int64_t zone_capacity = bs->bl.zone_capacity;
+ int index;
trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
+ start_offset = offset;
+ start_bytes = bytes;
+ if (bs->bl.zoned == BLK_Z_HM) {
+ index = start_offset / zone_size;
+ wp = &bs->wps->wp[index];
+ if (!QCOW2_ZT_IS_CONV(*wp)) {
+ if (offset != *wp && !is_append) {
+ /* The write offset must be equal to the zone write pointer */
+ error_report("Offset 0x%" PRIx64 " of regular writes must be "
+ "equal to the zone write pointer 0x%" PRIx64 "",
+ offset, *wp);
+ return -EINVAL;
+ }
+
+ if (is_append) {
+ /*
+ * The offset of append write is the write pointer value of
+ * that zone.
+ */
+ start_offset = *wp;
+ }
+
+ end_offset = start_offset + start_bytes;
+
+ /* Only allow writes when there are zone resources left */
+ zs = qcow2_get_zone_state(bs, index);
+ if (zs == BLK_ZS_CLOSED || zs == BLK_ZS_EMPTY) {
+ if (!qcow2_can_open_zone(bs)) {
+ error_report("no more open zones available");
+ return -EINVAL;
+ }
+ }
+
+ /*
+ * Align up (start_offset, zone_size), the start offset is not
+ * necessarily power of two.
+ */
+ end_zone = index * zone_size + zone_capacity;
+ /* Write cannot exceed the zone capacity. */
+ if (end_offset > end_zone) {
+ error_report("write exceeds zone capacity with end_offset:"
+ "0x%lx, end_zone: 0x%lx",
+ end_offset / 512, end_zone / 512);
+ return -EINVAL;
+ }
+
+ /*
+ * Real drives change states before it can write to the zone. If
+ * the write fails, the zone state may have changed.
+ *
+ * The zone state transitions to implicit open when the original
+ * state is empty or closed. When the wp reaches the end, the
+ * open states (explicit open, implicit open) become full.
+ */
+ zs = qcow2_get_zone_state(bs, index);
+ if (!(end_offset & (zone_capacity - 1))) {
+ /* Being aligned to zone capacity implies full state */
+ qcow2_rm_open_zone(s, index);
+ trace_qcow2_imp_open_zones(0x24,
+ s->nr_zones_imp_open);
+ } else {
+ qcow2_do_imp_open_zone(s, index, zs);
+ trace_qcow2_imp_open_zones(0x24,
+ s->nr_zones_imp_open);
+ }
+
+ /*
+ * The write pointer is update before IO completion, with the
+ * assumption that the write IO will succeed.
+ */
+ qemu_co_mutex_lock(&bs->wps->colock);
+ if (is_append) {
+ *offset_ptr = *wp;
+ }
+ *wp = end_offset;
+ ret = qcow2_rw_wp_at(bs, wp, index, true);
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ if (ret < 0) {
+ error_report("failed to update write pointer");
+ return -EINVAL;
+ }
+ }
+ }
+
while (bytes != 0 && aio_task_pool_status(aio) == 0) {
l2meta = NULL;
@@ -2943,6 +3344,7 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
qiov_offset += cur_bytes;
trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes);
}
+
ret = 0;
qemu_co_mutex_lock(&s->lock);
@@ -2961,11 +3363,32 @@ fail_nometa:
g_free(aio);
}
+ if (ret < 0 && bs->bl.zoned == BLK_Z_HM) {
+ /* update the wp when write IO failed */
+ qemu_co_mutex_lock(&bs->wps->colock);
+ index = start_offset / zone_size;
+ wp = &bs->wps->wp[index];
+ if (!QCOW2_ZT_IS_CONV(*wp)) {
+ ret = qcow2_rw_wp_at(bs, wp, index, false);
+ }
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ }
+
trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
return ret;
}
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
+ QEMUIOVector *qiov, size_t qiov_offset,
+ BdrvRequestFlags flags)
+{
+ return qcow2_co_pwv_part(bs, &offset, bytes, qiov, qiov_offset, false,
+ flags);
+}
+
+
static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
{
BDRVQcow2State *s = bs->opaque;
@@ -3001,6 +3424,25 @@ static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
return result;
}
+static void qcow2_do_close_all_zone(BDRVQcow2State *s)
+{
+ Qcow2ZoneListEntry *zone_entry, *next;
+
+ QTAILQ_FOREACH_SAFE(zone_entry, &s->imp_open_zones, imp_open_zone_entry,
+ next) {
+ QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
+ s->nr_zones_imp_open--;
+ }
+
+ QTAILQ_FOREACH_SAFE(zone_entry, &s->exp_open_zones, exp_open_zone_entry,
+ next) {
+ QTAILQ_REMOVE(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
+ s->nr_zones_exp_open--;
+ }
+
+ assert(s->nr_zones_imp_open + s->nr_zones_exp_open == 0);
+}
+
static void coroutine_mixed_fn GRAPH_RDLOCK
qcow2_do_close(BlockDriverState *bs, bool close_data_file)
{
@@ -3040,6 +3482,8 @@ qcow2_do_close(BlockDriverState *bs, bool close_data_file)
qcow2_refcount_close(bs);
qcow2_free_snapshots(bs);
+ qcow2_do_close_all_zone(s);
+ g_free(bs->wps);
}
static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs)
@@ -3357,7 +3801,10 @@ int qcow2_update_header(BlockDriverState *bs)
.max_active_zones =
cpu_to_be32(s->zoned_header.max_active_zones),
.max_append_bytes =
- cpu_to_be32(s->zoned_header.max_append_bytes)
+ cpu_to_be32(s->zoned_header.max_append_bytes),
+ .zonedmeta_offset =
+ cpu_to_be64(s->zoned_header.zonedmeta_offset),
+ .zonedmeta_size = cpu_to_be64(s->zoned_header.zonedmeta_size),
};
ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT,
&zoned_header, sizeof(zoned_header),
@@ -3766,7 +4213,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
int version;
int refcount_order;
uint64_t *refcount_table;
- int ret;
+ uint64_t zoned_meta_size, zoned_clusterlen;
+ int ret, offset, i;
uint8_t compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;
assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);
@@ -4113,6 +4561,42 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
ret = -EINVAL;
goto unlock;
}
+
+ uint32_t nrz = s->zoned_header.nr_zones;
+ zoned_meta_size = sizeof(uint64_t) * nrz;
+ g_autofree uint64_t *meta = NULL;
+ meta = g_new0(uint64_t, nrz);
+
+ for (i = 0; i < s->zoned_header.conventional_zones; ++i) {
+ meta[i] = i * s->zoned_header.zone_size;
+ meta[i] |= 1ULL << 59;
+ }
+
+ for (; i < nrz; ++i) {
+ meta[i] = i * s->zoned_header.zone_size;
+ }
+
+ offset = qcow2_alloc_clusters(blk_bs(blk), zoned_meta_size);
+ if (offset < 0) {
+ ret = offset;
+ error_setg_errno(errp, -ret, "Could not allocate clusters "
+ "for zoned metadata size");
+ goto unlock;
+ }
+ s->zoned_header.zonedmeta_offset = offset;
+ s->zoned_header.zonedmeta_size = zoned_meta_size;
+
+ zoned_clusterlen = size_to_clusters(s, zoned_meta_size)
+ * s->cluster_size;
+ ret = qcow2_pre_write_overlap_check(blk_bs(blk), 0, offset,
+ zoned_clusterlen, false);
+ assert(ret == 0);
+ ret = bdrv_pwrite(blk_bs(blk)->file, offset, zoned_meta_size, meta, 0);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Could not write zoned metadata "
+ "to disk");
+ goto unlock;
+ }
} else {
s->zoned_header.zoned = BLK_Z_NONE;
}
@@ -4512,6 +4996,359 @@ qcow2_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
return ret;
}
+static int coroutine_fn
+qcow2_co_zone_report(BlockDriverState *bs, int64_t offset,
+ unsigned int *nr_zones, BlockZoneDescriptor *zones)
+{
+ BDRVQcow2State *s = bs->opaque;
+ uint64_t zone_size = s->zoned_header.zone_size;
+ int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
+ int64_t size = bs->bl.nr_zones * zone_size;
+ unsigned int nrz;
+ int i = 0;
+ int si;
+
+ if (offset >= capacity) {
+ error_report("offset %" PRId64 " is equal to or greater than the "
+ "device capacity %" PRId64 "", offset, capacity);
+ return -EINVAL;
+ }
+
+ nrz = ((*nr_zones) < bs->bl.nr_zones) ? (*nr_zones) : bs->bl.nr_zones;
+ si = offset / zone_size; /* Zone size cannot be 0 for zoned device */
+ qemu_co_mutex_lock(&bs->wps->colock);
+ for (; i < nrz; ++i) {
+ if (i + si >= bs->bl.nr_zones) {
+ break;
+ }
+
+ zones[i].start = (si + i) * zone_size;
+
+ /* The last zone can be smaller than the zone size */
+ if ((si + i + 1) == bs->bl.nr_zones && size > capacity) {
+ uint32_t l = zone_size - (size - capacity);
+ zones[i].length = l;
+ zones[i].cap = l;
+ } else {
+ zones[i].length = zone_size;
+ zones[i].cap = zone_size;
+ }
+
+ uint64_t wp = bs->wps->wp[si + i];
+ if (QCOW2_ZT_IS_CONV(wp)) {
+ zones[i].type = BLK_ZT_CONV;
+ zones[i].state = BLK_ZS_NOT_WP;
+ /* Clear masking bits */
+ wp = QCOW2_GET_WP(wp);
+ } else {
+ zones[i].type = BLK_ZT_SWR;
+ zones[i].state = qcow2_get_zone_state(bs, si + i);
+ }
+ zones[i].wp = wp;
+ }
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ *nr_zones = i;
+ return 0;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_open_zone(BlockDriverState *bs, uint32_t index) {
+ BDRVQcow2State *s = bs->opaque;
+ int ret;
+
+ qemu_co_mutex_lock(&bs->wps->colock);
+ BlockZoneState zs = qcow2_get_zone_state(bs, index);
+ trace_qcow2_imp_open_zones(BLK_ZO_OPEN, s->nr_zones_imp_open);
+
+ switch (zs) {
+ case BLK_ZS_EMPTY:
+ if (!qcow2_can_activate_zone(bs)) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+ break;
+ case BLK_ZS_IOPEN:
+ qcow2_rm_imp_open_zone(s, index);
+ break;
+ case BLK_ZS_EOPEN:
+ return 0;
+ case BLK_ZS_CLOSED:
+ if (!qcow2_can_open_zone(bs)) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+ qcow2_rm_closed_zone(s, index);
+ break;
+ case BLK_ZS_FULL:
+ break;
+ default:
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ qcow2_do_exp_open_zone(s, index);
+ ret = 0;
+
+unlock:
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ return ret;
+}
+
+static int qcow2_close_zone(BlockDriverState *bs, uint32_t index)
+{
+ int ret;
+
+ qemu_co_mutex_lock(&bs->wps->colock);
+ BlockZoneState zs = qcow2_get_zone_state(bs, index);
+
+ switch (zs) {
+ case BLK_ZS_EMPTY:
+ break;
+ case BLK_ZS_IOPEN:
+ break;
+ case BLK_ZS_EOPEN:
+ break;
+ case BLK_ZS_CLOSED:
+ /* Closing a closed zone is not an error */
+ ret = 0;
+ goto unlock;
+ case BLK_ZS_FULL:
+ break;
+ default:
+ ret = -EINVAL;
+ goto unlock;
+ }
+ qcow2_do_close_zone(bs, index, zs);
+ ret = 0;
+
+unlock:
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ return ret;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_finish_zone(BlockDriverState *bs, uint32_t index) {
+ BDRVQcow2State *s = bs->opaque;
+ int ret;
+
+ qemu_co_mutex_lock(&bs->wps->colock);
+ uint64_t *wp = &bs->wps->wp[index];
+ BlockZoneState zs = qcow2_get_zone_state(bs, index);
+
+ switch (zs) {
+ case BLK_ZS_EMPTY:
+ if (!qcow2_can_activate_zone(bs)) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+ break;
+ case BLK_ZS_IOPEN:
+ qcow2_rm_imp_open_zone(s, index);
+ trace_qcow2_imp_open_zones(BLK_ZO_FINISH, s->nr_zones_imp_open);
+ break;
+ case BLK_ZS_EOPEN:
+ qcow2_rm_exp_open_zone(s, index);
+ break;
+ case BLK_ZS_CLOSED:
+ if (!qcow2_can_open_zone(bs)) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+ qcow2_rm_closed_zone(s, index);
+ break;
+ case BLK_ZS_FULL:
+ ret = 0;
+ goto unlock;
+ default:
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ *wp = ((uint64_t)index + 1) * s->zoned_header.zone_size;
+ ret = qcow2_rw_wp_at(bs, wp, index, true);
+
+unlock:
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ return ret;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_reset_zone(BlockDriverState *bs, uint32_t index,
+ int64_t len) {
+ BDRVQcow2State *s = bs->opaque;
+ int nrz = bs->bl.nr_zones;
+ int zone_size = bs->bl.zone_size;
+ int n, ret = 0;
+
+ qemu_co_mutex_lock(&bs->wps->colock);
+ uint64_t *wp = &bs->wps->wp[index];
+ if (len == bs->total_sectors << BDRV_SECTOR_BITS) {
+ n = nrz;
+ index = 0;
+ } else {
+ n = len / zone_size;
+ }
+
+ for (int i = 0; i < n; ++i) {
+ uint64_t *wp_i = (uint64_t *)(wp + i);
+ uint64_t wpi_v = *wp_i;
+ if (QCOW2_ZT_IS_CONV(wpi_v)) {
+ continue;
+ }
+
+ BlockZoneState zs = qcow2_get_zone_state(bs, index + i);
+ switch (zs) {
+ case BLK_ZS_EMPTY:
+ break;
+ case BLK_ZS_IOPEN:
+ qcow2_rm_imp_open_zone(s, index + i);
+ trace_qcow2_imp_open_zones(BLK_ZO_RESET, s->nr_zones_imp_open);
+ break;
+ case BLK_ZS_EOPEN:
+ qcow2_rm_exp_open_zone(s, index + i);
+ break;
+ case BLK_ZS_CLOSED:
+ qcow2_rm_closed_zone(s, index + i);
+ break;
+ case BLK_ZS_FULL:
+ break;
+ default:
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ if (zs == BLK_ZS_EMPTY) {
+ continue;
+ }
+
+ *wp_i = ((uint64_t)index + i) * zone_size;
+ ret = qcow2_rw_wp_at(bs, wp_i, index + i, true);
+ if (ret < 0) {
+ goto unlock;
+ }
+ /* clear data */
+ ret = qcow2_co_pwrite_zeroes(bs, *wp_i, zone_size, 0);
+ if (ret < 0) {
+ error_report("Failed to reset zone at 0x%" PRIx64 "", *wp_i);
+ }
+ }
+
+unlock:
+ qemu_co_mutex_unlock(&bs->wps->colock);
+ return ret;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp op,
+ int64_t offset, int64_t len)
+{
+ BDRVQcow2State *s = bs->opaque;
+ int ret = 0;
+ int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
+ int64_t zone_size = s->zoned_header.zone_size;
+ int64_t zone_size_mask = zone_size - 1;
+ uint32_t index = offset / zone_size;
+ BlockZoneWps *wps = bs->wps;
+
+ if (offset >= capacity) {
+ error_report("offset %" PRId64 " is equal to or greater than the"
+ "device capacity %" PRId64 "", offset, capacity);
+ return -EINVAL;
+ }
+
+ if (offset & zone_size_mask) {
+ error_report("sector offset %" PRId64 " is not aligned to zone size"
+ " %" PRId64 "", offset / 512, zone_size / 512);
+ return -EINVAL;
+ }
+
+ if (((offset + len) < capacity && len & zone_size_mask) ||
+ offset + len > capacity) {
+ error_report("number of sectors %" PRId64 " is not aligned to zone"
+ " size %" PRId64 "", len / 512, zone_size / 512);
+ return -EINVAL;
+ }
+
+ qemu_co_mutex_lock(&wps->colock);
+ uint64_t wpv = wps->wp[index];
+ if (QCOW2_ZT_IS_CONV(wpv) && len != capacity) {
+ error_report("zone mgmt operations are not allowed for "
+ "conventional zones");
+ ret = -EIO;
+ goto unlock;
+ }
+ qemu_co_mutex_unlock(&wps->colock);
+
+ switch (op) {
+ case BLK_ZO_OPEN:
+ ret = qcow2_open_zone(bs, index);
+ break;
+ case BLK_ZO_CLOSE:
+ ret = qcow2_close_zone(bs, index);
+ break;
+ case BLK_ZO_FINISH:
+ ret = qcow2_finish_zone(bs, index);
+ break;
+ case BLK_ZO_RESET:
+ ret = qcow2_reset_zone(bs, index, len);
+ break;
+ default:
+ error_report("Unsupported zone op: 0x%x", op);
+ ret = -ENOTSUP;
+ break;
+ }
+ return ret;
+
+unlock:
+ qemu_co_mutex_unlock(&wps->colock);
+ return ret;
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_co_zone_append(BlockDriverState *bs, int64_t *offset, QEMUIOVector *qiov,
+ BdrvRequestFlags flags)
+{
+ assert(flags == 0);
+ int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
+ int64_t zone_size_mask = bs->bl.zone_size - 1;
+ int64_t iov_len = 0;
+ int64_t len = 0;
+
+ if (*offset >= capacity) {
+ error_report("*offset %" PRId64 " is equal to or greater than the"
+ "device capacity %" PRId64 "", *offset, capacity);
+ return -EINVAL;
+ }
+
+ /* offset + len should not pass the end of that zone starting from offset */
+ if (*offset & zone_size_mask) {
+ error_report("sector offset %" PRId64 " is not aligned to zone size "
+ "%" PRId64 "", *offset / 512, bs->bl.zone_size / 512);
+ return -EINVAL;
+ }
+
+ int64_t wg = bs->bl.write_granularity;
+ int64_t wg_mask = wg - 1;
+ for (int i = 0; i < qiov->niov; i++) {
+ iov_len = qiov->iov[i].iov_len;
+ if (iov_len & wg_mask) {
+ error_report("len of IOVector[%d] 0x%" PRIx64 " is not aligned to "
+ "block size 0x%" PRIx64 "", i, iov_len, wg);
+ return -EINVAL;
+ }
+ }
+ len = qiov->size;
+
+ if ((len >> BDRV_SECTOR_BITS) > bs->bl.max_append_sectors) {
+ error_report("len 0x%" PRIx64 " in sectors is greater than "
+ "max_append_sectors 0x%" PRIx32 "",
+ len >> BDRV_SECTOR_BITS, bs->bl.max_append_sectors);
+ return -EINVAL;
+ }
+
+ return qcow2_co_pwv_part(bs, offset, len, qiov, 0, true, 0);
+}
+
static int coroutine_fn GRAPH_RDLOCK
qcow2_co_copy_range_from(BlockDriverState *bs,
BdrvChild *src, int64_t src_offset,
@@ -6578,6 +7415,10 @@ BlockDriver bdrv_qcow2 = {
.bdrv_co_pwritev_compressed_part = qcow2_co_pwritev_compressed_part,
.bdrv_make_empty = qcow2_make_empty,
+ .bdrv_co_zone_report = qcow2_co_zone_report,
+ .bdrv_co_zone_mgmt = qcow2_co_zone_mgmt,
+ .bdrv_co_zone_append = qcow2_co_zone_append,
+
.bdrv_snapshot_create = qcow2_snapshot_create,
.bdrv_snapshot_goto = qcow2_snapshot_goto,
.bdrv_snapshot_delete = qcow2_snapshot_delete,
diff --git a/block/qcow2.h b/block/qcow2.h
index 743f2e3e79..4f72b8d62a 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -256,9 +256,9 @@ typedef struct Qcow2ZonedHeaderExtension {
} QEMU_PACKED Qcow2ZonedHeaderExtension;
typedef struct Qcow2ZoneListEntry {
- QLIST_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
- QLIST_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
- QLIST_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
+ QTAILQ_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
+ QTAILQ_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
+ QTAILQ_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
} Qcow2ZoneListEntry;
typedef struct Qcow2UnknownHeaderExtension {
@@ -456,6 +456,13 @@ typedef struct BDRVQcow2State {
/* States of zoned device */
Qcow2ZonedHeaderExtension zoned_header;
+ QTAILQ_HEAD(, Qcow2ZoneListEntry) exp_open_zones;
+ QTAILQ_HEAD(, Qcow2ZoneListEntry) imp_open_zones;
+ QTAILQ_HEAD(, Qcow2ZoneListEntry) closed_zones;
+ Qcow2ZoneListEntry *zone_list_entries;
+ uint32_t nr_zones_exp_open;
+ uint32_t nr_zones_imp_open;
+ uint32_t nr_zones_closed;
} BDRVQcow2State;
typedef struct Qcow2COWRegion {
diff --git a/block/trace-events b/block/trace-events
index 950c82d4b8..30a3e303ca 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -76,6 +76,8 @@ qcow2_writev_data(void *co, uint64_t offset) "co %p offset 0x%" PRIx64
qcow2_pwrite_zeroes_start_req(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64
qcow2_pwrite_zeroes(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64
qcow2_skip_cow(void *co, uint64_t offset, int nb_clusters) "co %p offset 0x%" PRIx64 " nb_clusters %d"
+qcow2_wp_tracking(int index, uint64_t wp) "wps[%d]: 0x%" PRIx64
+qcow2_imp_open_zones(uint8_t op, int nrz) "nr_imp_open_zones after op 0x%x: %d"
# qcow2-cluster.c
qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 9cb9f1fb2b..285db19ac7 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -288,6 +288,9 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s, MultiReqBuffer *mrb)
int i = 0, start = 0, num_reqs = 0, niov = 0, nb_sectors = 0;
uint32_t max_transfer;
int64_t sector_num = 0;
+ BlockDriverState *bs = blk_bs(s->blk);
+ bool zone_cross;
+ int64_t zone_sector, end_sector;
if (mrb->num_reqs == 1) {
submit_requests(s, mrb, 0, 1, -1);
@@ -303,17 +306,34 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s, MultiReqBuffer *mrb)
for (i = 0; i < mrb->num_reqs; i++) {
VirtIOBlockReq *req = mrb->reqs[i];
if (num_reqs > 0) {
+ zone_cross = false;
+
+ /*
+ * On zoned backends, a single backend write must not span a zone
+ * boundary. Bail out of merging if combining req into the current
+ * batch would straddle a zone.
+ */
+ if (bs && bs->bl.zone_size > 0) {
+ zone_sector = bs->bl.zone_size / BDRV_SECTOR_SIZE;
+ end_sector = req->sector_num
+ + req->qiov.size / BDRV_SECTOR_SIZE - 1;
+ zone_cross = (sector_num / zone_sector) !=
+ (end_sector / zone_sector);
+ }
+
/*
* NOTE: We cannot merge the requests in below situations:
* 1. requests are not sequential
* 2. merge would exceed maximum number of IOVs
* 3. merge would exceed maximum transfer length of backend device
+ * 4. merge would cross a zone boundary on a zoned backend
*/
if (sector_num + nb_sectors != req->sector_num ||
niov > blk_get_max_iov(s->blk) - req->qiov.niov ||
req->qiov.size > max_transfer ||
nb_sectors > (max_transfer -
- req->qiov.size) / BDRV_SECTOR_SIZE) {
+ req->qiov.size) / BDRV_SECTOR_SIZE ||
+ zone_cross) {
submit_requests(s, mrb, start, num_reqs, niov);
num_reqs = 0;
}
diff --git a/include/qemu/queue.h b/include/qemu/queue.h
index e029e7bf66..3f0a48740e 100644
--- a/include/qemu/queue.h
+++ b/include/qemu/queue.h
@@ -179,6 +179,7 @@ struct { \
#define QLIST_EMPTY(head) ((head)->lh_first == NULL)
#define QLIST_FIRST(head) ((head)->lh_first)
#define QLIST_NEXT(elm, field) ((elm)->field.le_next)
+#define QLIST_LAST(head, field) (*(head)->lh_first->field.le_prev)
/*
diff --git a/include/qemu/range.h b/include/qemu/range.h
index d446ad885d..d39ba68407 100644
--- a/include/qemu/range.h
+++ b/include/qemu/range.h
@@ -213,6 +213,10 @@ static inline int range_covers_byte(uint64_t offset, uint64_t len,
static inline bool ranges_overlap(uint64_t first1, uint64_t len1,
uint64_t first2, uint64_t len2)
{
+ if (first1 + len1 == 0 || first2 + len2 == 0) {
+ return false;
+ }
+
uint64_t last1 = range_get_last(first1, len1);
uint64_t last2 = range_get_last(first2, len2);
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v10 4/4] iotests: test the zoned format feature for qcow2 file
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
` (2 preceding siblings ...)
2026-05-10 17:50 ` [PATCH v10 3/4] qcow2: add zoned emulation capability Sam Li
@ 2026-05-10 17:50 ` Sam Li
2026-05-14 18:38 ` [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Stefan Hajnoczi
4 siblings, 0 replies; 9+ messages in thread
From: Sam Li @ 2026-05-10 17:50 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, Stefan Hajnoczi, qemu-block, dlemoal,
Eric Blake, Michael S. Tsirkin, hare, Hanna Reitz, Sam Li
The zoned format feature can be tested by:
$ tests/qemu-iotests/check -qcow2 zoned-qcow2
Signed-off-by: Sam Li <faithilikerun@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/tests/zoned-qcow2 | 150 ++++++++++++++++++++
tests/qemu-iotests/tests/zoned-qcow2.out | 173 +++++++++++++++++++++++
2 files changed, 323 insertions(+)
create mode 100755 tests/qemu-iotests/tests/zoned-qcow2
create mode 100644 tests/qemu-iotests/tests/zoned-qcow2.out
diff --git a/tests/qemu-iotests/tests/zoned-qcow2 b/tests/qemu-iotests/tests/zoned-qcow2
new file mode 100755
index 0000000000..5dc76cb8eb
--- /dev/null
+++ b/tests/qemu-iotests/tests/zoned-qcow2
@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Test zone management operations for qcow2 file.
+#
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+status=1 # failure is the default!
+
+file_name="zbc.qcow2"
+_cleanup()
+{
+ _cleanup_test_img
+ _rm_test_img "$file_name"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ../common.rc
+. ../common.filter
+. ../common.qemu
+
+# This test only runs on Linux hosts with qcow2 image files.
+_supported_fmt qcow2
+_supported_proto file
+_supported_os Linux
+
+echo
+echo "=== Initial image setup ==="
+echo
+
+$QEMU_IMG create -f qcow2 $file_name -o size=768M -o zone.size=64M -o \
+zone.capacity=64M -o zone.conventional_zones=0 -o zone.max_append_bytes=32M \
+-o zone.max_open_zones=6 -o zone.max_active_zones=8 -o zone.mode=host-managed
+
+IMG="--image-opts -n driver=qcow2,file.driver=file,file.filename=$file_name"
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
+
+echo
+echo "=== Testing a qcow2 img with zoned format ==="
+echo
+echo "case 1: test zone operations one by one"
+
+echo "(1) report zones[0]:"
+$QEMU_IO $IMG -c "zrp 0 1"
+echo
+echo "report zones[0~9]:"
+$QEMU_IO $IMG -c "zrp 0 10"
+echo
+echo "report zones[-1]:" # zones[-1] dictates the last zone
+$QEMU_IO $IMG -c "zrp 0x2C000000 2" # 0x2C000000 / 512 = 0x160000
+echo
+echo
+echo "(2) open zones[0], zones[1], zones[-1] then close, finish, reset:"
+$QEMU_IO $IMG << EOF
+zo 0 0x4000000
+zrp 0 1
+zo 0x4000000 0x4000000
+zrp 0x4000000 1
+zo 0x2C000000 0x4000000
+zrp 0x2C000000 2
+zc 0 0x4000000
+zrp 0 1
+zc 0x4000000 0x4000000
+zrp 0x4000000 1
+zc 0x2C000000 0x4000000
+zrp 0x2C000000 2
+zf 0 0x4000000
+zrp 0 1
+zf 64M 64M
+zrp 0x4000000 2
+zf 0x2C000000 0x4000000
+zrp 0x2C000000 2
+zrs 0 0x4000000
+zrp 0 1
+zrs 0x4000000 0x4000000
+zrp 0x4000000 1
+zrs 0x2C000000 0x4000000
+zrp 0x2C000000 2
+EOF
+
+echo
+echo "(3) append write with (4k, 8k) data"
+$QEMU_IO $IMG -c "zrp 0 12" # the physical block size of the device is 4096
+echo "Append write zones[0], zones[1] twice"
+$QEMU_IO $IMG << EOF
+zap -p 0 0x1000 0x2000
+zrp 0 1
+zap -p 0 0x1000 0x2000
+zrp 0 1
+zap -p 0x4000000 0x1000 0x2000
+zrp 0x4000000 1
+zap -p 0x4000000 0x1000 0x2000
+zrp 0x4000000 1
+EOF
+
+echo
+echo "Reset all:"
+$QEMU_IO $IMG -c "zrp 0 12" -c "zrs 0 768M" -c "zrp 0 12"
+echo
+echo
+
+echo "case 2: test a sets of ops that works or not"
+echo "(1) append write (4k, 4k) and then write to full"
+$QEMU_IO $IMG << EOF
+zap -p 0 0x1000 0x1000
+zrp 0 1
+zap -p 0 0x1000 0x1ffd000
+zap -p 0 0x1000000 0x1000000
+zrp 0 1
+EOF
+
+echo "Reset zones[0]:"
+$QEMU_IO $IMG -c "zrs 0 64M" -c "zrp 0 1"
+
+echo "(2) write in zones[0], zones[3], zones[8], and then reset all"
+$QEMU_IO $IMG << EOF
+zap -p 0 0x1000 0x1000
+zap -p 0xc000000 0x1000 0x1000
+zap -p 0x20000000 0x1000 0x1000
+zrp 0 12
+zrs 0 768M
+zrp 0 12
+EOF
+
+echo "case 3: test zone resource management"
+echo "(1) write in zones[0], zones[1], zones[2] and then close it"
+$QEMU_IO $IMG << EOF
+zap -p 0 0x1000 0x1000
+zap -p 0x4000000 0x1000 0x1000
+zap -p 0x8000000 0x1000 0x1000
+zrp 0 12
+zc 0 64M
+zc 0x4000000 64M
+zc 0x8000000 64M
+zrp 0 12
+EOF
+
+echo "(2) reset all after 3(1)"
+$QEMU_IO $IMG << EOF
+zrs 0 768M
+zrp 0 12
+EOF
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/tests/zoned-qcow2.out b/tests/qemu-iotests/tests/zoned-qcow2.out
new file mode 100644
index 0000000000..b62865a487
--- /dev/null
+++ b/tests/qemu-iotests/tests/zoned-qcow2.out
@@ -0,0 +1,173 @@
+QA output created by zoned-qcow2
+
+=== Initial image setup ===
+
+Formatting 'zbc.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib zone.mode=host-managed zone.size=67108864 zone.capacity=67108864 zone.conventional_zones=0 zone.max_append_bytes=33554432 zone.max_active_zones=8 zone.max_open_zones=6 size=805306368 lazy_refcounts=off refcount_bits=16
+
+=== Testing a qcow2 img with zoned format ===
+
+case 1: test zone operations one by one
+(1) report zones[0]:
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+
+report zones[0~9]:
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+
+report zones[-1]:
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+
+
+(2) open zones[0], zones[1], zones[-1] then close, finish, reset:
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:3, [type: 2]
+qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:3, [type: 2]
+qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:3, [type: 2]
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcond:14, [type: 2]
+qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:14, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x180000, zcond:14, [type: 2]
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io>
+(3) append write with (4k, 8k) data
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+Append write zones[0], zones[1] twice
+qemu-io> After zap done, the append sector is 0x0
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x18, zcond:2, [type: 2]
+qemu-io> After zap done, the append sector is 0x18
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x30, zcond:2, [type: 2]
+qemu-io> After zap done, the append sector is 0x20000
+qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20018, zcond:2, [type: 2]
+qemu-io> After zap done, the append sector is 0x20018
+qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20030, zcond:2, [type: 2]
+qemu-io>
+Reset all:
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x30, zcond:4, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20030, zcond:4, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+
+
+case 2: test a sets of ops that works or not
+(1) append write (4k, 4k) and then write to full
+qemu-io> After zap done, the append sector is 0x0
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [type: 2]
+qemu-io> After zap done, the append sector is 0x10
+qemu-io> After zap done, the append sector is 0x10000
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcond:14, [type: 2]
+qemu-io> Reset zones[0]:
+start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+(2) write in zones[0], zones[3], zones[8], and then reset all
+qemu-io> After zap done, the append sector is 0x0
+qemu-io> After zap done, the append sector is 0x60000
+qemu-io> After zap done, the append sector is 0x100000
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60010, zcond:2, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100010, zcond:2, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> case 3: test zone resource management
+(1) write in zones[0], zones[1], zones[2] and then close it
+qemu-io> After zap done, the append sector is 0x0
+qemu-io> After zap done, the append sector is 0x20000
+qemu-io> After zap done, the append sector is 0x40000
+qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20010, zcond:2, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40010, zcond:2, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> qemu-io> qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:4, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20010, zcond:4, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40010, zcond:4, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> (2) reset all after 3(1)
+qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2]
+start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2]
+start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2]
+start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2]
+start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2]
+start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2]
+start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2]
+start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2]
+start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2]
+start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2]
+start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2]
+start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2]
+qemu-io> *** done
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
` (3 preceding siblings ...)
2026-05-10 17:50 ` [PATCH v10 4/4] iotests: test the zoned format feature for qcow2 file Sam Li
@ 2026-05-14 18:38 ` Stefan Hajnoczi
4 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2026-05-14 18:38 UTC (permalink / raw)
To: Sam Li
Cc: qemu-devel, Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, qemu-block, dlemoal, Eric Blake,
Michael S. Tsirkin, hare, Hanna Reitz
[-- Attachment #1: Type: text/plain, Size: 4722 bytes --]
On Sun, May 10, 2026 at 07:50:55PM +0200, Sam Li wrote:
> This patch series add a new extension - zoned format - to the
> qcow2 driver thereby allowing full zoned storage emulation on
> the qcow2 img file. Users can attach such a qcow2 file to the
> guest as a zoned device.
>
> Write pointer are preserved in the zoned metadata. It will be
> recovered after power cycle. Meanwhile, any open (implicit or
> explicit) zone will show up as closed.
>
> Zone states are in memory. Read-only and offline states are
> device-internal events, which are not considerred in qcow2
> emulation for simplicity. The other zone states
> (closed, empty, full) can be inferred from write poiner
> values, presistent across QEMU reboots. The open states are
> kept in memory using open zone lists.
>
Hi Sam,
Thanks for picking up this work again!
> To create a qcow2 file with zoned format, use command like this:
A qemu-img create command-line is missing here in the cover letter.
>
> Then add it to the QEMU command line:
> -blockdev node-name=drive1,driver=qcow2,file.driver=file,file.filename=../qemu/test.qcow2 \
> -device virtio-blk-pci,drive=drive1 \
>
> v9->v10:
> - add cross-boundary constraint for merging writes on zoned devices
> - extract call from assert() to fix image creation crash
>
> v8->v9:
> - fix compilation err after modifying types
>
> v7->v8:
> - sets default values for zoned img confurations [Markus, Damien]
> - changes the type of zone_size, zone_capacity from uint32_t to uint64_t [Stefan]
> - fix docs [Stefan]
> - modify append writes to increase concurrency [Damien, Stefan]
> - use tailqueue to track active zones [Stefan]
> - fix undefined behavior of ranges_overlap()
> - fix the iotest of case 2(1)
>
> v6->v7:
> - modify zone resource managemant (style) [Damien]
> - fix accessing list with negative index err
> - add some tests for zrm in iotests
> - address review comments [Markus]
>
> v5->v6:
> - fix docs and specs [Eric, Markus, Stefan]
> - add general sanity checks for zoned device configurations while creation and opening [Eric]
> - fix LRU when implicitly open a zone for a long time [Stefan]
>
> v4->v5:
> - add incompatible bit for zoned format [Eric]
> - fix and manage zone resources via LRU [Damien]
> - renaming functions and fields, spec changes [Markus, Damien]
> - add closed zone list
> - make qemu iotests for zoned device consecutive [Stefan]
>
> v3->v4:
> - use QLIST for implicit, explicit open zones management [Stefan]
> - keep zone states in memory and drop state bits in wp metadata structure [Damien, Stefan]
> - change zone resource management and iotests accordingly
> - add tracing for number of implicit zones
> - address review comments [Stefan, Markus]:
> * documentation, config, style
>
> v2->v3:
> - drop zoned_profile option [Klaus]
> - reformat doc comments of qcow2 [Markus]
> - add input validation and checks for zoned information [Stefan]
> - code style: format, comments, documentation, naming [Stefan]
> - add tracing function for wp tracking [Stefan]
> - reconstruct io path in check_zone_resources [Stefan]
>
> v1->v2:
> - add more tests to qemu-io zoned commands
> - make zone append change state to full when wp reaches end
> - add documentation to qcow2 zoned extension header
> - address review comments (Stefan):
> * fix zoned_mata allocation size
> * use bitwise or than addition
> * fix wp index overflow and locking
> * cleanups: comments, naming
>
> Sam Li (4):
> docs/qcow2: add the zoned format feature
> qcow2: add configurations for zoned format extension
> qcow2: add zoned emulation capability
> iotests: test the zoned format feature for qcow2 file
>
> block/file-posix.c | 2 +-
> block/qcow2.c | 1113 +++++++++++++++++++++-
> block/qcow2.h | 39 +-
> block/trace-events | 2 +
> docs/interop/qcow2.rst | 110 ++-
> docs/system/qemu-block-drivers.rst.inc | 42 +
> hw/block/virtio-blk.c | 22 +-
> include/block/block_int-common.h | 15 +-
> include/qemu/queue.h | 1 +
> include/qemu/range.h | 4 +
> qapi/block-core.json | 70 +-
> tests/qemu-iotests/tests/zoned-qcow2 | 150 +++
> tests/qemu-iotests/tests/zoned-qcow2.out | 173 ++++
> 13 files changed, 1730 insertions(+), 13 deletions(-)
> create mode 100755 tests/qemu-iotests/tests/zoned-qcow2
> create mode 100644 tests/qemu-iotests/tests/zoned-qcow2.out
>
> --
> 2.43.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v10 1/4] docs/qcow2: add the zoned format feature
2026-05-10 17:50 ` [PATCH v10 1/4] docs/qcow2: add the zoned format feature Sam Li
@ 2026-05-14 18:47 ` Stefan Hajnoczi
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2026-05-14 18:47 UTC (permalink / raw)
To: Sam Li
Cc: qemu-devel, Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, qemu-block, dlemoal, Eric Blake,
Michael S. Tsirkin, hare, Hanna Reitz
[-- Attachment #1: Type: text/plain, Size: 3054 bytes --]
On Sun, May 10, 2026 at 07:50:56PM +0200, Sam Li wrote:
> Add the specs for the zoned format feature of the qcow2 driver.
> The qcow2 file then can emulate real zoned devices, either passed
> through by virtio-blk device or NVMe ZNS drive to the guest
> given zoned information.
>
> Signed-off-by: Sam Li <faithilikerun@gmail.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> docs/system/qemu-block-drivers.rst.inc | 42 ++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-block-drivers.rst.inc
> index 384e95ba76..5066c943d5 100644
> --- a/docs/system/qemu-block-drivers.rst.inc
> +++ b/docs/system/qemu-block-drivers.rst.inc
> @@ -172,6 +172,48 @@ This section describes each format and the options that are supported for it.
> filename`` to check if the NOCOW flag is set or not (Capital 'C' is
> NOCOW flag).
>
> + .. option:: zone.mode
> + If this is set to ``host-managed``, the image is an emulated zoned
> + block device. This option is only valid to emulated zoned device files.
> +
> + .. option:: zone.size
> +
> + The size of a zone in bytes. The device is divided into zones of this
> + size with the exception of the last zone, which may be smaller.
This option is required when zone.mode=host-managed?
It would be useful to indicate whether each option listed here is
required or has a default value when absent.
> +
> + .. option:: zone.capacity
> +
> + The initial capacity value, in bytes, for all zones. The capacity must
> + be less than or equal to zone size. If the last zone is smaller, then
> + its capacity is capped.
> +
> + The zone capacity is per zone and may be different between zones in real
> + devices. QCow2 sets all zones to the same capacity.
This defaults to zone.size?
> +
> + .. option:: zone.conventional_zones
> +
> + The number of conventional zones of the zoned device.
This defaults to (size + size.size - 1) / zone.size?
> +
> + .. option:: zone.max_active_zones
> +
> + The limit of the zones with implicit open, explicit open or closed state.
> +
> + The max active zones must be less or equal to the number of SWR
> + (sequential write required) zones of the device.
This defaults to (size + size.size - 1) / zone.size?
> +
> + .. option:: zone.max_open_zones
> +
> + The maximal allowed open zones. The max open zones must not be larger than
> + the max active zones.
> +
> + If the limits of open zones or active zones are equal to the number of
> + SWR zones, then it is the same as having no limits.
This defaults to max_active_zones?
> + .. option:: zone.max_append_bytes
> +
> + The number of bytes in a zone append request that can be issued to the
> + device. It must be 512-byte aligned and less than the zone capacity.
Is there a default?
> +
> .. program:: image-formats
> .. option:: qed
>
> --
> 2.43.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v10 2/4] qcow2: add configurations for zoned format extension
2026-05-10 17:50 ` [PATCH v10 2/4] qcow2: add configurations for zoned format extension Sam Li
@ 2026-05-14 19:49 ` Stefan Hajnoczi
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2026-05-14 19:49 UTC (permalink / raw)
To: Sam Li
Cc: qemu-devel, Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, qemu-block, dlemoal, Eric Blake,
Michael S. Tsirkin, hare, Hanna Reitz
[-- Attachment #1: Type: text/plain, Size: 36491 bytes --]
On Sun, May 10, 2026 at 07:50:57PM +0200, Sam Li wrote:
> To configure the zoned format feature on the qcow2 driver, it
> requires settings as: the device size, zone model, zone size,
> zone capacity, number of conventional zones, limits on zone
> resources (max append bytes, max open zones, and max_active_zones).
>
> To create a qcow2 image with zoned format feature, use command like
> this:
> qemu-img create -f qcow2 zbc.qcow2 -o size=768M \
> -o zone.size=64M -o zone.capacity=64M -o zone.conventional_zones=0 \
> -o zone.max_append_bytes=4096 -o zone.max_open_zones=6 \
> -o zone.max_active_zones=8 -o zone.mode=host-managed
>
> Signed-off-by: Sam Li <faithilikerun@gmail.com>
> ---
> block/file-posix.c | 2 +-
> block/qcow2.c | 264 ++++++++++++++++++++++++++++++-
> block/qcow2.h | 32 +++-
> docs/interop/qcow2.rst | 110 ++++++++++++-
> include/block/block_int-common.h | 15 +-
> qapi/block-core.json | 70 +++++++-
> 6 files changed, 485 insertions(+), 8 deletions(-)
>
> diff --git a/block/file-posix.c b/block/file-posix.c
> index e49b13d6ab..14278785b9 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -3607,7 +3607,7 @@ raw_co_zone_append(BlockDriverState *bs,
>
> if (*offset & zone_size_mask) {
> error_report("sector offset %" PRId64 " is not aligned to zone size "
> - "%" PRId32 "", *offset / 512, bs->bl.zone_size / 512);
> + "%" PRId64 "", *offset / 512, bs->bl.zone_size / 512);
> return -EINVAL;
> }
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 81fd299b4c..b543bcf3e3 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -73,6 +73,7 @@ typedef struct {
> #define QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77
> #define QCOW2_EXT_MAGIC_BITMAPS 0x23852875
> #define QCOW2_EXT_MAGIC_DATA_FILE 0x44415441
> +#define QCOW2_EXT_MAGIC_ZONED_FORMAT 0x007a6264
>
> static int coroutine_fn
> qcow2_co_preadv_compressed(BlockDriverState *bs,
> @@ -194,6 +195,74 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *fmt, Error **errp)
> return cryptoopts_qdict;
> }
>
> +/*
> + * Passing by the zoned device configurations by a zoned_header struct, check
> + * if the zone device options are under constraints. Return false when some
> + * option is invalid
> + */
> +static inline bool
> +qcow2_check_zone_options(Qcow2ZonedHeaderExtension *zone_opt, Error **errp)
> +{
> + if (zone_opt) {
The zone_opt == NULL case never happens. Remove it to simplify the
function?
> + uint32_t sequential_zones;
> +
> + if (zone_opt->zone_size == 0) {
> + error_setg(errp, "Zoned extension header zone_size field "
> + "can not be 0");
> + return false;
> + }
> +
> + if (zone_opt->zone_capacity > zone_opt->zone_size) {
> + error_setg(errp, "zone capacity %" PRIu64 "B exceeds zone size "
> + "%" PRIu64 "B", zone_opt->zone_capacity,
> + zone_opt->zone_size);
> + return false;
> + }
> +
> + if (zone_opt->max_append_bytes + BDRV_SECTOR_SIZE >=
> + zone_opt->zone_capacity) {
> + error_setg(errp, "max append bytes %" PRIu64 "B exceeds zone "
> + "capacity %" PRIu32 "B by more than block size",
> + zone_opt->zone_capacity,
> + zone_opt->max_append_bytes);
> + return false;
> + }
> +
> + if (zone_opt->conventional_zones >= zone_opt->nr_zones) {
> + error_setg(errp, "Conventional_zones %" PRIu32 " exceeds "
> + "nr_zones %" PRIu32 ".",
> + zone_opt->conventional_zones, zone_opt->nr_zones);
> + return false;
> + }
> +
> + if (zone_opt->max_active_zones > zone_opt->nr_zones) {
> + error_setg(errp, "Max_active_zones %" PRIu32 " exceeds "
> + "nr_zones %" PRIu32 ". Set it to nr_zones.",
> + zone_opt->max_active_zones, zone_opt->nr_zones);
> + zone_opt->max_active_zones = zone_opt->nr_zones;
> + }
> +
> + sequential_zones = zone_opt->nr_zones - zone_opt->conventional_zones;
> + if (zone_opt->max_open_zones > sequential_zones) {
> + error_setg(errp, "Max_open_zones field can not be larger than"
> + "the number of SWR zones. Set it to number of SWR"
> + "zones %" PRIu32 ".", sequential_zones);
> + zone_opt->max_open_zones = sequential_zones;
> + }
> + if (zone_opt->max_open_zones > zone_opt->max_active_zones) {
> + error_setg(errp, "Max_open_zones %" PRIu32 " exceeds "
> + "max_active_zones %" PRIu32 ". Set it to "
> + "max_active_zones.",
> + zone_opt->max_open_zones,
> + zone_opt->max_active_zones);
> + zone_opt->max_open_zones = zone_opt->max_active_zones;
> + }
> +
> + return true;
> + }
> + return false;
> +}
> +
> /*
> * read qcow2 extension and fill bs
> * start reading from start_offset
> @@ -211,6 +280,7 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
> uint64_t offset;
> int ret;
> Qcow2BitmapHeaderExt bitmaps_ext;
> + Qcow2ZonedHeaderExtension zoned_ext;
>
> if (need_update_header != NULL) {
> *need_update_header = false;
> @@ -432,6 +502,51 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
> break;
> }
>
> + case QCOW2_EXT_MAGIC_ZONED_FORMAT:
> + {
> + if (ext.len < sizeof(zoned_ext)) {
Should this be ext.len != sizeof(zoned_ext)?
> + /* Missing fields */
> + error_setg(errp, "zoned_ext: len=%" PRIu32 " too small "
> + "(<%zu)", ext.len, sizeof(zoned_ext));
> + return -EINVAL;
> + }
> + ret = bdrv_pread(bs->file, offset, ext.len, &zoned_ext, 0);
...otherwise we cannot read ext.len bytes into &zoned_ext because it
could overflow.
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "zoned_ext: "
> + "Could not read ext header");
> + return ret;
> + }
> +
> + zoned_ext.zone_size = be64_to_cpu(zoned_ext.zone_size);
> + zoned_ext.zone_capacity = be64_to_cpu(zoned_ext.zone_capacity);
> + zoned_ext.conventional_zones =
> + be32_to_cpu(zoned_ext.conventional_zones);
> + zoned_ext.nr_zones = be32_to_cpu(zoned_ext.nr_zones);
> + 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);
> + zoned_ext.max_append_bytes =
> + be32_to_cpu(zoned_ext.max_append_bytes);
> + s->zoned_header = zoned_ext;
> +
> + /* refuse to open broken images */
> + if (zoned_ext.nr_zones != DIV_ROUND_UP(bs->total_sectors *
> + BDRV_SECTOR_SIZE, zoned_ext.zone_size)) {
> + error_setg(errp, "Zoned extension header nr_zones field "
> + "is wrong");
> + return -EINVAL;
> + }
> + if (!qcow2_check_zone_options(&zoned_ext, errp)) {
> + return -EINVAL;
> + }
> +
> +#ifdef DEBUG_EXT
> + printf("Qcow2: Got zoned format extension: "
> + "offset=%" PRIu32 "\n", offset);
> +#endif
> + break;
> + }
> +
> default:
> /* unknown magic - save it in case we need to rewrite the header */
> /* If you add a new feature, make sure to also update the fast
> @@ -2068,6 +2183,15 @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
> }
> bs->bl.pwrite_zeroes_alignment = s->subcluster_size;
> bs->bl.pdiscard_alignment = s->cluster_size;
> + bs->bl.zoned = s->zoned_header.zoned;
Let's avoid the assumption that qcow2 file format constants are
identical to internal QEMU block layer API constants (see more on this
below). This will need to translate from the qcow2 zoned header
host-managed constant to the QEMU block layer constant.
> + bs->bl.nr_zones = s->zoned_header.nr_zones;
> + bs->bl.max_append_sectors = s->zoned_header.max_append_bytes
> + >> BDRV_SECTOR_BITS;
> + bs->bl.max_active_zones = s->zoned_header.max_active_zones;
> + bs->bl.max_open_zones = s->zoned_header.max_open_zones;
> + 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;
> }
>
> static int GRAPH_UNLOCKED
> @@ -3170,6 +3294,11 @@ int qcow2_update_header(BlockDriverState *bs)
> .bit = QCOW2_INCOMPAT_EXTL2_BITNR,
> .name = "extended L2 entries",
> },
> + {
> + .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,
> + .bit = QCOW2_INCOMPAT_ZONED_FORMAT_BITNR,
> + .name = "zoned format",
> + },
> {
> .type = QCOW2_FEAT_TYPE_COMPATIBLE,
> .bit = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
> @@ -3215,6 +3344,31 @@ int qcow2_update_header(BlockDriverState *bs)
> buflen -= ret;
> }
>
> + /* Zoned devices header extension */
> + if (s->zoned_header.zoned == BLK_Z_HM) {
> + Qcow2ZonedHeaderExtension zoned_header = {
> + .zoned = s->zoned_header.zoned,
> + .zone_size = cpu_to_be64(s->zoned_header.zone_size),
> + .zone_capacity = cpu_to_be64(s->zoned_header.zone_capacity),
> + .conventional_zones =
> + cpu_to_be32(s->zoned_header.conventional_zones),
> + .nr_zones = cpu_to_be32(s->zoned_header.nr_zones),
> + .max_open_zones = cpu_to_be32(s->zoned_header.max_open_zones),
> + .max_active_zones =
> + cpu_to_be32(s->zoned_header.max_active_zones),
> + .max_append_bytes =
> + cpu_to_be32(s->zoned_header.max_append_bytes)
> + };
> + ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT,
> + &zoned_header, sizeof(zoned_header),
> + buflen);
> + if (ret < 0) {
> + goto fail;
> + }
> + buf += ret;
> + buflen -= ret;
> + }
> +
> /* Keep unknown header extensions */
> QLIST_FOREACH(uext, &s->unknown_header_ext, next) {
> ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);
> @@ -3589,6 +3743,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> ERRP_GUARD();
> BlockdevCreateOptionsQcow2 *qcow2_opts;
> QDict *options;
> + Qcow2ZoneCreateOptions *zone_struct;
> + Qcow2ZoneHostManaged *zone_host_managed;
>
> /*
> * Open the image file and write a minimal qcow2 header.
> @@ -3615,6 +3771,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
>
> assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);
> qcow2_opts = &create_options->u.qcow2;
> + zone_struct = create_options->u.qcow2.zone;
> + zone_host_managed = &create_options->u.qcow2.zone->u.host_managed;
>
> bs = bdrv_co_open_blockdev_ref(qcow2_opts->file, errp);
> if (bs == NULL) {
> @@ -3828,6 +3986,14 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> header->incompatible_features |=
> cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE);
> }
> + if (zone_struct && zone_struct->mode == QCOW2_ZONE_MODEL_HOST_MANAGED) {
> + /*
> + * The incompatible bit must be set when the zone model is
> + * host-managed
> + */
> + header->incompatible_features |=
> + cpu_to_be64(QCOW2_INCOMPAT_ZONED_FORMAT);
> + }
> if (qcow2_opts->data_file_raw) {
> header->autoclear_features |=
> cpu_to_be64(QCOW2_AUTOCLEAR_DATA_FILE_RAW);
> @@ -3885,10 +4051,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> bdrv_graph_co_rdlock();
> ret = qcow2_alloc_clusters(blk_bs(blk), 3 * cluster_size);
> if (ret < 0) {
> - bdrv_graph_co_rdunlock();
> error_setg_errno(errp, -ret, "Could not allocate clusters for qcow2 "
> "header and refcount table");
> - goto out;
> + goto unlock;
>
> } else if (ret != 0) {
> error_report("Huh, first cluster in empty image is already in use?");
> @@ -3896,11 +4061,62 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> }
>
> /* Set the external data file if necessary */
> + BDRVQcow2State *s = blk_bs(blk)->opaque;
> if (data_bs) {
> - BDRVQcow2State *s = blk_bs(blk)->opaque;
> s->image_data_file = g_strdup(data_bs->filename);
> }
>
> + if (zone_struct && zone_struct->mode == QCOW2_ZONE_MODEL_HOST_MANAGED) {
> + s->zoned_header.zoned = BLK_Z_HM;
BLK_Z_HM is a QEMU block layer constant while zoned_header.zoned is a
qcow2 file format field. Please do not mix the two, even if the constant
values are identical. Instead, define a constant for host-manager (1) in
block/qcow2.h and use that. This ensures that QEMU's interval constant
values can be changed in the future and are not tied to the qcow2 file
format.
> +
> + if (!zone_host_managed->has_size) {
> + s->zoned_header.zone_size = DEFAULT_ZONE_SIZE;
> + } else {
> + s->zoned_header.zone_size = zone_host_managed->size;
> + }
> + s->zoned_header.nr_zones = DIV_ROUND_UP(qcow2_opts->size,
> + s->zoned_header.zone_size);
> +
> + if (zone_host_managed->has_capacity) {
> + s->zoned_header.zone_capacity = zone_host_managed->capacity;
> + } else {
> + s->zoned_header.zone_capacity = s->zoned_header.zone_size;
> + }
> +
> + if (zone_host_managed->has_conventional_zones) {
> + s->zoned_header.conventional_zones =
> + zone_host_managed->conventional_zones;
> + }
> +
> + if (zone_host_managed->has_max_active_zones) {
> + s->zoned_header.max_active_zones =
> + zone_host_managed->max_active_zones;
> +
> + if (zone_host_managed->has_max_open_zones) {
> + s->zoned_header.max_open_zones =
> + zone_host_managed->max_open_zones;
> + } else {
> + s->zoned_header.max_open_zones =
> + zone_host_managed->max_active_zones;
> + }
> + }
> +
> + if (zone_host_managed->has_max_append_bytes) {
> + s->zoned_header.max_append_bytes =
> + zone_host_managed->max_append_bytes;
> + } else {
> + s->zoned_header.max_append_bytes = DEFAULT_MAX_APPEND_BYTES;
> + }
> +
> + if (!qcow2_check_zone_options(&s->zoned_header, errp)) {
> + s->zoned_header.zoned = BLK_Z_NONE;
> + ret = -EINVAL;
> + goto unlock;
> + }
> + } else {
> + s->zoned_header.zoned = BLK_Z_NONE;
> + }
> +
> /* Create a full header (including things like feature table) */
> ret = qcow2_update_header(blk_bs(blk));
> bdrv_graph_co_rdunlock();
> @@ -3974,6 +4190,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> }
>
> ret = 0;
> + goto out;
> +unlock:
> + bdrv_graph_co_rdunlock();
> out:
> blk_co_unref(blk);
> bdrv_co_unref(bs);
> @@ -4052,6 +4271,10 @@ qcow2_co_create_opts(BlockDriver *drv, const char *filename, QemuOpts *opts,
> { BLOCK_OPT_COMPAT_LEVEL, "version" },
> { BLOCK_OPT_DATA_FILE_RAW, "data-file-raw" },
> { BLOCK_OPT_COMPRESSION_TYPE, "compression-type" },
> + { BLOCK_OPT_CONVENTIONAL_ZONES, "zone.conventional-zones" },
> + { 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" },
> { NULL, NULL },
> };
>
> @@ -6265,6 +6488,41 @@ static QemuOptsList qcow2_create_opts = {
> .type = QEMU_OPT_BOOL, \
> .help = "Assume the external data file already exists and " \
> "do not overwrite it" \
> + }, \
> + { \
> + .name = BLOCK_OPT_ZONE_MODEL, \
> + .type = QEMU_OPT_STRING, \
> + .help = "zone model modes, mode choice: host-managed", \
> + }, \
> + { \
> + .name = BLOCK_OPT_ZONE_SIZE, \
> + .type = QEMU_OPT_SIZE, \
> + .help = "zone size", \
> + }, \
> + { \
> + .name = BLOCK_OPT_ZONE_CAPACITY, \
> + .type = QEMU_OPT_SIZE, \
> + .help = "zone capacity", \
> + }, \
> + { \
> + .name = BLOCK_OPT_CONVENTIONAL_ZONES, \
> + .type = QEMU_OPT_NUMBER, \
> + .help = "numbers of conventional zones", \
> + }, \
> + { \
> + .name = BLOCK_OPT_MAX_APPEND_BYTES, \
> + .type = QEMU_OPT_SIZE, \
> + .help = "max append bytes", \
> + }, \
> + { \
> + .name = BLOCK_OPT_MAX_ACTIVE_ZONES, \
> + .type = QEMU_OPT_NUMBER, \
> + .help = "max active zones", \
> + }, \
> + { \
> + .name = BLOCK_OPT_MAX_OPEN_ZONES, \
> + .type = QEMU_OPT_NUMBER, \
> + .help = "max open zones", \
> },
> QCOW_COMMON_OPTIONS,
> { /* end of list */ }
> diff --git a/block/qcow2.h b/block/qcow2.h
> index 192a45d596..743f2e3e79 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -129,6 +129,9 @@
>
> #define DEFAULT_CLUSTER_SIZE 65536
>
> +#define DEFAULT_ZONE_SIZE (256 * MiB)
> +#define DEFAULT_MAX_APPEND_BYTES (64 * KiB)
DEFAULT_ZONE_MAX_APPEND_BYTES would make it clear that this constant is
related to zones.
> +
> #define QCOW2_OPT_DATA_FILE "data-file"
> #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
> #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"
> @@ -237,6 +240,27 @@ typedef struct Qcow2CryptoHeaderExtension {
> uint64_t length;
> } QEMU_PACKED Qcow2CryptoHeaderExtension;
>
> +typedef struct Qcow2ZonedHeaderExtension {
> + /* Zoned device attributes */
> + uint8_t zoned;
> + uint8_t reserved[3];
I suggest padding to natural alignment so there is no need to worry
about misaligned loads/stores:
uint8_t reserved[7];
> + uint64_t zone_size;
> + uint64_t zone_capacity;
> + uint32_t conventional_zones;
> + uint32_t nr_zones;
> + uint32_t max_active_zones;
> + uint32_t max_open_zones;
> + uint32_t max_append_bytes;
> + uint64_t zonedmeta_size;
> + uint64_t zonedmeta_offset;
> +} QEMU_PACKED Qcow2ZonedHeaderExtension;
> +
> +typedef struct Qcow2ZoneListEntry {
> + QLIST_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
> + QLIST_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
> + QLIST_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
> +} Qcow2ZoneListEntry;
> +
> typedef struct Qcow2UnknownHeaderExtension {
> uint32_t magic;
> uint32_t len;
> @@ -257,17 +281,20 @@ enum {
> QCOW2_INCOMPAT_DATA_FILE_BITNR = 2,
> QCOW2_INCOMPAT_COMPRESSION_BITNR = 3,
> QCOW2_INCOMPAT_EXTL2_BITNR = 4,
> + QCOW2_INCOMPAT_ZONED_FORMAT_BITNR = 5,
> QCOW2_INCOMPAT_DIRTY = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
> QCOW2_INCOMPAT_CORRUPT = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
> QCOW2_INCOMPAT_DATA_FILE = 1 << QCOW2_INCOMPAT_DATA_FILE_BITNR,
> QCOW2_INCOMPAT_COMPRESSION = 1 << QCOW2_INCOMPAT_COMPRESSION_BITNR,
> QCOW2_INCOMPAT_EXTL2 = 1 << QCOW2_INCOMPAT_EXTL2_BITNR,
> + QCOW2_INCOMPAT_ZONED_FORMAT = 1 << QCOW2_INCOMPAT_ZONED_FORMAT_BITNR,
>
> QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY
> | QCOW2_INCOMPAT_CORRUPT
> | QCOW2_INCOMPAT_DATA_FILE
> | QCOW2_INCOMPAT_COMPRESSION
> - | QCOW2_INCOMPAT_EXTL2,
> + | QCOW2_INCOMPAT_EXTL2
> + | QCOW2_INCOMPAT_ZONED_FORMAT,
> };
>
> /* Compatible feature bits */
> @@ -426,6 +453,9 @@ typedef struct BDRVQcow2State {
> * is to convert the image with the desired compression type set.
> */
> Qcow2CompressionType compression_type;
> +
> + /* States of zoned device */
> + Qcow2ZonedHeaderExtension zoned_header;
> } BDRVQcow2State;
>
> typedef struct Qcow2COWRegion {
> diff --git a/docs/interop/qcow2.rst b/docs/interop/qcow2.rst
> index 5948591107..7bf3a00e77 100644
> --- a/docs/interop/qcow2.rst
> +++ b/docs/interop/qcow2.rst
> @@ -128,7 +128,26 @@ the next fields through ``header_length``.
> allows subcluster-based allocation. See the
> Extended L2 Entries section for more details.
>
> - Bits 5-63: Reserved (set to 0)
> + Bit 5: Zoned extension bit. If this bit is set then
> + the file is an emulated zoned device. The
> + zoned extension must be present.
> + Implementations that do not support zoned
> + emulation cannot open this file because it
> + generally only make sense to interpret the
> + data along with the zone information and
> + write pointers.
> +
> + It is unsafe when any qcow2 user without
> + knowing the zoned extension reads or edits
> + a file with the zoned extension. The write
> + pointer tracking can be corrupted when a
> + writer edits a file, like overwriting beyond
> + the write pointer locations. Or a reader tries
> + to access a file without knowing write
> + pointers where the software setup will cause
> + invalid reads.
> +
> + Bits 6-63: Reserved (set to 0)
>
> 80 - 87: compatible_features
> Bitmask of compatible features. An implementation can
> @@ -259,6 +278,7 @@ be stored. Each extension has a structure like the following::
> 0x23852875 - Bitmaps extension
> 0x0537be77 - Full disk encryption header pointer
> 0x44415441 - External data file name string
> + 0x007a6264 - Zoned extension
> other - Unknown header extension, can be safely
> ignored
>
> @@ -344,6 +364,94 @@ The fields of the bitmaps extension are::
> Offset into the image file at which the bitmap directory
> starts. Must be aligned to a cluster boundary.
>
> +Zoned extension
> +---------------
> +
> +The zoned extension must be present if the incompatible bit is set, and
> +omitted when the incompatible bit is clear. It contains fields for
The first sentence is a little vague about the "incompatible bit".
Either saying "the corresponding incompatible bit" or
"incompatible_features bit 5" is more specific and gives the reader an
indication that they need to look for a specific bit.
> +emulating the zoned storage model (https://zonedstorage.io/). When the
> +zone model mode is not host-managed, it is regarded as incompatible
> +and reports an error to users.
This sentence is unnecessary because the same information is repeated in
the zoned field description below. I suggest removing it since the zoned
field description provides more context, but if you want you could
replace it with something like:
Currently only the host-managed zone model is supported.
> +
> +The write pointers for each zone are stored in an area called zonedmeta
> +clusters. It is 8 bytes per zone. The offset and size of the zonedmeta
Slightly more descriptive:
"It is 8 bytes per zone" -> "The zonedmeta clusters contain a table of
the zone write pointers. Each entry is 8 bytes."
> +are kept in the zoned extension header.
> +
> +The fields of the zoned extension are::
> +
> + Byte 0: zoned
> + The byte represents the zoned model of the device. 0 is for
> + a non-zoned device (all other information in this header
> + is ignored). 1 is for a host-managed device, which only
> + allows for sequential writes within each zone. Other
> + values may be added later, the implementation must refuse
> + to open a device containing an unknown zone model.
> +
> + 1 - 3: Reserved, must be zero.
> +
> + 4 - 11: zone_size
> + Total size of each zone, in bytes. The 64-bit field is to
> + satisfy the virtio-blk zone_size range and emulate a read
> + zoned device, whose maximum zone size can be as large as
> + 2TB.
> +
> + The value must be power of 2. Linux currently requires
> + the zone size to be a power of 2 number of LBAs. Qcow2
> + following this is mainly to allow emulating a real
> + ZNS drive configuration. It is not relevant to the cluster
> + size.
> +
> + 12 - 19: zone_capacity
> + The number of writable bytes within the zones. The bytes
> + between zone capacity and zone size are unusable: reads
> + will return 0s and writes will fail.
> +
> + A zone capacity is always smaller or equal to the zone
> + size. It is for emulating a real ZNS drive configuration,
> + which has the constraint of aligning to some hardware erase
> + block size.
> +
> + 20 - 23: conventional_zones
> + The number of conventional zones. The conventional zones
> + allow sequential writes and random writes. While the
> + sequential zones only allow sequential writes.
> +
> + 24 - 27: nr_zones
> + The number of zones. It is the sum of conventional zones
> + and sequential zones. The maximum value for nr_zones is
> + (2^32 - 1)/8 = 536870911.
> +
> + 28 - 31: max_active_zones
> + The number of the zones that can be in the implicit open,
> + explicit open or closed state. The max active zones cannot
> + be larger than the max open zones.
> +
> + 32 - 35: max_open_zones
> + The maximal number of open (implicitly open or explicitly
> + open) zones. It cannot be larger than the number of SWR
> + zones of the device.
> +
> + If the limits of open zones or active zones are equal to
> + the total number of SWR zones, then it's the same as having
> + no limits therefore max open zones and max active zones are
> + set to 0.
> +
> + 36 - 39: max_append_bytes
> + The number of bytes of a zone append request that can be
> + issued to the device. It must be 512-byte aligned and less
> + than the zone capacity.
> +
> + 40 - 47: zonedmeta_size
> + The size of zoned metadata in bytes. It contains no more
> + than 4GB. The zoned metadata structure is the write
> + pointers for each zone whose size is the number of zones
> + multiplied by the zone size.
I can't parse the last sentence. Is this field necessary since there is
already a nr_zones field?
> +
> + 48 - 55: zonedmeta_offset
> + The offset of zoned metadata structure in the contained
> + image, in bytes.
Do you want to say anything about the order in which metadata is
persisted to disk when zones used? I guess the data is written into the
image file first, then the non-zoned qcow2 L1/L2/refcount metadata is
updated, and finally the write pointer is written. Write pointers are
not guaranteed to be updated on disk until the write request followed by
a flush request are both completed.
(The idea is that the data must be visible in the qcow2 file before it
is safe to update the write pointer. Otherwise a power failure would
leave the file in an inconsistent state where the write pointer has
advanced but the data was not written.)
> Full disk encryption header pointer
> -----------------------------------
>
> diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
> index 147c08155f..349876bc65 100644
> --- a/include/block/block_int-common.h
> +++ b/include/block/block_int-common.h
> @@ -57,6 +57,13 @@
> #define BLOCK_OPT_COMPRESSION_TYPE "compression_type"
> #define BLOCK_OPT_EXTL2 "extended_l2"
> #define BLOCK_OPT_KEEP_DATA_FILE "keep_data_file"
> +#define BLOCK_OPT_ZONE_MODEL "zone.mode"
> +#define BLOCK_OPT_ZONE_SIZE "zone.size"
> +#define BLOCK_OPT_ZONE_CAPACITY "zone.capacity"
> +#define BLOCK_OPT_CONVENTIONAL_ZONES "zone.conventional_zones"
> +#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_PROBE_BUF_SIZE 512
>
> @@ -901,7 +908,13 @@ typedef struct BlockLimits {
> BlockZoneModel zoned;
>
> /* zone size expressed in bytes */
> - uint32_t zone_size;
> + uint64_t zone_size;
> +
> + /*
> + * The number of usable logical blocks within the zone, expressed
> + * in bytes. A zone capacity is smaller or equal to the zone size.
> + */
> + uint64_t zone_capacity;
>
> /* total number of zones */
> uint32_t nr_zones;
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 508b081ac1..d771dfb4a1 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -5268,6 +5268,70 @@
> { 'enum': 'Qcow2CompressionType',
> 'data': [ 'zlib', { 'name': 'zstd', 'if': 'CONFIG_ZSTD' } ] }
>
> +##
> +# @Qcow2ZoneModel:
> +#
> +# Zoned device model used in qcow2 image file
> +#
> +# @host-managed: The host-managed model only allows sequential write
> +# over the device zones.
> +#
> +# Since 11.0
> +##
> +{ 'enum': 'Qcow2ZoneModel',
> + 'data': [ 'host-managed'] }
> +
> +##
> +# @Qcow2ZoneHostManaged:
> +#
> +# The host-managed zone model. It only allows sequential writes.
> +#
> +# @size: Total number of bytes within zones (default 256 MB).
> +#
> +# @capacity: The number of usable logical blocks within zones
> +# in bytes. A zone capacity is always smaller or equal to the
> +# zone size (default to zone size).
> +#
> +# @conventional-zones: The number of conventional zones of the
> +# zoned device (default 0).
> +#
> +# @max-open-zones: The maximal number of open zones. It is less than
> +# or equal to the number of sequential write required zones of
> +# the device (default 0).
> +#
> +# @max-active-zones: The maximal number of zones in the implicit
> +# open, explicit open or closed state. It is less than or equal
> +# to the max open zones (default 0).
> +#
> +# @max-append-bytes: The maximal number of bytes of a zone
> +# append request that can be issued to the device. It must be
> +# 512-byte aligned and less than the zone capacity
> +# (default 64 KB).
> +#
> +# Since 11.0
> +##
> +{ 'struct': 'Qcow2ZoneHostManaged',
> + 'data': { '*size': 'size',
> + '*capacity': 'size',
> + '*conventional-zones': 'uint32',
> + '*max-open-zones': 'uint32',
> + '*max-active-zones': 'uint32',
> + '*max-append-bytes': 'size' } }
> +
> +##
> +# @Qcow2ZoneCreateOptions:
> +#
> +# The zone device model for the qcow2 image.
> +#
> +# @mode: The zone device model modes.
> +#
> +# Since 11.0
> +##
> +{ 'union': 'Qcow2ZoneCreateOptions',
> + 'base': { 'mode': 'Qcow2ZoneModel' },
> + 'discriminator': 'mode',
> + 'data': { 'host-managed': 'Qcow2ZoneHostManaged' } }
> +
> ##
> # @BlockdevCreateOptionsQcow2:
> #
> @@ -5310,6 +5374,9 @@
> # @compression-type: The image cluster compression method
> # (default: zlib, since 5.1)
> #
> +# @zone: The zone device model modes. The default is that the
> +# device is not zoned. (since 11.0)
> +#
> # Since: 2.12
> ##
> { 'struct': 'BlockdevCreateOptionsQcow2',
> @@ -5326,7 +5393,8 @@
> '*preallocation': 'PreallocMode',
> '*lazy-refcounts': 'bool',
> '*refcount-bits': 'int',
> - '*compression-type':'Qcow2CompressionType' } }
> + '*compression-type':'Qcow2CompressionType',
> + '*zone': 'Qcow2ZoneCreateOptions' } }
>
> ##
> # @BlockdevCreateOptionsQed:
> --
> 2.43.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v10 3/4] qcow2: add zoned emulation capability
2026-05-10 17:50 ` [PATCH v10 3/4] qcow2: add zoned emulation capability Sam Li
@ 2026-05-14 20:23 ` Stefan Hajnoczi
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2026-05-14 20:23 UTC (permalink / raw)
To: Sam Li
Cc: qemu-devel, Pierrick Bouvier, dmitry.fomichev, Kevin Wolf, cassel,
Markus Armbruster, qemu-block, dlemoal, Eric Blake,
Michael S. Tsirkin, hare, Hanna Reitz
[-- Attachment #1: Type: text/plain, Size: 43069 bytes --]
On Sun, May 10, 2026 at 07:50:58PM +0200, Sam Li wrote:
> By adding zone operations and zoned metadata, the zoned emulation
> capability enables full emulation support of zoned device using
> a qcow2 file. The zoned device metadata includes zone type,
> zoned device state and write pointer of each zone, which is stored
> to an array of unsigned integers.
>
> Each zone of a zoned device makes state transitions following
> the zone state machine. The zone state machine mainly describes
> five states, IMPLICIT OPEN, EXPLICIT OPEN, FULL, EMPTY and CLOSED.
> READ ONLY and OFFLINE states will generally be affected by device
> internal events. The operations on zones cause corresponding state
> changing.
>
> Zoned devices have limits on zone resources, which put constraints on
> write operations on zones. It is managed by active zone queues
> following LRU policy.
>
> Signed-off-by: Sam Li <faithilikerun@gmail.com>
> ---
> block/qcow2.c | 851 +++++++++++++++++++++++++++++++++++++++++-
> block/qcow2.h | 13 +-
> block/trace-events | 2 +
> hw/block/virtio-blk.c | 22 +-
> include/qemu/queue.h | 1 +
> include/qemu/range.h | 4 +
> 6 files changed, 884 insertions(+), 9 deletions(-)
Here are is the feedback I have so far:
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index b543bcf3e3..c84b67976e 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -195,6 +195,293 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *fmt, Error **errp)
> return cryptoopts_qdict;
> }
>
> +#define QCOW2_ZT_IS_CONV(wp) (wp & 1ULL << 59)
Patch 1 does not document in the file format specification that write
pointer bit 59 indicates a conventional zone.
> +#define QCOW2_GET_WP(wp) ((wp << 5) >> 5)
> +
> +/*
> + * To emulate a real zoned device, closed, empty and full states are
> + * preserved after a power cycle. The open states are in-memory and will
> + * be lost after closing the device. Read-only and offline states are
> + * device-internal events, which are not considered for simplicity.
> + */
> +static inline BlockZoneState qcow2_get_zone_state(BlockDriverState *bs,
> + uint32_t index)
> +{
> + BDRVQcow2State *s = bs->opaque;
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> + uint64_t zone_wp = bs->wps->wp[index];
> + uint64_t zone_start;
> +
> + if (QCOW2_ZT_IS_CONV(zone_wp)) {
> + return BLK_ZS_NOT_WP;
> + }
> +
> + if (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) {
> + return BLK_ZS_EOPEN;
> + }
> + if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) {
> + return BLK_ZS_IOPEN;
> + }
> +
> + zone_start = index * bs->bl.zone_size;
> + if (zone_wp == zone_start) {
> + return BLK_ZS_EMPTY;
> + }
> + if (zone_wp >= zone_start + bs->bl.zone_capacity) {
> + return BLK_ZS_FULL;
> + }
> + if (zone_wp > zone_start) {
> + if (!QTAILQ_IN_USE(zone_entry, closed_zone_entry)) {
> + /*
> + * The number of closed zones is not always updated in time when
> + * the device is closed. However, it only matters when doing
> + * zone report. Refresh the count and list of closed zones to
> + * provide correct zone states for zone report.
> + */
> + QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_entry);
> + s->nr_zones_closed++;
> + }
> + return BLK_ZS_CLOSED;
> + }
> + return BLK_ZS_NOT_WP;
> +}
> +
> +static void qcow2_rm_exp_open_zone(BDRVQcow2State *s,
> + uint32_t index)
> +{
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> +
> + QTAILQ_REMOVE(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
> + s->nr_zones_exp_open--;
> +}
> +
> +static void qcow2_rm_imp_open_zone(BDRVQcow2State *s,
> + int32_t index)
> +{
> + Qcow2ZoneListEntry *zone_entry;
> + if (index < 0) {
> + /* Apply LRU when the index is not specified. */
> + zone_entry = QTAILQ_LAST(&s->imp_open_zones);
> + } else {
> + zone_entry = &s->zone_list_entries[index];
> + }
> +
> + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
> + s->nr_zones_imp_open--;
> +}
> +
> +static void qcow2_rm_open_zone(BDRVQcow2State *s,
> + uint32_t index)
> +{
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> +
> + if (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) {
> + qcow2_rm_exp_open_zone(s, index);
> + } else if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) {
> + qcow2_rm_imp_open_zone(s, index);
> + }
> +}
> +
> +static void qcow2_rm_closed_zone(BDRVQcow2State *s,
> + uint32_t index)
> +{
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> +
> + QTAILQ_REMOVE(&s->closed_zones, zone_entry, closed_zone_entry);
> + s->nr_zones_closed--;
> +}
> +
> +static void qcow2_do_imp_open_zone(BDRVQcow2State *s,
> + uint32_t index,
> + BlockZoneState zs)
> +{
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> +
> + switch (zs) {
> + case BLK_ZS_EMPTY:
> + break;
> + case BLK_ZS_CLOSED:
> + qcow2_rm_closed_zone(s, index);
> + break;
> + case BLK_ZS_IOPEN:
> + /*
> + * The LRU policy: update the zone that is most recently
> + * used to the head of the zone list
> + */
> + if (zone_entry == QTAILQ_FIRST(&s->imp_open_zones)) {
> + return;
> + }
> + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
> + s->nr_zones_imp_open--;
> + break;
> + default:
> + return;
> + }
> +
> + QTAILQ_INSERT_HEAD(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
> + s->nr_zones_imp_open++;
> +}
> +
> +static void qcow2_do_exp_open_zone(BDRVQcow2State *s,
> + uint32_t index)
> +{
> + Qcow2ZoneListEntry *zone_entry = &s->zone_list_entries[index];
> +
> + QTAILQ_INSERT_HEAD(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
> + s->nr_zones_exp_open++;
> +}
> +
> +/*
> + * The list of zones is managed using an LRU policy: the last
> + * zone of the list is always the one that was least recently used
> + * for writing and is chosen as the zone to close to be able to
> + * implicitly open another zone.
> + *
> + * We can only close the open zones. The index is not specified
> + * when it is less than 0.
> + */
> +static void qcow2_do_close_zone(BlockDriverState *bs,
> + int32_t index,
> + BlockZoneState zs)
> +{
> + BDRVQcow2State *s = bs->opaque;
> + Qcow2ZoneListEntry *zone_entry;
> +
> + if (index >= 0) {
> + zone_entry = &s->zone_list_entries[index];
> + } else {
> + /* before removal of the last implicitly open zone */
> + zone_entry = QTAILQ_LAST(&s->imp_open_zones);
> + }
> +
> + if (zs == BLK_ZS_IOPEN) {
> + qcow2_rm_imp_open_zone(s, index);
> + goto close_zone;
> + }
> +
> + if (index >= 0 && zs == BLK_ZS_EOPEN) {
> + qcow2_rm_exp_open_zone(s, index);
> + /*
> + * The zone state changes when the zone is removed from the list of
> + * open zones (explicitly open -> empty). The closed zone list is
> + * refreshed during get_zone_state().
> + */
> + qcow2_get_zone_state(bs, index);
> + }
> + return;
> +
> +close_zone:
> + QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_entry);
> + s->nr_zones_closed++;
> +}
> +
> +/*
> + * Read/Write the new wp value to the dedicated location of the image file.
> + */
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_rw_wp_at(BlockDriverState *bs, uint64_t *wp,
> + int32_t index, bool is_write) {
> + BDRVQcow2State *s = bs->opaque;
> + g_autofree uint64_t *temp = NULL;
> + uint64_t wpv = *wp;
> + int ret;
> +
> + if (is_write) {
> + ret = bdrv_pwrite(bs->file, s->zoned_header.zonedmeta_offset
> + + sizeof(uint64_t) * index, sizeof(uint64_t), wp, 0);
> + if (ret < 0) {
> + *wp = wpv;
> + goto exit;
> + }
> + } else {
> + temp = g_new(uint64_t, 1);
> + ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset
> + + sizeof(uint64_t) * index, sizeof(uint64_t), temp, 0);
> + if (ret < 0) {
> + goto exit;
> + }
> +
> + *wp = *temp;
> + }
> +
> + trace_qcow2_wp_tracking(index, *wp >> BDRV_SECTOR_BITS);
> + return ret;
> +
> +exit:
> + error_report("Failed to %s metadata to file", is_write ? "write" : "read");
> + return ret;
> +}
> +
> +static bool qcow2_can_activate_zone(BlockDriverState *bs)
> +{
> + BDRVQcow2State *s = bs->opaque;
> +
> + /* When the max active zone is zero, there is no limit on active zones */
> + if (!s->zoned_header.max_active_zones) {
> + return true;
> + }
> +
> + /* Active zones are zones that are open or closed */
> + return s->nr_zones_exp_open + s->nr_zones_imp_open + s->nr_zones_closed
> + < s->zoned_header.max_active_zones;
> +}
> +
> +/*
> + * This function manages open zones under active zones limit. It checks
> + * if a zone can transition to open state while maintaining max open and
> + * active zone limits.
> + */
> +static bool qcow2_can_open_zone(BlockDriverState *bs)
> +{
> + BDRVQcow2State *s = bs->opaque;
> +
> + /* When the max open zone is zero, there is no limit on open zones */
> + if (!s->zoned_header.max_open_zones) {
> + return true;
> + }
> +
> + /*
> + * The open zones are zones with the states of explicitly and
> + * implicitly open.
> + */
> + if (s->nr_zones_imp_open + s->nr_zones_exp_open <
> + s->zoned_header.max_open_zones) {
> + return true;
> + }
> +
> + /*
> + * Zones are managed one at a time. Thus, the number of implicitly open
> + * zone can never be over the open zone limit. When the active zone limit
> + * is not reached, close only one implicitly open zone.
> + */
> + if (qcow2_can_activate_zone(bs)) {
> + qcow2_do_close_zone(bs, -1, BLK_ZS_IOPEN);
> + trace_qcow2_imp_open_zones(0x23, s->nr_zones_imp_open);
> + return true;
> + }
> + return false;
> +}
> +
> +static inline int coroutine_fn GRAPH_RDLOCK
> +qcow2_refresh_zonedmeta(BlockDriverState *bs)
> +{
> + int ret;
> + BDRVQcow2State *s = bs->opaque;
> + uint64_t wps_size = s->zoned_header.zonedmeta_size;
> + g_autofree uint64_t *temp = NULL;
> +
> + temp = g_new(uint64_t, s->zoned_header.nr_zones);
> + ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset,
> + wps_size, temp, 0);
> + if (ret < 0) {
> + error_report("Cannot read metadata");
> + return ret;
> + }
> +
> + memcpy(bs->wps->wp, temp, wps_size);
> + return 0;
> +}
> +
> /*
> * Passing by the zoned device configurations by a zoned_header struct, check
> * if the zone device options are under constraints. Return false when some
> @@ -527,7 +814,23 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
> be32_to_cpu(zoned_ext.max_active_zones);
> zoned_ext.max_append_bytes =
> be32_to_cpu(zoned_ext.max_append_bytes);
> + zoned_ext.zonedmeta_offset =
> + be64_to_cpu(zoned_ext.zonedmeta_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);
> + ret = qcow2_refresh_zonedmeta(bs);
> + if (ret < 0) {
> + return ret;
> + }
> +
> + s->zone_list_entries = g_new0(Qcow2ZoneListEntry,
> + zoned_ext.nr_zones);
> + QTAILQ_INIT(&s->exp_open_zones);
> + QTAILQ_INIT(&s->imp_open_zones);
> + QTAILQ_INIT(&s->closed_zones);
> + qemu_co_mutex_init(&bs->wps->colock);
>
> /* refuse to open broken images */
> if (zoned_ext.nr_zones != DIV_ROUND_UP(bs->total_sectors *
> @@ -2883,21 +3186,119 @@ static coroutine_fn GRAPH_RDLOCK int qcow2_co_pwritev_task_entry(AioTask *task)
> t->l2meta);
> }
>
> +/*
> + * If it is an append write request, the offset pointer needs to be updated to
> + * the wp value of that zone after the IO completion. The unique pointer is
> + * passed on to this function to prevent the value being changed in condition of
> + * multiple concurrent writes.
> + */
> static int coroutine_fn GRAPH_RDLOCK
> -qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
> - QEMUIOVector *qiov, size_t qiov_offset,
> - BdrvRequestFlags flags)
> +qcow2_co_pwv_part(BlockDriverState *bs, int64_t *offset_ptr, int64_t bytes,
> + QEMUIOVector *qiov, size_t qiov_offset, bool is_append,
> + BdrvRequestFlags flags)
> {
> BDRVQcow2State *s = bs->opaque;
> int offset_in_cluster;
> int ret;
> unsigned int cur_bytes; /* number of sectors in current iteration */
> uint64_t host_offset;
> + int64_t offset = *offset_ptr;
> QCowL2Meta *l2meta = NULL;
> AioTaskPool *aio = NULL;
> + int64_t start_offset, start_bytes;
> + BlockZoneState zs;
> + int64_t end_zone, end_offset;
> + uint64_t *wp;
> + int64_t zone_size = bs->bl.zone_size;
> + int64_t zone_capacity = bs->bl.zone_capacity;
> + int index;
>
> trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes);
>
> + start_offset = offset;
> + start_bytes = bytes;
> + if (bs->bl.zoned == BLK_Z_HM) {
> + index = start_offset / zone_size;
> + wp = &bs->wps->wp[index];
> + if (!QCOW2_ZT_IS_CONV(*wp)) {
> + if (offset != *wp && !is_append) {
> + /* The write offset must be equal to the zone write pointer */
> + error_report("Offset 0x%" PRIx64 " of regular writes must be "
> + "equal to the zone write pointer 0x%" PRIx64 "",
> + offset, *wp);
> + return -EINVAL;
> + }
> +
> + if (is_append) {
> + /*
> + * The offset of append write is the write pointer value of
> + * that zone.
> + */
> + start_offset = *wp;
> + }
> +
> + end_offset = start_offset + start_bytes;
> +
> + /* Only allow writes when there are zone resources left */
> + zs = qcow2_get_zone_state(bs, index);
> + if (zs == BLK_ZS_CLOSED || zs == BLK_ZS_EMPTY) {
> + if (!qcow2_can_open_zone(bs)) {
> + error_report("no more open zones available");
> + return -EINVAL;
> + }
> + }
> +
> + /*
> + * Align up (start_offset, zone_size), the start offset is not
> + * necessarily power of two.
> + */
> + end_zone = index * zone_size + zone_capacity;
> + /* Write cannot exceed the zone capacity. */
> + if (end_offset > end_zone) {
> + error_report("write exceeds zone capacity with end_offset:"
> + "0x%lx, end_zone: 0x%lx",
> + end_offset / 512, end_zone / 512);
> + return -EINVAL;
> + }
> +
> + /*
> + * Real drives change states before it can write to the zone. If
> + * the write fails, the zone state may have changed.
> + *
> + * The zone state transitions to implicit open when the original
> + * state is empty or closed. When the wp reaches the end, the
> + * open states (explicit open, implicit open) become full.
> + */
> + zs = qcow2_get_zone_state(bs, index);
> + if (!(end_offset & (zone_capacity - 1))) {
> + /* Being aligned to zone capacity implies full state */
> + qcow2_rm_open_zone(s, index);
> + trace_qcow2_imp_open_zones(0x24,
> + s->nr_zones_imp_open);
> + } else {
> + qcow2_do_imp_open_zone(s, index, zs);
> + trace_qcow2_imp_open_zones(0x24,
> + s->nr_zones_imp_open);
> + }
> +
> + /*
> + * The write pointer is update before IO completion, with the
> + * assumption that the write IO will succeed.
> + */
> + qemu_co_mutex_lock(&bs->wps->colock);
> + if (is_append) {
> + *offset_ptr = *wp;
> + }
> + *wp = end_offset;
> + ret = qcow2_rw_wp_at(bs, wp, index, true);
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + if (ret < 0) {
> + error_report("failed to update write pointer");
> + return -EINVAL;
> + }
> + }
> + }
> +
> while (bytes != 0 && aio_task_pool_status(aio) == 0) {
>
> l2meta = NULL;
> @@ -2943,6 +3344,7 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
> qiov_offset += cur_bytes;
> trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes);
> }
> +
> ret = 0;
>
> qemu_co_mutex_lock(&s->lock);
> @@ -2961,11 +3363,32 @@ fail_nometa:
> g_free(aio);
> }
>
> + if (ret < 0 && bs->bl.zoned == BLK_Z_HM) {
> + /* update the wp when write IO failed */
> + qemu_co_mutex_lock(&bs->wps->colock);
> + index = start_offset / zone_size;
> + wp = &bs->wps->wp[index];
> + if (!QCOW2_ZT_IS_CONV(*wp)) {
> + ret = qcow2_rw_wp_at(bs, wp, index, false);
> + }
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + }
> +
> trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
>
> return ret;
> }
>
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
> + QEMUIOVector *qiov, size_t qiov_offset,
> + BdrvRequestFlags flags)
> +{
> + return qcow2_co_pwv_part(bs, &offset, bytes, qiov, qiov_offset, false,
> + flags);
> +}
> +
> +
> static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
> {
> BDRVQcow2State *s = bs->opaque;
> @@ -3001,6 +3424,25 @@ static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
> return result;
> }
>
> +static void qcow2_do_close_all_zone(BDRVQcow2State *s)
> +{
> + Qcow2ZoneListEntry *zone_entry, *next;
> +
> + QTAILQ_FOREACH_SAFE(zone_entry, &s->imp_open_zones, imp_open_zone_entry,
> + next) {
> + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry);
> + s->nr_zones_imp_open--;
> + }
> +
> + QTAILQ_FOREACH_SAFE(zone_entry, &s->exp_open_zones, exp_open_zone_entry,
> + next) {
> + QTAILQ_REMOVE(&s->exp_open_zones, zone_entry, exp_open_zone_entry);
> + s->nr_zones_exp_open--;
> + }
> +
> + assert(s->nr_zones_imp_open + s->nr_zones_exp_open == 0);
> +}
> +
> static void coroutine_mixed_fn GRAPH_RDLOCK
> qcow2_do_close(BlockDriverState *bs, bool close_data_file)
> {
> @@ -3040,6 +3482,8 @@ qcow2_do_close(BlockDriverState *bs, bool close_data_file)
>
> qcow2_refcount_close(bs);
> qcow2_free_snapshots(bs);
> + qcow2_do_close_all_zone(s);
> + g_free(bs->wps);
> }
>
> static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs)
> @@ -3357,7 +3801,10 @@ int qcow2_update_header(BlockDriverState *bs)
> .max_active_zones =
> cpu_to_be32(s->zoned_header.max_active_zones),
> .max_append_bytes =
> - cpu_to_be32(s->zoned_header.max_append_bytes)
> + cpu_to_be32(s->zoned_header.max_append_bytes),
> + .zonedmeta_offset =
> + cpu_to_be64(s->zoned_header.zonedmeta_offset),
> + .zonedmeta_size = cpu_to_be64(s->zoned_header.zonedmeta_size),
> };
> ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT,
> &zoned_header, sizeof(zoned_header),
> @@ -3766,7 +4213,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> int version;
> int refcount_order;
> uint64_t *refcount_table;
> - int ret;
> + uint64_t zoned_meta_size, zoned_clusterlen;
> + int ret, offset, i;
> uint8_t compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;
>
> assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);
> @@ -4113,6 +4561,42 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
> ret = -EINVAL;
> goto unlock;
> }
> +
> + uint32_t nrz = s->zoned_header.nr_zones;
> + zoned_meta_size = sizeof(uint64_t) * nrz;
> + g_autofree uint64_t *meta = NULL;
> + meta = g_new0(uint64_t, nrz);
> +
> + for (i = 0; i < s->zoned_header.conventional_zones; ++i) {
> + meta[i] = i * s->zoned_header.zone_size;
> + meta[i] |= 1ULL << 59;
> + }
> +
> + for (; i < nrz; ++i) {
> + meta[i] = i * s->zoned_header.zone_size;
> + }
> +
> + offset = qcow2_alloc_clusters(blk_bs(blk), zoned_meta_size);
> + if (offset < 0) {
> + ret = offset;
> + error_setg_errno(errp, -ret, "Could not allocate clusters "
> + "for zoned metadata size");
> + goto unlock;
> + }
> + s->zoned_header.zonedmeta_offset = offset;
> + s->zoned_header.zonedmeta_size = zoned_meta_size;
> +
> + zoned_clusterlen = size_to_clusters(s, zoned_meta_size)
> + * s->cluster_size;
> + ret = qcow2_pre_write_overlap_check(blk_bs(blk), 0, offset,
> + zoned_clusterlen, false);
> + assert(ret == 0);
> + ret = bdrv_pwrite(blk_bs(blk)->file, offset, zoned_meta_size, meta, 0);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "Could not write zoned metadata "
> + "to disk");
> + goto unlock;
> + }
> } else {
> s->zoned_header.zoned = BLK_Z_NONE;
> }
> @@ -4512,6 +4996,359 @@ qcow2_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
> return ret;
> }
>
> +static int coroutine_fn
> +qcow2_co_zone_report(BlockDriverState *bs, int64_t offset,
> + unsigned int *nr_zones, BlockZoneDescriptor *zones)
> +{
> + BDRVQcow2State *s = bs->opaque;
> + uint64_t zone_size = s->zoned_header.zone_size;
> + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
> + int64_t size = bs->bl.nr_zones * zone_size;
> + unsigned int nrz;
> + int i = 0;
> + int si;
> +
> + if (offset >= capacity) {
> + error_report("offset %" PRId64 " is equal to or greater than the "
> + "device capacity %" PRId64 "", offset, capacity);
> + return -EINVAL;
> + }
> +
> + nrz = ((*nr_zones) < bs->bl.nr_zones) ? (*nr_zones) : bs->bl.nr_zones;
> + si = offset / zone_size; /* Zone size cannot be 0 for zoned device */
> + qemu_co_mutex_lock(&bs->wps->colock);
> + for (; i < nrz; ++i) {
> + if (i + si >= bs->bl.nr_zones) {
> + break;
> + }
> +
> + zones[i].start = (si + i) * zone_size;
> +
> + /* The last zone can be smaller than the zone size */
> + if ((si + i + 1) == bs->bl.nr_zones && size > capacity) {
> + uint32_t l = zone_size - (size - capacity);
> + zones[i].length = l;
> + zones[i].cap = l;
> + } else {
> + zones[i].length = zone_size;
> + zones[i].cap = zone_size;
> + }
> +
> + uint64_t wp = bs->wps->wp[si + i];
> + if (QCOW2_ZT_IS_CONV(wp)) {
> + zones[i].type = BLK_ZT_CONV;
> + zones[i].state = BLK_ZS_NOT_WP;
> + /* Clear masking bits */
> + wp = QCOW2_GET_WP(wp);
> + } else {
> + zones[i].type = BLK_ZT_SWR;
> + zones[i].state = qcow2_get_zone_state(bs, si + i);
> + }
> + zones[i].wp = wp;
> + }
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + *nr_zones = i;
> + return 0;
> +}
> +
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_open_zone(BlockDriverState *bs, uint32_t index) {
> + BDRVQcow2State *s = bs->opaque;
> + int ret;
> +
> + qemu_co_mutex_lock(&bs->wps->colock);
> + BlockZoneState zs = qcow2_get_zone_state(bs, index);
> + trace_qcow2_imp_open_zones(BLK_ZO_OPEN, s->nr_zones_imp_open);
> +
> + switch (zs) {
> + case BLK_ZS_EMPTY:
> + if (!qcow2_can_activate_zone(bs)) {
> + ret = -EBUSY;
> + goto unlock;
> + }
> + break;
> + case BLK_ZS_IOPEN:
> + qcow2_rm_imp_open_zone(s, index);
> + break;
> + case BLK_ZS_EOPEN:
> + return 0;
> + case BLK_ZS_CLOSED:
> + if (!qcow2_can_open_zone(bs)) {
> + ret = -EINVAL;
> + goto unlock;
> + }
> + qcow2_rm_closed_zone(s, index);
> + break;
> + case BLK_ZS_FULL:
> + break;
> + default:
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + qcow2_do_exp_open_zone(s, index);
> + ret = 0;
> +
> +unlock:
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + return ret;
> +}
> +
> +static int qcow2_close_zone(BlockDriverState *bs, uint32_t index)
> +{
> + int ret;
> +
> + qemu_co_mutex_lock(&bs->wps->colock);
> + BlockZoneState zs = qcow2_get_zone_state(bs, index);
> +
> + switch (zs) {
> + case BLK_ZS_EMPTY:
> + break;
> + case BLK_ZS_IOPEN:
> + break;
> + case BLK_ZS_EOPEN:
> + break;
> + case BLK_ZS_CLOSED:
> + /* Closing a closed zone is not an error */
> + ret = 0;
> + goto unlock;
> + case BLK_ZS_FULL:
> + break;
> + default:
> + ret = -EINVAL;
> + goto unlock;
> + }
> + qcow2_do_close_zone(bs, index, zs);
> + ret = 0;
> +
> +unlock:
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + return ret;
> +}
> +
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_finish_zone(BlockDriverState *bs, uint32_t index) {
> + BDRVQcow2State *s = bs->opaque;
> + int ret;
> +
> + qemu_co_mutex_lock(&bs->wps->colock);
> + uint64_t *wp = &bs->wps->wp[index];
> + BlockZoneState zs = qcow2_get_zone_state(bs, index);
> +
> + switch (zs) {
> + case BLK_ZS_EMPTY:
> + if (!qcow2_can_activate_zone(bs)) {
> + ret = -EBUSY;
> + goto unlock;
> + }
> + break;
> + case BLK_ZS_IOPEN:
> + qcow2_rm_imp_open_zone(s, index);
> + trace_qcow2_imp_open_zones(BLK_ZO_FINISH, s->nr_zones_imp_open);
> + break;
> + case BLK_ZS_EOPEN:
> + qcow2_rm_exp_open_zone(s, index);
> + break;
> + case BLK_ZS_CLOSED:
> + if (!qcow2_can_open_zone(bs)) {
> + ret = -EINVAL;
> + goto unlock;
> + }
> + qcow2_rm_closed_zone(s, index);
> + break;
> + case BLK_ZS_FULL:
> + ret = 0;
> + goto unlock;
> + default:
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + *wp = ((uint64_t)index + 1) * s->zoned_header.zone_size;
> + ret = qcow2_rw_wp_at(bs, wp, index, true);
> +
> +unlock:
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + return ret;
> +}
> +
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_reset_zone(BlockDriverState *bs, uint32_t index,
> + int64_t len) {
> + BDRVQcow2State *s = bs->opaque;
> + int nrz = bs->bl.nr_zones;
> + int zone_size = bs->bl.zone_size;
> + int n, ret = 0;
> +
> + qemu_co_mutex_lock(&bs->wps->colock);
> + uint64_t *wp = &bs->wps->wp[index];
> + if (len == bs->total_sectors << BDRV_SECTOR_BITS) {
> + n = nrz;
> + index = 0;
> + } else {
> + n = len / zone_size;
> + }
> +
> + for (int i = 0; i < n; ++i) {
> + uint64_t *wp_i = (uint64_t *)(wp + i);
> + uint64_t wpi_v = *wp_i;
> + if (QCOW2_ZT_IS_CONV(wpi_v)) {
> + continue;
> + }
> +
> + BlockZoneState zs = qcow2_get_zone_state(bs, index + i);
> + switch (zs) {
> + case BLK_ZS_EMPTY:
> + break;
> + case BLK_ZS_IOPEN:
> + qcow2_rm_imp_open_zone(s, index + i);
> + trace_qcow2_imp_open_zones(BLK_ZO_RESET, s->nr_zones_imp_open);
> + break;
> + case BLK_ZS_EOPEN:
> + qcow2_rm_exp_open_zone(s, index + i);
> + break;
> + case BLK_ZS_CLOSED:
> + qcow2_rm_closed_zone(s, index + i);
> + break;
> + case BLK_ZS_FULL:
> + break;
> + default:
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + if (zs == BLK_ZS_EMPTY) {
> + continue;
> + }
> +
> + *wp_i = ((uint64_t)index + i) * zone_size;
> + ret = qcow2_rw_wp_at(bs, wp_i, index + i, true);
> + if (ret < 0) {
> + goto unlock;
> + }
> + /* clear data */
> + ret = qcow2_co_pwrite_zeroes(bs, *wp_i, zone_size, 0);
> + if (ret < 0) {
> + error_report("Failed to reset zone at 0x%" PRIx64 "", *wp_i);
> + }
> + }
> +
> +unlock:
> + qemu_co_mutex_unlock(&bs->wps->colock);
> + return ret;
> +}
> +
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp op,
> + int64_t offset, int64_t len)
> +{
> + BDRVQcow2State *s = bs->opaque;
> + int ret = 0;
> + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
> + int64_t zone_size = s->zoned_header.zone_size;
> + int64_t zone_size_mask = zone_size - 1;
> + uint32_t index = offset / zone_size;
> + BlockZoneWps *wps = bs->wps;
> +
> + if (offset >= capacity) {
> + error_report("offset %" PRId64 " is equal to or greater than the"
> + "device capacity %" PRId64 "", offset, capacity);
> + return -EINVAL;
> + }
> +
> + if (offset & zone_size_mask) {
> + error_report("sector offset %" PRId64 " is not aligned to zone size"
> + " %" PRId64 "", offset / 512, zone_size / 512);
> + return -EINVAL;
> + }
> +
> + if (((offset + len) < capacity && len & zone_size_mask) ||
> + offset + len > capacity) {
> + error_report("number of sectors %" PRId64 " is not aligned to zone"
> + " size %" PRId64 "", len / 512, zone_size / 512);
> + return -EINVAL;
> + }
> +
> + qemu_co_mutex_lock(&wps->colock);
> + uint64_t wpv = wps->wp[index];
Do we need to check that index < nr_zones?
> + if (QCOW2_ZT_IS_CONV(wpv) && len != capacity) {
Does the len != capacity check cover all cases or is it just for
BLK_ZO_RESET? For example, when BLK_ZO_OPEN is called with len ==
capacity it seems possible to perform an open operation on the zone?
> + error_report("zone mgmt operations are not allowed for "
> + "conventional zones");
> + ret = -EIO;
> + goto unlock;
> + }
> + qemu_co_mutex_unlock(&wps->colock);
> +
> + switch (op) {
> + case BLK_ZO_OPEN:
> + ret = qcow2_open_zone(bs, index);
> + break;
> + case BLK_ZO_CLOSE:
> + ret = qcow2_close_zone(bs, index);
> + break;
> + case BLK_ZO_FINISH:
> + ret = qcow2_finish_zone(bs, index);
> + break;
> + case BLK_ZO_RESET:
> + ret = qcow2_reset_zone(bs, index, len);
> + break;
> + default:
> + error_report("Unsupported zone op: 0x%x", op);
> + ret = -ENOTSUP;
> + break;
> + }
> + return ret;
> +
> +unlock:
> + qemu_co_mutex_unlock(&wps->colock);
> + return ret;
> +}
> +
> +static int coroutine_fn GRAPH_RDLOCK
> +qcow2_co_zone_append(BlockDriverState *bs, int64_t *offset, QEMUIOVector *qiov,
> + BdrvRequestFlags flags)
> +{
> + assert(flags == 0);
> + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS;
> + int64_t zone_size_mask = bs->bl.zone_size - 1;
> + int64_t iov_len = 0;
> + int64_t len = 0;
> +
> + if (*offset >= capacity) {
> + error_report("*offset %" PRId64 " is equal to or greater than the"
> + "device capacity %" PRId64 "", *offset, capacity);
> + return -EINVAL;
> + }
> +
> + /* offset + len should not pass the end of that zone starting from offset */
> + if (*offset & zone_size_mask) {
> + error_report("sector offset %" PRId64 " is not aligned to zone size "
> + "%" PRId64 "", *offset / 512, bs->bl.zone_size / 512);
> + return -EINVAL;
> + }
> +
> + int64_t wg = bs->bl.write_granularity;
> + int64_t wg_mask = wg - 1;
> + for (int i = 0; i < qiov->niov; i++) {
> + iov_len = qiov->iov[i].iov_len;
> + if (iov_len & wg_mask) {
> + error_report("len of IOVector[%d] 0x%" PRIx64 " is not aligned to "
> + "block size 0x%" PRIx64 "", i, iov_len, wg);
> + return -EINVAL;
> + }
> + }
> + len = qiov->size;
> +
> + if ((len >> BDRV_SECTOR_BITS) > bs->bl.max_append_sectors) {
> + error_report("len 0x%" PRIx64 " in sectors is greater than "
> + "max_append_sectors 0x%" PRIx32 "",
> + len >> BDRV_SECTOR_BITS, bs->bl.max_append_sectors);
> + return -EINVAL;
> + }
> +
> + return qcow2_co_pwv_part(bs, offset, len, qiov, 0, true, 0);
> +}
> +
> static int coroutine_fn GRAPH_RDLOCK
> qcow2_co_copy_range_from(BlockDriverState *bs,
> BdrvChild *src, int64_t src_offset,
> @@ -6578,6 +7415,10 @@ BlockDriver bdrv_qcow2 = {
> .bdrv_co_pwritev_compressed_part = qcow2_co_pwritev_compressed_part,
> .bdrv_make_empty = qcow2_make_empty,
>
> + .bdrv_co_zone_report = qcow2_co_zone_report,
> + .bdrv_co_zone_mgmt = qcow2_co_zone_mgmt,
This struct seems to align the equals signs so it's nicer to look at.
Please align this equals sign for consistency.
> + .bdrv_co_zone_append = qcow2_co_zone_append,
> +
> .bdrv_snapshot_create = qcow2_snapshot_create,
> .bdrv_snapshot_goto = qcow2_snapshot_goto,
> .bdrv_snapshot_delete = qcow2_snapshot_delete,
> diff --git a/block/qcow2.h b/block/qcow2.h
> index 743f2e3e79..4f72b8d62a 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -256,9 +256,9 @@ typedef struct Qcow2ZonedHeaderExtension {
> } QEMU_PACKED Qcow2ZonedHeaderExtension;
>
> typedef struct Qcow2ZoneListEntry {
> - QLIST_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
> - QLIST_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
> - QLIST_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
> + QTAILQ_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry;
> + QTAILQ_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry;
> + QTAILQ_ENTRY(Qcow2ZoneListEntry) closed_zone_entry;
> } Qcow2ZoneListEntry;
Please squash this into the patch that introduced Qcow2ZoneListEntry or,
better yet, remove it from that patch and defer the definition of this
struct until the current patch.
>
> typedef struct Qcow2UnknownHeaderExtension {
> @@ -456,6 +456,13 @@ typedef struct BDRVQcow2State {
>
> /* States of zoned device */
> Qcow2ZonedHeaderExtension zoned_header;
> + QTAILQ_HEAD(, Qcow2ZoneListEntry) exp_open_zones;
> + QTAILQ_HEAD(, Qcow2ZoneListEntry) imp_open_zones;
> + QTAILQ_HEAD(, Qcow2ZoneListEntry) closed_zones;
> + Qcow2ZoneListEntry *zone_list_entries;
> + uint32_t nr_zones_exp_open;
> + uint32_t nr_zones_imp_open;
> + uint32_t nr_zones_closed;
> } BDRVQcow2State;
>
> typedef struct Qcow2COWRegion {
> diff --git a/block/trace-events b/block/trace-events
> index 950c82d4b8..30a3e303ca 100644
> --- a/block/trace-events
> +++ b/block/trace-events
> @@ -76,6 +76,8 @@ qcow2_writev_data(void *co, uint64_t offset) "co %p offset 0x%" PRIx64
> qcow2_pwrite_zeroes_start_req(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64
> qcow2_pwrite_zeroes(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64
> qcow2_skip_cow(void *co, uint64_t offset, int nb_clusters) "co %p offset 0x%" PRIx64 " nb_clusters %d"
> +qcow2_wp_tracking(int index, uint64_t wp) "wps[%d]: 0x%" PRIx64
> +qcow2_imp_open_zones(uint8_t op, int nrz) "nr_imp_open_zones after op 0x%x: %d"
>
> # qcow2-cluster.c
> qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 9cb9f1fb2b..285db19ac7 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
Please move the virtio-blk changes into a separate patch. It doesn't
seem to be directly related to qcow2 support.
> @@ -288,6 +288,9 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s, MultiReqBuffer *mrb)
> int i = 0, start = 0, num_reqs = 0, niov = 0, nb_sectors = 0;
> uint32_t max_transfer;
> int64_t sector_num = 0;
> + BlockDriverState *bs = blk_bs(s->blk);
> + bool zone_cross;
> + int64_t zone_sector, end_sector;
>
> if (mrb->num_reqs == 1) {
> submit_requests(s, mrb, 0, 1, -1);
> @@ -303,17 +306,34 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s, MultiReqBuffer *mrb)
> for (i = 0; i < mrb->num_reqs; i++) {
> VirtIOBlockReq *req = mrb->reqs[i];
> if (num_reqs > 0) {
> + zone_cross = false;
> +
> + /*
> + * On zoned backends, a single backend write must not span a zone
> + * boundary. Bail out of merging if combining req into the current
> + * batch would straddle a zone.
> + */
> + if (bs && bs->bl.zone_size > 0) {
> + zone_sector = bs->bl.zone_size / BDRV_SECTOR_SIZE;
> + end_sector = req->sector_num
> + + req->qiov.size / BDRV_SECTOR_SIZE - 1;
> + zone_cross = (sector_num / zone_sector) !=
> + (end_sector / zone_sector);
> + }
> +
> /*
> * NOTE: We cannot merge the requests in below situations:
> * 1. requests are not sequential
> * 2. merge would exceed maximum number of IOVs
> * 3. merge would exceed maximum transfer length of backend device
> + * 4. merge would cross a zone boundary on a zoned backend
> */
> if (sector_num + nb_sectors != req->sector_num ||
> niov > blk_get_max_iov(s->blk) - req->qiov.niov ||
> req->qiov.size > max_transfer ||
> nb_sectors > (max_transfer -
> - req->qiov.size) / BDRV_SECTOR_SIZE) {
> + req->qiov.size) / BDRV_SECTOR_SIZE ||
> + zone_cross) {
> submit_requests(s, mrb, start, num_reqs, niov);
> num_reqs = 0;
> }
> diff --git a/include/qemu/queue.h b/include/qemu/queue.h
> index e029e7bf66..3f0a48740e 100644
> --- a/include/qemu/queue.h
> +++ b/include/qemu/queue.h
> @@ -179,6 +179,7 @@ struct { \
> #define QLIST_EMPTY(head) ((head)->lh_first == NULL)
> #define QLIST_FIRST(head) ((head)->lh_first)
> #define QLIST_NEXT(elm, field) ((elm)->field.le_next)
> +#define QLIST_LAST(head, field) (*(head)->lh_first->field.le_prev)
If QLIST_LAST() is supposed to fetch the last element in the list, then
it won't work:
#define QLIST_INSERT_HEAD(head, elm, field) do { \
if (((elm)->field.le_next = (head)->lh_first) != NULL) \
(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
(head)->lh_first = (elm); \
(elm)->field.le_prev = &(head)->lh_first; \
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The first node's le_prev points to the head's lh_first field, not to the
last node.
>
>
> /*
> diff --git a/include/qemu/range.h b/include/qemu/range.h
> index d446ad885d..d39ba68407 100644
> --- a/include/qemu/range.h
> +++ b/include/qemu/range.h
> @@ -213,6 +213,10 @@ static inline int range_covers_byte(uint64_t offset, uint64_t len,
> static inline bool ranges_overlap(uint64_t first1, uint64_t len1,
> uint64_t first2, uint64_t len2)
> {
> + if (first1 + len1 == 0 || first2 + len2 == 0) {
> + return false;
> + }
What is this?
> +
> uint64_t last1 = range_get_last(first1, len1);
> uint64_t last2 = range_get_last(first2, len2);
>
> --
> 2.43.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-05-14 20:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-10 17:50 [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Sam Li
2026-05-10 17:50 ` [PATCH v10 1/4] docs/qcow2: add the zoned format feature Sam Li
2026-05-14 18:47 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 2/4] qcow2: add configurations for zoned format extension Sam Li
2026-05-14 19:49 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 3/4] qcow2: add zoned emulation capability Sam Li
2026-05-14 20:23 ` Stefan Hajnoczi
2026-05-10 17:50 ` [PATCH v10 4/4] iotests: test the zoned format feature for qcow2 file Sam Li
2026-05-14 18:38 ` [PATCH v10 0/4] Add full zoned storage emulation to qcow2 driver Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.