Alignment checks cleanup
v2 cover Alignment checks cleanup
While working on 4k support, I noticed that there is lot of code using BDRV_SECTOR_SIZE (512) for checking alignment. I wonder how this can work with 4k storage.
Lets start by cleaning up to make the code easier to understand:
- Use QEMU_IS_ALIGNED macro to check alignment
- Remove unneeded masks based on BDRV_SECTOR_SIZE
Nir Soffer (2):
block: Use QEMU_IS_ALIGNED
block: Remove unused masks
block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- include/block/block.h | 2 -- migration/block.c | 2 +- qemu-img.c | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/2 block: Use QEMU_IS_ALIGNED
Replace instances of:
(n & (BDRV_SECTOR_SIZE - 1)) == 0
And:
(n & ~BDRV_SECTOR_MASK) == 0
With:
QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)
Which reveals the intent of the code better, and makes it easier to locate the code checking alignment.
--- block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- qemu-img.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-)
block/bochs.c +2 -2
@@ -248,8 +248,8 @@ bochs_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,QEMUIOVector local_qiov;int ret; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));qemu_iovec_init (&local_qiov, qiov->niov);qemu_co_mutex_lock (&s->lock);
block/cloop.c +2 -2
@@ -253,8 +253,8 @@ cloop_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,int nb_sectors = bytes >>BDRV_SECTOR_BITS ;int ret, i; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));qemu_co_mutex_lock (&s->lock);
block/dmg.c +2 -2
@@ -697,8 +697,8 @@ dmg_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,int nb_sectors = bytes >>BDRV_SECTOR_BITS ;int ret, i; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));qemu_co_mutex_lock (&s->lock);
block/io.c +4 -4
@@ -1080,8 +1080,8 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriverState *bs, sector_num = offset >>BDRV_SECTOR_BITS ; nb_sectors = bytes >>BDRV_SECTOR_BITS ; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));assert (bytes <=BDRV_REQUEST_MAX_BYTES );assert (drv->bdrv_co_readv);
@@ -1133,8 +1133,8 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs, sector_num = offset >>BDRV_SECTOR_BITS ; nb_sectors = bytes >>BDRV_SECTOR_BITS ; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));assert (bytes <=BDRV_REQUEST_MAX_BYTES );assert (drv->bdrv_co_writev);
block/qcow2-cluster.c +2 -2
@@ -470,8 +470,8 @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs, {if (bytes && bs->encrypted) {BDRVQcow2State *s = bs->opaque; -assert ((offset_in_cluster & ~BDRV_SECTOR_MASK ) ==0 ); -assert ((bytes & ~BDRV_SECTOR_MASK ) ==0 ); +assert (QEMU_IS_ALIGNED (offset_in_cluster,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE ));assert (s->crypto); if (qcow2_co_encrypt(bs, cluster_offset, src_cluster_offset + offset_in_cluster,
block/qcow2.c +2 -2
@@ -2072,8 +2072,8 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, }if (bs->encrypted) {assert (s->crypto); -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((cur_bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (cur_bytes,BDRV_SECTOR_SIZE ));if (qcow2_co_decrypt (bs, cluster_offset, offset, cluster_data, cur_bytes) <0 ) { ret = -EIO ;
block/vvfat.c +4 -4
@@ -1547,8 +1547,8 @@ vvfat_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,int nb_sectors = bytes >>BDRV_SECTOR_BITS ;void *buf; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE )); buf =g_try_malloc (bytes);if (bytes && buf ==NULL ) {
@@ -3082,8 +3082,8 @@ vvfat_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,int nb_sectors = bytes >>BDRV_SECTOR_BITS ;void *buf; -assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 ); -assert ((bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); +assert (QEMU_IS_ALIGNED (offset,BDRV_SECTOR_SIZE )); +assert (QEMU_IS_ALIGNED (bytes,BDRV_SECTOR_SIZE )); buf =g_try_malloc (bytes);if (bytes && buf ==NULL ) {
qemu-img.c +1 -1
@@ -2141,7 +2141,7 @@ static int img_convert(int argc, char **argv)int64_t sval; sval =cvtnum (optarg); -if (sval <0 || sval & (BDRV_SECTOR_SIZE -1 ) || +if (sval <0 || !QEMU_IS_ALIGNED (sval,BDRV_SECTOR_SIZE ) || sval /BDRV_SECTOR_SIZE >MAX_BUF_SECTORS ) {error_report ("Invalid buffer size for sparse output specified. " "Valid sizes are multiples of %llu up to %llu. Select "
Signature · 1 line
2.20.1
PATCH v2 2/2 block: Remove unused masks
In reply to Nir SofferReplace confusing usage:
~BDRV_SECTOR_MASK
With more clear:
(BDRV_SECTOR_SIZE - 1)
Remove BDRV_SECTOR_MASK and the unused BDRV_BLOCK_OFFSET_MASK which was it's last user.
--- include/block/block.h | 2 -- migration/block.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
include/block/block.h +0 -2
@@ -143,7 +143,6 @@ typedef struct HDGeometry {#define BDRV_SECTOR_BITS 9#define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) -#define BDRV_SECTOR_MASK ~(BDRV_SECTOR_SIZE - 1)#define BDRV_REQUEST_MAX_SECTORS MIN(SIZE_MAX >> BDRV_SECTOR_BITS, \ INT_MAX >> BDRV_SECTOR_BITS)
@@ -195,7 +194,6 @@ typedef struct HDGeometry {#define BDRV_BLOCK_ALLOCATED 0x10#define BDRV_BLOCK_EOF 0x20#define BDRV_BLOCK_RECURSE 0x40 -#define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
migration/block.c +1 -1
@@ -906,7 +906,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) do { addr = qemu_get_be64(f); - flags = addr & ~BDRV_SECTOR_MASK; + flags = addr & (BDRV_SECTOR_SIZE - 1); addr >>= BDRV_SECTOR_BITS; if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 2/2] block: Remove unused masks
Quoted 4 lines · Nir Soffer
Replace confusing usage:
~BDRV_SECTOR_MASK
Quoted 8 lines
With more clear:
(BDRV_SECTOR_SIZE - 1)Remove
BDRV_SECTOR_MASKand the unusedBDRV_BLOCK_OFFSET_MASKwhich was it's last user.Signed-off-by Nir Soffer <[email protected]>
Re: [Qemu-devel] [Qemu-block] [PATCH v2 2/2] block: Remove unused masks
In reply to Nir SofferQuoted 11 lines · Nir Soffer
Replace confusing usage:
~BDRV_SECTOR_MASK
With more clear:
(BDRV_SECTOR_SIZE - 1)Remove
BDRV_SECTOR_MASKand the unusedBDRV_BLOCK_OFFSET_MASKwhich was it's last user.
Kind of lateral in my opinion, but if there was only ONE user across TWO definitions, then for sure it can go, especially because using the ALIGNED macros is indeed nicer and should be encouraged.
Quoted 40 lines
Signed-off-by Nir Soffer <[email protected]>--- include/block/block.h | 2 -- migration/block.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)include/block/block.h +0
-2@@ -143,7 +143,6 @@ typedef struct HDGeometry {#define BDRV_SECTOR_BITS 9#define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) -#define BDRV_SECTOR_MASK ~(BDRV_SECTOR_SIZE - 1)#define BDRV_REQUEST_MAX_SECTORS MIN(SIZE_MAX >> BDRV_SECTOR_BITS, \ INT_MAX >> BDRV_SECTOR_BITS)@@ -195,7 +194,6 @@ typedef struct HDGeometry {#define BDRV_BLOCK_ALLOCATED 0x10#define BDRV_BLOCK_EOF 0x20#define BDRV_BLOCK_RECURSE 0x40 -#define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;migration/block.c +1
-1@@ -906,7 +906,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) do { addr = qemu_get_be64(f); - flags = addr & ~BDRV_SECTOR_MASK; + flags = addr & (BDRV_SECTOR_SIZE - 1); addr >>= BDRV_SECTOR_BITS; if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
Quoted 12 lines · Nir Soffer
While working on 4k support, I noticed that there is lot of code using
BDRV_SECTOR_SIZE(512) for checking alignment. I wonder how this can work with 4k storage.Lets start by cleaning up to make the code easier to understand:
- UseQEMU_IS_ALIGNEDmacro to check alignment
- Remove unneeded masks based onBDRV_SECTOR_SIZENir Soffer (2):
block: UseQEMU_IS_ALIGNED
block: Remove unused masks
Quoted 12 lines
block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- include/block/block.h | 2 -- migration/block.c | 2 +- qemu-img.c | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-)
V2 changelog?
(Looks like adding patch 2 as a result of changing away users from the BDRV_SECTOR_MASK.)
Quoted 29 lines · John Snow
Quoted 2 lines · Nir Soffer
While working on 4k support, I noticed that there is lot of code using
BDRV_SECTOR_SIZE(512) for checking alignment. I wonder how this canwork with
Quoted 10 lines
4k storage.
Lets start by cleaning up to make the code easier to understand:
- UseQEMU_IS_ALIGNEDmacro to check alignment
- Remove unneeded masks based onBDRV_SECTOR_SIZENir Soffer (2):
block: UseQEMU_IS_ALIGNED
block: Remove unused masksQuoted 12 lines
block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- include/block/block.h | 2 -- migration/block.c | 2 +- qemu-img.c | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-)
Quoted 6 lines
V2 changelog?
(Looks like adding patch 2 as a result of changing away users from the
BDRV_SECTOR_MASK.)
Right.
Changes since v1:
- Replace usage of BDRV_SECTOR_MASK in qcow2-cluster.c (Max)
- Remove unused masks
v1 was here:
https://lists.nongnu.org/archive/html/qemu-block/2019-08/msg00875.html
Quoted 1 line
Reviewed-by John Snow <[email protected]>
Thanks!
Max, can you review again?
Quoted 53 lines · Nir Soffer
Quoted 29 lines · John Snow
Quoted 2 lines · Nir Soffer
While working on 4k support, I noticed that there is lot of code using
BDRV_SECTOR_SIZE(512) for checking alignment. I wonder how this canwork with
Quoted 10 lines
4k storage.
Lets start by cleaning up to make the code easier to understand:
- UseQEMU_IS_ALIGNEDmacro to check alignment
- Remove unneeded masks based onBDRV_SECTOR_SIZENir Soffer (2):
block: UseQEMU_IS_ALIGNED
block: Remove unused masksQuoted 12 lines
block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- include/block/block.h | 2 -- migration/block.c | 2 +- qemu-img.c | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-)Quoted 6 lines
V2 changelog?
(Looks like adding patch 2 as a result of changing away users from the
BDRV_SECTOR_MASK.)Right.
Changes since v1:
- Replace usage ofBDRV_SECTOR_MASKinqcow2-cluster.c(Max)
- Remove unused masksv1 was here:
https://lists.nongnu.org/archive/html/qemu-block/2019-08/msg00875.htmlQuoted 1 line
Reviewed-by John Snow <[email protected]>Thanks!
Max Reitz
AppliedQuoted 12 lines · Nir Soffer
While working on 4k support, I noticed that there is lot of code using
BDRV_SECTOR_SIZE(512) for checking alignment. I wonder how this can work with 4k storage.Lets start by cleaning up to make the code easier to understand:
- UseQEMU_IS_ALIGNEDmacro to check alignment
- Remove unneeded masks based onBDRV_SECTOR_SIZENir Soffer (2):
block: UseQEMU_IS_ALIGNED
block: Remove unused masks
Quoted 11 lines
block/bochs.c | 4 ++-- block/cloop.c | 4 ++-- block/dmg.c | 4 ++-- block/io.c | 8 ++++---- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 ++-- block/vvfat.c | 8 ++++---- include/block/block.h | 2 -- migration/block.c | 2 +- qemu-img.c | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-)
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
(I think you should check the setting of git config’s user.email in your qemu directory. Even if you send the patches through a gmail address (which I don’t quite know why you’re doing that, but it isn’t like that really matters), the patches should then still contain a “From: ” that shows the actual author as set by user.name and user.email.)
Max