block: introduce BDRV_REQUEST_MAX_SECTORS
PATCH 1/1 block: introduce BDRV_REQUEST_MAX_SECTORS
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX >> BDRV_SECTOR_BITS
UINT_MAX >> BDRV_SECTOR_BITS
SIZE_MAX >> BDRV_SECTOR_BITS
This patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)
block.c +8 -11
@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,static int bdrv_check_request (BlockDriverState *bs,int64_t sector_num,int nb_sectors) { -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EIO ; }
@@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, .iov_len = nb_sectors * BDRV_SECTOR_SIZE, }; -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ; }
@@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) }for (;;) { - nb_sectors = target_sectors - sector_num; + nb_sectors =MIN (target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS );if (nb_sectors <=0 ) {return 0 ; } -if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %" PRId64 ": %s",
@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; }
@@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,struct iovec iov = {0 };int ret =0 ; -int max_write_zeroes = bs->bl.max_write_zeroes ? - bs->bl.max_write_zeroes :INT_MAX ; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;
@@ -3458,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; }
@@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,return 0 ; } - max_discard = bs->bl.max_discard ? bs->bl.max_discard :INT_MAX ; + max_discard =MIN_NON_ZERO (bs->bl.max_discard,BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 ) {int ret;int num = nb_sectors;
hw/block/virtio-blk.c +2 -2
@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS );qsort (mrb->reqs, mrb->num_reqs,sizeof (*mrb->reqs), &multireq_compare);
@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,uint64_t nb_sectors = size >>BDRV_SECTOR_BITS ;uint64_t total_sectors; -if (nb_sectors >INT_MAX ) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {
include/block/block.h +3 -0
@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file
Signature · 1 line
1.9.1
Quoted 119 lines · Peter Lieven
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX>>BDRV_SECTOR_BITS
UINT_MAX>>BDRV_SECTOR_BITS
SIZE_MAX>>BDRV_SECTOR_BITSThis patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
Signed-off-by Peter Lieven <[email protected]>--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)block.c +8
-11@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,static int bdrv_check_request (BlockDriverState *bs,int64_t sector_num,int nb_sectors) { -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EIO ; }@@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, .iov_len = nb_sectors * BDRV_SECTOR_SIZE, }; -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ; }@@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) }for (;;) { - nb_sectors = target_sectors - sector_num; + nb_sectors =MIN (target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS );if (nb_sectors <=0 ) {return 0 ; } -if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %" PRId64 ": %s",@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; }@@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,struct iovec iov = {0 };int ret =0 ; -int max_write_zeroes = bs->bl.max_write_zeroes ? - bs->bl.max_write_zeroes :INT_MAX ; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;@@ -3458,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; }@@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,return 0 ; } - max_discard = bs->bl.max_discard ? bs->bl.max_discard :INT_MAX ; + max_discard =MIN_NON_ZERO (bs->bl.max_discard,BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 ) {int ret;int num = nb_sectors;hw/block/virtio-blk.c +2
-2@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS );qsort (mrb->reqs, mrb->num_reqs,sizeof (*mrb->reqs), &multireq_compare);@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,uint64_t nb_sectors = size >>BDRV_SECTOR_BITS ;uint64_t total_sectors; -if (nb_sectors >INT_MAX ) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {include/block/block.h +0
-0
include/block/block.h typedef enum { · line 91
Quoted 9 lines
include/block/block.h +3
-0@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file
On the other hand the limitation to INT_MAX for a request size (in bytes) is here.
bdrv_check_byte_request
if (size > INT_MAX) {
return -EIO;
}which means that all my patches from series
[PATCH v3 0/2] fix max_discard for NBD/gluster block drivers
becomes unnecessary but this was not that obvious before this clarification :)
Den
Am 03.02.2015 um 14:29 schrieb Denis V. Lunev:
Quoted 122 lines · Peter Lieven
Quoted 107 lines
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX>>BDRV_SECTOR_BITS
UINT_MAX>>BDRV_SECTOR_BITS
SIZE_MAX>>BDRV_SECTOR_BITSThis patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
Signed-off-by Peter Lieven <[email protected]>--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)block.c +1
-1@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,static int bdrv_check_request (BlockDriverState *bs,int64_t sector_num,int nb_sectors) { -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EIO ; } @@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,.iov_len =
nb_sectors*BDRV_SECTOR_SIZE,
};
- if (nb_sectors< 0 ||nb_sectors>INT_MAX/BDRV_SECTOR_SIZE) {block.c +3
-5+if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ; } @@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) }for (;;) { - nb_sectors = target_sectors - sector_num; + nb_sectors =MIN (target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS );if (nb_sectors <=0 ) {return 0 ; } -if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %" PRId64 ": %s",@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,struct iovec iov = {0}; int ret = 0;- int
max_write_zeroes=bs->bl.max_write_zeroes?block.c +3
-2- bs->bl.max_write_zeroes : INT_MAX; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;@@ -3458,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,return 0; }-
max_discard=bs->bl.max_discard?bs->bl.max_discard:INT_MAX;block.c +1
-0+ max_discard =MIN_NON_ZERO (bs->bl.max_discard,BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 ) {int ret;int num = nb_sectors;hw/block/virtio-blk.c +2
-1@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS );qsort (mrb->reqs, mrb->num_reqs,sizeof (*mrb->reqs), &multireq_compare);@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,uint64_t nb_sectors = size >>BDRV_SECTOR_BITS ;uint64_t total_sectors; - if (nb_sectors > INT_MAX) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {include/block/block.h +0
-0include/block/block.h typedef enum { · line 90
Quoted 8 lines
include/block/block.h +2
-0@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file Reviewed-by Denis V. Lunev <[email protected]>On the other hand the limitation to
INT_MAXfor a request size (in bytes) is here.
bdrv_check_byte_request
Quoted 8 lines
if (size > INT_MAX) { return -EIO; }which means that all my patches from series
[PATCH v3 0/2] fixmax_discardfor NBD/gluster block drivers
becomes unnecessary but this was not that obvious before this clarification :)
No, not completely. If we run into the check above the request fails. If you set max_write_zeroes the request is appropiately trimmed. So if the driver allows less than BDRV_REQUEST_MAX_SECTORS sectors you still have to set it in the BlockLimits.
Peter
Quoted 149 lines · Peter Lieven
Am 03.02.2015 um 14:29 schrieb Denis V. Lunev:
Quoted 139 lines · Peter Lieven
Quoted 124 lines
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX>>BDRV_SECTOR_BITS
UINT_MAX>>BDRV_SECTOR_BITS
SIZE_MAX>>BDRV_SECTOR_BITSThis patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
Signed-off-by Peter Lieven <[email protected]>--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)block.c +1
-1@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset, static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { - if (nb_sectors < 0 || nb_sectors > INT_MAX / BDRV_SECTOR_SIZE) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EIO;}@@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs,
int64_tsector_num,uint8_t*buf,
.iov_len =nb_sectors*BDRV_SECTOR_SIZE,
};
- if (nb_sectors< 0 ||nb_sectors>INT_MAX/BDRV_SECTOR_SIZE) {+ if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) } for (;;) {block.c +1
-1- nb_sectors = target_sectors - sector_num; + nb_sectors = MIN(target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS); if (nb_sectors <= 0) { return 0; }block.c +0
-3-if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %"PRId64 ": %s",
block.c +1
-1@@ -3167,7 +3164,7 @@ static int coroutine_fnbdrv_co_do_readv (BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { -if (nb_sectors <0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ;} @@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, struct iovec iov = {0}; int ret = 0;- int
max_write_zeroes=bs->bl.max_write_zeroes?block.c +3
-2- bs->bl.max_write_zeroes : INT_MAX; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;@@ -3458,7 +3455,7 @@ static int coroutine_fnbdrv_co_do_writev (BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { -if (nb_sectors <0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ;} @@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, return 0; } - max_discard = bs->bl.max_discard ? bs->bl.max_discard : INT_MAX; + max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS); while (nb_sectors > 0) { int ret; int num = nb_sectors;hw/block/virtio-blk.c +1
-1@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS ); qsort(mrb->reqs, mrb->num_reqs, sizeof(*mrb->reqs),&multireq_compare);hw/block/virtio-blk.c +1
-0@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, uint64_t nb_sectors = size >> BDRV_SECTOR_BITS;uint64_t total_sectors; - if (nb_sectors > INT_MAX) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {include/block/block.h +0
-0include/block/block.h typedef enum { · line 90
Quoted 8 lines
include/block/block.h +2
-0@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file Reviewed-by Denis V. Lunev <[email protected]>On the other hand the limitation to
INT_MAXfor a request size (in bytes) is here.
bdrv_check_byte_requestQuoted 8 lines
if (size > INT_MAX) { return -EIO; }which means that all my patches from series
[PATCH v3 0/2] fixmax_discardfor NBD/gluster block drivers
becomes unnecessary but this was not that obvious before this clarification :)
Quoted 7 lines
No, not completely. If we run into the check above the request fails. If you set
max_write_zeroesthe request is appropiately trimmed. So if the driver allows less thanBDRV_REQUEST_MAX_SECTORSsectors you still have to set it in the BlockLimits.Peter
your point will be correct after the following patch applied
block.c +1 -1
@@ -2647,7 +2647,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, i {int64_t len; -if (size >INT_MAX ) { +if (size >BDRV_REQUEST_MAX_SECTORS <<BDRV_SECTOR_BITS ) {return -EIO ; }
without we will fail at entry point inside bdrv_check_byte_request(). My patch applies the limit of UINT32_MAX over the value which is not greater than INT_MAX in the current codebase. bdrv_check_byte_request() is performed at the very-very beginning of the processing, f.e
bdrv_co_discard
bdrv_check_request
bdrv_check_byte_request <-- (INT_MAX limit applied)
max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS);
Den
Am 03.02.2015 um 16:33 schrieb Denis V. Lunev:
Quoted 147 lines · Peter Lieven
Quoted 132 lines
Am 03.02.2015 um 14:29 schrieb Denis V. Lunev:
Quoted 122 lines · Peter Lieven
Quoted 107 lines
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX>>BDRV_SECTOR_BITS
UINT_MAX>>BDRV_SECTOR_BITS
SIZE_MAX>>BDRV_SECTOR_BITSThis patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
Signed-off-by Peter Lieven <[email protected]>--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)block.c +1
-1@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,static int bdrv_check_request (BlockDriverState *bs,int64_t sector_num,int nb_sectors) { -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EIO ; } @@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,.iov_len =
nb_sectors*BDRV_SECTOR_SIZE,
};
- if (nb_sectors< 0 ||nb_sectors>INT_MAX/BDRV_SECTOR_SIZE) {block.c +3
-5+if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ; } @@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) }for (;;) { - nb_sectors = target_sectors - sector_num; + nb_sectors =MIN (target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS );if (nb_sectors <=0 ) {return 0 ; } -if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %" PRId64 ": %s",@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,struct iovec iov = {0}; int ret = 0;- int
max_write_zeroes=bs->bl.max_write_zeroes?block.c +3
-2- bs->bl.max_write_zeroes : INT_MAX; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;@@ -3458,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,return 0; }-
max_discard=bs->bl.max_discard?bs->bl.max_discard:INT_MAX;block.c +1
-0+ max_discard =MIN_NON_ZERO (bs->bl.max_discard,BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 ) {int ret;int num = nb_sectors;hw/block/virtio-blk.c +2
-1@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS );qsort (mrb->reqs, mrb->num_reqs,sizeof (*mrb->reqs), &multireq_compare);@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,uint64_t nb_sectors = size >>BDRV_SECTOR_BITS ;uint64_t total_sectors; - if (nb_sectors > INT_MAX) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {include/block/block.h +0
-0include/block/block.h typedef enum { · line 90
Quoted 8 lines
include/block/block.h +2
-0@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file Reviewed-by Denis V. Lunev <[email protected]>On the other hand the limitation to
INT_MAXfor a request size (in bytes) is here.
bdrv_check_byte_requestQuoted 8 lines
if (size > INT_MAX) { return -EIO; }which means that all my patches from series
[PATCH v3 0/2] fixmax_discardfor NBD/gluster block drivers
becomes unnecessary but this was not that obvious before this clarification :)Quoted 7 lines
No, not completely. If we run into the check above the request fails. If you set
max_write_zeroesthe request is appropiately trimmed. So if the driver allows less thanBDRV_REQUEST_MAX_SECTORSsectors you still have to set it in the BlockLimits.Peter
your point will be correct after the following patch applied
block.c +0
-0
block.c static int bdrv_check_byte_request(BlockDriverState *bs, i · line 2652
Quoted 7 lines
block.c +1
-1@@ -2647,7 +2647,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, i {int64_t len; -if (size >INT_MAX ) { +if (size >BDRV_REQUEST_MAX_SECTORS <<BDRV_SECTOR_BITS ) {return -EIO ; }
You are right, this will still fail if SIZE_MAX < INT_MAX. I would send a v2 of my patch and add the above. Then Kevin can remove your 2 patches, right?
Peter
Quoted 13 lines
without we will fail at entry point inside
bdrv_check_byte_request(). My patch applies the limit ofUINT32_MAXover the value which is not greater thanINT_MAXin the current codebase.bdrv_check_byte_request()is performed at the very-very beginning of the processing, f.e
bdrv_co_discard
bdrv_check_request
bdrv_check_byte_request<-- (INT_MAXlimit applied)
max_discard=MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS);Den
Quoted 150 lines · Peter Lieven
Am 03.02.2015 um 16:33 schrieb Denis V. Lunev:
Quoted 149 lines · Peter Lieven
Quoted 131 lines
Am 03.02.2015 um 14:29 schrieb Denis V. Lunev:
Quoted 122 lines · Peter Lieven
Quoted 107 lines
we check and adjust request sizes at several places with sometimes inconsistent checks or default values:
INT_MAX
INT_MAX>>BDRV_SECTOR_BITS
UINT_MAX>>BDRV_SECTOR_BITS
SIZE_MAX>>BDRV_SECTOR_BITSThis patches introdocues a macro for the maximal allowed sectors per request and uses it at several places.
Signed-off-by Peter Lieven <[email protected]>--- block.c | 19 ++++++++----------- hw/block/virtio-blk.c | 4 ++-- include/block/block.h | 3 +++ 3 files changed, 13 insertions(+), 13 deletions(-)block.c +1
-1@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,static int bdrv_check_request (BlockDriverState *bs,int64_t sector_num,int nb_sectors) { -if (nb_sectors <0 || nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { +if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EIO ; } @@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,.iov_len =
nb_sectors*BDRV_SECTOR_SIZE,
};
- if (nb_sectors< 0 ||nb_sectors>INT_MAX/BDRV_SECTOR_SIZE) {block.c +3
-5+if (nb_sectors <0 || nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return -EINVAL ; } @@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) }for (;;) { - nb_sectors = target_sectors - sector_num; + nb_sectors =MIN (target_sectors - sector_num,BDRV_REQUEST_MAX_SECTORS );if (nb_sectors <=0 ) {return 0 ; } -if (nb_sectors >INT_MAX /BDRV_SECTOR_SIZE ) { - nb_sectors =INT_MAX /BDRV_SECTOR_SIZE ; - } ret =bdrv_get_block_status (bs, sector_num, nb_sectors, &n);if (ret <0 ) { error_report("error getting block status at sector %" PRId64 ": %s",@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -3202,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,struct iovec iov = {0}; int ret = 0;- int
max_write_zeroes=bs->bl.max_write_zeroes?block.c +3
-2- bs->bl.max_write_zeroes : INT_MAX; +int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_write_zeroes, +BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 && !ret) {int num = nb_sectors;@@ -3458,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, BdrvRequestFlags flags) { - if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return -EINVAL; } @@ -5120,7 +5117,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,return 0; }-
max_discard=bs->bl.max_discard?bs->bl.max_discard:INT_MAX;block.c +1
-0+ max_discard =MIN_NON_ZERO (bs->bl.max_discard,BDRV_REQUEST_MAX_SECTORS );while (nb_sectors >0 ) {int ret;int num = nb_sectors;hw/block/virtio-blk.c +2
-1@@ -381,7 +381,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len =blk_get_max_transfer_length (mrb->reqs[0 ]->dev->blk); - max_xfer_len =MIN_NON_ZERO (max_xfer_len,INT_MAX ); + max_xfer_len =MIN_NON_ZERO (max_xfer_len,BDRV_REQUEST_MAX_SECTORS );qsort (mrb->reqs, mrb->num_reqs,sizeof (*mrb->reqs), &multireq_compare);@@ -447,7 +447,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,uint64_t nb_sectors = size >>BDRV_SECTOR_BITS ;uint64_t total_sectors; - if (nb_sectors > INT_MAX) { +if (nb_sectors >BDRV_REQUEST_MAX_SECTORS ) {return false; }if (sector & dev->sector_mask) {include/block/block.h +0
-0include/block/block.h typedef enum { · line 90
Quoted 8 lines
include/block/block.h +2
-0@@ -83,6 +83,9 @@ typedef enum {#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) +/* * Allocation status flags * BDRV_BLOCK_DATA: data is read from bs->file or another file Reviewed-by Denis V. Lunev <[email protected]>On the other hand the limitation to
INT_MAXfor a request size (in bytes) is here.
bdrv_check_byte_requestQuoted 8 lines
if (size > INT_MAX) { return -EIO; }which means that all my patches from series
[PATCH v3 0/2] fixmax_discardfor NBD/gluster block drivers
becomes unnecessary but this was not that obvious before this clarification :)Quoted 7 lines
No, not completely. If we run into the check above the request fails. If you set
max_write_zeroesthe request is appropiately trimmed. So if the driver allows less thanBDRV_REQUEST_MAX_SECTORSsectors you still have to set it in the BlockLimits.Peter
your point will be correct after the following patch applied
block.c +0
-0@@ -2647,7 +2647,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, i {int64_t len;
Quoted 9 lines
block.c static int bdrv_check_byte_request(BlockDriverState *bs, i · line 2652
Quoted 4 lines
block.c +1
-1-if (size >INT_MAX ) { +if (size >BDRV_REQUEST_MAX_SECTORS <<BDRV_SECTOR_BITS ) {return -EIO ; }You are right, this will still fail if
SIZE_MAX<INT_MAX. I would send a v2 of my patch and add the above. Then Kevin can remove your 2 patches, right?Peter
that's cool. Though in this case NBD patch will be necessary. Gluster code is correct. I'll re-spin it as some modification is necessary.
Quoted 12 lines
Quoted 12 lines
without we will fail at entry point inside
bdrv_check_byte_request(). My patch applies the limit ofUINT32_MAXover the value which is not greater thanINT_MAXin the current codebase.bdrv_check_byte_request()is performed at the very-very beginning of the processing, f.e
bdrv_co_discard
bdrv_check_request
bdrv_check_byte_request<-- (INT_MAXlimit applied)
max_discard=MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS);Den