From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDTln-0007qh-N9 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 05:39:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDTlm-0006I3-F7 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 05:39:27 -0400 References: <1466060287-31514-1-git-send-email-den@openvz.org> <1466060287-31514-3-git-send-email-den@openvz.org> <5762728E.4090407@virtuozzo.com> From: "Denis V. Lunev" Message-ID: <576273BF.70806@openvz.org> Date: Thu, 16 Jun 2016 12:39:11 +0300 MIME-Version: 1.0 In-Reply-To: <5762728E.4090407@virtuozzo.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/3] block: fix race in bdrv_co_discard with drive-mirror List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: Stefan Hajnoczi , Fam Zheng , Kevin Wolf , Max Reitz On 06/16/2016 12:34 PM, Vladimir Sementsov-Ogievskiy wrote: > On 16.06.2016 09:58, Denis V. Lunev wrote: >> Actually we must set dirty bitmap dirty after we have written all our >> zeroes for correct processing in drive mirror code. In the other case >> we can face not zeroes in this dirty area there in mirror_iteration. >> >> Signed-off-by: Denis V. Lunev >> CC: Vladimir Sementsov-Ogievskiy >> CC: Stefan Hajnoczi >> CC: Fam Zheng >> CC: Kevin Wolf >> CC: Max Reitz >> --- >> block/io.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/block/io.c b/block/io.c >> index b51f681..513bd99 100644 >> --- a/block/io.c >> +++ b/block/io.c >> @@ -2265,7 +2265,6 @@ int coroutine_fn >> bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, >> tracked_request_begin(&req, bs, NULL, sector_num << >> BDRV_SECTOR_BITS, >> nb_sectors << BDRV_SECTOR_BITS, >> BDRV_TRACKED_DISCARD); >> - 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) { >> @@ -2314,6 +2313,8 @@ int coroutine_fn >> bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, >> } >> ret = 0; >> out: >> + bdrv_set_dirty(bs, req.offset << BDRV_SECTOR_BITS, > s/<>/ >> + req.bytes << BDRV_SECTOR_BITS); > and here >> tracked_request_end(&req); >> return ret; >> } > > very nice, thanks ;)