nbd: reduce max_block restrictions
cover nbd: reduce max_block restrictions
Recent changes in NBD protocol allowed to use some commands without max_block restriction. Let's drop restrictions.
NBD change is here:
https://github.com/NetworkBlockDevice/nbd/commit/9f30fedb8699f151e7ef4ccc07e624330be3316b#diff-762fb7c670348da69cc9050ef58fe3ae
Vladimir Sementsov-Ogievskiy (5):
block/nbd-client: drop max_block restriction from block_status block/nbd-client: drop max_block restriction from discard
block: add max_pwrite_zeroes_no_fallback to BlockLimits block/io: fix bdrv_co_do_pwrite_zeroes head calculation block/io: auto-no-fallback for write-zeroes
include/block/block_int.h | 8 ++++++++ block/blkdebug.c | 7 ++++++- block/io.c | 32 +++++++++++++++++++++++++++++--- block/nbd.c | 5 +---- 4 files changed, 44 insertions(+), 8 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/5 block/nbd-client: drop max_block restriction from block_status
NBD spec is updated, so that max_block doesn't relate to NBD_CMD_BLOCK_STATUS. So, drop the restriction.
--- block/nbd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
block/nbd.c +1 -3
@@ -1320,9 +1320,7 @@ static int coroutine_fn nbd_client_co_block_status(NBDRequest request = { .type =NBD_CMD_BLOCK_STATUS , .from = offset, - .len =MIN (MIN_NON_ZERO (QEMU_ALIGN_DOWN (INT_MAX , - bs->bl.request_alignment), - s->info.max_block), + .len =MIN (QEMU_ALIGN_DOWN (INT_MAX , bs->bl.request_alignment),MIN (bytes, s->info.size - offset)), .flags =NBD_CMD_FLAG_REQ_ONE , };
Signature · 1 line
2.21.0
Re: [PATCH 1/5] block/nbd-client: drop max_block restriction from block_status
Quoted 13 lines · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate toNBD_CMD_BLOCK_STATUS. So, drop the restriction.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/nbd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)block/nbd.c +0
-0
block/nbd.c static int coroutine_fn nbd_client_co_block_status( · line 1324
Quoted 8 lines
block/nbd.c +1
-3@@ -1320,9 +1320,7 @@ static int coroutine_fn nbd_client_co_block_status(NBDRequest request = { .type =NBD_CMD_BLOCK_STATUS , .from = offset, - .len =MIN (MIN_NON_ZERO (QEMU_ALIGN_DOWN (INT_MAX , - bs->bl.request_alignment), - s->info.max_block), + .len =MIN (QEMU_ALIGN_DOWN (INT_MAX , bs->bl.request_alignment),MIN (bytes, s->info.size - offset)),
We're still capped at 32 bits (instead of status over the entire device), but future NBD extensions will get to that. In the meantime, this is a lot nicer than having to stick to 32M per request.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH 2/5 block/nbd-client: drop max_block restriction from discard
In reply to Vladimir Sementsov-OgievskiyNBD spec is updated, so that max_block doesn't relate to NBD_CMD_TRIM. So, drop the restriction.
--- block/nbd.c | 1 - 1 file changed, 1 deletion(-)
block/nbd.c +0 -1
@@ -1955,7 +1955,6 @@ static void nbd_refresh_limits(BlockDriverState *bs, Error **errp) } bs->bl.request_alignment = min; - bs->bl.max_pdiscard = max; bs->bl.max_pwrite_zeroes = max; bs->bl.max_transfer = max;
Signature · 1 line
2.21.0
Re: [PATCH 2/5] block/nbd-client: drop max_block restriction from discard
Quoted 13 lines · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate toNBD_CMD_TRIM. So, drop the restriction.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/nbd.c | 1 - 1 file changed, 1 deletion(-)block/nbd.c +0
-0
block/nbd.c static void nbd_refresh_limits(BlockDriverState *bs, Error **errp) · line 1958
Quoted 4 lines
block/nbd.c +0
-1@@ -1955,7 +1955,6 @@ static void nbd_refresh_limits(BlockDriverState *bs, Error **errp) } bs->bl.request_alignment = min; - bs->bl.max_pdiscard = max;
We should still tell the block layer that we have a 32-bit cap (in case the block layer starts supporting 64-bit discard).
Quoted 4 lines
block/nbd.c +0
-0bs->bl.max_pwrite_zeroes = max; bs->bl.max_transfer = max;
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH 3/5 block: add max_pwrite_zeroes_no_fallback to BlockLimits
In reply to Vladimir Sementsov-OgievskiyNBD spec is updated, so that max_block doesn't relate to NBD_CMD_WRITE_ZEROES with NBD_CMD_FLAG_FAST_ZERO (which mirrors Qemu flag BDRV_REQ_NO_FALLBACK). To drop the restriction we need new max_pwrite_zeroes_no_fallback.
Default value of new max_pwrite_zeroes_no_fallback is zero and it means no-restriction, so we are automatically done by this commit. Note that nbd and blkdebug are the only drivers which in the same time define max_pwrite_zeroes limit and support BDRV_REQ_NO_FALLBACK, so we need to update only blkdebug.
--- include/block/block_int.h | 8 ++++++++ block/blkdebug.c | 7 ++++++- block/io.c | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-)
include/block/block_int.h +8 -0
@@ -618,6 +618,14 @@ typedef struct BlockLimits {* pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; +/* +* Maximum number of bytes that can zeroized at once if flag +* BDRV_REQ_NO_FALLBACK specified (since it is signed, it must be < 2G, if +* set). Must be multiple of pwrite_zeroes_alignment. May be 0 if no +* inherent 32-bit limit. +*/ +int32_t max_pwrite_zeroes_no_fallback; +/* Optimal alignment for write zeroes requests in bytes. A power * of 2 is best but not mandatory. Must be a multiple of * bl.request_alignment, and must be less than max_pwrite_zeroes
block/blkdebug.c +6 -1
@@ -692,7 +692,11 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, }assert (QEMU_IS_ALIGNED (offset, align));assert (QEMU_IS_ALIGNED (bytes, align)); -if (bs->bl.max_pwrite_zeroes) { +if ((flags &BDRV_REQ_NO_FALLBACK ) && + bs->bl.max_pwrite_zeroes_no_fallback) + { +assert (bytes <= bs->bl.max_pwrite_zeroes_no_fallback); + }else if (bs->bl.max_pwrite_zeroes) {assert (bytes <= bs->bl.max_pwrite_zeroes); }
@@ -977,6 +981,7 @@ static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) }if (s->max_write_zero) { bs->bl.max_pwrite_zeroes = s->max_write_zero; + bs->bl.max_pwrite_zeroes_no_fallback = s->max_write_zero; }if (s->opt_discard) { bs->bl.pdiscard_alignment = s->opt_discard;
block/io.c +3 -1
@@ -1752,7 +1752,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,int head =0 ;int tail =0 ; -int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_pwrite_zeroes,INT_MAX ); +int max_write_zeroes =MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes,INT_MAX );int alignment =MAX (bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment);int max_transfer =MIN_NON_ZERO (bs->bl.max_transfer,MAX_BOUNCE_BUFFER );
Signature · 1 line
2.21.0
Re: [PATCH 3/5] block: add max_pwrite_zeroes_no_fallback to BlockLimits
Quoted 1 line · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate to
Maybe: The NBD spec was recently updated to clarify that max_block...
Quoted 3 lines
NBD_CMD_WRITE_ZEROESwithNBD_CMD_FLAG_FAST_ZERO(which mirrors Qemu flagBDRV_REQ_NO_FALLBACK). To drop the restriction we need newmax_pwrite_zeroes_no_fallback.
It feels odd to have two different pwrite_zeroes limits in the block layer, but I can live with it if other block layer gurus are also okay with it.
Quoted 3 lines
Default value of new
max_pwrite_zeroes_no_fallbackis zero and it means no-restriction, so we are automatically done by this commit. Note that
Why not have the default value be set to the existing value of the normal pwrite_zeroes limit, rather than 0?
Quoted 3 lines
nbd and blkdebug are the only drivers which in the same time define
max_pwrite_zeroeslimit and supportBDRV_REQ_NO_FALLBACK, so we need to update only blkdebug.
Grammar:
The default value for the new max_pwrite_zeroes_no_fallback is zero, meaning no restriction, which covers all drivers not touched by this commit. Note that nbd and blkdebug are the only drivers which have a max_pwrite_zeroes limit while supporting BDRV_REQ_NO_FALLBACK, so we only need to update blkdebug.
Except that I think there IS still a limit in current NBD: you can't request anything larger than 32 bits (whereas some other drivers may allow a full 63-bit request, as well as future NBD usage when we finally add 64-bit extensions to the protocol). So I think this patch is incomplete; it should be updating the nbd code to set the proper limit.
(I still need to post v2 of my patches for bdrv_co_make_zero support, which is a case where knowing if there is a 32-bit limit when using BDRV_REQ_NO_FALLBACK for fast zeroing is important).
Quoted 13 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/block/block_int.h | 8 ++++++++ block/blkdebug.c | 7 ++++++- block/io.c | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-)include/block/block_int.h +0
-0
include/block/block_int.h typedef struct BlockLimits { · line 622
Quoted 5 lines
include/block/block_int.h +2
-0@@ -618,6 +618,14 @@ typedef struct BlockLimits {* pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; +/* +* Maximum number of bytes that can zeroized at once if flag
zeroed
include/block/block_int.h typedef struct BlockLimits { · line 624
Quoted 2 lines
include/block/block_int.h +2
-0+* BDRV_REQ_NO_FALLBACK specified (since it is signed, it must be < 2G, if +* set).
Why must it be a signed 32-bit number? Why not let it be a 64-bit number?
Quoted 26 lines
Must be multiple of
pwrite_zeroes_alignment. May be 0 if noinclude/block/block_int.h +4
-0+* inherent 32-bit limit. +*/ +int32_t max_pwrite_zeroes_no_fallback; +/* Optimal alignment for write zeroes requests in bytes. A power * of 2 is best but not mandatory. Must be a multiple of * bl.request_alignment, and must be less than max_pwrite_zeroes block/blkdebug.c +5
-1@@ -692,7 +692,11 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, }assert (QEMU_IS_ALIGNED (offset, align));assert (QEMU_IS_ALIGNED (bytes, align)); -if (bs->bl.max_pwrite_zeroes) { +if ((flags &BDRV_REQ_NO_FALLBACK ) && + bs->bl.max_pwrite_zeroes_no_fallback) + { +assert (bytes <= bs->bl.max_pwrite_zeroes_no_fallback); + }else if (bs->bl.max_pwrite_zeroes) {assert (bytes <= bs->bl.max_pwrite_zeroes); }
block/blkdebug.c static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) · line 984
Quoted 4 lines
block/blkdebug.c +1
-0@@ -977,6 +981,7 @@ static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) }if (s->max_write_zero) { bs->bl.max_pwrite_zeroes = s->max_write_zero; + bs->bl.max_pwrite_zeroes_no_fallback = s->max_write_zero;
Ah, so you DO default it to max_pwwrite_zeroes instead of to 0; the commit message does not quite match the code.
Quoted 8 lines
block/blkdebug.c +0
-0}if (s->opt_discard) { bs->bl.pdiscard_alignment = s->opt_discard;block/io.c +0
-0
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1757
Quoted 7 lines
block/io.c +3
-1@@ -1752,7 +1752,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,int head =0 ;int tail =0 ; -int max_write_zeroes =MIN_NON_ZERO (bs->bl.max_pwrite_zeroes,INT_MAX ); +int max_write_zeroes =MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes,INT_MAX );
I'd still like to get rid of this INT_MAX clamping. If we can blank the entire image in one call, even when it is larger than 4G, then it is worth making that exposed to the user. (Even in NBD, we might decide to add an extension that allows NBD_CMD_WRITE_ZEROES with a new flag and with offset/length == 0/0, as an official way to make the entire image zero, whereas it is now currently unspecified to pass a length of 0).
Quoted 4 lines
block/io.c +0
-0int alignment =MAX (bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment);int max_transfer =MIN_NON_ZERO (bs->bl.max_transfer,MAX_BOUNCE_BUFFER );
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 3/5] block: add max_pwrite_zeroes_no_fallback to BlockLimits
Quoted 86 lines · Eric Blake
Quoted 1 line · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate toMaybe: The NBD spec was recently updated to clarify that
max_block...Quoted 3 lines
NBD_CMD_WRITE_ZEROESwithNBD_CMD_FLAG_FAST_ZERO(which mirrors Qemu flagBDRV_REQ_NO_FALLBACK). To drop the restriction we need newmax_pwrite_zeroes_no_fallback.It feels odd to have two different
pwrite_zeroeslimits in the block layer, but I can live with it if other block layer gurus are also okay with it.Quoted 3 lines
Default value of new
max_pwrite_zeroes_no_fallbackis zero and it means no-restriction, so we are automatically done by this commit. Note thatWhy not have the default value be set to the existing value of the normal
pwrite_zeroeslimit, rather than 0?Quoted 3 lines
nbd and blkdebug are the only drivers which in the same time define
max_pwrite_zeroeslimit and supportBDRV_REQ_NO_FALLBACK, so we need to update only blkdebug.Grammar:
The default value for the new
max_pwrite_zeroes_no_fallbackis zero, meaning no restriction, which covers all drivers not touched by this commit. Note that nbd and blkdebug are the only drivers which have amax_pwrite_zeroeslimit while supportingBDRV_REQ_NO_FALLBACK, so we only need to update blkdebug.Except that I think there IS still a limit in current NBD: you can't request anything larger than 32 bits (whereas some other drivers may allow a full 63-bit request, as well as future NBD usage when we finally add 64-bit extensions to the protocol). So I think this patch is incomplete; it should be updating the nbd code to set the proper limit.
(I still need to post v2 of my patches for
bdrv_co_make_zerosupport, which is a case where knowing if there is a 32-bit limit when usingBDRV_REQ_NO_FALLBACKfor fast zeroing is important).Quoted 13 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
include/block/block_int.h| 8 ++++++++
block/blkdebug.c | 7 ++++++-
block/io.c | 4 +++-3 files changed, 17 insertions(+), 2 deletions(-)include/block/block_int.h +0
-0include/block/block_int.h typedef struct BlockLimits { · line 621
Quoted 4 lines
include/block/block_int.h +2
-0@@ -618,6 +618,14 @@ typedef struct BlockLimits {* pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; + /* +* Maximum number of bytes that can zeroized at once if flag zeroed
include/block/block_int.h typedef struct BlockLimits { · line 623
Quoted 2 lines
include/block/block_int.h +2
-0+ * BDRV_REQ_NO_FALLBACK specified (since it is signed, it must be < 2G, if + * set).Why must it be a signed 32-bit number? Why not let it be a 64-bit number?
Quoted 25 lines
Must be multiple of
pwrite_zeroes_alignment. May be 0 if no + * inherent 32-bit limit.
+ */
+int32_tmax_pwrite_zeroes_no_fallback;
+
/* Optimal alignment for write zeroes requests in bytes. A power
* of 2 is best but not mandatory. Must be a multiple of
* bl.request_alignment, and must be less thanmax_pwrite_zeroesblock/blkdebug.c +5
-1@@ -692,7 +692,11 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, } assert(QEMU_IS_ALIGNED(offset, align)); assert(QEMU_IS_ALIGNED(bytes, align)); - if (bs->bl.max_pwrite_zeroes) { + if ((flags & BDRV_REQ_NO_FALLBACK) && + bs->bl.max_pwrite_zeroes_no_fallback) + { + assert(bytes <= bs->bl.max_pwrite_zeroes_no_fallback); + } else if (bs->bl.max_pwrite_zeroes) { assert(bytes <= bs->bl.max_pwrite_zeroes); }block/blkdebug.c static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) · line 984
Quoted 4 lines
block/blkdebug.c +1
-0@@ -977,6 +981,7 @@ static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) } if (s->max_write_zero) { bs->bl.max_pwrite_zeroes = s->max_write_zero; + bs->bl.max_pwrite_zeroes_no_fallback = s->max_write_zero;Ah, so you DO default it to
max_pwwrite_zeroesinstead of to 0; the commit message does not quite match the code.
Quoted 17 lines
Quoted 8 lines
block/blkdebug.c +0
-0} if (s->opt_discard) { bs->bl.pdiscard_alignment = s->opt_discard;block/io.c +0
-0block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1756
Quoted 6 lines
block/io.c +3
-1@@ -1752,7 +1752,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, int head = 0; int tail = 0; - int max_write_zeroes = MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, INT_MAX); + int max_write_zeroes = MIN_NON_ZERO((flags & BDRV_REQ_NO_FALLBACK) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes, INT_MAX);I'd still like to get rid of this
INT_MAXclamping. If we can blank the entire image in one call, even when it is larger than 4G, then it is worth making that exposed to the user. (Even in NBD, we might decide to add an extension that allowsNBD_CMD_WRITE_ZEROESwith a new flag and with offset/length == 0/0, as an official way to make the entire image zero, whereas it is now currently unspecified to pass a length of 0).
Hmm. This series is kind of hacking. Now, 5.0 is missed anyway, I think, I'll prepare something more complete. It would be good to prepare generic block layer for 64bit commands.
Quoted 5 lines
Quoted 4 lines
block/io.c +0
-0int alignment = MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFFER);
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/5] block: add max_pwrite_zeroes_no_fallback to BlockLimits
Quoted 105 lines · Vladimir Sementsov-Ogievskiy
Quoted 86 lines · Eric Blake
Quoted 1 line · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate toMaybe: The NBD spec was recently updated to clarify that
max_block...Quoted 3 lines
NBD_CMD_WRITE_ZEROESwithNBD_CMD_FLAG_FAST_ZERO(which mirrors Qemu flagBDRV_REQ_NO_FALLBACK). To drop the restriction we need newmax_pwrite_zeroes_no_fallback.It feels odd to have two different
pwrite_zeroeslimits in the block layer, but I can live with it if other block layer gurus are also okay with it.Quoted 3 lines
Default value of new
max_pwrite_zeroes_no_fallbackis zero and it means no-restriction, so we are automatically done by this commit. Note thatWhy not have the default value be set to the existing value of the normal
pwrite_zeroeslimit, rather than 0?Quoted 3 lines
nbd and blkdebug are the only drivers which in the same time define
max_pwrite_zeroeslimit and supportBDRV_REQ_NO_FALLBACK, so we need to update only blkdebug.Grammar:
The default value for the new
max_pwrite_zeroes_no_fallbackis zero, meaning no restriction, which covers all drivers not touched by this commit. Note that nbd and blkdebug are the only drivers which have amax_pwrite_zeroeslimit while supportingBDRV_REQ_NO_FALLBACK, so we only need to update blkdebug.Except that I think there IS still a limit in current NBD: you can't request anything larger than 32 bits (whereas some other drivers may allow a full 63-bit request, as well as future NBD usage when we finally add 64-bit extensions to the protocol). So I think this patch is incomplete; it should be updating the nbd code to set the proper limit.
(I still need to post v2 of my patches for
bdrv_co_make_zerosupport, which is a case where knowing if there is a 32-bit limit when usingBDRV_REQ_NO_FALLBACKfor fast zeroing is important).Quoted 13 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
include/block/block_int.h| 8 ++++++++
block/blkdebug.c | 7 ++++++-
block/io.c | 4 +++-3 files changed, 17 insertions(+), 2 deletions(-)include/block/block_int.h +0
-0include/block/block_int.h typedef struct BlockLimits { · line 621
Quoted 4 lines
include/block/block_int.h +2
-0@@ -618,6 +618,14 @@ typedef struct BlockLimits {* pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; + /* +* Maximum number of bytes that can zeroized at once if flag zeroed
include/block/block_int.h typedef struct BlockLimits { · line 623
Quoted 2 lines
include/block/block_int.h +2
-0+ * BDRV_REQ_NO_FALLBACK specified (since it is signed, it must be < 2G, if + * set).Why must it be a signed 32-bit number? Why not let it be a 64-bit number?
Quoted 25 lines
Must be multiple of
pwrite_zeroes_alignment. May be 0 if no + * inherent 32-bit limit.
+ */
+int32_tmax_pwrite_zeroes_no_fallback;
+
/* Optimal alignment for write zeroes requests in bytes. A power
* of 2 is best but not mandatory. Must be a multiple of
* bl.request_alignment, and must be less thanmax_pwrite_zeroesblock/blkdebug.c +5
-1@@ -692,7 +692,11 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, } assert(QEMU_IS_ALIGNED(offset, align)); assert(QEMU_IS_ALIGNED(bytes, align)); - if (bs->bl.max_pwrite_zeroes) { + if ((flags & BDRV_REQ_NO_FALLBACK) && + bs->bl.max_pwrite_zeroes_no_fallback) + { + assert(bytes <= bs->bl.max_pwrite_zeroes_no_fallback); + } else if (bs->bl.max_pwrite_zeroes) { assert(bytes <= bs->bl.max_pwrite_zeroes); }block/blkdebug.c static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) · line 984
Quoted 4 lines
block/blkdebug.c +1
-0@@ -977,6 +981,7 @@ static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) } if (s->max_write_zero) { bs->bl.max_pwrite_zeroes = s->max_write_zero; + bs->bl.max_pwrite_zeroes_no_fallback = s->max_write_zero;Ah, so you DO default it to
max_pwwrite_zeroesinstead of to 0; the commit message does not quite match the code.Quoted 17 lines
Quoted 8 lines
block/blkdebug.c +0
-0} if (s->opt_discard) { bs->bl.pdiscard_alignment = s->opt_discard;block/io.c +0
-0block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1756
Quoted 6 lines
block/io.c +3
-1@@ -1752,7 +1752,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, int head = 0; int tail = 0; - int max_write_zeroes = MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, INT_MAX); + int max_write_zeroes = MIN_NON_ZERO((flags & BDRV_REQ_NO_FALLBACK) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes, INT_MAX);I'd still like to get rid of this
INT_MAXclamping. If we can blank the entire image in one call, even when it is larger than 4G, then it is worth making that exposed to the user. (Even in NBD, we might decide to add an extension that allowsNBD_CMD_WRITE_ZEROESwith a new flag and with offset/length == 0/0, as an official way to make the entire image zero, whereas it is now currently unspecified to pass a length of 0).
Quoted 1 line
Hmm. This series is kind of hacking. Now, 5.0 is missed anyway, I think, I'll prepare something more complete. It would be good to prepare generic block layer for 64bit commands.
I've started: "[RFC 0/3] 64bit block-layer part I". But I now see that it's not simple thing to convert the block-layer, so it probably will not be fast, and better not force the dependency between the series. So, I'll handle your comments and resend this series in separate and will try to keep it parallel.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
block/io.c +0
-0int alignment = MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFFER);
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/5] block: add max_pwrite_zeroes_no_fallback to BlockLimits
In reply to Eric BlakeQuoted 9 lines · Eric Blake
Quoted 1 line · Vladimir Sementsov-Ogievskiy
NBD spec is updated, so that
max_blockdoesn't relate toMaybe: The NBD spec was recently updated to clarify that
max_block...Quoted 3 lines
NBD_CMD_WRITE_ZEROESwithNBD_CMD_FLAG_FAST_ZERO(which mirrors Qemu flagBDRV_REQ_NO_FALLBACK). To drop the restriction we need newmax_pwrite_zeroes_no_fallback.
Quoted 7 lines
It feels odd to have two different
pwrite_zeroeslimits in the block layer, but I can live with it if other block layer gurus are also okay with it.Quoted 3 lines
Default value of new
max_pwrite_zeroes_no_fallbackis zero and it means no-restriction, so we are automatically done by this commit. Note thatWhy not have the default value be set to the existing value of the normal
pwrite_zeroeslimit, rather than 0?
Hm I agree, that it's better to keep safer default.
Quoted 61 lines
Quoted 4 lines
nbd and blkdebug are the only drivers which in the same time define
max_pwrite_zeroeslimit and supportBDRV_REQ_NO_FALLBACK, so we need to update only blkdebug.Grammar:
The default value for the new
max_pwrite_zeroes_no_fallbackis zero, meaning no restriction, which covers all drivers not touched by this commit. Note that nbd and blkdebug are the only drivers which have amax_pwrite_zeroeslimit while supportingBDRV_REQ_NO_FALLBACK, so we only need to update blkdebug.Except that I think there IS still a limit in current NBD: you can't request anything larger than 32 bits (whereas some other drivers may allow a full 63-bit request, as well as future NBD usage when we finally add 64-bit extensions to the protocol). So I think this patch is incomplete; it should be updating the nbd code to set the proper limit.
(I still need to post v2 of my patches for
bdrv_co_make_zerosupport, which is a case where knowing if there is a 32-bit limit when usingBDRV_REQ_NO_FALLBACKfor fast zeroing is important).Quoted 13 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
include/block/block_int.h| 8 ++++++++
block/blkdebug.c | 7 ++++++-
block/io.c | 4 +++-3 files changed, 17 insertions(+), 2 deletions(-)include/block/block_int.h +0
-0include/block/block_int.h typedef struct BlockLimits { · line 621
Quoted 4 lines
include/block/block_int.h +2
-0@@ -618,6 +618,14 @@ typedef struct BlockLimits {* pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; + /* +* Maximum number of bytes that can zeroized at once if flag zeroed
include/block/block_int.h typedef struct BlockLimits { · line 623
Quoted 2 lines
include/block/block_int.h +2
-0+ * BDRV_REQ_NO_FALLBACK specified (since it is signed, it must be < 2G, if + * set).Why must it be a signed 32-bit number? Why not let it be a 64-bit number?
Quoted 23 lines
Must be multiple of
pwrite_zeroes_alignment. May be 0 if no + * inherent 32-bit limit.
+ */
+int32_tmax_pwrite_zeroes_no_fallback;
+
/* Optimal alignment for write zeroes requests in bytes. A power
* of 2 is best but not mandatory. Must be a multiple of
* bl.request_alignment, and must be less thanmax_pwrite_zeroesblock/blkdebug.c +5
-1@@ -692,7 +692,11 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, } assert(QEMU_IS_ALIGNED(offset, align)); assert(QEMU_IS_ALIGNED(bytes, align)); - if (bs->bl.max_pwrite_zeroes) { + if ((flags & BDRV_REQ_NO_FALLBACK) && + bs->bl.max_pwrite_zeroes_no_fallback) + { + assert(bytes <= bs->bl.max_pwrite_zeroes_no_fallback); + } else if (bs->bl.max_pwrite_zeroes) { assert(bytes <= bs->bl.max_pwrite_zeroes);
Quoted 8 lines
block/blkdebug.c static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) · line 984
Quoted 6 lines
block/blkdebug.c +1
-0}@@ -977,6 +981,7 @@ static void blkdebug_refresh_limits(BlockDriverState *bs, Error **errp) } if (s->max_write_zero) { bs->bl.max_pwrite_zeroes = s->max_write_zero; + bs->bl.max_pwrite_zeroes_no_fallback = s->max_write_zero;Ah, so you DO default it to
max_pwwrite_zeroesinstead of to 0; the commit message does not quite match the code.
In this patch it's only for blkdebug. But I'm going to change the default as you proposed.
Quoted 17 lines
Quoted 9 lines
block/blkdebug.c +0
-0} if (s->opt_discard) { bs->bl.pdiscard_alignment = s->opt_discard;block/io.c +0
-0block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1756
Quoted 6 lines
block/io.c +3
-1@@ -1752,7 +1752,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, int head = 0; int tail = 0; - int max_write_zeroes = MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, INT_MAX); + int max_write_zeroes = MIN_NON_ZERO((flags & BDRV_REQ_NO_FALLBACK) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes, INT_MAX);I'd still like to get rid of this
INT_MAXclamping. If we can blank the entire image in one call, even when it is larger than 4G, then it is worth making that exposed to the user. (Even in NBD, we might decide to add an extension that allowsNBD_CMD_WRITE_ZEROESwith a new flag and with offset/length == 0/0, as an official way to make the entire image zero, whereas it is now currently unspecified to pass a length of 0).
We can't get rid of it now, just because write_zero driver handler has int argument. So, I'm going to convert block-layer to int64_t-everywhere, but do it in separate series.
Quoted 6 lines
Quoted 5 lines
block/io.c +0
-0int alignment = MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFFER);
Signature · 2 lines
Best regards, Vladimir
PATCH 4/5 block/io: fix bdrv_co_do_pwrite_zeroes head calculation
In reply to Vladimir Sementsov-OgievskiyIt's wrong to update head using num in this place, as num may be reduced during the iteration, and we'll have wrong head value on next iteration.
Instead update head at iteration end.
--- block/io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/io.c +3 -1
@@ -1785,7 +1785,6 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,* convenience, limit this request to max_transfer even if * we don't need to fall back to writes. */ num =MIN (MIN (bytes, max_transfer), alignment - head); - head = (head + num) % alignment;assert (num < max_write_zeroes); }else if (tail && num > alignment) {/* Shorten the request to the last aligned sector. */
@@ -1844,6 +1843,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, offset += num; bytes -= num; +if (head) { + head = offset % alignment; + } } fail:
Signature · 1 line
2.21.0
Re: [PATCH 4/5] block/io: fix bdrv_co_do_pwrite_zeroes head calculation
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
It's wrong to update head using num in this place, as num may be reduced during the iteration, and we'll have wrong head value on next iteration.
Instead update head at iteration end.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Offhand, I don't see how this fixes any bug....
/me reads on
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1788
Quoted 11 lines
block/io.c +0
-1@@ -1785,7 +1785,6 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,* convenience, limit this request to max_transfer even if * we don't need to fall back to writes. */ num =MIN (MIN (bytes, max_transfer), alignment - head); - head = (head + num) % alignment;assert (num < max_write_zeroes);
Here, we've asserted that if head was non-zero, num was already smaller than max_write_zeroes. The rest of the loop does indeed have code that appears like it can reduce num, but that code is guarded:
/* limit request size */
if (num > max_write_zeroes) {
num = max_write_zeroes;
}
...
if (ret == -ENOTSUP && !(flags & BDRV_REQ_NO_FALLBACK)) {
/* Fall back to bounce buffer if write zeroes is unsupported */
BdrvRequestFlags write_flags = flags & ~BDRV_REQ_ZERO_WRITE;
if ((flags & BDRV_REQ_FUA) &&
!(bs->supported_write_flags & BDRV_REQ_FUA)) {
/* No need for bdrv_driver_pwrite() to do a fallback
* flush on each chunk; use just one at the end */
write_flags &= ~BDRV_REQ_FUA;
need_flush = true;
}
num = MIN(num, max_transfer);Oh. Now I see. If max_write_zeroes is > max_transfer, but we fall back to a bounce buffer, it is indeed possible that a misaligned request that forces fallbacks to writes may indeed require more than one write to get to the point where it is then using a buffer aligned to max_write_zeroes.
Do we have an iotest provoking this, or is it theoretical? With an iotest, this one is material for 5.0 even if the rest of the series misses soft freeze.
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1848
Quoted 9 lines
block/io.c +3
-0}else if (tail && num > alignment) {/* Shorten the request to the last aligned sector. */ @@ -1844,6 +1843,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, offset += num; bytes -= num; +if (head) { + head = offset % alignment; + }
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 4/5] block/io: fix bdrv_co_do_pwrite_zeroes head calculation
Quoted 39 lines · Eric Blake
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
It's wrong to update head using num in this place, as num may be reduced during the iteration, and we'll have wrong head value on next iteration.
Instead update head at iteration end.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
block/io.c| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)Offhand, I don't see how this fixes any bug....
/me reads onblock/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1788
Quoted 11 lines
block/io.c +0
-1@@ -1785,7 +1785,6 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,* convenience, limit this request to max_transfer even if * we don't need to fall back to writes. */ num = MIN(MIN(bytes, max_transfer), alignment - head); - head = (head + num) % alignment; assert(num < max_write_zeroes);Here, we've asserted that if head was non-zero, num was already smaller than max_write_zeroes. The rest of the loop does indeed have code that appears like it can reduce num, but that code is guarded:
/* limit request size */
if (num >max_write_zeroes) {
num =max_write_zeroes;
}
...
if (ret ==-ENOTSUP&& !(flags &BDRV_REQ_NO_FALLBACK)) { /* Fall back to bounce buffer if write zeroes is unsupported */ BdrvRequestFlagswrite_flags= flags & ~BDRV_REQ_ZERO_WRITE;
Quoted 8 lines
if ((flags &
BDRV_REQ_FUA) && !(bs->supported_write_flags &BDRV_REQ_FUA)) { /* No need forbdrv_driver_pwrite()to do a fallback
* flush on each chunk; use just one at the end */write_flags&= ~BDRV_REQ_FUA;
need_flush= true;
}
num =MIN(num, max_transfer);
Now I think that this is impossible. If we updated head above, than num is already less or equal to max_transfer, so is not updated by this line. Or do I now miss something?
So, the patch may be good as refactoring but not really needed for 5.0.
Quoted 16 lines
Oh. Now I see. If
max_write_zeroesis >max_transfer, but we fall back to a bounce buffer, it is indeed possible that a misaligned request that forces fallbacks to writes may indeed require more than one write to get to the point where it is then using a buffer aligned tomax_write_zeroes.Do we have an iotest provoking this, or is it theoretical? With an iotest, this one is material for 5.0 even if the rest of the series misses soft freeze.
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1847
Quoted 8 lines
block/io.c +3
-0} else if (tail && num > alignment) { /* Shorten the request to the last aligned sector. */@@ -1844,6 +1843,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, offset += num; bytes -= num; + if (head) { + head = offset % alignment; + }Reviewed-by Eric Blake <[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 5/5 block/io: auto-no-fallback for write-zeroes
In reply to Vladimir Sementsov-OgievskiyNBD driver may has max_pwrite_zeroes but doesn't has max_pwrite_zeroes_no_fallback limit. This means, that (when BDRV_REQ_NO_FALLBACK is supported) it is beneficial to try send request with BDRV_REQ_NO_FALLBACK instead of splitting the request accordingly to max_pwrite_zeroes.
If failed, fallback to old behavior.
--- block/io.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
block/io.c +26 -4
@@ -1752,17 +1752,28 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,int head =0 ;int tail =0 ; -int max_write_zeroes =MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? - bs->bl.max_pwrite_zeroes_no_fallback : - bs->bl.max_pwrite_zeroes,INT_MAX ); +int max_write_zeroes;int alignment =MAX (bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment);int max_transfer =MIN_NON_ZERO (bs->bl.max_transfer,MAX_BOUNCE_BUFFER ); +bool auto_no_fallback;if (!drv) {return -ENOMEDIUM ; } +if (!(flags &BDRV_REQ_NO_FALLBACK ) && + (bs->supported_zero_flags &BDRV_REQ_NO_FALLBACK ) && + bs->bl.max_pwrite_zeroes && + bs->bl.max_pwrite_zeroes < bytes && + (bs->bl.max_pwrite_zeroes < bs->bl.max_pwrite_zeroes_no_fallback || + bs->bl.max_pwrite_zeroes_no_fallback ==0 )) + { +assert (drv->bdrv_co_pwrite_zeroes); + flags |=BDRV_REQ_NO_FALLBACK ; + auto_no_fallback = true; + } +if ((flags & ~bs->supported_zero_flags) &BDRV_REQ_NO_FALLBACK ) {return -ENOTSUP ; }
@@ -1770,7 +1781,11 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,assert (alignment % bs->bl.request_alignment ==0 ); head = offset % alignment; tail = (offset + bytes) % alignment; - max_write_zeroes =QEMU_ALIGN_DOWN (max_write_zeroes, alignment); + max_write_zeroes = +QEMU_ALIGN_DOWN (MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes,INT_MAX ), + alignment);assert (max_write_zeroes >= bs->bl.request_alignment);while (bytes >0 && !ret) {
@@ -1801,6 +1816,13 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,if (drv->bdrv_co_pwrite_zeroes) { ret = drv->bdrv_co_pwrite_zeroes (bs, offset, num, flags & bs->supported_zero_flags); +if (ret == -ENOTSUP && auto_no_fallback) { + flags &= ~BDRV_REQ_NO_FALLBACK ; + max_write_zeroes = +QEMU_ALIGN_DOWN (MIN_NON_ZERO (bs->bl.max_pwrite_zeroes, +INT_MAX ), alignment); +continue ; + }if (ret != -ENOTSUP && (flags &BDRV_REQ_FUA ) && !(bs->supported_zero_flags &BDRV_REQ_FUA )) { need_flush = true;
Signature · 1 line
2.21.0
Re: [PATCH 5/5] block/io: auto-no-fallback for write-zeroes
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
NBD driver may has
max_pwrite_zeroesbut doesn't hasmax_pwrite_zeroes_no_fallbacklimit. This means, that (whenBDRV_REQ_NO_FALLBACKis supported) it is beneficial to try send request withBDRV_REQ_NO_FALLBACKinstead of splitting the request accordingly tomax_pwrite_zeroes.If failed, fallback to old behavior.
Grammar:
When BDRV_REQ_NO_FALLBACK is supported, the NBD driver supports a larger request size. Add code to try large zero requests with a NO_FALLBACK request prior to having to split a request into chunks according to max_pwrite_zeroes.
Quoted 23 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/io.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)block/io.c +2
-3@@ -1752,17 +1752,28 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,int head =0 ;int tail =0 ; -int max_write_zeroes =MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? - bs->bl.max_pwrite_zeroes_no_fallback : - bs->bl.max_pwrite_zeroes,INT_MAX ); +int max_write_zeroes;int alignment =MAX (bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment);int max_transfer =MIN_NON_ZERO (bs->bl.max_transfer,MAX_BOUNCE_BUFFER ); +bool auto_no_fallback;
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1770
Quoted 10 lines
block/io.c +6
-0if (!drv) {return -ENOMEDIUM ; } +if (!(flags &BDRV_REQ_NO_FALLBACK ) && + (bs->supported_zero_flags &BDRV_REQ_NO_FALLBACK ) && + bs->bl.max_pwrite_zeroes && + bs->bl.max_pwrite_zeroes < bytes && + (bs->bl.max_pwrite_zeroes < bs->bl.max_pwrite_zeroes_no_fallback || + bs->bl.max_pwrite_zeroes_no_fallback ==0 ))
Why are we letting max_pwrite_zeroes_no_fallback ever be 0? It might be more convenient if it is always guaranteed to be >= max_pwrite_zeroes by the block layer.
Quoted 27 lines
block/io.c +11
-1+ { +assert (drv->bdrv_co_pwrite_zeroes); + flags |=BDRV_REQ_NO_FALLBACK ; + auto_no_fallback = true; + } +if ((flags & ~bs->supported_zero_flags) &BDRV_REQ_NO_FALLBACK ) {return -ENOTSUP ; }@@ -1770,7 +1781,11 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,assert (alignment % bs->bl.request_alignment ==0 ); head = offset % alignment; tail = (offset + bytes) % alignment; - max_write_zeroes =QEMU_ALIGN_DOWN (max_write_zeroes, alignment); + max_write_zeroes = +QEMU_ALIGN_DOWN (MIN_NON_ZERO ((flags &BDRV_REQ_NO_FALLBACK ) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes,INT_MAX ), + alignment);assert (max_write_zeroes >= bs->bl.request_alignment);while (bytes >0 && !ret) {@@ -1801,6 +1816,13 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,if (drv->bdrv_co_pwrite_zeroes) { ret = drv->bdrv_co_pwrite_zeroes (bs, offset, num, flags & bs->supported_zero_flags);
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1828
Quoted 10 lines
block/io.c +7
-0+if (ret == -ENOTSUP && auto_no_fallback) { + flags &= ~BDRV_REQ_NO_FALLBACK ; + max_write_zeroes = +QEMU_ALIGN_DOWN (MIN_NON_ZERO (bs->bl.max_pwrite_zeroes, +INT_MAX ), alignment); +continue ; + }if (ret != -ENOTSUP && (flags &BDRV_REQ_FUA ) && !(bs->supported_zero_flags &BDRV_REQ_FUA )) { need_flush = true;
Otherwise makes sense.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 5/5] block/io: auto-no-fallback for write-zeroes
Quoted 37 lines · Eric Blake
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
NBD driver may has
max_pwrite_zeroesbut doesn't hasmax_pwrite_zeroes_no_fallbacklimit. This means, that (whenBDRV_REQ_NO_FALLBACKis supported) it is beneficial to try send request withBDRV_REQ_NO_FALLBACKinstead of splitting the request accordingly tomax_pwrite_zeroes.If failed, fallback to old behavior.
Grammar:
When
BDRV_REQ_NO_FALLBACKis supported, the NBD driver supports a larger request size. Add code to try large zero requests with aNO_FALLBACKrequest prior to having to split a request into chunks according tomax_pwrite_zeroes.Quoted 24 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
block/io.c| 30 ++++++++++++++++++++++++++----1 file changed, 26 insertions(+), 4 deletions(-)block/io.c +2
-3@@ -1752,17 +1752,28 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, int head = 0; int tail = 0; - int max_write_zeroes = MIN_NON_ZERO((flags & BDRV_REQ_NO_FALLBACK) ? - bs->bl.max_pwrite_zeroes_no_fallback : - bs->bl.max_pwrite_zeroes, INT_MAX); + int max_write_zeroes; int alignment = MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFFER); + bool auto_no_fallback; if (!drv) { return -ENOMEDIUM; }
Quoted 8 lines
block/io.c static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, · line 1770
Quoted 6 lines
block/io.c +6
-0+ if (!(flags & BDRV_REQ_NO_FALLBACK) && + (bs->supported_zero_flags & BDRV_REQ_NO_FALLBACK) && + bs->bl.max_pwrite_zeroes && + bs->bl.max_pwrite_zeroes < bytes && + (bs->bl.max_pwrite_zeroes < bs->bl.max_pwrite_zeroes_no_fallback || + bs->bl.max_pwrite_zeroes_no_fallback == 0))Why are we letting
max_pwrite_zeroes_no_fallbackever be 0? It might be more convenient if it is always guaranteed to be >=max_pwrite_zeroesby the block layer.
All other limits may be 0 too, which means some default.. So, if we want to set the default for max_pwrite_zeroes_no_fallback explicitly, I think we should do it for all other limits too. And it should be separate thing..
Quoted 40 lines
Quoted 33 lines
block/io.c +18
-1+ { + assert(drv->bdrv_co_pwrite_zeroes); + flags |= BDRV_REQ_NO_FALLBACK; + auto_no_fallback = true; + } + if ((flags & ~bs->supported_zero_flags) & BDRV_REQ_NO_FALLBACK) { return -ENOTSUP; }@@ -1770,7 +1781,11 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, assert(alignment % bs->bl.request_alignment == 0); head = offset % alignment; tail = (offset + bytes) % alignment; - max_write_zeroes = QEMU_ALIGN_DOWN(max_write_zeroes, alignment); + max_write_zeroes = + QEMU_ALIGN_DOWN(MIN_NON_ZERO((flags & BDRV_REQ_NO_FALLBACK) ? + bs->bl.max_pwrite_zeroes_no_fallback : + bs->bl.max_pwrite_zeroes, INT_MAX), + alignment); assert(max_write_zeroes >= bs->bl.request_alignment); while (bytes > 0 && !ret) {@@ -1801,6 +1816,13 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, if (drv->bdrv_co_pwrite_zeroes) { ret = drv->bdrv_co_pwrite_zeroes(bs, offset, num, flags & bs->supported_zero_flags); + if (ret == -ENOTSUP && auto_no_fallback) { + flags &= ~BDRV_REQ_NO_FALLBACK; + max_write_zeroes = + QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, + INT_MAX), alignment); + continue; + }Quoted 4 lines
if (ret !=
-ENOTSUP&& (flags &BDRV_REQ_FUA) && !(bs->supported_zero_flags &BDRV_REQ_FUA)) {need_flush= true;Otherwise makes sense.
Signature · 2 lines
Best regards, Vladimir