From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49E94C6FA82 for ; Sat, 17 Sep 2022 20:22:15 +0000 (UTC) Received: from localhost ([::1]:59764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZeKM-0006FN-AF for qemu-devel@archiver.kernel.org; Sat, 17 Sep 2022 16:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZeG7-0008Pf-Lw for qemu-devel@nongnu.org; Sat, 17 Sep 2022 16:18:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZeG4-0001BN-5N for qemu-devel@nongnu.org; Sat, 17 Sep 2022 16:17:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663445867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=M8xsBA0RUuHseymGNf5JEWFLpYrs2o0dfv1keg7+TT0=; b=TdSvPB3aF/tFmA9jlebM8Ps57CiUIRMAOjQUXKPASiqdGPRQuI5EYzdylVtSdUehOyRyXV 2lhCSvhep60UH5vM/V65ibWmzVKEHeOMXK3wxLlwQCjvMo+KbYE+9VQsNKUJZ5gDmG8BCR pNAGXj9Qli1tak1LZK4nYYugbYCe8Sw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-FYHHgxZuPSehWALnBCsbMg-1; Sat, 17 Sep 2022 16:17:43 -0400 X-MC-Unique: FYHHgxZuPSehWALnBCsbMg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE787101A52A; Sat, 17 Sep 2022 20:17:42 +0000 (UTC) Received: from localhost (unknown [10.39.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id D34BC2166B26; Sat, 17 Sep 2022 20:17:41 +0000 (UTC) Date: Fri, 16 Sep 2022 16:00:28 +0000 From: Stefan Hajnoczi To: Sam Li Cc: qemu-devel@nongnu.org, dmitry.fomichev@wdc.com, Markus Armbruster , Eric Blake , qemu-block@nongnu.org, Kevin Wolf , Fam Zheng , damien.lemoal@opensource.wdc.com, hare@suse.de, Hanna Reitz Subject: Re: [PATCH v9 3/7] block: add block layer APIs resembling Linux ZonedBlockDevice ioctls Message-ID: References: <20220910052759.27517-1-faithilikerun@gmail.com> <20220910052759.27517-4-faithilikerun@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2rRNGBPzBFJnhOZs" Content-Disposition: inline In-Reply-To: <20220910052759.27517-4-faithilikerun@gmail.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_24_48=1.34, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --2rRNGBPzBFJnhOZs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 10, 2022 at 01:27:55PM +0800, Sam Li wrote: > Add a new zoned_host_device BlockDriver. The zoned_host_device option > accepts only zoned host block devices. By adding zone management > operations in this new BlockDriver, users can use the new block > layer APIs including Report Zone and four zone management operations > (open, close, finish, reset). >=20 > Qemu-io uses the new APIs to perform zoned storage commands of the device: > zone_report(zrp), zone_open(zo), zone_close(zc), zone_reset(zrs), > zone_finish(zf). >=20 > For example, to test zone_report, use following command: > $ ./build/qemu-io --image-opts -n driver=3Dzoned_host_device, filename=3D= /dev/nullb0 > -c "zrp offset nr_zones" >=20 > Signed-off-by: Sam Li > Reviewed-by: Hannes Reinecke > --- > block/block-backend.c | 145 ++++++++++++++ > block/file-posix.c | 323 +++++++++++++++++++++++++++++- > block/io.c | 41 ++++ > include/block/block-io.h | 7 + > include/block/block_int-common.h | 21 ++ > include/block/raw-aio.h | 6 +- > include/sysemu/block-backend-io.h | 17 ++ > meson.build | 1 + > qapi/block-core.json | 8 +- > qemu-io-cmds.c | 143 +++++++++++++ > 10 files changed, 708 insertions(+), 4 deletions(-) >=20 > diff --git a/block/block-backend.c b/block/block-backend.c > index d4a5df2ac2..ebe8d7bdf3 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -1431,6 +1431,15 @@ typedef struct BlkRwCo { > void *iobuf; > int ret; > BdrvRequestFlags flags; > + union { > + struct { > + unsigned int *nr_zones; > + BlockZoneDescriptor *zones; > + } zone_report; > + struct { > + BlockZoneOp op; > + } zone_mgmt; > + }; > } BlkRwCo; > =20 > int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags) > @@ -1775,6 +1784,142 @@ int coroutine_fn blk_co_flush(BlockBackend *blk) > return ret; > } > =20 > +static void blk_aio_zone_report_entry(void *opaque) { > + BlkAioEmAIOCB *acb =3D opaque; > + BlkRwCo *rwco =3D &acb->rwco; > + > + rwco->ret =3D blk_co_zone_report(rwco->blk, rwco->offset, > + rwco->zone_report.nr_zones, > + rwco->zone_report.zones); > + blk_aio_complete(acb); > +} > + > +BlockAIOCB *blk_aio_zone_report(BlockBackend *blk, int64_t offset, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones, > + BlockCompletionFunc *cb, void *opaque) > +{ > + BlkAioEmAIOCB *acb; > + Coroutine *co; > + IO_CODE(); > + > + blk_inc_in_flight(blk); > + acb =3D blk_aio_get(&blk_aio_em_aiocb_info, blk, cb, opaque); > + acb->rwco =3D (BlkRwCo) { > + .blk =3D blk, > + .offset =3D offset, > + .ret =3D NOT_DONE, > + .zone_report =3D { > + .zones =3D zones, > + .nr_zones =3D nr_zones, Indentation is off here. QEMU uses 4-space indentation. > + }, > + }; > + acb->has_returned =3D false; > + > + co =3D qemu_coroutine_create(blk_aio_zone_report_entry, acb); > + bdrv_coroutine_enter(blk_bs(blk), co); > + > + acb->has_returned =3D true; > + if (acb->rwco.ret !=3D NOT_DONE) { > + replay_bh_schedule_oneshot_event(blk_get_aio_context(blk), > + blk_aio_complete_bh, acb); > + } > + > + return &acb->common; > +} > + > +static void blk_aio_zone_mgmt_entry(void *opaque) { > + BlkAioEmAIOCB *acb =3D opaque; > + BlkRwCo *rwco =3D &acb->rwco; > + > + rwco->ret =3D blk_co_zone_mgmt(rwco->blk, rwco->zone_mgmt.op, > + rwco->offset, acb->bytes); > + blk_aio_complete(acb); > +} > + > +BlockAIOCB *blk_aio_zone_mgmt(BlockBackend *blk, BlockZoneOp op, > + int64_t offset, int64_t len, > + BlockCompletionFunc *cb, void *opaque) { > + BlkAioEmAIOCB *acb; > + Coroutine *co; > + IO_CODE(); > + > + blk_inc_in_flight(blk); > + acb =3D blk_aio_get(&blk_aio_em_aiocb_info, blk, cb, opaque); > + acb->rwco =3D (BlkRwCo) { > + .blk =3D blk, > + .offset =3D offset, > + .ret =3D NOT_DONE, > + .zone_mgmt =3D { > + .op =3D op, Indentation is off here. QEMU uses 4-space indentation. > + }, > + }; > + acb->bytes =3D len; > + acb->has_returned =3D false; > + > + co =3D qemu_coroutine_create(blk_aio_zone_mgmt_entry, acb); > + bdrv_coroutine_enter(blk_bs(blk), co); > + > + acb->has_returned =3D true; > + if (acb->rwco.ret !=3D NOT_DONE) { > + replay_bh_schedule_oneshot_event(blk_get_aio_context(blk), > + blk_aio_complete_bh, acb); > + } > + > + return &acb->common; > +} > + > +/* > + * Send a zone_report command. > + * offset is a byte offset from the start of the device. No alignment > + * required for offset. > + * nr_zones represents IN maximum and OUT actual. > + */ > +int coroutine_fn blk_co_zone_report(BlockBackend *blk, int64_t offset, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + int ret; > + IO_CODE(); > + > + blk_inc_in_flight(blk); /* increase before waiting */ > + blk_wait_while_drained(blk); > + if (!blk_is_available(blk)) { > + blk_dec_in_flight(blk); > + return -ENOMEDIUM; > + } > + ret =3D bdrv_co_zone_report(blk_bs(blk), offset, nr_zones, zones); > + blk_dec_in_flight(blk); > + return ret; > +} > + > +/* > + * Send a zone_management command. > + * op is the zone operation; > + * offset is the byte offset from the start of the zoned device; > + * len is the maximum number of bytes the command should operate on. It > + * should be aligned with the zone sector size. > + */ > +int coroutine_fn blk_co_zone_mgmt(BlockBackend *blk, BlockZoneOp op, > + int64_t offset, int64_t len) > +{ > + int ret; > + IO_CODE(); > + > + > + blk_inc_in_flight(blk); > + blk_wait_while_drained(blk); > + > + ret =3D blk_check_byte_request(blk, offset, len); > + if (ret < 0) { Missing blk_dec_in_flight(blk). > + return ret; > + } > + > + ret =3D bdrv_co_zone_mgmt(blk_bs(blk), op, offset, len); > + blk_dec_in_flight(blk); > + return ret; > +} > + > void blk_drain(BlockBackend *blk) > { > BlockDriverState *bs =3D blk_bs(blk); > diff --git a/block/file-posix.c b/block/file-posix.c > index 0a8b4b426e..4edfa25d04 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -67,6 +67,9 @@ > #include > #include > #include > +#if defined(CONFIG_BLKZONED) > +#include > +#endif > #include > #include > #include > @@ -216,6 +219,15 @@ typedef struct RawPosixAIOData { > PreallocMode prealloc; > Error **errp; > } truncate; > + struct { > + unsigned int *nr_zones; > + BlockZoneDescriptor *zones; > + } zone_report; > + struct { > + unsigned long zone_op; > + const char *zone_op_name; > + bool all; > + } zone_mgmt; > }; > } RawPosixAIOData; > =20 > @@ -1339,7 +1351,7 @@ static void raw_refresh_limits(BlockDriverState *bs= , Error **errp) > #endif > =20 > if (bs->sg || S_ISBLK(st.st_mode)) { > - int ret =3D hdev_get_max_hw_transfer(s->fd, &st); > + ret =3D hdev_get_max_hw_transfer(s->fd, &st); > =20 > if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { > bs->bl.max_hw_transfer =3D ret; > @@ -1356,6 +1368,27 @@ static void raw_refresh_limits(BlockDriverState *b= s, Error **errp) > zoned =3D BLK_Z_NONE; > } > bs->bl.zoned =3D zoned; > + if (zoned !=3D BLK_Z_NONE) { > + ret =3D get_sysfs_long_val(&st, "chunk_sectors"); > + if (ret > 0) { > + bs->bl.zone_sectors =3D ret; > + } > + > + ret =3D get_sysfs_long_val(&st, "zone_append_max_bytes"); > + if (ret > 0) { > + bs->bl.max_append_sectors =3D ret / 512; > + } > + > + ret =3D get_sysfs_long_val(&st, "max_open_zones"); > + if (ret >=3D 0) { > + bs->bl.max_open_zones =3D ret; > + } > + > + ret =3D get_sysfs_long_val(&st, "max_active_zones"); > + if (ret >=3D 0) { > + bs->bl.max_active_zones =3D ret; > + } > + } > } > =20 > static int check_for_dasd(int fd) > @@ -1850,6 +1883,145 @@ static off_t copy_file_range(int in_fd, off_t *in= _off, int out_fd, > } > #endif > =20 > +/* > + * parse_zone - Fill a zone descriptor > + */ > +#if defined(CONFIG_BLKZONED) > +static inline void parse_zone(struct BlockZoneDescriptor *zone, > + const struct blk_zone *blkz) { > + zone->start =3D blkz->start; > + zone->length =3D blkz->len; > + zone->cap =3D blkz->capacity; > + zone->wp =3D blkz->wp; > + > + switch (blkz->type) { > + case BLK_ZONE_TYPE_SEQWRITE_REQ: > + zone->type =3D BLK_ZT_SWR; > + break; > + case BLK_ZONE_TYPE_SEQWRITE_PREF: > + zone->type =3D BLK_ZT_SWP; > + break; > + case BLK_ZONE_TYPE_CONVENTIONAL: > + zone->type =3D BLK_ZT_CONV; > + break; > + default: > + g_assert_not_reached(); > + } > + > + switch (blkz->cond) { > + case BLK_ZONE_COND_NOT_WP: > + zone->cond =3D BLK_ZS_NOT_WP; > + break; > + case BLK_ZONE_COND_EMPTY: > + zone->cond =3D BLK_ZS_EMPTY; > + break; > + case BLK_ZONE_COND_IMP_OPEN: > + zone->cond =3DBLK_ZS_IOPEN; > + break; > + case BLK_ZONE_COND_EXP_OPEN: > + zone->cond =3D BLK_ZS_EOPEN; > + break; > + case BLK_ZONE_COND_CLOSED: > + zone->cond =3D BLK_ZS_CLOSED; > + break; > + case BLK_ZONE_COND_READONLY: > + zone->cond =3D BLK_ZS_RDONLY; > + break; > + case BLK_ZONE_COND_FULL: > + zone->cond =3D BLK_ZS_FULL; > + break; > + case BLK_ZONE_COND_OFFLINE: > + zone->cond =3D BLK_ZS_OFFLINE; > + break; > + default: > + g_assert_not_reached(); > + } > +} > +#endif > + > +#if defined(CONFIG_BLKZONED) > +static int do_zone_report(int64_t sector, int fd, > + struct BlockZoneDescriptor *zones, > + unsigned int nrz) { > + struct blk_zone *blkz; > + int ret, n =3D 0, i =3D 0; > + > + int64_t rep_size =3D sizeof(struct blk_zone_report) + nrz * sizeof(s= truct blk_zone); > + g_autofree struct blk_zone_report *rep =3D NULL; > + rep =3D g_malloc(rep_size); > + > + blkz =3D (struct blk_zone *)(rep + 1); > + while (n < nrz) { > + memset(rep, 0, rep_size); > + rep->sector =3D sector; > + rep->nr_zones =3D nrz - n; > + > + do { > + ret =3D ioctl(fd, BLKREPORTZONE, rep); > + } while (ret !=3D 0 && errno =3D=3D EINTR); > + if (ret !=3D 0) { > + error_report("%d: ioctl BLKREPORTZONE at %" PRId64 " failed = %d", > + fd, sector, errno); > + return -errno; > + } > + > + if (!rep->nr_zones) { > + break; > + } > + > + for (i =3D 0; i < rep->nr_zones; i++, n++) { > + parse_zone(&zones[n], &blkz[i]); > + /* The next report should start after the last zone reported= */ > + sector =3D blkz[i].start + blkz[i].len; > + } > + } > + return n; > +} > +#endif > + > +static int handle_aiocb_zone_report(void *opaque) { > +#if defined(CONFIG_BLKZONED) > + RawPosixAIOData *aiocb =3D opaque; > + int fd =3D aiocb->aio_fildes; > + unsigned int *nr_zones =3D aiocb->zone_report.nr_zones; > + BlockZoneDescriptor *zones =3D aiocb->zone_report.zones; > + /* zoned block devices use 512-byte sectors */ > + int64_t sector =3D aiocb->aio_offset / 512; > + > + *nr_zones =3D do_zone_report(sector, fd, zones, *nr_zones); > + return 0; > +#else > + return -ENOTSUP; > +#endif > +} > + > +static int handle_aiocb_zone_mgmt(void *opaque) { > +#if defined(CONFIG_BLKZONED) > + RawPosixAIOData *aiocb =3D opaque; > + int fd =3D aiocb->aio_fildes; > + int64_t sector =3D aiocb->aio_offset / 512; > + int64_t nr_sectors =3D aiocb->aio_nbytes / 512; > + struct blk_zone_range range; > + int ret; > + > + /* Execute the operation */ > + range.sector =3D sector; > + range.nr_sectors =3D nr_sectors; > + do { > + ret =3D ioctl(fd, aiocb->zone_mgmt.zone_op, &range); > + } while (ret !=3D 0 && errno =3D=3D EINTR); > + > + if (ret !=3D 0) { > + error_report("ioctl %s failed %d", aiocb->zone_mgmt.zone_op_name, > + errno); > + return -errno; > + } > + return ret; > +#else > + return -ENOTSUP; > +#endif > +} > + > static int handle_aiocb_copy_range(void *opaque) > { > RawPosixAIOData *aiocb =3D opaque; > @@ -3022,6 +3194,104 @@ static void raw_account_discard(BDRVRawState *s, = uint64_t nbytes, int ret) > } > } > =20 > +/* > + * zone report - Get a zone block device's information in the form > + * of an array of zone descriptors. > + * zones is an array of zone descriptors to hold zone information on rep= ly; > + * offset can be any byte within the entire size of the device; > + * nr_zones is the maxium number of sectors the command should operate o= n. > + */ > +static int coroutine_fn raw_co_zone_report(BlockDriverState *bs, int64_t= offset, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones) { > +#if defined(CONFIG_BLKZONED) > + BDRVRawState *s =3D bs->opaque; > + RawPosixAIOData acb; > + > + acb =3D (RawPosixAIOData) { > + .bs =3D bs, > + .aio_fildes =3D s->fd, > + .aio_type =3D QEMU_AIO_ZONE_REPORT, > + .aio_offset =3D offset, > + .zone_report =3D { > + .nr_zones =3D nr_zones, > + .zones =3D zones, Indentation is off here. QEMU uses 4-space indentation. > + }, > + }; > + > + return raw_thread_pool_submit(bs, handle_aiocb_zone_report, &acb); > +#else > + return -ENOTSUP; > +#endif > +} > + > +/* > + * zone management operations - Execute an operation on a zone > + */ > +static int coroutine_fn raw_co_zone_mgmt(BlockDriverState *bs, BlockZone= Op op, > + int64_t offset, int64_t len) { > +#if defined(CONFIG_BLKZONED) > + BDRVRawState *s =3D bs->opaque; > + RawPosixAIOData acb; > + int64_t zone_sector, zone_sector_mask; > + const char *zone_op_name; > + unsigned long zone_op; > + bool is_all =3D false; > + > + zone_sector =3D bs->bl.zone_sectors; > + zone_sector_mask =3D zone_sector - 1; > + if (offset & zone_sector_mask) { > + error_report("sector offset %" PRId64 " is not aligned to zone s= ize " > + "%" PRId64 "", offset, zone_sector); > + return -EINVAL; > + } > + > + if (len & zone_sector_mask) { > + error_report("number of sectors %" PRId64 " is not aligned to zo= ne size" > + " %" PRId64 "", len, zone_sector); > + return -EINVAL; > + } > + > + switch (op) { > + case BLK_ZO_OPEN: > + zone_op_name =3D "BLKOPENZONE"; > + zone_op =3D BLKOPENZONE; > + break; > + case BLK_ZO_CLOSE: > + zone_op_name =3D "BLKCLOSEZONE"; > + zone_op =3D BLKCLOSEZONE; > + break; > + case BLK_ZO_FINISH: > + zone_op_name =3D "BLKFINISHZONE"; > + zone_op =3D BLKFINISHZONE; > + break; > + case BLK_ZO_RESET: > + zone_op_name =3D "BLKRESETZONE"; > + zone_op =3D BLKRESETZONE; > + break; > + default: > + g_assert_not_reached(); > + } > + > + acb =3D (RawPosixAIOData) { > + .bs =3D bs, > + .aio_fildes =3D s->fd, > + .aio_type =3D QEMU_AIO_ZONE_MGMT, > + .aio_offset =3D offset, > + .aio_nbytes =3D len, > + .zone_mgmt =3D { > + .zone_op =3D zone_op, > + .zone_op_name =3D zone_op_name, > + .all =3D is_all, This is unused. Please remove the field for now. > + }, > + }; > + > + return raw_thread_pool_submit(bs, handle_aiocb_zone_mgmt, &acb); > +#else > + return -ENOTSUP; > +#endif > +} > + > static coroutine_fn int > raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes, > bool blkdev) > @@ -3752,6 +4022,54 @@ static BlockDriver bdrv_host_device =3D { > #endif > }; > =20 > +#if defined(CONFIG_BLKZONED) > +static BlockDriver bdrv_zoned_host_device =3D { > + .format_name =3D "zoned_host_device", > + .protocol_name =3D "zoned_host_device", > + .instance_size =3D sizeof(BDRVRawState), > + .bdrv_needs_filename =3D true, > + .bdrv_probe_device =3D hdev_probe_device, > + .bdrv_file_open =3D hdev_open, > + .bdrv_close =3D raw_close, > + .bdrv_reopen_prepare =3D raw_reopen_prepare, > + .bdrv_reopen_commit =3D raw_reopen_commit, > + .bdrv_reopen_abort =3D raw_reopen_abort, > + .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, > + .create_opts =3D &bdrv_create_opts_simple, > + .mutable_opts =3D mutable_opts, > + .bdrv_co_invalidate_cache =3D raw_co_invalidate_cache, > + .bdrv_co_pwrite_zeroes =3D hdev_co_pwrite_zeroes, > + > + .bdrv_co_preadv =3D raw_co_preadv, > + .bdrv_co_pwritev =3D raw_co_pwritev, > + .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, > + .bdrv_co_pdiscard =3D hdev_co_pdiscard, > + .bdrv_co_copy_range_from =3D raw_co_copy_range_from, > + .bdrv_co_copy_range_to =3D raw_co_copy_range_to, > + .bdrv_refresh_limits =3D raw_refresh_limits, > + .bdrv_io_plug =3D raw_aio_plug, > + .bdrv_io_unplug =3D raw_aio_unplug, > + .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, > + > + .bdrv_co_truncate =3D raw_co_truncate, > + .bdrv_getlength =3D raw_getlength, > + .bdrv_get_info =3D raw_get_info, > + .bdrv_get_allocated_file_size > + =3D raw_get_allocated_file_size, > + .bdrv_get_specific_stats =3D hdev_get_specific_stats, > + .bdrv_check_perm =3D raw_check_perm, > + .bdrv_set_perm =3D raw_set_perm, > + .bdrv_abort_perm_update =3D raw_abort_perm_update, > + .bdrv_probe_blocksizes =3D hdev_probe_blocksizes, > + .bdrv_probe_geometry =3D hdev_probe_geometry, > + .bdrv_co_ioctl =3D hdev_co_ioctl, > + > + /* zone management operations */ > + .bdrv_co_zone_report =3D raw_co_zone_report, > + .bdrv_co_zone_mgmt =3D raw_co_zone_mgmt, > +}; > +#endif > + > #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kern= el__) > static void cdrom_parse_filename(const char *filename, QDict *options, > Error **errp) > @@ -4012,6 +4330,9 @@ static void bdrv_file_init(void) > bdrv_register(&bdrv_file); > #if defined(HAVE_HOST_BLOCK_DEVICE) > bdrv_register(&bdrv_host_device); > +#if defined(CONFIG_BLKZONED) > + bdrv_register(&bdrv_zoned_host_device); > +#endif > #ifdef __linux__ > bdrv_register(&bdrv_host_cdrom); > #endif > diff --git a/block/io.c b/block/io.c > index 0a8cbefe86..de9ec1d740 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -3198,6 +3198,47 @@ out: > return co.ret; > } > =20 > +int bdrv_co_zone_report(BlockDriverState *bs, int64_t offset, Missing coroutine_fn: int coroutine_fn bdrv_co_foo(...) All coroutine functions must be labelled like this. > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones) > +{ > + BlockDriver *drv =3D bs->drv; > + CoroutineIOCompletion co =3D { > + .coroutine =3D qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || !drv->bdrv_co_zone_report) { > + co.ret =3D -ENOTSUP; > + goto out; > + } > + co.ret =3D drv->bdrv_co_zone_report(bs, offset, nr_zones, zones); > +out: > + bdrv_dec_in_flight(bs); > + return co.ret; > +} > + > +int bdrv_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp op, coroutine_fn is missing. > + int64_t offset, int64_t len) > +{ > + BlockDriver *drv =3D bs->drv; > + CoroutineIOCompletion co =3D { > + .coroutine =3D qemu_coroutine_self(), > + }; > + IO_CODE(); > + > + bdrv_inc_in_flight(bs); > + if (!drv || !drv->bdrv_co_zone_mgmt) { > + co.ret =3D -ENOTSUP; > + goto out; > + } > + co.ret =3D drv->bdrv_co_zone_mgmt(bs, op, offset, len); > +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 fd25ffa9be..65463b88d9 100644 > --- a/include/block/block-io.h > +++ b/include/block/block-io.h > @@ -88,6 +88,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); > =20 > +/* Report zone information of zone block device. */ > +int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offse= t, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp 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, > diff --git a/include/block/block_int-common.h b/include/block/block_int-c= ommon.h > index 7f7863cc9e..078ddd7e67 100644 > --- a/include/block/block_int-common.h > +++ b/include/block/block_int-common.h > @@ -691,6 +691,12 @@ struct BlockDriver { > QEMUIOVector *qiov, > int64_t pos); > =20 > + int coroutine_fn (*bdrv_co_zone_report)(BlockDriverState *bs, > + int64_t offset, unsigned int *nr_zones, > + BlockZoneDescriptor *zones); > + int coroutine_fn (*bdrv_co_zone_mgmt)(BlockDriverState *bs, BlockZon= eOp op, > + int64_t offset, int64_t len); > + > /* removable device specific */ > bool (*bdrv_is_inserted)(BlockDriverState *bs); > void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); > @@ -828,6 +834,21 @@ typedef struct BlockLimits { > =20 > /* device zone model */ > BlockZoneModel zoned; > + > + /* zone size expressed in 512-byte sectors */ > + uint32_t zone_sectors; > + > + /* total number of zones */ > + unsigned int nr_zones; > + > + /* maximum sectors of a zone append write operation */ > + int64_t max_append_sectors; > + > + /* maximum number of open zones */ > + int64_t max_open_zones; > + > + /* maximum number of active zones */ > + int64_t max_active_zones; > } BlockLimits; > =20 > typedef struct BdrvOpBlocker BdrvOpBlocker; > diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h > index 21fc10c4c9..3d26929cdd 100644 > --- a/include/block/raw-aio.h > +++ b/include/block/raw-aio.h > @@ -29,6 +29,8 @@ > #define QEMU_AIO_WRITE_ZEROES 0x0020 > #define QEMU_AIO_COPY_RANGE 0x0040 > #define QEMU_AIO_TRUNCATE 0x0080 > +#define QEMU_AIO_ZONE_REPORT 0x0100 > +#define QEMU_AIO_ZONE_MGMT 0x0200 > #define QEMU_AIO_TYPE_MASK \ > (QEMU_AIO_READ | \ > QEMU_AIO_WRITE | \ > @@ -37,7 +39,9 @@ > QEMU_AIO_DISCARD | \ > QEMU_AIO_WRITE_ZEROES | \ > QEMU_AIO_COPY_RANGE | \ > - QEMU_AIO_TRUNCATE) > + QEMU_AIO_TRUNCATE | \ > + QEMU_AIO_ZONE_REPORT | \ > + QEMU_AIO_ZONE_MGMT) > =20 > /* AIO flags */ > #define QEMU_AIO_MISALIGNED 0x1000 > diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-bac= kend-io.h > index 50f5aa2e07..6835525582 100644 > --- a/include/sysemu/block-backend-io.h > +++ b/include/sysemu/block-backend-io.h > @@ -45,6 +45,12 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_t= offset, > BlockCompletionFunc *cb, void *opaque); > BlockAIOCB *blk_aio_flush(BlockBackend *blk, > BlockCompletionFunc *cb, void *opaque); > +BlockAIOCB *blk_aio_zone_report(BlockBackend *blk, int64_t offset, > + unsigned int *nr_zones, BlockZoneDescrip= tor *zones, > + BlockCompletionFunc *cb, void *opaque); > +BlockAIOCB *blk_aio_zone_mgmt(BlockBackend *blk, BlockZoneOp op, > + int64_t offset, int64_t len, > + BlockCompletionFunc *cb, void *opaque); > BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, int64_t offset, int64_t = bytes, > BlockCompletionFunc *cb, void *opaque); > void blk_aio_cancel_async(BlockAIOCB *acb); > @@ -156,6 +162,17 @@ int generated_co_wrapper blk_pwrite_zeroes(BlockBack= end *blk, int64_t offset, > int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, > int64_t bytes, BdrvRequestFlags fl= ags); > =20 > +int coroutine_fn blk_co_zone_report(BlockBackend *blk, int64_t offset, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones); > +int generated_co_wrapper blk_zone_report(BlockBackend *blk, int64_t offs= et, > + unsigned int *nr_zones, > + BlockZoneDescriptor *zones); > +int coroutine_fn blk_co_zone_mgmt(BlockBackend *blk, BlockZoneOp op, > + int64_t offset, int64_t len); > +int generated_co_wrapper blk_zone_mgmt(BlockBackend *blk, BlockZoneOp op, > + int64_t offset, int64_t len); > + > int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset, > int64_t bytes); > int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, > diff --git a/meson.build b/meson.build > index 20fddbd707..2f436bb355 100644 > --- a/meson.build > +++ b/meson.build > @@ -1883,6 +1883,7 @@ config_host_data.set('CONFIG_REPLICATION', get_opti= on('live_block_migration').al > # has_header > config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) > config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.= h')) > +config_host_data.set('CONFIG_BLKZONED', cc.has_header('linux/blkzoned.h'= )) > config_host_data.set('CONFIG_VALGRIND_H', cc.has_header('valgrind/valgri= nd.h')) > config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h')) > config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 2173e7734a..c6bbb7a037 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2942,6 +2942,7 @@ > # @compress: Since 5.0 > # @copy-before-write: Since 6.2 > # @snapshot-access: Since 7.0 > +# @zoned_host_device: Since 7.2 > # > # Since: 2.9 > ## > @@ -2955,7 +2956,8 @@ > 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parall= els', > 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd= ', > { 'name': 'replication', 'if': 'CONFIG_REPLICATION' }, > - 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } > + 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', > + { 'name': 'zoned_host_device', 'if': 'CONFIG_BLKZONED' } ] } > =20 > ## > # @BlockdevOptionsFile: > @@ -4329,7 +4331,9 @@ > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > 'vpc': 'BlockdevOptionsGenericFormat', > - 'vvfat': 'BlockdevOptionsVVFAT' > + 'vvfat': 'BlockdevOptionsVVFAT', > + 'zoned_host_device': { 'type': 'BlockdevOptionsFile', > + 'if': 'CONFIG_BLKZONED' } > } } > =20 > ## > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index 952dc940f1..446a059603 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1712,6 +1712,144 @@ static const cmdinfo_t flush_cmd =3D { > .oneline =3D "flush all in-core file state to disk", > }; > =20 > +static int zone_report_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset; > + unsigned int nr_zones; > + > + ++optind; > + offset =3D cvtnum(argv[optind]); > + ++optind; > + nr_zones =3D cvtnum(argv[optind]); > + > + g_autofree BlockZoneDescriptor *zones =3D NULL; > + zones =3D g_new(BlockZoneDescriptor, nr_zones); > + ret =3D blk_zone_report(blk, offset, &nr_zones, zones); > + if (ret < 0) { > + printf("zone report failed: %s\n", strerror(-ret)); > + } else { > + for (int i =3D 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 =3D { > + .name =3D "zone_report", > + .altname =3D "zrp", > + .cfunc =3D zone_report_f, > + .argmin =3D 2, > + .argmax =3D 2, > + .args =3D "offset number", > + .oneline =3D "report zone information", > +}; > + > +static int zone_open_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset =3D cvtnum(argv[optind]); > + ++optind; > + len =3D cvtnum(argv[optind]); > + ret =3D blk_zone_mgmt(blk, BLK_ZO_OPEN, offset, len); > + if (ret < 0) { > + printf("zone open failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_open_cmd =3D { > + .name =3D "zone_open", > + .altname =3D "zo", > + .cfunc =3D zone_open_f, > + .argmin =3D 2, > + .argmax =3D 2, > + .args =3D "offset len", > + .oneline =3D "explicit open a range of zones in zone block devic= e", > +}; > + > +static int zone_close_f(BlockBackend *blk, int argc, char **argv) > +{ > + int ret; > + int64_t offset, len; > + ++optind; > + offset =3D cvtnum(argv[optind]); > + ++optind; > + len =3D cvtnum(argv[optind]); > + ret =3D blk_zone_mgmt(blk, BLK_ZO_CLOSE, offset, len); > + if (ret < 0) { > + printf("zone close failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_close_cmd =3D { > + .name =3D "zone_close", > + .altname =3D "zc", > + .cfunc =3D zone_close_f, > + .argmin =3D 2, > + .argmax =3D 2, > + .args =3D "offset len", > + .oneline =3D "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 =3D cvtnum(argv[optind]); > + ++optind; > + len =3D cvtnum(argv[optind]); > + ret =3D blk_zone_mgmt(blk, BLK_ZO_FINISH, offset, len); > + if (ret < 0) { > + printf("zone finish failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_finish_cmd =3D { > + .name =3D "zone_finish", > + .altname =3D "zf", > + .cfunc =3D zone_finish_f, > + .argmin =3D 2, > + .argmax =3D 2, > + .args =3D "offset len", > + .oneline =3D "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 =3D cvtnum(argv[optind]); > + ++optind; > + len =3D cvtnum(argv[optind]); > + ret =3D blk_zone_mgmt(blk, BLK_ZO_RESET, offset, len); > + if (ret < 0) { > + printf("zone reset failed: %s\n", strerror(-ret)); > + } > + return ret; > +} > + > +static const cmdinfo_t zone_reset_cmd =3D { > + .name =3D "zone_reset", > + .altname =3D "zrs", > + .cfunc =3D zone_reset_f, > + .argmin =3D 2, > + .argmax =3D 2, > + .args =3D "offset len", > + .oneline =3D "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 =3D { > .name =3D "truncate", > @@ -2504,6 +2642,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); > --=20 > 2.37.3 >=20 --2rRNGBPzBFJnhOZs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmMknZwACgkQnKSrs4Gr c8jLIgf/eoP1z/TCJPacg6vRCr+ecuisZydZZjCg8GjHYEfDow4W3cWhoZQgNY38 ZhdAh7fbcL9AgHvi64dyH6afUrrH4wZGGhtgd1RLROxd2uT8Mvs+Rz2QzITygwGU LjIGfG9CruQeegLnP5P13Ds0238X4PmnImwVnbiAm8eMCalcVAsLURk5bbXl3wZF +oAIKToK+MDFxKDu7zehQ5ysytgJaVev2TvkqgKVzMAS1QU+L+6/JtgclpQaZeIF QK2Q6yY0P+2har+mDdyMtFSWuLZqsJTk+1UcTM6MxB63tGQO/cJBkR6DkL4tZ61/ 2C8KGrtyoA+5jYGLcVSNCFDjQe2MEA== =ANSC -----END PGP SIGNATURE----- --2rRNGBPzBFJnhOZs--