| Message ID | 20220627001917.9417-3-faithilikerun@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | *** Add support for zoned device *** | expand |
On 6/27/22 02:19, Sam Li wrote: > --- Good coding style would advise to add some text here what the patch does. > block/io.c | 21 +++++++ > include/block/block-io.h | 13 +++++ > qemu-io-cmds.c | 121 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 155 insertions(+) > > diff --git a/block/io.c b/block/io.c > index 789e6373d5..656a1b7271 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -3258,6 +3258,27 @@ out: > return co.ret; > } > > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > + int64_t len, int64_t *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + if (!bs->drv->bdrv_co_zone_report) { > + return -ENOTSUP; ENOTSUP or EOPNOTSUP? Kevin? > + } > + > + return bs->drv->bdrv_co_zone_report(bs, offset, len, nr_zones, zones); > +} > + > +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, > + int64_t offset, int64_t len) > +{ > + if (!bs->drv->bdrv_co_zone_mgmt) { > + return -ENOTSUP; > + } > + > + return bs->drv->bdrv_co_zone_mgmt(bs, op, offset, len); > +} > + > 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 62c84f0519..c85c174579 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 len, int64_t *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, > + int64_t offset, int64_t len); > + There's the thing with the intendation ... please make it consistent, and ideally follow with whatever the remaining prototypes do. > 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, > @@ -290,6 +297,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 len, 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); > + Again here. > /** > * bdrv_parent_drained_begin_single: > * > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 2f0d8ac25a..3f2592b9f5 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1706,6 +1706,122 @@ 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, len, nr_zones; > + int i = 0; > + > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ++optind; > + nr_zones = cvtnum(argv[optind]); > + And 'optind' is set where? Plus do check for 'argv' overflow; before increasing 'optind' and using 'argv[optind]' you have to validate that 'argv[optind]' is a valid pointer. > + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); > + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); > + while (i < nr_zones) { > + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " > + "zcond:%u, [type: %u]\n", > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > + zones[i].cond, zones[i].type); > + ++i; As 'i' is a simple iterator maybe use a 'for' loop here. But that really is a matter of preference :-) > + } > + return ret; > +} > + > +static const cmdinfo_t zone_report_cmd = { > + .name = "zone_report", > + .altname = "f", altname 'f'? Is that correct? > + .cfunc = zone_report_f, > + .argmin = 3, > + .argmax = 3, > + .args = "offset [offset..] len [len..] number [num..]", > + .oneline = "report a number of zones", > +}; > + > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > +{ > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); Same here: please check for 'argv' overflow. > + return blk_zone_mgmt(blk, zone_open, offset, len); > +} > + > +static const cmdinfo_t zone_open_cmd = { > + .name = "zone_open", > + .altname = "f", Same here; shouldn't 'altname' be different for each function? 'zo', maybe? > + .cfunc = zone_open_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset [offset..] len [len..]", > + .oneline = "explicit open a range of zones in zone block device", > +}; > + > +static int zone_close_f(BlockBackend *blk, int argc, char **argv) > +{ > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); argv checking. > + return blk_zone_mgmt(blk, zone_close, offset, len); > +} > + > +static const cmdinfo_t zone_close_cmd = { > + .name = "zone_close", > + .altname = "f", altname 'zc' > + .cfunc = zone_close_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset [offset..] len [len..]", > + .oneline = "close a range of zones in zone block device", > +}; > + > +static int zone_finish_f(BlockBackend *blk, int argc, char **argv) > +{ > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); Argv checking. > + return blk_zone_mgmt(blk, zone_finish, offset, len); > +} > + > +static const cmdinfo_t zone_finish_cmd = { > + .name = "zone_finish", > + .altname = "f", altname 'zf' > + .cfunc = zone_finish_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset [offset..] len [len..]", > + .oneline = "finish a range of zones in zone block device", > +}; > + > +static int zone_reset_f(BlockBackend *blk, int argc, char **argv) > +{ > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); Argv checking. > + return blk_zone_mgmt(blk, zone_reset, offset, len); > +} > + > +static const cmdinfo_t zone_reset_cmd = { > + .name = "zone_reset", > + .altname = "f", altname 'zf' > + .cfunc = zone_reset_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset [offset..] len [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 +2614,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); Otherwise looks okay. Cheers, Hannes
Hannes Reinecke <hare@suse.de> 于2022年6月27日周一 15:30写道： > > On 6/27/22 02:19, Sam Li wrote: > > --- > > Good coding style would advise to add some text here what the patch does. > > > block/io.c | 21 +++++++ > > include/block/block-io.h | 13 +++++ > > qemu-io-cmds.c | 121 +++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 155 insertions(+) > > > > diff --git a/block/io.c b/block/io.c > > index 789e6373d5..656a1b7271 100644 > > --- a/block/io.c > > +++ b/block/io.c > > @@ -3258,6 +3258,27 @@ out: > > return co.ret; > > } > > > > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, > > + int64_t len, int64_t *nr_zones, > > + BlockZoneDescriptor *zones) > > +{ > > + if (!bs->drv->bdrv_co_zone_report) { > > + return -ENOTSUP; > > ENOTSUP or EOPNOTSUP? > Kevin? > > > + } > > + > > + return bs->drv->bdrv_co_zone_report(bs, offset, len, nr_zones, zones); > > +} > > + > > +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, > > + int64_t offset, int64_t len) > > +{ > > + if (!bs->drv->bdrv_co_zone_mgmt) { > > + return -ENOTSUP; > > + } > > + > > + return bs->drv->bdrv_co_zone_mgmt(bs, op, offset, len); > > +} > > + > > 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 62c84f0519..c85c174579 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 len, int64_t *nr_zones, > > + BlockZoneDescriptor *zones); > > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, zone_op op, > > + int64_t offset, int64_t len); > > + > > There's the thing with the intendation ... please make it consistent, > and ideally follow with whatever the remaining prototypes do. > > > 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, > > @@ -290,6 +297,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 len, 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); > > + > > Again here. > > > /** > > * bdrv_parent_drained_begin_single: > > * > > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > > index 2f0d8ac25a..3f2592b9f5 100644 > > --- a/qemu-io-cmds.c > > +++ b/qemu-io-cmds.c > > @@ -1706,6 +1706,122 @@ 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, len, nr_zones; > > + int i = 0; > > + > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > + ++optind; > > + nr_zones = cvtnum(argv[optind]); > > + > And 'optind' is set where? optind is declared in getopt_core.h. > Plus do check for 'argv' overflow; before increasing 'optind' and using > 'argv[optind]' you have to validate that 'argv[optind]' is a valid pointer. > Maybe we can check if argc is bigger than what we want? > > + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); > > + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); > > + while (i < nr_zones) { > > + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " > > + "zcond:%u, [type: %u]\n", > > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > > + zones[i].cond, zones[i].type); > > + ++i; > As 'i' is a simple iterator maybe use a 'for' loop here. > But that really is a matter of preference :-) > Ok! > > + } > > + return ret; > > +} > > + > > +static const cmdinfo_t zone_report_cmd = { > > + .name = "zone_report", > > + .altname = "f", > > altname 'f'? > Is that correct? > No, it's not. I misunderstood altname's meaning. Changed it now. > > + .cfunc = zone_report_f, > > + .argmin = 3, > > + .argmax = 3, > > + .args = "offset [offset..] len [len..] number [num..]", > > + .oneline = "report a number of zones", > > +}; > > + > > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > > +{ > > + int64_t offset, len; > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > Same here: please check for 'argv' overflow. > > > + return blk_zone_mgmt(blk, zone_open, offset, len); > > +} > > + > > +static const cmdinfo_t zone_open_cmd = { > > + .name = "zone_open", > > + .altname = "f", > > Same here; shouldn't 'altname' be different for each function? > 'zo', maybe? > > > + .cfunc = zone_open_f, > > + .argmin = 2, > > + .argmax = 2, > > + .args = "offset [offset..] len [len..]", > > + .oneline = "explicit open a range of zones in zone block device", > > +}; > > + > > +static int zone_close_f(BlockBackend *blk, int argc, char **argv) > > +{ > > + int64_t offset, len; > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > argv checking. > > > + return blk_zone_mgmt(blk, zone_close, offset, len); > > +} > > + > > +static const cmdinfo_t zone_close_cmd = { > > + .name = "zone_close", > > + .altname = "f", > > altname 'zc' > > > + .cfunc = zone_close_f, > > + .argmin = 2, > > + .argmax = 2, > > + .args = "offset [offset..] len [len..]", > > + .oneline = "close a range of zones in zone block device", > > +}; > > + > > +static int zone_finish_f(BlockBackend *blk, int argc, char **argv) > > +{ > > + int64_t offset, len; > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > Argv checking. > > > + return blk_zone_mgmt(blk, zone_finish, offset, len); > > +} > > + > > +static const cmdinfo_t zone_finish_cmd = { > > + .name = "zone_finish", > > + .altname = "f", > > altname 'zf' > > > + .cfunc = zone_finish_f, > > + .argmin = 2, > > + .argmax = 2, > > + .args = "offset [offset..] len [len..]", > > + .oneline = "finish a range of zones in zone block device", > > +}; > > + > > +static int zone_reset_f(BlockBackend *blk, int argc, char **argv) > > +{ > > + int64_t offset, len; > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > Argv checking. > > > + return blk_zone_mgmt(blk, zone_reset, offset, len); > > +} > > + > > +static const cmdinfo_t zone_reset_cmd = { > > + .name = "zone_reset", > > + .altname = "f", > > altname 'zf' > > > + .cfunc = zone_reset_f, > + .argmin = 2, > > + .argmax = 2, > > + .args = "offset [offset..] len [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 +2614,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); > > Otherwise looks okay. > Thanks! > Cheers, > > Hannes > -- > Dr. Hannes Reinecke Kernel Storage Architect > hare@suse.de +49 911 74053 688 > SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg > HRB 36809 (AG Nürnberg), GF: Felix Imendörffer
On Mon, Jun 27, 2022 at 08:19:14AM +0800, Sam Li wrote: > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 2f0d8ac25a..3f2592b9f5 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1706,6 +1706,122 @@ 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, len, nr_zones; > + int i = 0; > + > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + ++optind; > + nr_zones = cvtnum(argv[optind]); > + > + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); > + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); > + while (i < nr_zones) { Does blk_zone_report() set nr_zones to 0 on failure or do we need to check if (ret < 0) here? > + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " The rest of the source file uses printf() instead of fprintf(stdout, ...). That's usually preferred because it's shorter. > + "zcond:%u, [type: %u]\n", Please use PRIx64 instead of lx format specifiers for portability. On 32-bit hosts lx is 32-bit, not 64-bit. You can grep QEMU's code for examples of PRIx64. > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > + zones[i].cond, zones[i].type); > + ++i; > + } A for loop is more idiomatic: for (int i = 0; i < nr_zones; i++) { ... } > + return ret; > +} > + > +static const cmdinfo_t zone_report_cmd = { > + .name = "zone_report", > + .altname = "f", > + .cfunc = zone_report_f, > + .argmin = 3, > + .argmax = 3, > + .args = "offset [offset..] len [len..] number [num..]", The arguments are "offset len number". This command does not accept optional offset/len/num arguments. > + .oneline = "report a number of zones", Maybe "report zone information". > +}; > + > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > +{ > + int64_t offset, len; > + ++optind; > + offset = cvtnum(argv[optind]); > + ++optind; > + len = cvtnum(argv[optind]); > + return blk_zone_mgmt(blk, zone_open, offset, len); Where is the error reported? When I look at read_f() I see: if (ret < 0) { printf("read failed: %s\n", strerror(-ret)); I think something similar is needed because qemu-io.c does not print an error message for us. The same is true for the other commands defined in this patch. > +} > + > +static const cmdinfo_t zone_open_cmd = { > + .name = "zone_open", > + .altname = "f", > + .cfunc = zone_open_f, > + .argmin = 2, > + .argmax = 2, > + .args = "offset [offset..] len [len..]", There are no optional offset/len args. The same is true for the other commands below.
Stefan Hajnoczi <stefanha@redhat.com> 于2022年6月28日周二 16:20写道： > > On Mon, Jun 27, 2022 at 08:19:14AM +0800, Sam Li wrote: > > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > > index 2f0d8ac25a..3f2592b9f5 100644 > > --- a/qemu-io-cmds.c > > +++ b/qemu-io-cmds.c > > @@ -1706,6 +1706,122 @@ 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, len, nr_zones; > > + int i = 0; > > + > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > + ++optind; > > + nr_zones = cvtnum(argv[optind]); > > + > > + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); > > + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); > > + while (i < nr_zones) { > > Does blk_zone_report() set nr_zones to 0 on failure or do we need to > check if (ret < 0) here? I'll check if (ret<0) in zone_report and other commands in this patch as well. > > > + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " > > The rest of the source file uses printf() instead of fprintf(stdout, > ...). That's usually preferred because it's shorter. > > > + "zcond:%u, [type: %u]\n", > > Please use PRIx64 instead of lx format specifiers for portability. On > 32-bit hosts lx is 32-bit, not 64-bit. You can grep QEMU's code for > examples of PRIx64. Noted. It is necessary. > > > + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > > + zones[i].cond, zones[i].type); > > + ++i; > > + } > > A for loop is more idiomatic: > > for (int i = 0; i < nr_zones; i++) { > ... > } > > > + return ret; > > +} > > + > > +static const cmdinfo_t zone_report_cmd = { > > + .name = "zone_report", > > + .altname = "f", > > + .cfunc = zone_report_f, > > + .argmin = 3, > > + .argmax = 3, > > + .args = "offset [offset..] len [len..] number [num..]", > > The arguments are "offset len number". This command does not accept > optional offset/len/num arguments. > > > + .oneline = "report a number of zones", > > Maybe "report zone information". > > > +}; > > + > > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > > +{ > > + int64_t offset, len; > > + ++optind; > > + offset = cvtnum(argv[optind]); > > + ++optind; > > + len = cvtnum(argv[optind]); > > + return blk_zone_mgmt(blk, zone_open, offset, len); > > Where is the error reported? When I look at read_f() I see: > > if (ret < 0) { > printf("read failed: %s\n", strerror(-ret)); > > I think something similar is needed because qemu-io.c does not print an > error message for us. The same is true for the other commands defined in > this patch. > > > +} > > + > > +static const cmdinfo_t zone_open_cmd = { > > + .name = "zone_open", > > + .altname = "f", > > + .cfunc = zone_open_f, > > + .argmin = 2, > > + .argmax = 2, > > + .args = "offset [offset..] len [len..]", > > There are no optional offset/len args. The same is true for the other > commands below. Thanks for reviewing! Sam
On 6/28/22 16:56, Stefan Hajnoczi wrote: > On Mon, Jun 27, 2022 at 08:19:14AM +0800, Sam Li wrote: >> diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c >> index 2f0d8ac25a..3f2592b9f5 100644 >> --- a/qemu-io-cmds.c >> +++ b/qemu-io-cmds.c >> @@ -1706,6 +1706,122 @@ 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, len, nr_zones; >> + int i = 0; >> + >> + ++optind; >> + offset = cvtnum(argv[optind]); >> + ++optind; >> + len = cvtnum(argv[optind]); >> + ++optind; >> + nr_zones = cvtnum(argv[optind]); >> + >> + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); >> + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); >> + while (i < nr_zones) { > > Does blk_zone_report() set nr_zones to 0 on failure or do we need to > check if (ret < 0) here? ret = 0 means "no zone reported" which happen only if nr_zones is 0 or the start offset is past the end of the disk capacity. ret < 0 would mean that a report zone operation was actually attempted and failed (EIO, ENOMEM etc). > >> + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " > > The rest of the source file uses printf() instead of fprintf(stdout, > ...). That's usually preferred because it's shorter. > >> + "zcond:%u, [type: %u]\n", > > Please use PRIx64 instead of lx format specifiers for portability. On > 32-bit hosts lx is 32-bit, not 64-bit. You can grep QEMU's code for > examples of PRIx64. > >> + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, >> + zones[i].cond, zones[i].type); >> + ++i; >> + } > > A for loop is more idiomatic: > > for (int i = 0; i < nr_zones; i++) { > ... > } > >> + return ret; >> +} >> + >> +static const cmdinfo_t zone_report_cmd = { >> + .name = "zone_report", >> + .altname = "f", >> + .cfunc = zone_report_f, >> + .argmin = 3, >> + .argmax = 3, >> + .args = "offset [offset..] len [len..] number [num..]", > > The arguments are "offset len number". This command does not accept > optional offset/len/num arguments. The arguments should be offset + len OR offset + number of zones. Having the 3 of them does not make sense to me. The interface would then be: (1) offset + len -> report all zones in the block range [offset .. offset + len - 1] (2) offset + number of zones -> report at most "number of zones" from the zone containing the block at "offset". (2) matches the semantic used at the device command level. So I prefer to approach (1). > >> + .oneline = "report a number of zones", > > Maybe "report zone information". > >> +}; >> + >> +static int zone_open_f(BlockBackend *blk, int argc, char **argv) >> +{ >> + int64_t offset, len; >> + ++optind; >> + offset = cvtnum(argv[optind]); >> + ++optind; >> + len = cvtnum(argv[optind]); >> + return blk_zone_mgmt(blk, zone_open, offset, len); > > Where is the error reported? When I look at read_f() I see: > > if (ret < 0) { > printf("read failed: %s\n", strerror(-ret)); > > I think something similar is needed because qemu-io.c does not print an > error message for us. The same is true for the other commands defined in > this patch. > >> +} >> + >> +static const cmdinfo_t zone_open_cmd = { >> + .name = "zone_open", >> + .altname = "f", >> + .cfunc = zone_open_f, >> + .argmin = 2, >> + .argmax = 2, >> + .args = "offset [offset..] len [len..]", > > There are no optional offset/len args. The same is true for the other > commands below.
Damien Le Moal <damien.lemoal@opensource.wdc.com> 于2022年6月28日周二 17:11写道： > > On 6/28/22 16:56, Stefan Hajnoczi wrote: > > On Mon, Jun 27, 2022 at 08:19:14AM +0800, Sam Li wrote: > >> diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > >> index 2f0d8ac25a..3f2592b9f5 100644 > >> --- a/qemu-io-cmds.c > >> +++ b/qemu-io-cmds.c > >> @@ -1706,6 +1706,122 @@ 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, len, nr_zones; > >> + int i = 0; > >> + > >> + ++optind; > >> + offset = cvtnum(argv[optind]); > >> + ++optind; > >> + len = cvtnum(argv[optind]); > >> + ++optind; > >> + nr_zones = cvtnum(argv[optind]); > >> + > >> + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); > >> + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); > >> + while (i < nr_zones) { > > > > Does blk_zone_report() set nr_zones to 0 on failure or do we need to > > check if (ret < 0) here? > > ret = 0 means "no zone reported" which happen only if nr_zones is 0 or the > start offset is past the end of the disk capacity. ret < 0 would mean that > a report zone operation was actually attempted and failed (EIO, ENOMEM etc). > > > > >> + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " > > > > The rest of the source file uses printf() instead of fprintf(stdout, > > ...). That's usually preferred because it's shorter. > > > >> + "zcond:%u, [type: %u]\n", > > > > Please use PRIx64 instead of lx format specifiers for portability. On > > 32-bit hosts lx is 32-bit, not 64-bit. You can grep QEMU's code for > > examples of PRIx64. > > > >> + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, > >> + zones[i].cond, zones[i].type); > >> + ++i; > >> + } > > > > A for loop is more idiomatic: > > > > for (int i = 0; i < nr_zones; i++) { > > ... > > } > > > >> + return ret; > >> +} > >> + > >> +static const cmdinfo_t zone_report_cmd = { > >> + .name = "zone_report", > >> + .altname = "f", > >> + .cfunc = zone_report_f, > >> + .argmin = 3, > >> + .argmax = 3, > >> + .args = "offset [offset..] len [len..] number [num..]", > > > > The arguments are "offset len number". This command does not accept > > optional offset/len/num arguments. > > The arguments should be offset + len OR offset + number of zones. Having > the 3 of them does not make sense to me. The interface would then be: > > (1) offset + len -> report all zones in the block range [offset .. offset > + len - 1] > > (2) offset + number of zones -> report at most "number of zones" from the > zone containing the block at "offset". > > (2) matches the semantic used at the device command level. So I prefer to > approach (1). Yes, I'll remove the len argument then. > > > > >> + .oneline = "report a number of zones", > > > > Maybe "report zone information". > > > >> +}; > >> + > >> +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > >> +{ > >> + int64_t offset, len; > >> + ++optind; > >> + offset = cvtnum(argv[optind]); > >> + ++optind; > >> + len = cvtnum(argv[optind]); > >> + return blk_zone_mgmt(blk, zone_open, offset, len); > > > > Where is the error reported? When I look at read_f() I see: > > > > if (ret < 0) { > > printf("read failed: %s\n", strerror(-ret)); > > > > I think something similar is needed because qemu-io.c does not print an > > error message for us. The same is true for the other commands defined in > > this patch. > > > >> +} > >> + > >> +static const cmdinfo_t zone_open_cmd = { > >> + .name = "zone_open", > >> + .altname = "f", > >> + .cfunc = zone_open_f, > >> + .argmin = 2, > >> + .argmax = 2, > >> + .args = "offset [offset..] len [len..]", > > > > There are no optional offset/len args. The same is true for the other > > commands below. > > > -- > Damien Le Moal > Western Digital Research
diff --git a/block/io.c b/block/io.c index 789e6373d5..656a1b7271 100644 --- a/block/io.c +++ b/block/io.c @@ -3258,6 +3258,27 @@ out: return co.ret; } +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, + int64_t len, int64_t *nr_zones, + BlockZoneDescriptor *zones) +{ + if (!bs->drv->bdrv_co_zone_report) { + return -ENOTSUP; + } + + return bs->drv->bdrv_co_zone_report(bs, offset, len, nr_zones, zones); +} + +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, + int64_t offset, int64_t len) +{ + if (!bs->drv->bdrv_co_zone_mgmt) { + return -ENOTSUP; + } + + return bs->drv->bdrv_co_zone_mgmt(bs, op, offset, len); +} + 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 62c84f0519..c85c174579 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 len, 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, @@ -290,6 +297,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 len, 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..3f2592b9f5 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1706,6 +1706,122 @@ 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, len, nr_zones; + int i = 0; + + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + ++optind; + nr_zones = cvtnum(argv[optind]); + + g_autofree BlockZoneDescriptor *zones = g_new(BlockZoneDescriptor, nr_zones); + ret = blk_zone_report(blk, offset, len, &nr_zones, zones); + while (i < nr_zones) { + fprintf(stdout, "start: 0x%lx, len 0x%lx, cap 0x%lx, wptr 0x%lx, " + "zcond:%u, [type: %u]\n", + zones[i].start, zones[i].length, zones[i].cap, zones[i].wp, + zones[i].cond, zones[i].type); + ++i; + } + return ret; +} + +static const cmdinfo_t zone_report_cmd = { + .name = "zone_report", + .altname = "f", + .cfunc = zone_report_f, + .argmin = 3, + .argmax = 3, + .args = "offset [offset..] len [len..] number [num..]", + .oneline = "report a number of zones", +}; + +static int zone_open_f(BlockBackend *blk, int argc, char **argv) +{ + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_open, offset, len); +} + +static const cmdinfo_t zone_open_cmd = { + .name = "zone_open", + .altname = "f", + .cfunc = zone_open_f, + .argmin = 2, + .argmax = 2, + .args = "offset [offset..] len [len..]", + .oneline = "explicit open a range of zones in zone block device", +}; + +static int zone_close_f(BlockBackend *blk, int argc, char **argv) +{ + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_close, offset, len); +} + +static const cmdinfo_t zone_close_cmd = { + .name = "zone_close", + .altname = "f", + .cfunc = zone_close_f, + .argmin = 2, + .argmax = 2, + .args = "offset [offset..] len [len..]", + .oneline = "close a range of zones in zone block device", +}; + +static int zone_finish_f(BlockBackend *blk, int argc, char **argv) +{ + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_finish, offset, len); +} + +static const cmdinfo_t zone_finish_cmd = { + .name = "zone_finish", + .altname = "f", + .cfunc = zone_finish_f, + .argmin = 2, + .argmax = 2, + .args = "offset [offset..] len [len..]", + .oneline = "finish a range of zones in zone block device", +}; + +static int zone_reset_f(BlockBackend *blk, int argc, char **argv) +{ + int64_t offset, len; + ++optind; + offset = cvtnum(argv[optind]); + ++optind; + len = cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_reset, offset, len); +} + +static const cmdinfo_t zone_reset_cmd = { + .name = "zone_reset", + .altname = "f", + .cfunc = zone_reset_f, + .argmin = 2, + .argmax = 2, + .args = "offset [offset..] len [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 +2614,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);