From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6AE6790DAD for ; Thu, 25 Jan 2024 15:41:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4838E1B9C3 for ; Thu, 25 Jan 2024 15:41:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 25 Jan 2024 15:41:55 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 04D17492AB for ; Thu, 25 Jan 2024 15:41:55 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 25 Jan 2024 15:41:43 +0100 Message-Id: <20240125144149.216064-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240125144149.216064-1-f.ebner@proxmox.com> References: <20240125144149.216064-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.074 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [HACK qemu 07/13] block/block-copy: always consider source cluster size too X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2024 14:41:56 -0000 With backup fleecing, it might be necessary to discard the source. There will be an assertion failure if bitmaps on the source side have a bigger granularity than the block copy's cluster size, so just consider the source side too. This also supersedes the hunk in block/backup.c added by "PVE-Backup: add backup-dump block driver". Signed-off-by: Fiona Ebner --- Still need to wait on a response from upstream. For now this hack, so that the RFC as a whole doesn't have to wait. block/backup.c | 8 -------- block/block-copy.c | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/block/backup.c b/block/backup.c index 51f9d28115..7950bff27e 100644 --- a/block/backup.c +++ b/block/backup.c @@ -435,14 +435,6 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, } cluster_size = block_copy_cluster_size(bcs); - if (cluster_size < 0) { - goto error; - } - - BlockDriverInfo bdi; - if (bdrv_get_info(bs, &bdi) == 0) { - cluster_size = MAX(cluster_size, bdi.cluster_size); - } if (perf->max_chunk && perf->max_chunk < cluster_size) { error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup " diff --git a/block/block-copy.c b/block/block-copy.c index 05cfccfda8..cf750ef670 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -310,13 +310,19 @@ void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range, } } -static int64_t block_copy_calculate_cluster_size(BlockDriverState *target, +static int64_t block_copy_calculate_cluster_size(BlockDriverState *source, + BlockDriverState *target, Error **errp) { int ret; + int64_t source_cluster_size = BLOCK_COPY_CLUSTER_SIZE_DEFAULT; BlockDriverInfo bdi; bool target_does_cow = bdrv_backing_chain_next(target); + if (bdrv_get_info(source, &bdi) == 0) { + source_cluster_size = MAX(source_cluster_size, bdi.cluster_size); + } + /* * If there is no backing file on the target, we cannot rely on COW if our * backup cluster size is smaller than the target cluster size. Even for @@ -327,11 +333,11 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target, /* Cluster size is not defined */ warn_report("The target block device doesn't provide " "information about the block size and it doesn't have a " - "backing file. The default block size of %u bytes is " + "backing file. The source's or default block size of %ld bytes is " "used. If the actual block size of the target exceeds " - "this default, the backup may be unusable", - BLOCK_COPY_CLUSTER_SIZE_DEFAULT); - return BLOCK_COPY_CLUSTER_SIZE_DEFAULT; + "this value, the backup may be unusable", + source_cluster_size); + return source_cluster_size; } else if (ret < 0 && !target_does_cow) { error_setg_errno(errp, -ret, "Couldn't determine the cluster size of the target image, " @@ -341,10 +347,10 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target, return ret; } else if (ret < 0 && target_does_cow) { /* Not fatal; just trudge on ahead. */ - return BLOCK_COPY_CLUSTER_SIZE_DEFAULT; + return source_cluster_size; } - return MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size); + return MAX(source_cluster_size, bdi.cluster_size); } BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, @@ -358,7 +364,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, BdrvDirtyBitmap *copy_bitmap; bool is_fleecing; - cluster_size = block_copy_calculate_cluster_size(target->bs, errp); + cluster_size = block_copy_calculate_cluster_size(source->bs, target->bs, errp); if (cluster_size < 0) { return NULL; } -- 2.39.2