From nobody Mon Feb 9 16:39:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1655696281; cv=none; d=zohomail.com; s=zohoarc; b=SRHtubpEpN96oo1C8s0W+ZhmrJ6Gl71NA/lSVwx1jT2sISRXhyb5J6nVUe+sqb6XBeYuVZkNTVp4qb/errz1PomD9h+HxqrAVYPMLFoIiDGvmqZFTtA/0GcDe2f4cCNRvhXOhyhks8OaJsmrBHuRRfC+s9AJZiGLIDC/I5Fcyzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655696281; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kHXVdfxWciSUYoqdILWnjSfuQDIA13b45d7ntDwQZzA=; b=BJPLhBeL9PtuBGZ1rzqxDIIwth97qpcJBwLy7it339s70j0tKRNJcfsCjA5/f59C8nw6PZQxB/c+9T4kXI8GzZOrMu2FV4/TWnBXxRKtxoRQ3xAUIdmaKHjw2D+YGNKCPTTbkjPzIWQw83I+Jopa6J1bU5En7iCdjxW2+BO+QFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655696281043877.0388518584441; Sun, 19 Jun 2022 20:38:01 -0700 (PDT) Received: from localhost ([::1]:35314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o38Eh-0003g5-5V for importer@patchew.org; Sun, 19 Jun 2022 23:37:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o38DT-0002rn-6U; Sun, 19 Jun 2022 23:36:43 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:33519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o38DQ-00010j-FF; Sun, 19 Jun 2022 23:36:42 -0400 Received: by mail-pg1-x531.google.com with SMTP id z14so9177841pgh.0; Sun, 19 Jun 2022 20:36:39 -0700 (PDT) Received: from fedora.. ([106.84.130.14]) by smtp.gmail.com with ESMTPSA id i4-20020aa78b44000000b0051c66160a3asm7741799pfd.181.2022.06.19.20.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 20:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kHXVdfxWciSUYoqdILWnjSfuQDIA13b45d7ntDwQZzA=; b=A8B+Sx5tpnv6/M0mJjdZKUnGoUZsUN26bi2uaSg9ZnqokTKbmCk0Fc+YpQkpzQlS7T TOB9reI3NMJSx5ut1znbORoUgvcWB81gGckb2jLvGu4nImwtusJ0OM+YTw8TPElOz7+I uE+a/UseNXVnl5/vBShuOZzxV2Zpys/qe8lR2oB20sjiBNC05n7ttp7hn/AbuCWM/ITA enCdgZd3cVKJ7GVFw31BuhHVkDOccSZg+dX97CCG4r/j1wa+qY9S4AO1tRP30cYzVd/K vseJrbbaHrAeNzDr4gC7FK9DAU+kIq7uQrJebEDbRyZ9590Rh8SO66l8qLZPhAgLK+fR FuNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kHXVdfxWciSUYoqdILWnjSfuQDIA13b45d7ntDwQZzA=; b=FxWSV9o44MFkW6dxhpPJMt87wLUB6m6r6yOXkAKFkCChmk5s/phYjmhA9R8PB7JcAN yhAksJ2cPT1DePg0WgeW7j09gUaqKdnawFNFLxJjakzxJg9UoyfCbZWqQSVAz6tYWqmt UqI76DpOMFF91EtdSMsW8awGrZ68zMMzXrXRsis+2mLxBpMzNmOG9kUElbl9AqH8fFSC Qae753WrNRtGg4WN1mpplNchwjffj6YoukFJnsJ5ISFVJPFRc+/Hs+FFv2oMRUQBzCt+ JLPBXSzi/iqmuZl00x27ZbJjwnQ2Gm/W46FwoFhk0P9uEIjQO5XeYS89vRgx3gN+BHc0 1jRQ== X-Gm-Message-State: AJIora9b9ysStWV+gFhFGTTBRQY9z+qGZsvR5DCVX0Z/4JhWb97ZTqMz na0BLtxtjX+TZmqhgG3jXlBzJUmeK5eX6NqZ X-Google-Smtp-Source: AGRyM1uUyGTMDEVVsI2qWbrdSFTzOaTMdO0vkwjAVbrO6uCzBgEWFZLctsJJYFLTOYyWl6SG18iQ0Q== X-Received: by 2002:a63:1b26:0:b0:3fd:8db8:9602 with SMTP id b38-20020a631b26000000b003fd8db89602mr20437319pgb.239.1655696198571; Sun, 19 Jun 2022 20:36:38 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: dmitry.fomichev@wdc.com, Stefan Hajnoczi , Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Hanna Reitz , hare@suse.de, damien.lemoal@opensource.wdc.com, Sam Li Subject: [RFC v2] Adding block layer APIs resembling Linux ZoneBlockDevice ioctls. Date: Mon, 20 Jun 2022 11:36:11 +0800 Message-Id: <20220620033611.82166-1-faithilikerun@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=faithilikerun@gmail.com; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1655696281694100001 Content-Type: text/plain; charset="utf-8" Fix some mistakes before. It can report a range of zones now. Signed-off-by: Sam Li --- block/block-backend.c | 22 ++++ block/coroutines.h | 5 + block/file-posix.c | 182 ++++++++++++++++++++++++++++++ block/io.c | 23 ++++ include/block/block-common.h | 43 ++++++- include/block/block-io.h | 13 +++ include/block/block_int-common.h | 20 ++++ qemu-io-cmds.c | 118 +++++++++++++++++++ tests/qemu-iotests/tests/zoned.sh | 52 +++++++++ 9 files changed, 477 insertions(+), 1 deletion(-) create mode 100644 tests/qemu-iotests/tests/zoned.sh diff --git a/block/block-backend.c b/block/block-backend.c index e0e1aff4b1..20248e4a35 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -104,6 +104,8 @@ typedef struct BlockBackendAIOCB { int ret; } BlockBackendAIOCB; =20 + + static const AIOCBInfo block_backend_aiocb_info =3D { .get_aio_context =3D blk_aiocb_get_aio_context, .aiocb_size =3D sizeof(BlockBackendAIOCB), @@ -1810,6 +1812,25 @@ int blk_flush(BlockBackend *blk) return ret; } =20 +int blk_co_zone_report(BlockBackend *blk, int64_t offset, int64_t len, + int64_t *nr_zones, + struct BlockZoneDescriptor *zones) +{ + int ret; + ret =3D bdrv_co_zone_report(blk->root->bs, offset, len, nr_zones, zone= s); + return ret; +} + +int blk_co_zone_mgmt(BlockBackend *blk, enum zone_op op, + int64_t offset, int64_t len) +{ + int ret; + ret =3D bdrv_co_zone_mgmt(blk->root->bs, op, offset, len); + + return ret; +} + + void blk_drain(BlockBackend *blk) { BlockDriverState *bs =3D blk_bs(blk); @@ -2634,3 +2655,4 @@ int blk_make_empty(BlockBackend *blk, Error **errp) =20 return bdrv_make_empty(blk->root, errp); } + diff --git a/block/coroutines.h b/block/coroutines.h index 830ecaa733..247326255f 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -80,6 +80,11 @@ int coroutine_fn blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); =20 int coroutine_fn blk_co_do_flush(BlockBackend *blk); +int coroutine_fn blk_co_zone_report(BlockBackend *blk, int64_t offset, + int64_t len, int64_t *nr_zones, + struct BlockZoneDescriptor *zones); +int coroutine_fn blk_co_zone_mgmt(BlockBackend *blk, enum zone_op op, + int64_t offset, int64_t len); =20 =20 /* diff --git a/block/file-posix.c b/block/file-posix.c index 48cd096624..71fd21f8ba 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -178,6 +178,137 @@ typedef struct BDRVRawReopenState { bool check_cache_dropped; } BDRVRawReopenState; =20 +/* + * parse_zone - Fill a zone descriptor + */ +static inline void parse_zone(struct BlockZoneDescriptor *zone, + struct blk_zone *blkz) { + zone->start =3D blkz->start << BDRV_SECTOR_BITS; + zone->length =3D blkz->len << BDRV_SECTOR_BITS; + zone->cap =3D blkz->capacity << BDRV_SECTOR_BITS; + zone->wp =3D blkz->wp << BDRV_SECTOR_BITS; + zone->type =3D blkz->type; + zone->cond =3D blkz->type; +} + +/** + * zone report - Get a zone block device's information in the + * form of an array of zone descriptors. + * + * @param bs: passing zone block device file descriptor + * @param zones: Space to hold zone information on reply + * @param offset: the location in the zone block device + * @return 0 on success, -1 on failure + */ +static int raw_co_zone_report(BlockDriverState *bs, int64_t offset, int64_= t len, + int64_t *nr_zones, + struct BlockZoneDescriptor *zones) { + BDRVRawState *s =3D bs->opaque; + struct blk_zone_report *rep; + struct BlockZoneDescriptor bzd; + struct blk_zone *blkz; + int64_t zone_size_mask, end, rep_size, nrz; + int ret, n =3D 0, i =3D 0; + + printf("%s\n", "start to report zone"); + nrz =3D *nr_zones; + rep_size =3D sizeof(struct blk_zone_report) + nrz * sizeof(struct blk_= zone); + rep =3D (struct blk_zone_report *)malloc(rep_size); + if (!rep) { + return -1; + } + + zone_size_mask =3D zone_start_sector - 1; + /* align up */ + end =3D ((offset + len + zone_size_mask) & (~zone_size_mask)) + >> BDRV_SECTOR_BITS; + + blkz =3D (struct blk_zone *)(rep + 1); + while (offset < end) { + memset(rep, 0, rep_size); + rep->sector =3D offset; + rep->nr_zones =3D nrz; + + ret =3D ioctl(s->fd, BLKREPORTZONE, rep); + if (ret !=3D 0) { + ret =3D -errno; + error_report("%d: ioctl BLKREPORTZONE at %ld failed %d", + s->fd, offset, errno); + free(rep); + return ret; + } + + if (!rep->nr_zones) { + break; + } + + for (i =3D 0; i < rep->nr_zones; i++) { + parse_zone(&bzd, &blkz[i]); + if (zones) { + memcpy(&zones[n], &bzd, sizeof(bzd)); + } + } + + offset =3D blkz[i].start + blkz[i].len; + } + + return ret; +} + +/** + * zone management operations - Execute an operation on a zone + */ +static int raw_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, + int64_t offset, int64_t len) { + BDRVRawState *s =3D bs->opaque; + struct blk_zone_range range; + const char *ioctl_name; + uint64_t ioctl_op; + int64_t zone_size_mask, end; + int ret; + + zone_size_mask =3D zone_start_sector - 1; + /* align up */ + end =3D ((offset + len + zone_size_mask) & (~zone_size_mask)) + >> BDRV_SECTOR_BITS; + offset =3D (offset & (~zone_size_mask)) >> BDRV_SECTOR_BITS; /* align = down */ + + switch (op) { + case zone_open: + ioctl_name =3D "BLKOPENZONE"; + ioctl_op =3D BLKOPENZONE; + break; + case zone_close: + ioctl_name =3D "BLKCLOSEZONE"; + ioctl_op =3D BLKCLOSEZONE; + break; + case zone_finish: + ioctl_name =3D "BLKFINISHZONE"; + ioctl_op =3D BLKFINISHZONE; + break; + case zone_reset: + ioctl_name =3D "BLKRESETZONE"; + ioctl_op =3D BLKRESETZONE; + break; + default: + error_report("Invalid zone operation 0x%x", op); + errno =3D -EINVAL; + return -1; + } + + /* Execute the operation */ + range.sector =3D offset; + range.nr_sectors =3D end - offset; + ret =3D ioctl(s->fd, ioctl_op, &range); + if (ret !=3D 0) { + error_report("ioctl %s failed %d", + ioctl_name, errno); + return -1; + } + + return 0; +} + static int fd_open(BlockDriverState *bs) { BDRVRawState *s =3D bs->opaque; @@ -3324,6 +3455,9 @@ BlockDriver bdrv_file =3D { .bdrv_abort_perm_update =3D raw_abort_perm_update, .create_opts =3D &raw_create_opts, .mutable_opts =3D mutable_opts, + + .bdrv_co_zone_report =3D raw_co_zone_report, + .bdrv_co_zone_mgmt =3D raw_co_zone_mgmt, }; =20 /***********************************************/ @@ -3703,6 +3837,53 @@ static BlockDriver bdrv_host_device =3D { #endif }; =20 +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_parse_filename =3D hdev_parse_filename, + .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, +}; + #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel= __) static void cdrom_parse_filename(const char *filename, QDict *options, Error **errp) @@ -3964,6 +4145,7 @@ static void bdrv_file_init(void) #if defined(HAVE_HOST_BLOCK_DEVICE) bdrv_register(&bdrv_host_device); #ifdef __linux__ + bdrv_register(&bdrv_zoned_host_device); bdrv_register(&bdrv_host_cdrom); #endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) diff --git a/block/io.c b/block/io.c index 789e6373d5..3e8bb83cc3 100644 --- a/block/io.c +++ b/block/io.c @@ -3258,6 +3258,29 @@ out: return co.ret; } =20 +int bdrv_co_zone_report(BlockDriverState *bs, + int64_t offset, int64_t len, int64_t *nr_zones, + struct BlockZoneDescriptor *zones) +{ + int ret =3D 0; + if (!bs->drv->bdrv_co_zone_report(bs, offset, len, nr_zones, zones)) { + return -ENOTSUP; + } + + return ret; +} + +int bdrv_co_zone_mgmt(BlockDriverState *bs, enum zone_op op, + int64_t offset, int64_t len) +{ + int ret =3D 0; + if (!bs->drv->bdrv_co_zone_mgmt(bs, op, offset, len)) { + return -ENOTSUP; + } + + return ret; +} + void *qemu_blockalign(BlockDriverState *bs, size_t size) { IO_CODE(); diff --git a/include/block/block-common.h b/include/block/block-common.h index fdb7306e78..24c468d8ad 100644 --- a/include/block/block-common.h +++ b/include/block/block-common.h @@ -23,7 +23,7 @@ */ #ifndef BLOCK_COMMON_H #define BLOCK_COMMON_H - +#include #include "block/aio.h" #include "block/aio-wait.h" #include "qemu/iov.h" @@ -48,6 +48,47 @@ typedef struct BlockDriver BlockDriver; typedef struct BdrvChild BdrvChild; typedef struct BdrvChildClass BdrvChildClass; +enum zone_type { + BLK_ZT_CONV =3D BLK_ZONE_TYPE_CONVENTIONAL, + BLK_ZT_SWR =3D BLK_ZONE_TYPE_SEQWRITE_REQ, + BLK_ZT_SWP =3D BLK_ZONE_TYPE_SEQWRITE_PREF, +}; + +enum zone_cond { + BLK_ZS_NOT_WP =3D BLK_ZONE_COND_NOT_WP, + BLK_ZS_EMPTY =3D BLK_ZONE_COND_EMPTY, + BLK_ZS_IOPEN =3D BLK_ZONE_COND_IMP_OPEN, + BLK_ZS_EOPEN =3D BLK_ZONE_COND_EXP_OPEN, + BLK_ZS_CLOSED =3D BLK_ZONE_COND_CLOSED, + BLK_ZS_RDONLY =3D BLK_ZONE_COND_READONLY, + BLK_ZS_FULL =3D BLK_ZONE_COND_FULL, + BLK_ZS_OFFLINE =3D BLK_ZONE_COND_OFFLINE, +}; + +enum zone_op { + zone_open, + zone_close, + zone_finish, + zone_reset, +}; + +/* + * Zone descriptor data structure. + * Provide information on a zone with all position and size values in byte= s. + */ +typedef struct BlockZoneDescriptor { + uint64_t start; + uint64_t length; + uint64_t cap; + uint64_t wp; + enum zone_type type; + enum zone_cond cond; +} BlockZoneDescriptor; + +enum zone_model { + BLK_Z_HM, + BLK_Z_HA, +}; =20 typedef struct BlockDriverInfo { /* in bytes, 0 if irrelevant */ diff --git a/include/block/block-io.h b/include/block/block-io.h index 62c84f0519..deb8902684 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 *b= uf); /* 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 offset, + int64_t len, int64_t *nr_zones, + struct BlockZoneDescriptor *zones); +int coroutine_fn bdrv_co_zone_mgmt(BlockDriverState *bs, enum 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); =20 +int generated_co_wrapper blk_zone_report(BlockBackend *blk, int64_t offset, + int64_t len, int64_t *nr_zones, + struct 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/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 8947abab76..4d0180a7da 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -63,6 +63,7 @@ #define BLOCK_OPT_EXTL2 "extended_l2" =20 #define BLOCK_PROBE_BUF_SIZE 512 +#define zone_start_sector 512 =20 enum BdrvTrackedRequestType { BDRV_TRACKED_READ, @@ -94,6 +95,19 @@ typedef struct BdrvTrackedRequest { struct BdrvTrackedRequest *waiting_for; } BdrvTrackedRequest; =20 +/** + * Zone device information data structure. + * Provide information on a device. + */ +typedef struct zbd_dev { + enum zone_model model; + uint32_t block_size; + uint32_t write_granularity; + uint32_t nr_zones; + struct BlockZoneDescriptor *zones; /* array of zones */ + uint32_t max_nr_open_zones; /* maximum number of explicitly open zones= */ + uint32_t max_nr_active_zones; +} zbd_dev; =20 struct BlockDriver { /* @@ -691,6 +705,12 @@ struct BlockDriver { QEMUIOVector *qiov, int64_t pos); =20 + int coroutine_fn (*bdrv_co_zone_report)(BlockDriverState *bs, + int64_t offset, int64_t len, int64_t *nr_zones, + struct BlockZoneDescriptor *zones); + int coroutine_fn (*bdrv_co_zone_mgmt)(BlockDriverState *bs, enum zone_= op op, + int64_t offset, int64_t len); + /* removable device specific */ bool (*bdrv_is_inserted)(BlockDriverState *bs); void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 2f0d8ac25a..51da6b7a89 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1706,6 +1706,119 @@ 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; + printf("block report\n"); + BlockZoneDescriptor *zones; + int64_t offset, len, nr_zones; + int i =3D 0; + + ++optind; + offset =3D cvtnum(argv[optind]); + ++optind; + len =3D cvtnum(argv[optind]); + ++optind; + nr_zones =3D cvtnum(argv[optind]); + zones =3D malloc(sizeof(struct BlockZoneDescriptor) * nr_zones); + ret =3D 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; + } + free(zones); + return ret; +} + +static const cmdinfo_t zone_report_cmd =3D { + .name =3D "zone_report", + .altname =3D "f", + .cfunc =3D zone_report_f, + .argmin =3D 3, + .argmax =3D 3, + .args =3D "offset [offset..] len [len..] number [num..]", + .oneline =3D "report a number of bytes of zone information", +}; + +static int zone_open_f(BlockBackend *blk, int argc, char **argv) +{ + return blk_zone_mgmt(blk, zone_open, 0, 0); +} + +static const cmdinfo_t zone_open_cmd =3D { + .name =3D "zone_open", + .altname =3D "f", + .cfunc =3D zone_open_f, + .argmin =3D 2, + .argmax =3D 2, + .args =3D "offset [offset..] len [len..]", + .oneline =3D "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 =3D cvtnum(argv[optind]); + ++optind; + len =3D cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_close, offset, len); +} + +static const cmdinfo_t zone_close_cmd =3D { + .name =3D "zone_close", + .altname =3D "f", + .cfunc =3D zone_close_f, + .argmin =3D 2, + .argmax =3D 2, + .args =3D "offset [offset..] len [len..]", + .oneline =3D "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 =3D cvtnum(argv[optind]); + ++optind; + len =3D cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_finish, offset, len); +} + +static const cmdinfo_t zone_finish_cmd =3D { + .name =3D "zone_finish", + .altname =3D "f", + .cfunc =3D zone_finish_f, + .argmin =3D 2, + .argmax =3D 2, + .args =3D "offset [offset..] len [len..]", + .oneline =3D "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 =3D cvtnum(argv[optind]); + ++optind; + len =3D cvtnum(argv[optind]); + return blk_zone_mgmt(blk, zone_reset, offset, len); +} + +static const cmdinfo_t zone_reset_cmd =3D { + .name =3D "zone_reset", + .altname =3D "f", + .cfunc =3D zone_reset_f, + .argmin =3D 2, + .argmax =3D 2, + .args =3D "offset [offset..] len [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", @@ -2498,6 +2611,11 @@ static void __attribute((constructor)) init_qemuio_c= ommands(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); diff --git a/tests/qemu-iotests/tests/zoned.sh b/tests/qemu-iotests/tests/z= oned.sh new file mode 100644 index 0000000000..042e47af27 --- /dev/null +++ b/tests/qemu-iotests/tests/zoned.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +# +# Test zone management operations. +# + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.pattern + +# much of this could be generic for any format supporting compression. +_supported_fmt qcow qcow2 +_supported_proto file +_supported_os Linux + +TEST_OFFSETS=3D"0" +TEST_LENS=3D"1000" +IMG=3D"--image-opts driver=3Dzoned_host_device,filename=3D/dev/nullb0 -c" +QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT + +echo "Testing a null_blk device" +echo +echo "Simple cases: testing operations once at a time" +echo +echo "At beginning: report all of the zones" +echo +$QEMU_IO "$IMG zone_report" +$QEMU_IO "$IMG zone_open" +echo "After opening a zone:" +$QEMU_IO "$IMG zone_report" +$QEMU_IO "$IMG zone_close" +echo "After closing a zone:" +$QEMU_IO "$IMG zone_report" +$QEMU_IO "$IMG zone_reset" +echo "After resetting a zone:" +$QEMU_IO "$IMG zone_report" + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 --=20 2.35.3