Deriving the zone that an offset belongs to is open coded in five places, in two files, as a division of the offset by BlockLimits.zone_size. The zone size of a zoned device is always a power of two, which Linux requires of every device it accepts, so the division is a shift.
Add bdrv_zone_index() and use it. No functional change; the count of zones that a management operation spans stays a division, since it is a length rather than an offset. Signed-off-by: Niklas Cassel <[email protected]> --- block/file-posix.c | 8 ++++---- block/io.c | 7 +++++++ hw/block/virtio-blk.c | 2 +- include/block/block-io.h | 5 +++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index c0d6ee30e4..00323f7a9f 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1359,7 +1359,7 @@ static int get_zones_wp(BlockDriverState *bs, int fd, int64_t offset, size_t rep_size; uint64_t sector = offset >> BDRV_SECTOR_BITS; BlockZoneWps *wps = bs->wps; - unsigned int j = offset / bs->bl.zone_size; + unsigned int j = bdrv_zone_index(bs, offset); unsigned int n = 0, i = 0; int ret; rep_size = sizeof(struct blk_zone_report) + nrz * sizeof(struct blk_zone); @@ -2560,7 +2560,7 @@ raw_co_prw(BlockDriverState *bs, int64_t *offset_ptr, uint64_t bytes, bs->bl.zoned != BLK_Z_NONE) { qemu_co_mutex_lock(&bs->wps->colock); if (type & QEMU_AIO_ZONE_APPEND) { - int index = offset / bs->bl.zone_size; + int index = bdrv_zone_index(bs, offset); offset = bs->wps->wp[index]; } } @@ -2615,7 +2615,7 @@ out: bs->bl.zoned != BLK_Z_NONE) { BlockZoneWps *wps = bs->wps; if (ret == 0) { - uint64_t *wp = &wps->wp[offset / bs->bl.zone_size]; + uint64_t *wp = &wps->wp[bdrv_zone_index(bs, offset)]; if (!BDRV_ZT_IS_CONV(*wp)) { if (type & QEMU_AIO_ZONE_APPEND) { *offset_ptr = *wp; @@ -3513,7 +3513,7 @@ static int coroutine_fn raw_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp op, return -EINVAL; } - uint32_t i = offset / bs->bl.zone_size; + uint32_t i = bdrv_zone_index(bs, offset); uint32_t nrz = len / bs->bl.zone_size; uint64_t *wp = &wps->wp[i]; if (BDRV_ZT_IS_CONV(*wp) && len != capacity) { diff --git a/block/io.c b/block/io.c index a916b236c3..497247b684 100644 --- a/block/io.c +++ b/block/io.c @@ -3361,6 +3361,13 @@ out: return co.ret; } +uint32_t bdrv_zone_index(BlockDriverState *bs, uint64_t offset) +{ + IO_CODE(); + + return offset >> ctz64(bs->bl.zone_size); +} + void *qemu_blockalign(BlockDriverState *bs, size_t size) { IO_CODE(); diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index ffcd327803..8c5b87793e 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -527,7 +527,7 @@ static bool check_zoned_request(VirtIOBlock *s, int64_t offset, int64_t len, } } - index = offset / bs->bl.zone_size; + index = bdrv_zone_index(bs, offset); if (BDRV_ZT_IS_CONV(bs->wps->wp[index])) { *status = VIRTIO_BLK_S_ZONE_INVALID_CMD; return false; diff --git a/include/block/block-io.h b/include/block/block-io.h index d34d846bb2..71c8cdf2e1 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -126,6 +126,11 @@ int coroutine_fn GRAPH_RDLOCK bdrv_co_zone_append(BlockDriverState *bs, int64_t *offset, QEMUIOVector *qiov, BdrvRequestFlags flags); +/* + * The index of the zone that @offset falls in. A zoned device always has a + * zone size that is a power of two, so the division is a shift. + */ +uint32_t bdrv_zone_index(BlockDriverState *bs, uint64_t offset); bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); -- 2.55.0
