| Message ID | 20220712021345.8530-3-faithilikerun@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for zoned device | expand |
On 7/12/22 04:13, Sam Li wrote: > Add zoned storage commands of the device: zone_open(zo), zone_close(zc), > zone_reset(zs), zone_report(zp), zone_finish(zf). > > For example, it can be called by: > ./build/qemu-io --image-opts driver=zoned_host_device, filename=/dev/nullb0 > -c "zone_report 0 0 1" > > Signed-off-by: Sam Li <faithilikerun@gmail.com> > --- > block/io.c | 57 ++++++++++++++++ > include/block/block-io.h | 13 ++++ > qemu-io-cmds.c | 143 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 213 insertions(+) > > diff --git a/block/io.c b/block/io.c > index 1e9bf09a49..a760be0131 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -3243,6 +3243,63 @@ out: > return co.ret; > } > > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_report)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_report) { > + co.ret = drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); > + } else { > + co.ret = -ENOTSUP; > + goto out; > + qemu_coroutine_yield(); > + } > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, > + int64_t offset, int64_t len) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_mgmt)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_mgmt) { > + co.ret = drv->bdrv_co_zone_mgmt(bs, op, offset, len); > + } else { > + co.ret = -ENOTSUP; > + goto out; > + qemu_coroutine_yield(); > + } > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > void *qemu_blockalign(BlockDriverState *bs, size_t size) > { > IO_CODE(); > diff --git a/include/block/block-io.h b/include/block/block-io.h > index 053a27141a..a0ae140452 100644 > --- a/include/block/block-io.h > +++ b/include/block/block-io.h > @@ -80,6 +80,13 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); > /* Ensure contents are flushed to disk. */ > int coroutine_fn bdrv_co_flush(BlockDriverState *bs); > > +/* Report zone information of zone block device. */ > +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, > + int64_t offset, int64_t len); > + > int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes); > bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); > int bdrv_block_status(BlockDriverState *bs, int64_t offset, > @@ -289,6 +296,12 @@ bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > int generated_co_wrapper > bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > > +int generated_co_wrapper > +blk_zone_report(BlockBackend *blk, int64_t offset, int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int generated_co_wrapper > +blk_zone_mgmt(BlockBackend *blk, enum zone_op op, int64_t offset, int64_t len); > + > /** > * bdrv_parent_drained_begin_single: > * > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 2f0d8ac25a..a88fa322d2 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1706,6 +1706,144 @@ static const cmdinfo_t flush_cmd = { > .oneline = "flush all in-core file state to disk", > }; > > +static int zone_report_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, nr_zones; > + > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + nr_zones = cvtnum(argv[optind]); > + > + g_autofree BlockZoneDescriptor *zones = NULL; > + zones = g_new(BlockZoneDescriptor, nr_zones); > + ret = blk_zone_report(blk, offset, &nr_zones, zones); > + if (ret < 0) { > + printf("zone report failed: %s\n", strerror(-ret)); > + } else { > + for (int i = 0; i < nr_zones; ++i) { > + printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " > + "cap"" 0x%" PRIx64 ",wptr 0x%" PRIx64 ", " > + "zcond:%u, [type: %u]\n", > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > + zones[i].cond, zones[i].type); > + } > + } > + return ret; > +} > + > +static const cmdinfo_t zone_report_cmd = { > + .name = "zone_report", > + .altname = "zp", > + .cfunc = zone_report_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset number", > + .oneline = "report zone information", > +}; > + 'zp' is a bit odd; I'd rather go with 'zrp'. Otherwise: Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 7/12/22 11:13, Sam Li wrote: > Add zoned storage commands of the device: zone_open(zo), zone_close(zc), > zone_reset(zs), zone_report(zp), zone_finish(zf). > > For example, it can be called by: > ./build/qemu-io --image-opts driver=zoned_host_device, filename=/dev/nullb0 > -c "zone_report 0 0 1" I would move this patch and also patch 5 last in the series, so that the tests are added once all the code is in place. > > Signed-off-by: Sam Li <faithilikerun@gmail.com> > --- > block/io.c | 57 ++++++++++++++++ > include/block/block-io.h | 13 ++++ > qemu-io-cmds.c | 143 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 213 insertions(+) > > diff --git a/block/io.c b/block/io.c > index 1e9bf09a49..a760be0131 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -3243,6 +3243,63 @@ out: > return co.ret; > } > > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_report)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_report) { > + co.ret = drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); > + } else { > + co.ret = -ENOTSUP; > + goto out; > + qemu_coroutine_yield(); > + } > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, > + int64_t offset, int64_t len) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_mgmt)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_mgmt) { > + co.ret = drv->bdrv_co_zone_mgmt(bs, op, offset, len); > + } else { > + co.ret = -ENOTSUP; > + goto out; > + qemu_coroutine_yield(); > + } > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > void *qemu_blockalign(BlockDriverState *bs, size_t size) > { > IO_CODE(); > diff --git a/include/block/block-io.h b/include/block/block-io.h > index 053a27141a..a0ae140452 100644 > --- a/include/block/block-io.h > +++ b/include/block/block-io.h > @@ -80,6 +80,13 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); > /* Ensure contents are flushed to disk. */ > int coroutine_fn bdrv_co_flush(BlockDriverState *bs); > > +/* Report zone information of zone block device. */ > +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, > + int64_t offset, int64_t len); > + > int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes); > bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); > int bdrv_block_status(BlockDriverState *bs, int64_t offset, > @@ -289,6 +296,12 @@ bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > int generated_co_wrapper > bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > > +int generated_co_wrapper > +blk_zone_report(BlockBackend *blk, int64_t offset, int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int generated_co_wrapper > +blk_zone_mgmt(BlockBackend *blk, enum zone_op op, int64_t offset, int64_t len); > + > /** > * bdrv_parent_drained_begin_single: > * > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 2f0d8ac25a..a88fa322d2 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1706,6 +1706,144 @@ static const cmdinfo_t flush_cmd = { > .oneline = "flush all in-core file state to disk", > }; > > +static int zone_report_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, nr_zones; > + > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + nr_zones = cvtnum(argv[optind]); > + > + g_autofree BlockZoneDescriptor *zones = NULL; > + zones = g_new(BlockZoneDescriptor, nr_zones); > + ret = blk_zone_report(blk, offset, &nr_zones, zones); > + if (ret < 0) { > + printf("zone report failed: %s\n", strerror(-ret)); > + } else { > + for (int i = 0; i < nr_zones; ++i) { > + printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " > + "cap"" 0x%" PRIx64 ",wptr 0x%" PRIx64 ", " > + "zcond:%u, [type: %u]\n", > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > + zones[i].cond, zones[i].type); > + } > + } > + return ret; > +} > + > +static const cmdinfo_t zone_report_cmd = { > + .name = "zone_report", > + .altname = "zp", > + .cfunc = zone_report_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset number", > + .oneline = "report zone information", > +}; > + > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ret = blk_zone_mgmt(blk, zone_open, offset, len); > + if (ret < 0) { > + printf("zone open failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_open_cmd = { > + .name = "zone_open", > + .altname = "zo", > + .cfunc = zone_open_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset len", > + .oneline = "explicit open a range of zones in zone block device", > +}; > + > +static int zone_close_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ret = blk_zone_mgmt(blk, zone_close, offset, len); > + if (ret < 0) { > + printf("zone close failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_close_cmd = { > + .name = "zone_close", > + .altname = "zc", > + .cfunc = zone_close_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset len", > + .oneline = "close a range of zones in zone block device", > +}; > + > +static int zone_finish_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ret = blk_zone_mgmt(blk, zone_finish, offset, len); > + if (ret < 0) { > + printf("zone finish failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_finish_cmd = { > + .name = "zone_finish", > + .altname = "zf", > + .cfunc = zone_finish_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset len", > + .oneline = "finish a range of zones in zone block device", > +}; > + > +static int zone_reset_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ret = blk_zone_mgmt(blk, zone_reset, offset, len); > + if (ret < 0) { > + printf("zone reset failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_reset_cmd = { > + .name = "zone_reset", > + .altname = "zrs", > + .cfunc = zone_reset_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset len", > + .oneline = "reset a zone write pointer in zone block device", > +}; > + > + > static int truncate_f(BlockBackend *blk, int argc, char **argv); > static const cmdinfo_t truncate_cmd = { > .name = "truncate", > @@ -2498,6 +2636,11 @@ static void __attribute((constructor)) init_qemuio_commands(void) > qemuio_add_command(&aio_write_cmd); > qemuio_add_command(&aio_flush_cmd); > qemuio_add_command(&flush_cmd); > + qemuio_add_command(&zone_report_cmd); > + qemuio_add_command(&zone_open_cmd); > + qemuio_add_command(&zone_close_cmd); > + qemuio_add_command(&zone_finish_cmd); > + qemuio_add_command(&zone_reset_cmd); > qemuio_add_command(&truncate_cmd); > qemuio_add_command(&length_cmd); > qemuio_add_command(&info_cmd);
On Mon, 11 Jul 2022 at 22:17, Sam Li <faithilikerun@gmail.com> wrote: > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_report)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_report) { At this point we know drv->bdrv_co_zone_report is non-NULL because it has been checked already. The if statement can be dropped. > + co.ret = drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); > + } else { > + co.ret = -ENOTSUP; This case is already handled by if (... || (!drv->bdrv_co_zone_report)) above. The else body can be dropped. > + goto out; > + qemu_coroutine_yield(); > + } > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, Please follow QEMU coding style and typedef BdrvZoneOp instead of writing out enum zone_op. > + int64_t offset, int64_t len) > +{ > + BlockDriver *drv = bs->drv; > + CoroutineIOCompletion co = { > + .coroutine = qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || (!drv->bdrv_co_zone_mgmt)) { > + co.ret = -ENOTSUP; > + goto out; > + } > + > + if (drv->bdrv_co_zone_mgmt) { > + co.ret = drv->bdrv_co_zone_mgmt(bs, op, offset, len); > + } else { > + co.ret = -ENOTSUP; > + goto out; > + qemu_coroutine_yield(); > + } Same comments here. > + > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > void *qemu_blockalign(BlockDriverState *bs, size_t size) > { > IO_CODE(); > diff --git a/include/block/block-io.h b/include/block/block-io.h > index 053a27141a..a0ae140452 100644 > --- a/include/block/block-io.h > +++ b/include/block/block-io.h > @@ -80,6 +80,13 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); > /* Ensure contents are flushed to disk. */ > int coroutine_fn bdrv_co_flush(BlockDriverState *bs); > > +/* Report zone information of zone block device. */ > +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, > + int64_t offset, int64_t len); > + > int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes); > bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); > int bdrv_block_status(BlockDriverState *bs, int64_t offset, > @@ -289,6 +296,12 @@ bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > int generated_co_wrapper > bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); > > +int generated_co_wrapper > +blk_zone_report(BlockBackend *blk, int64_t offset, int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int generated_co_wrapper > +blk_zone_mgmt(BlockBackend *blk, enum zone_op op, int64_t offset, int64_t len); > + > /** > * bdrv_parent_drained_begin_single: > * > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 2f0d8ac25a..a88fa322d2 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1706,6 +1706,144 @@ static const cmdinfo_t flush_cmd = { > .oneline = "flush all in-core file state to disk", > }; > > +static int zone_report_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, nr_zones; > + > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + nr_zones = cvtnum(argv[optind]); > + > + g_autofree BlockZoneDescriptor *zones = NULL; > + zones = g_new(BlockZoneDescriptor, nr_zones); > + ret = blk_zone_report(blk, offset, &nr_zones, zones); > + if (ret < 0) { > + printf("zone report failed: %s\n", strerror(-ret)); > + } else { > + for (int i = 0; i < nr_zones; ++i) { > + printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " > + "cap"" 0x%" PRIx64 ",wptr 0x%" PRIx64 ", " > + "zcond:%u, [type: %u]\n", > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > + zones[i].cond, zones[i].type); > + } > + } > + return ret; > +} > + > +static const cmdinfo_t zone_report_cmd = { > + .name = "zone_report", > + .altname = "zp", > + .cfunc = zone_report_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset number", > + .oneline = "report zone information", > +}; > + > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ret = blk_zone_mgmt(blk, zone_open, offset, len); Please name enum constants in all caps: BDRV_ZONE_OPEN or BDRV_ZO_OPEN.
On 7/27/22 23:13, Stefan Hajnoczi wrote: > On Mon, 11 Jul 2022 at 22:17, Sam Li <faithilikerun@gmail.com> wrote: >> +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, >> + int64_t *nr_zones, >> + BlockZoneDescriptor *zones) >> +{ >> + BlockDriver *drv = bs->drv; >> + CoroutineIOCompletion co = { >> + .coroutine = qemu_coroutine_self(), >> + }; >> + IO_CODE(); >> + >> + bdrv_inc_in_flight(bs); >> + if (!drv || (!drv->bdrv_co_zone_report)) { You can drop the inner parenthesis for "(!drv->bdrv_co_zone_report)". >> + co.ret = -ENOTSUP; >> + goto out; >> + } >> + >> + if (drv->bdrv_co_zone_report) { > > At this point we know drv->bdrv_co_zone_report is non-NULL because it > has been checked already. The if statement can be dropped. > >> + co.ret = drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); >> + } else { >> + co.ret = -ENOTSUP; > > This case is already handled by if (... || > (!drv->bdrv_co_zone_report)) above. The else body can be dropped. > >> + goto out; >> + qemu_coroutine_yield(); >> + } >> + >> +out: >> + bdrv_dec_in_flight(bs); >> + return co.ret; >> +} >> + >> +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, > > Please follow QEMU coding style and typedef BdrvZoneOp instead of > writing out enum zone_op. > >> + int64_t offset, int64_t len) >> +{ >> + BlockDriver *drv = bs->drv; >> + CoroutineIOCompletion co = { >> + .coroutine = qemu_coroutine_self(), >> + }; >> + IO_CODE(); >> + >> + bdrv_inc_in_flight(bs); >> + if (!drv || (!drv->bdrv_co_zone_mgmt)) { >> + co.ret = -ENOTSUP; >> + goto out; >> + } >> + >> + if (drv->bdrv_co_zone_mgmt) { >> + co.ret = drv->bdrv_co_zone_mgmt(bs, op, offset, len); >> + } else { >> + co.ret = -ENOTSUP; >> + goto out; >> + qemu_coroutine_yield(); >> + } > > Same comments here. > >> + >> +out: >> + bdrv_dec_in_flight(bs); >> + return co.ret; >> +} >> + >> void *qemu_blockalign(BlockDriverState *bs, size_t size) >> { >> IO_CODE(); >> diff --git a/include/block/block-io.h b/include/block/block-io.h >> index 053a27141a..a0ae140452 100644 >> --- a/include/block/block-io.h >> +++ b/include/block/block-io.h >> @@ -80,6 +80,13 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); >> /* Ensure contents are flushed to disk. */ >> int coroutine_fn bdrv_co_flush(BlockDriverState *bs); >> >> +/* Report zone information of zone block device. */ >> +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, >> + int64_t *nr_zones, >> + BlockZoneDescriptor *zones); >> +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, >> + int64_t offset, int64_t len); >> + >> int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes); >> bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); >> int bdrv_block_status(BlockDriverState *bs, int64_t offset, >> @@ -289,6 +296,12 @@ bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); >> int generated_co_wrapper >> bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); >> >> +int generated_co_wrapper >> +blk_zone_report(BlockBackend *blk, int64_t offset, int64_t *nr_zones, >> + BlockZoneDescriptor *zones); >> +int generated_co_wrapper >> +blk_zone_mgmt(BlockBackend *blk, enum zone_op op, int64_t offset, int64_t len); >> + >> /** >> * bdrv_parent_drained_begin_single: >> * >> diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c >> index 2f0d8ac25a..a88fa322d2 100644 >> --- a/qemu-io-cmds.c >> +++ b/qemu-io-cmds.c >> @@ -1706,6 +1706,144 @@ static const cmdinfo_t flush_cmd = { >> .oneline = "flush all in-core file state to disk", >> }; >> >> +static int zone_report_f(BlockBackend *blk, int argc, char **argv) >> +{ >> + int ret; >> + int64_t offset, nr_zones; >> + >> + ++optind; >> + offset = cvtnum(argv[optind]); >> + ++optind; >> + nr_zones = cvtnum(argv[optind]); >> + >> + g_autofree BlockZoneDescriptor *zones = NULL; >> + zones = g_new(BlockZoneDescriptor, nr_zones); >> + ret = blk_zone_report(blk, offset, &nr_zones, zones); >> + if (ret < 0) { >> + printf("zone report failed: %s\n", strerror(-ret)); >> + } else { >> + for (int i = 0; i < nr_zones; ++i) { >> + printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " >> + "cap"" 0x%" PRIx64 ",wptr 0x%" PRIx64 ", " >> + "zcond:%u, [type: %u]\n", >> + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, >> + zones[i].cond, zones[i].type); >> + } >> + } >> + return ret; >> +} >> + >> +static const cmdinfo_t zone_report_cmd = { >> + .name = "zone_report", >> + .altname = "zp", >> + .cfunc = zone_report_f, >> + .argmin = 2, >> + .argmax = 2, >> + .args = "offset number", >> + .oneline = "report zone information", >> +}; >> + >> +static int zone_open_f(BlockBackend *blk, int argc, char **argv) >> +{ >> + int ret; >> + int64_t offset, len; >> + ++optind; >> + offset = cvtnum(argv[optind]); >> + ++optind; >> + len = cvtnum(argv[optind]); >> + ret = blk_zone_mgmt(blk, zone_open, offset, len); > > Please name enum constants in all caps: BDRV_ZONE_OPEN or BDRV_ZO_OPEN.
diff --git a/block/io.c b/block/io.c index 1e9bf09a49..a760be0131 100644 --- a/block/io.c +++ b/block/io.c @@ -3243,6 +3243,63 @@ out: return co.ret; } +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, + int64_t *nr_zones, + BlockZoneDescriptor *zones) +{ + BlockDriver *drv = bs->drv; + CoroutineIOCompletion co = { + .coroutine = qemu_coroutine_self(), + }; + IO_CODE(); + + bdrv_inc_in_flight(bs); + if (!drv || (!drv->bdrv_co_zone_report)) { + co.ret = -ENOTSUP; + goto out; + } + + if (drv->bdrv_co_zone_report) { + co.ret = drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); + } else { + co.ret = -ENOTSUP; + goto out; + qemu_coroutine_yield(); + } + +out: + bdrv_dec_in_flight(bs); + return co.ret; +} + +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, + int64_t offset, int64_t len) +{ + BlockDriver *drv = bs->drv; + CoroutineIOCompletion co = { + .coroutine = qemu_coroutine_self(), + }; + IO_CODE(); + + bdrv_inc_in_flight(bs); + if (!drv || (!drv->bdrv_co_zone_mgmt)) { + co.ret = -ENOTSUP; + goto out; + } + + if (drv->bdrv_co_zone_mgmt) { + co.ret = drv->bdrv_co_zone_mgmt(bs, op, offset, len); + } else { + co.ret = -ENOTSUP; + goto out; + qemu_coroutine_yield(); + } + +out: + bdrv_dec_in_flight(bs); + return co.ret; +} + void *qemu_blockalign(BlockDriverState *bs, size_t size) { IO_CODE(); diff --git a/include/block/block-io.h b/include/block/block-io.h index 053a27141a..a0ae140452 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -80,6 +80,13 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); /* Ensure contents are flushed to disk. */ int coroutine_fn bdrv_co_flush(BlockDriverState *bs); +/* Report zone information of zone block device. */ +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, + int64_t *nr_zones, + BlockZoneDescriptor *zones); +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, + int64_t offset, int64_t len); + int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes); bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); int bdrv_block_status(BlockDriverState *bs, int64_t offset, @@ -289,6 +296,12 @@ bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); int generated_co_wrapper bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); +int generated_co_wrapper +blk_zone_report(BlockBackend *blk, int64_t offset, int64_t *nr_zones, + BlockZoneDescriptor *zones); +int generated_co_wrapper +blk_zone_mgmt(BlockBackend *blk, enum zone_op op, int64_t offset, int64_t len); + /** * bdrv_parent_drained_begin_single: * diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 2f0d8ac25a..a88fa322d2 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1706,6 +1706,144 @@ static const cmdinfo_t flush_cmd = { .oneline = "flush all in-core file state to disk", }; +static int zone_report_f(BlockBackend *blk, int argc, char **argv) +{ + int ret; + int64_t offset, nr_zones; + + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + nr_zones = cvtnum(argv[optind]); + + g_autofree BlockZoneDescriptor *zones = NULL; + zones = g_new(BlockZoneDescriptor, nr_zones); + ret = blk_zone_report(blk, offset, &nr_zones, zones); + if (ret < 0) { + printf("zone report failed: %s\n", strerror(-ret)); + } else { + for (int i = 0; i < nr_zones; ++i) { + printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " + "cap"" 0x%" PRIx64 ",wptr 0x%" PRIx64 ", " + "zcond:%u, [type: %u]\n", + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, + zones[i].cond, zones[i].type); + } + } + return ret; +} + +static const cmdinfo_t zone_report_cmd = { + .name = "zone_report", + .altname = "zp", + .cfunc = zone_report_f, + .argmin = 2, + .argmax = 2, + .args = "offset number", + .oneline = "report zone information", +}; + +static int zone_open_f(BlockBackend *blk, int argc, char **argv) +{ + int ret; + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + ret = blk_zone_mgmt(blk, zone_open, offset, len); + if (ret < 0) { + printf("zone open failed: %s\n", strerror(-ret)); + } + return ret; +} + +static const cmdinfo_t zone_open_cmd = { + .name = "zone_open", + .altname = "zo", + .cfunc = zone_open_f, + .argmin = 2, + .argmax = 2, + .args = "offset len", + .oneline = "explicit open a range of zones in zone block device", +}; + +static int zone_close_f(BlockBackend *blk, int argc, char **argv) +{ + int ret; + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + ret = blk_zone_mgmt(blk, zone_close, offset, len); + if (ret < 0) { + printf("zone close failed: %s\n", strerror(-ret)); + } + return ret; +} + +static const cmdinfo_t zone_close_cmd = { + .name = "zone_close", + .altname = "zc", + .cfunc = zone_close_f, + .argmin = 2, + .argmax = 2, + .args = "offset len", + .oneline = "close a range of zones in zone block device", +}; + +static int zone_finish_f(BlockBackend *blk, int argc, char **argv) +{ + int ret; + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + ret = blk_zone_mgmt(blk, zone_finish, offset, len); + if (ret < 0) { + printf("zone finish failed: %s\n", strerror(-ret)); + } + return ret; +} + +static const cmdinfo_t zone_finish_cmd = { + .name = "zone_finish", + .altname = "zf", + .cfunc = zone_finish_f, + .argmin = 2, + .argmax = 2, + .args = "offset len", + .oneline = "finish a range of zones in zone block device", +}; + +static int zone_reset_f(BlockBackend *blk, int argc, char **argv) +{ + int ret; + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + ret = blk_zone_mgmt(blk, zone_reset, offset, len); + if (ret < 0) { + printf("zone reset failed: %s\n", strerror(-ret)); + } + return ret; +} + +static const cmdinfo_t zone_reset_cmd = { + .name = "zone_reset", + .altname = "zrs", + .cfunc = zone_reset_f, + .argmin = 2, + .argmax = 2, + .args = "offset len", + .oneline = "reset a zone write pointer in zone block device", +}; + + static int truncate_f(BlockBackend *blk, int argc, char **argv); static const cmdinfo_t truncate_cmd = { .name = "truncate", @@ -2498,6 +2636,11 @@ static void __attribute((constructor)) init_qemuio_commands(void) qemuio_add_command(&aio_write_cmd); qemuio_add_command(&aio_flush_cmd); qemuio_add_command(&flush_cmd); + qemuio_add_command(&zone_report_cmd); + qemuio_add_command(&zone_open_cmd); + qemuio_add_command(&zone_close_cmd); + qemuio_add_command(&zone_finish_cmd); + qemuio_add_command(&zone_reset_cmd); qemuio_add_command(&truncate_cmd); qemuio_add_command(&length_cmd); qemuio_add_command(&info_cmd);
Add zoned storage commands of the device: zone_open(zo), zone_close(zc), zone_reset(zs), zone_report(zp), zone_finish(zf). For example, it can be called by: ./build/qemu-io --image-opts driver=zoned_host_device, filename=/dev/nullb0 -c "zone_report 0 0 1" Signed-off-by: Sam Li <faithilikerun@gmail.com> --- block/io.c | 57 ++++++++++++++++ include/block/block-io.h | 13 ++++ qemu-io-cmds.c | 143 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 213 insertions(+)