From patchwork Wed Apr 12 13:07:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 9677497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1CC3601C3 for ; Wed, 12 Apr 2017 13:09:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2DE228662 for ; Wed, 12 Apr 2017 13:09:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6AFC28671; Wed, 12 Apr 2017 13:09:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C39D28662 for ; Wed, 12 Apr 2017 13:09:25 +0000 (UTC) Received: from localhost ([::1]:44271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyI1U-0001O2-C9 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Apr 2017 09:09:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyI0d-0001JO-Ne for qemu-devel@nongnu.org; Wed, 12 Apr 2017 09:08:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyI0Y-0005xJ-Qh for qemu-devel@nongnu.org; Wed, 12 Apr 2017 09:08:31 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:35858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyI0Y-0005x6-KM; Wed, 12 Apr 2017 09:08:26 -0400 Received: by mail-pf0-x244.google.com with SMTP id i5so4993376pfc.3; Wed, 12 Apr 2017 06:08:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8WE/1ujNpTB1EgbmgACsrRwUlSZlNYfxYFA4uZHOWkU=; b=G/3+yaEgdglDBmYF8GpeAXzvwDEtFsBJP0ySdm7enLWTr+Y79SrH0Mk7dYNEj+2dyI vAahUs8ueqhtDZnPkvsgI6zPVl8agpC1lrBZGwSB1AjsruIsgrYvr6iD5Jz6cpXcnbZY j9KH1przDawBI9RUX3S7KnNvdaPSJH7VN2RD55NEZI22L3oBFgsi4IXhnjiVHNIUgRkj UWazgtw1u8SYDNSbGSVp9cAvOouo8+6v69Nx3wbe/KTkoTGCiipAWWKdSyxDj+I4QSvH 2kuJ33CPdn1JwdaOp427JBsZnwASzwNZHMcL+dQ8GP8AR1GGMwvOqup0z4C8UkS6PtVu E0nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8WE/1ujNpTB1EgbmgACsrRwUlSZlNYfxYFA4uZHOWkU=; b=MQsHlzW+1tj5Tvlqxcy5eSWOWhUFfp/QUAEMgkiQvtNvGQON/DuboEfmsOWku6IesH E8XJvyEzaTD3i0vfWngWKSC9hgskiRF9Dook7/Pyksl9gik0+NIXY1DmdpV2Zp0meqVY lAWT5giongiBgdoeY5e79j947zx8DjfpFzn0/J64dfD8ErAozFQnoZNlAx+nfhvmNpQi ctmQMSvKMv4AzsOTbT1o//qsV/cggrQqUvZz0ppGVg71T7dt/LMIUf9oeISoUNwmSOWo sJ7wYfM2YLs06xXVUWFFJKZE0zE0twTgj1KkhQR8iwpYB+JNzNDkq5udvoAWlyo8H2VT Rtxg== X-Gm-Message-State: AFeK/H0S+Pfh2S1Ya2LkPce6XqZuygZ5hrj/QE/GFqo0/EGO69xYMRPs3MxEiFfSz8Xvjw== X-Received: by 10.84.174.131 with SMTP id r3mr83483377plb.136.1492002505791; Wed, 12 Apr 2017 06:08:25 -0700 (PDT) Received: from localhost.localdomain ([119.28.70.25]) by smtp.gmail.com with ESMTPSA id f6sm4121196pfe.57.2017.04.12.06.08.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 06:08:25 -0700 (PDT) From: jemmy858585@gmail.com X-Google-Original-From: lidongchen@tencent.com To: qemu-devel@nongnu.org Date: Wed, 12 Apr 2017 21:07:56 +0800 Message-Id: <1492002476-26784-1-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH v5] migration/block: use blk_pwrite_zeroes for each zero cluster X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, dgilbert@redhat.com, stefanha@redhat.com, Lidong Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lidong Chen BLOCK_SIZE is (1 << 20), qcow2 cluster size is 65536 by default, this maybe cause the qcow2 file size is bigger after migration. This patch check each cluster, use blk_pwrite_zeroes for each zero cluster. Signed-off-by: Lidong Chen --- migration/block.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/migration/block.c b/migration/block.c index 7734ff7..41c7a55 100644 --- a/migration/block.c +++ b/migration/block.c @@ -885,6 +885,8 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) int64_t total_sectors = 0; int nr_sectors; int ret; + BlockDriverInfo bdi; + int cluster_size; do { addr = qemu_get_be64(f); @@ -919,6 +921,15 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) error_report_err(local_err); return -EINVAL; } + + ret = bdrv_get_info(blk_bs(blk), &bdi); + if (ret == 0 && bdi.cluster_size > 0 && + bdi.cluster_size <= BLOCK_SIZE && + BLOCK_SIZE % bdi.cluster_size == 0) { + cluster_size = bdi.cluster_size; + } else { + cluster_size = BLOCK_SIZE; + } } if (total_sectors - addr < BDRV_SECTORS_PER_DIRTY_CHUNK) { @@ -932,10 +943,30 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) nr_sectors * BDRV_SECTOR_SIZE, BDRV_REQ_MAY_UNMAP); } else { + int i; + int64_t cur_addr; + uint8_t *cur_buf; + buf = g_malloc(BLOCK_SIZE); qemu_get_buffer(f, buf, BLOCK_SIZE); - ret = blk_pwrite(blk, addr * BDRV_SECTOR_SIZE, buf, - nr_sectors * BDRV_SECTOR_SIZE, 0); + for (i = 0; i < BLOCK_SIZE / cluster_size; i++) { + cur_addr = addr * BDRV_SECTOR_SIZE + i * cluster_size; + cur_buf = buf + i * cluster_size; + + if ((!block_mig_state.zero_blocks || + cluster_size < BLOCK_SIZE) && + buffer_is_zero(cur_buf, cluster_size)) { + ret = blk_pwrite_zeroes(blk, cur_addr, + cluster_size, + BDRV_REQ_MAY_UNMAP); + } else { + ret = blk_pwrite(blk, cur_addr, cur_buf, + cluster_size, 0); + } + if (ret < 0) { + break; + } + } g_free(buf); }