block: prepare for 64bit
cover block: prepare for 64bit
Hi all!
This is a preparation series for v4 of "[PATCH v3 00/17] 64bit block-layer".
The whole thing is in 04, and 01-03 are small preparations.
Vladimir Sementsov-Ogievskiy (4):
block/file-posix: fix workaround in raw_do_pwrite_zeroes() block/io: bdrv_refresh_limits(): use ERRP_GUARD block/io: bdrv_check_byte_request(): drop bdrv_is_inserted()
block: introduce BDRV_MAX_LENGTH
include/block/block.h | 10 ++++++ include/block/block_int.h | 8 +++++ block.c | 17 ++++++++- block/file-posix.c | 7 ++-- block/io.c | 69 ++++++++++++++++++++++++++---------- tests/test-write-threshold.c | 4 +++ tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/206.out | 6 ++++ 8 files changed, 98 insertions(+), 25 deletions(-)
Signature · 1 line
2.21.3
PATCH 1/4 block/file-posix: fix workaround in raw_do_pwrite_zeroes()
We should not set overlap_bytes:
1. Don't worry: it is calculated by bdrv_mark_request_serialising() and will be equal to or greater than bytes anyway.
2. If the request was already aligned up to some greater alignment, than we may break things: we reduce overlap_bytes, and further bdrv_mark_request_serialising() may not help, as it will not restore old bigger alignment.
--- block/file-posix.c | 1 - 1 file changed, 1 deletion(-)
block/file-posix.c +0 -1
@@ -2952,7 +2952,6 @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes, end =INT64_MAX & -(uint64_t )bs->bl.request_alignment; req->bytes = end - req->offset; - req->overlap_bytes = req->bytes;bdrv_mark_request_serialising (req, bs->bl.request_alignment); }
Signature · 1 line
2.21.3
PATCH 2/4 block/io: bdrv_refresh_limits(): use ERRP_GUARD
In reply to Vladimir Sementsov-OgievskiyThis simplifies following commit.
--- block/io.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
block/io.c +3 -4
@@ -135,10 +135,10 @@ static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)void bdrv_refresh_limits (BlockDriverState *bs,Error **errp) { +ERRP_GUARD ();BlockDriver *drv = bs->drv;BdrvChild *c;bool have_limits; -Error *local_err =NULL ;memset (&bs->bl,0 ,sizeof (bs->bl));
@@ -156,9 +156,8 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp) QLIST_FOREACH(c, &bs->children, next) {if (c->role & (BDRV_CHILD_DATA |BDRV_CHILD_FILTERED |BDRV_CHILD_COW )) { -bdrv_refresh_limits (c->bs, &local_err); -if (local_err) { -error_propagate (errp, local_err); +bdrv_refresh_limits (c->bs, errp); +if (*errp) {return ; }bdrv_merge_limits (&bs->bl, &c->bs->bl);
Signature · 1 line
2.21.3
Re: [PATCH 2/4] block/io: bdrv_refresh_limits(): use ERRP_GUARD
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
This simplifies following commit.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Berto
PATCH 3/4 block/io: bdrv_check_byte_request(): drop bdrv_is_inserted()
In reply to Vladimir Sementsov-OgievskiyMove bdrv_is_inserted() calls into callers.
We are going to make bdrv_check_byte_request() a clean thing. bdrv_is_inserted() is not about checking the request, it's about checking the bs. So, it should be separate.
With this patch we probably change error path for some failure scenarios. But depending on the fact that querying too big request on empty cdrom (or corrupted qcow2 node with no drv) will result in EIO and not ENOMEDIUM would be very strange. More over, we are going to move to 64bit requests, so larger requests will be allowed anyway.
More over, keeping in mind that cdrom is the only driver that has .bdrv_is_inserted() handler it's strange that we should care so much about it in generic block layer, intuitively we should just do read and write, and cdrom driver should return correct errors if it is not inserted. But it's a work for another series.
--- block/io.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
block/io.c +12 -13
@@ -884,17 +884,12 @@ static bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *selfreturn waited; } -static int bdrv_check_byte_request (BlockDriverState *bs,int64_t offset, -size_t size) +static int bdrv_check_byte_request (int64_t offset,size_t size) {if (size >BDRV_REQUEST_MAX_BYTES ) {return -EIO ; } -if (!bdrv_is_inserted (bs)) { -return -ENOMEDIUM ; - } -if (offset <0 ) {return -EIO ; }
@@ -1642,7 +1637,11 @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,trace_bdrv_co_preadv (bs, offset, bytes, flags); - ret =bdrv_check_byte_request (bs, offset, bytes); +if (!bdrv_is_inserted (bs)) { +return -ENOMEDIUM ; + } + + ret =bdrv_check_byte_request (offset, bytes);if (ret <0 ) {return ret; }
@@ -2054,11 +2053,11 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,trace_bdrv_co_pwritev (child->bs, offset, bytes, flags); -if (!bs->drv) { +if (!bdrv_is_inserted (bs)) {return -ENOMEDIUM ; } - ret =bdrv_check_byte_request (bs, offset, bytes); + ret =bdrv_check_byte_request (offset, bytes);if (ret <0 ) {return ret; }
@@ -3045,10 +3044,10 @@ static int coroutine_fn bdrv_co_copy_range_internal(assert (!(read_flags &BDRV_REQ_NO_FALLBACK ));assert (!(write_flags &BDRV_REQ_NO_FALLBACK )); -if (!dst || !dst->bs) { +if (!dst || !dst->bs || !bdrv_is_inserted (dst->bs)) {return -ENOMEDIUM ; } - ret =bdrv_check_byte_request (dst->bs, dst_offset, bytes); + ret =bdrv_check_byte_request (dst_offset, bytes);if (ret) {return ret; }
@@ -3056,10 +3055,10 @@ static int coroutine_fn bdrv_co_copy_range_internal(return bdrv_co_pwrite_zeroes (dst, dst_offset, bytes, write_flags); } -if (!src || !src->bs) { +if (!src || !src->bs || !bdrv_is_inserted (src->bs)) {return -ENOMEDIUM ; } - ret =bdrv_check_byte_request (src->bs, src_offset, bytes); + ret =bdrv_check_byte_request (src_offset, bytes);if (ret) {return ret; }
Signature · 1 line
2.21.3
Re: [PATCH 3/4] block/io: bdrv_check_byte_request(): drop bdrv_is_inserted()
Quoted 12 lines · Vladimir Sementsov-Ogievskiy
Move
bdrv_is_inserted()calls into callers.We are going to make
bdrv_check_byte_request()a clean thing.bdrv_is_inserted()is not about checking the request, it's about checking the bs. So, it should be separate.With this patch we probably change error path for some failure scenarios. But depending on the fact that querying too big request on empty cdrom (or corrupted qcow2 node with no drv) will result in EIO and not ENOMEDIUM would be very strange. More over, we are going to move to 64bit requests, so larger requests will be allowed anyway.
Quoted 7 lines
More over, keeping in mind that cdrom is the only driver that has .bdrv_is_inserted() handler it's strange that we should care so much about it in generic block layer, intuitively we should just do read and write, and cdrom driver should return correct errors if it is not inserted. But it's a work for another series.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Berto
PATCH 4/4 block: introduce BDRV_MAX_LENGTH
In reply to Vladimir Sementsov-OgievskiyWe are going to modify block layer to work with 64bit requests. And first step is moving to int64_t type for both offset and bytes arguments in all block request related functions.
It's mostly safe (when widening signed or unsigned int to int64_t), but switching from uint64_t is questionable.
So, let's first establish the set of requests we want to work with. First signed int64_t should be enough, as off_t is signed anyway. Then, obviously offset + bytes should not overflow.
And most interesting: (offset + bytes) being aligned up should not overflow as well. Aligned to what alignment? First thing that comes in mind is bs->bl.request_alignment, as we align up request to this alignment. But there is another thing: look at bdrv_mark_request_serialising(). It aligns request up to some given alignment. And this parameter may be bdrv_get_cluster_size(), which is often a lot greater than bs->bl.request_alignment.
Note also, that bdrv_mark_request_serialising() uses signed int64_t for calculations. So, actually, we already depend on some restrictions.
Happily, bdrv_get_cluster_size() returns int and bs->bl.request_alignment has 32bit unsigned type, but defined to be a power of 2 less than INT_MAX. So, we may establish, that INT_MAX is absolute maximum for any kind of alignment that may occur with the request.
Note, that bdrv_get_cluster_size() is not documented to return power of 2, still bdrv_mark_request_serialising() behaves like it is. Also, backup uses bdi.cluster_size and is not prepared to it not being power of 2.
So, let's establish that Qemu supports only power-of-2 clusters and alignments.
So, alignment can't be greater than 2^30.
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and request_alignment), let's simply set QEMU_ALIGN_DOWN(INT64_MAX, 2^30) as absolute maximum bytes length for Qemu. Actually, it's not much less than INT64_MAX.
OK, then, let's apply it to block/io.
Let's consider all block/io entry points of offset/bytes:
4 bytes/offset interface functions: bdrv_co_preadv_part(), bdrv_co_pwritev_part(), bdrv_co_copy_range_internal() and bdrv_co_pdiscard() and we check them all with bdrv_check_request().
We also have one entry point with only offset: bdrv_co_truncate(). Check the offset.
And one public structure: BdrvTrackedRequest. Happily, it has only three external users:
file-posix.c: adopted by this patch write-threshold.c: only read fields test-write-threshold.c: sets obviously small constant values
Better is to make the structure private and add corresponding interfaces.. Still it's not obvious what kind of interface is needed for file-posix.c. Let's keep it public but add corresponding assertions.
After this patch we'll convert functions in block/io.c to int64_t bytes and offset parameters. We can assume that offset/bytes pair always satisfy new restrictions, and make
corresponding assertions where needed. If we reach some offset/bytes point in block/io.c missing bdrv_check_request() it is considered a bug. As well, if block/io.c modifies a offset/bytes request, expanding it more then aligning up to request_alignment, it's a bug too.
For all io requests except for discard we keep for now old restriction of 32bit request length.
iotest 206 output error message changed, as now test disk size is larger than new limit. Add one more test case with new maximum disk size to cover too-big-L1 case.
--- include/block/block.h | 10 +++++++ include/block/block_int.h | 8 ++++++ block.c | 17 +++++++++++- block/file-posix.c | 6 ++--- block/io.c | 51 +++++++++++++++++++++++++++++------- tests/test-write-threshold.c | 4 +++ tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/206.out | 6 +++++ 8 files changed, 90 insertions(+), 14 deletions(-)
include/block/block.h +10 -0
@@ -142,6 +142,16 @@ typedef struct HDGeometry { INT_MAX >> BDRV_SECTOR_BITS)#define BDRV_REQUEST_MAX_BYTES (BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS) +/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT)) +/* * Allocation status flags for bdrv_block_status() and friends. *
include/block/block_int.h +8 -0
@@ -70,6 +70,12 @@ enum BdrvTrackedRequestType { BDRV_TRACKED_TRUNCATE, }; +/* +* That is not quite good that BdrvTrackedRequest structure is public, +* as block/io.c is very careful about incoming offset/bytes being +* correct. Be sure to assert bdrv_check_request() succeeded after any +* modification of BdrvTrackedRequest object out of block/io.c +*/ typedef struct BdrvTrackedRequest { BlockDriverState *bs; int64_t offset;
@@ -87,6 +93,8 @@ typedef struct BdrvTrackedRequest {struct BdrvTrackedRequest *waiting_for; } BdrvTrackedRequest; +int bdrv_check_request (int64_t offset,int64_t bytes); +struct BlockDriver {const char *format_name;int instance_size;
block.c +16 -1
@@ -961,6 +961,11 @@ int refresh_total_sectors(BlockDriverState *bs, int64_t hint) } bs->total_sectors = hint; + +if (bs->total_sectors *BDRV_SECTOR_SIZE >BDRV_MAX_LENGTH ) { +return -EFBIG ; + } +return 0 ; }
@@ -5534,6 +5539,7 @@ void bdrv_get_backing_filename(BlockDriverState *bs,int bdrv_get_info (BlockDriverState *bs,BlockDriverInfo *bdi) { +int ret;BlockDriver *drv = bs->drv;/* if bs->drv == NULL, bs is closed, so there's nothing to do here */ if (!drv) {
@@ -5547,7 +5553,16 @@ int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)return -ENOTSUP ; }memset (bdi,0 ,sizeof (*bdi)); -return drv->bdrv_get_info (bs, bdi); + ret = drv->bdrv_get_info (bs, bdi); +if (ret <0 ) { +return ret; + } + +if (bdi->cluster_size >BDRV_MAX_ALIGNMENT ) { +return -EINVAL ; + } + +return 0 ; } ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
block/file-posix.c +3 -3
@@ -2926,7 +2926,6 @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes,#ifdef CONFIG_FALLOCATE if (offset + bytes > bs->total_sectors *BDRV_SECTOR_SIZE ) {BdrvTrackedRequest *req; -uint64_t end;/* * This is a workaround for a bug in the Linux XFS driver,
@@ -2950,8 +2949,9 @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes,assert (req->offset <= offset);assert (req->offset + req->bytes >= offset + bytes); - end =INT64_MAX & -(uint64_t )bs->bl.request_alignment; - req->bytes = end - req->offset; + req->bytes =BDRV_MAX_LENGTH - req->offset; + +assert (bdrv_check_request (req->offset, req->bytes) ==0 );bdrv_mark_request_serialising (req, bs->bl.request_alignment); }
block/io.c +42 -9
103 lines not on this page · raw message
tests/test-write-threshold.c +4 -0
@@ -64,6 +64,8 @@ static void test_threshold_not_trigger(void) req.offset =1024 ; req.bytes =1024 ; +assert (bdrv_check_request (req.offset, req.bytes) ==0 ); +bdrv_write_threshold_set (&bs, threshold); amount =bdrv_write_threshold_exceeded (&bs, &req); g_assert_cmpuint(amount, ==, 0);
@@ -82,6 +84,8 @@ static void test_threshold_trigger(void) req.offset = (4 *1024 *1024 ) -1024 ; req.bytes =2 *1024 ; +assert (bdrv_check_request (req.offset, req.bytes) ==0 ); +bdrv_write_threshold_set (&bs, threshold); amount =bdrv_write_threshold_exceeded (&bs, &req); g_assert_cmpuint(amount, >=, 1024);
tests/qemu-iotests/206 +1 -1
@@ -201,7 +201,7 @@ with iotests.FilePath('t.qcow2') as disk_path, \ vm.launch() for size in [ 1234, 18446744073709551104, 9223372036854775808, - 9223372036854775296 ]: + 9223372036854775296, 9223372035781033984 ]: vm.blockdev_create({ 'driver': imgfmt, 'file': 'node0', 'size': size })
tests/qemu-iotests/206.out +6 -0
@@ -180,6 +180,12 @@ Job failed: Could not resize image: Image size cannot be negative {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 9223372036854775296}}} {"return": {}} +Job failed: Could not resize image: Required too big image size, it must be not greater than 9223372035781033984 +{"execute": "job-dismiss", "arguments": {"id": "job0"}} +{"return": {}} + +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "file": "node0", "size": 9223372035781033984}}} +{"return": {}} Job failed: Could not resize image: Failed to grow the L1 table: File too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}}
Signature · 1 line
2.21.3
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.
include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))
This change broke nbdkit tests.
We test that qemu can handle a qemu NBD export of size 2^63 - 512, the largest size that (experimentally) we found qemu could safely handle. eg:
https://github.com/libguestfs/nbdkit/blob/master/tests/test-memory-largest-for-qemu.sh
Before this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' image: nbd://localhost:10809 file format: raw virtual size: 8 EiB (9223372036854775296 bytes) disk size: unavailable
After this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' qemu-img: Could not open 'nbd://localhost:10809': Could not refresh total sector count: File too large
Can I confirm that this limit is now the new official one and we should adjust nbdkit tests? Or was this change unintentional given that qemu seemed happy to handle 2^63 - 512 disks before?
Note that nbdkit & libnbd support up to 2^63 - 1 bytes (we are not limited to whole sectors). Also the Linux kernel will let you create a /dev/nbdX device of size 2^63 - 1.
Rich.
Signature · 4 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 7 lines · Richard W.M. Jones
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.
Quoted 11 lines
include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
Actually that's not the only problem. It appears that we're unable to read or write the last sector of this disk:
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -r -f raw "$uri" -c "r -v $(( 2**63 - 2**30 - 512 )) 512" ' read failed: Input/output error
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -f raw "$uri" -c "w -P 3 $(( 2**63 - 2**30 - 512 )) 512" ' write failed: Input/output error
You can play around with the constants. I found it's possible to read and write the non-aligned 512 bytes starting at 2^63-2^30-513. Could be a fencepost error somewhere in qemu?
Rich.
Signature · 4 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 26 lines · Richard W.M. Jones
Quoted 7 lines · Richard W.M. Jones
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.Quoted 11 lines
include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
Actually that's not the only problem. It appears that we're unable to read or write the last sector of this disk:
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -r -f raw "$uri" -c "r -v $(( 2**63 - 2**30 - 512 )) 512" ' read failed: Input/output error
Quoted 6 lines
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -f raw "$uri" -c "w -P 3 $(( 2**63 - 2**30 - 512 )) 512" ' write failed: Input/output errorYou can play around with the constants. I found it's possible to read and write the non-aligned 512 bytes starting at 2^63-2^30-513. Could be a fencepost error somewhere in qemu?
Actually this is a pre-existing bug in qemu.
What happens is qemu-io calls qemu_strtosz("9223372035781033472") which returns 0x7fffffffc0000000 and no error. That answer is plain flat out wrong. The reason for that is qemu_strtosz uses floating point for the calculation(!) so is limited to 53 bits of precision and silently truncates.
It happened we were just lucky that our earlier test with 2^63 - 1024 worked.
Rich.
Signature · 4 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 34 lines · Richard W.M. Jones
Quoted 26 lines · Richard W.M. Jones
Quoted 7 lines · Richard W.M. Jones
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.Quoted 11 lines
include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
Actually that's not the only problem. It appears that we're unable to read or write the last sector of this disk:
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -r -f raw "$uri" -c "r -v $(( 2**63 - 2**30 - 512 )) 512" ' read failed: Input/output errorQuoted 6 lines
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -f raw "$uri" -c "w -P 3 $(( 2**63 - 2**30 - 512 )) 512" ' write failed: Input/output errorYou can play around with the constants. I found it's possible to read and write the non-aligned 512 bytes starting at 2^63-2^30-513. Could be a fencepost error somewhere in qemu?
Quoted 7 lines
Actually this is a pre-existing bug in qemu.
What happens is qemu-io calls
qemu_strtosz("9223372035781033472")which returns0x7fffffffc0000000and no error. That answer is plain flat out wrong. The reason for that isqemu_strtoszuses floating point for the calculation(!) so is limited to 53 bits of precision and silently truncates.
Hmm.. Seems it wants to support floats, like 1.5G.. Don't seem to be very useful, but why not. I think we should call qemu_strtou64 first, and only if it fails or leaves '.', 'e' or 'E' (anything else?) as end character we should do all this floating point logic.
Quoted 6 lines
It happened we were just lucky that our earlier test with 2^63 - 1024 worked.
Rich.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 37 lines · Vladimir Sementsov-Ogievskiy
Quoted 36 lines · Richard W.M. Jones
Quoted 26 lines · Richard W.M. Jones
Quoted 7 lines · Richard W.M. Jones
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.Quoted 11 lines
include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
Actually that's not the only problem. It appears that we're unable to read or write the last sector of this disk:
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -r -f raw "$uri" -c "r -v $(( 2**63 - 2**30 - 512 )) 512" ' read failed: Input/output errorQuoted 6 lines
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -f raw "$uri" -c "w -P 3 $(( 2**63 - 2**30 - 512 )) 512" ' write failed: Input/output errorYou can play around with the constants. I found it's possible to read and write the non-aligned 512 bytes starting at 2^63-2^30-513. Could be a fencepost error somewhere in qemu?
Actually this is a pre-existing bug in qemu.
Quoted 7 lines
Quoted 5 lines
What happens is qemu-io calls
qemu_strtosz("9223372035781033472")which returns0x7fffffffc0000000and no error. That answer is plain flat out wrong. The reason for that isqemu_strtoszuses floating point for the calculation(!) so is limited to 53 bits of precision and silently truncates.Hmm.. Seems it wants to support floats, like 1.5G.. Don't seem to be very useful, but why not. I think we should call
qemu_strtou64first, and only if it fails or leaves '.', 'e' or 'E' (anything else?) as end character we should do all this floating point logic.
I'm not sure we actually care about the floating point exponent syntax suffixes. The test suite doesn't cover that format, only the plain fractional parts.
It should be possible to avoid floating point entirely if we just split on "." and then use int64 arithmetic to scale the two parts before recombining them.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
In reply to Richard W.M. JonesQuoted 13 lines · Richard W.M. Jones
Quoted 6 lines
Actually that's not the only problem. It appears that we're unable to read or write the last sector of this disk:
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -r -f raw "$uri" -c "r -v $(( 2**63 - 2**30 - 512 )) 512" ' read failed: Input/output errorQuoted 6 lines
$ nbdkit memory $(( 2**63 - 2**30 )) --run 'build/qemu-io -f raw "$uri" -c "w -P 3 $(( 2**63 - 2**30 - 512 )) 512" ' write failed: Input/output errorYou can play around with the constants. I found it's possible to read and write the non-aligned 512 bytes starting at 2^63-2^30-513. Could be a fencepost error somewhere in qemu?
Quoted 7 lines
Actually this is a pre-existing bug in qemu.
What happens is qemu-io calls
qemu_strtosz("9223372035781033472")which returns0x7fffffffc0000000and no error. That answer is plain flat out wrong. The reason for that isqemu_strtoszuses floating point for the calculation(!) so is limited to 53 bits of precision and silently truncates.
I'm working a patch for that soon. It was easy to fix things to parse with full 64 bits of precision while still allowing a fractional bump (for things like 1.5M), but harder to chase down all the spots in the testsuite that are impacted by our parser now being more accurate.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
In reply to Richard W.M. JonesQuoted 38 lines · Richard W.M. Jones
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
We test that qemu can handle a qemu NBD export of size 2^63 - 512, the largest size that (experimentally) we found qemu could safely handle. eg:
https://github.com/libguestfs/nbdkit/blob/master/tests/test-memory-largest-for-qemu.sh
Before this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' image: nbd://localhost:10809 file format: raw virtual size: 8 EiB (9223372036854775296 bytes) disk size: unavailableAfter this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' qemu-img: Could not open 'nbd://localhost:10809': Could not refresh total sector count: File too large
Quoted 8 lines
Can I confirm that this limit is now the new official one and we should adjust nbdkit tests? Or was this change unintentional given that qemu seemed happy to handle 2^63 - 512 disks before?
Note that nbdkit & libnbd support up to 2^63 - 1 bytes (we are not limited to whole sectors). Also the Linux kernel will let you create a
/dev/nbdXdevice of size 2^63 - 1.
Hi Rich! The change is intentional.
I think the benefit of having clean limit, allowing us to align up bytes to some alignment (which is a common operation) exceeds the loss of 1G at the end of 2**63 range. We get simpler and safer code. And anyway, new limit is not much worse than 2**63. If at some point we have a problem with it being too restrictive, it's than very likely that 2**63 would be too small as well, which will require so much work that our a bit more restrictive limit is unlikely to increase the difficulty.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 4/4] block: introduce BDRV_MAX_LENGTH
Quoted 48 lines · Vladimir Sementsov-Ogievskiy
Quoted 38 lines · Richard W.M. Jones
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Finally to be safe with calculations, to not calculate different maximums for different nodes (depending on cluster size and
request_alignment), let's simply setQEMU_ALIGN_DOWN(INT64_MAX, 2^30)as absolute maximum bytes length for Qemu. Actually, it's not much less thanINT64_MAX.include/block/block.h typedef struct HDGeometry { · line 153
Quoted 9 lines
include/block/block.h +9
-0+/* +* We want allow aligning requests and disk length up to any 32bit alignment +* and don't afraid of overflow. +* To achieve it, and in the same time use some pretty number as maximum disk +* size, let's define maximum "length" (a limit for any offset/bytes request and +* for disk size) to be the greatest power of 2 less than INT64_MAX. +*/ +#define BDRV_MAX_ALIGNMENT (1L << 30) +#define BDRV_MAX_LENGTH (QEMU_ALIGN_DOWN(INT64_MAX, BDRV_MAX_ALIGNMENT))This change broke nbdkit tests.
We test that qemu can handle a qemu NBD export of size 2^63 - 512, the largest size that (experimentally) we found qemu could safely handle. eg:
https://github.com/libguestfs/nbdkit/blob/master/tests/test-memory-largest-for-qemu.sh
Before this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' image: nbd://localhost:10809 file format: raw virtual size: 8 EiB (9223372036854775296 bytes) disk size: unavailableAfter this commit:
$ nbdkit memory $(( 2**63 - 512 )) --run './qemu-img info "$uri"' qemu-img: Could not open 'nbd://localhost:10809': Could not refresh total sector count: File too largeQuoted 8 lines
Can I confirm that this limit is now the new official one and we should adjust nbdkit tests? Or was this change unintentional given that qemu seemed happy to handle 2^63 - 512 disks before?
Note that nbdkit & libnbd support up to 2^63 - 1 bytes (we are not limited to whole sectors). Also the Linux kernel will let you create a
/dev/nbdXdevice of size 2^63 - 1.
Quoted 6 lines
Hi Rich! The change is intentional.
I think the benefit of having clean limit, allowing us to align up bytes to some alignment (which is a common operation) exceeds the loss of 1G at the end of 2**63 range. We get simpler and safer code. And anyway, new limit is not much worse than 2**63.
That's fine, as long as we settle on this. I've updated the nbdkit tests:
https://github.com/libguestfs/nbdkit/commit/c3ec8c951e39a0f921252c162c236f23c588d2bd
Quoted 5 lines
If at some
point we have a problem with it being too restrictive, it's than very likely that 2**63 would be too small as well, which will require so much work that our a bit more restrictive limit is unlikely to increase the difficulty.
The next step is definitely working on 128 bit offsets!
https://rwmj.wordpress.com/2011/10/03/when-will-disk-sizes-go-beyond-64-bits/
Rich.
Signature · 5 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/
Kevin Wolf
AppliedAm 03.12.2020 um 23:27 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 6 lines
Hi all!
This is a preparation series for v4 of "[PATCH v3 00/17] 64bit block-layer".
The whole thing is in 04, and 01-03 are small preparations.
Thanks, applied to the block branch.
Kevin
Quoted 10 lines · Kevin Wolf
Am 03.12.2020 um 23:27 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 6 lines
Hi all!
This is a preparation series for v4 of "[PATCH v3 00/17] 64bit block-layer".
The whole thing is in 04, and 01-03 are small preparations.
Thanks, applied to the block branch.
Thank you!
Signature · 2 lines
Best regards, Vladimir