From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAafl-0002Mz-HO for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAafh-0000X6-FH for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAafh-0000X2-2e for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:41 -0400 From: Stefan Hajnoczi Date: Thu, 2 Jul 2015 10:19:42 +0100 Message-Id: <1435828789-9647-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1435828789-9647-1-git-send-email-stefanha@redhat.com> References: <1435828789-9647-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 10/17] block: Fix dirty bitmap in bdrv_co_discard List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng Unsetting dirty globally with discard is not very correct. The discard may zero out sectors (depending on can_write_zeroes_with_unmap), we should replicate this change to destination side to make sure that the guest sees the same data. Calling bdrv_reset_dirty also troubles mirror job because the hbitmap iterator doesn't expect unsetting of bits after current position. So let's do it the opposite way which fixes both problems: set the dirty bits if we are to discard it. Reported-by: wangxiaolong@ucloud.cn Signed-off-by: Fam Zheng Reviewed-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- block/io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/io.c b/block/io.c index ccf79c3..ad31822 100644 --- a/block/io.c +++ b/block/io.c @@ -2412,8 +2412,6 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, return -EPERM; } - bdrv_reset_dirty(bs, sector_num, nb_sectors); - /* Do nothing if disabled. */ if (!(bs->open_flags & BDRV_O_UNMAP)) { return 0; @@ -2423,6 +2421,8 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, return 0; } + bdrv_set_dirty(bs, sector_num, nb_sectors); + max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS); while (nb_sectors > 0) { int ret; -- 2.4.3