[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/8] block/copy-before-write: use uint64_t for timeout in nanoseco
From: |
Kevin Wolf |
Subject: |
[PULL 5/8] block/copy-before-write: use uint64_t for timeout in nanoseconds |
Date: |
Tue, 11 Jun 2024 19:36:55 +0200 |
From: Fiona Ebner <f.ebner@proxmox.com>
rather than the uint32_t for which the maximum is slightly more than 4
seconds and larger values would overflow. The QAPI interface allows
specifying the number of seconds, so only values 0 to 4 are safe right
now, other values lead to a much lower timeout than a user expects.
The block_copy() call where this is used already takes a uint64_t for
the timeout, so no change required there.
Fixes: 6db7fd1ca9 ("block/copy-before-write: implement cbw-timeout option")
Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20240429141934.442154-1-f.ebner@proxmox.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/copy-before-write.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index cd65524e26..853e01a1eb 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -43,7 +43,7 @@ typedef struct BDRVCopyBeforeWriteState {
BlockCopyState *bcs;
BdrvChild *target;
OnCbwError on_cbw_error;
- uint32_t cbw_timeout_ns;
+ uint64_t cbw_timeout_ns;
bool discard_source;
/*
--
2.45.2
- [PULL 0/8] Block layer patches, Kevin Wolf, 2024/06/11
- [PULL 1/8] block: drop force_dup parameter of raw_reconfigure_getfd(), Kevin Wolf, 2024/06/11
- [PULL 2/8] Revert "monitor: use aio_co_reschedule_self()", Kevin Wolf, 2024/06/11
- [PULL 3/8] aio: warn about iohandler_ctx special casing, Kevin Wolf, 2024/06/11
- [PULL 4/8] qemu-io: add cvtnum() error handling for zone commands, Kevin Wolf, 2024/06/11
- [PULL 5/8] block/copy-before-write: use uint64_t for timeout in nanoseconds,
Kevin Wolf <=
- [PULL 6/8] linux-aio: add IO_CMD_FDSYNC command support, Kevin Wolf, 2024/06/11
- [PULL 7/8] block/crypto: create ciphers on demand, Kevin Wolf, 2024/06/11
- [PULL 8/8] crypto/block: drop qcrypto_block_open() n_threads argument, Kevin Wolf, 2024/06/11
- Re: [PULL 0/8] Block layer patches, Richard Henderson, 2024/06/13