Received: from eggs.gnu.org ([2001:4830:134:3::10]:55073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEHoQ-0000Lx-E6 for qemu-devel@nongnu.org; Tue, 27 Aug 2013 07:52:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEHoK-00013C-D2 for qemu-devel@nongnu.org; Tue, 27 Aug 2013 07:51:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEHoJ-000138-TY for qemu-devel@nongnu.org; Tue, 27 Aug 2013 07:51:48 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7RBpla9011638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 27 Aug 2013 07:51:47 -0400 Date: Tue, 27 Aug 2013 13:51:59 +0200 From: Kevin Wolf Message-ID: <20130827115159.GE648@dhcp-200-207.str.redhat.com> References: <1377522260-16676-1-git-send-email-mreitz@redhat.com> <1377522260-16676-4-git-send-email-mreitz@redhat.com> <20130827113205.GD648@dhcp-200-207.str.redhat.com> <521C9064.2030101@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <521C9064.2030101@redhat.com> Subject: Re: [Qemu-devel] [PATCH 3/5] qcow2: Employ metadata overlap checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Am 27.08.2013 um 13:41 hat Max Reitz geschrieben: > Am 27.08.2013 13:32, schrieb Kevin Wolf: > >Am 26.08.2013 um 15:04 hat Max Reitz geschrieben: > >>The pre-write overlap check function is now called before most of the > >>qcow2 writes (aborting it on collision or other error). > >> > >>Signed-off-by: Max Reitz > >>--- > >> block/qcow2-cache.c | 17 +++++++++++++++++ > >> block/qcow2-cluster.c | 23 +++++++++++++++++++++++ > >> block/qcow2-snapshot.c | 24 ++++++++++++++++++++++++ > >> block/qcow2.c | 38 +++++++++++++++++++++++++++++++++++++- > >> 4 files changed, 101 insertions(+), 1 deletion(-) > >>@@ -368,6 +384,13 @@ static int coroutine_fn copy_sectors(BlockDriverState *bs, > >> &s->aes_encrypt_key); > >> } > >>+ ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT, > >>+ ((cluster_offset >> 9) + n_start) << 9, n * BDRV_SECTOR_SIZE); > >Looks a bit overcomplicated, I'd like something like this better: > > > >cluster_offset + n_start * BDRV_SECTOR_SIZE > Yes, but this wouldn't correspond with the write call if > (cluster_offset & ((1 << 9) - 1)) != 0. ;-) And then you have a problem anyway. It's something that I'd be happy to assert() at any time, i.e. if it isn't true, it's a bug. > Basically, I just wanted it to match exactly the write command. I can see your point. Well, matter of taste, I guess. > > > >>+ if (ret) { > >>+ ret = (ret < 0) ? ret : -EIO; > >I wonder whether the -EIO logic should be moved into > >qcow2_pre_write_overlap_check(). Currently each single caller seems to > >have this check. > Seems reasonable. I didn't want to prevent the caller from receiving > information about the exact overlap, but that could be achieved > through an optional result pointer as well, I think. Don't complicate an interface for a potential caller that doesn't exist yet. If one comes up, it will change the interface as it needs. Kevin