From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9006C63798 for ; Mon, 23 Nov 2020 16:10:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E03A920782 for ; Mon, 23 Nov 2020 16:10:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gNvvx+2z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E03A920782 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khEQX-0005EB-Ff for qemu-devel@archiver.kernel.org; Mon, 23 Nov 2020 11:10:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khEPa-0004O6-0m for qemu-devel@nongnu.org; Mon, 23 Nov 2020 11:09:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khEPX-0001Xa-0a for qemu-devel@nongnu.org; Mon, 23 Nov 2020 11:09:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606147788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lQ18zr7dTWOdc4VcYcYGijK03fMSts8yJUg8tRNmzjY=; b=gNvvx+2zhh9GIpN1YRHuYUJpalUQrt3my3gFDVQe4dGpaBH7VSdUMoeopdlzhFhYlq67xt 5w6lbh9kItg8APqHdgb4BP38AdkjmkTYWfSRmmWU73E9TTBdTcoQSw0a22DPAldQGYoSu5 1Mo6ixJQLzDacx7uZ/wGZiUpNdWNtbE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-SLL5p961NJ-m1DbdOkjzEQ-1; Mon, 23 Nov 2020 11:09:46 -0500 X-MC-Unique: SLL5p961NJ-m1DbdOkjzEQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB0E38015C4; Mon, 23 Nov 2020 16:09:44 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-153.ams2.redhat.com [10.36.113.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD8BC19D80; Mon, 23 Nov 2020 16:09:42 +0000 (UTC) Date: Mon, 23 Nov 2020 17:09:41 +0100 From: Kevin Wolf To: Maxim Levitsky Subject: Re: [PATCH 1/1] Fix qcow2 corruption on discard Message-ID: <20201123160941.GD5317@merkur.fritz.box> References: <20201123154929.330338-1-mlevitsk@redhat.com> <20201123154929.330338-2-mlevitsk@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201123154929.330338-2-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, Alberto Garcia , qemu-block@nongnu.org, zhang_youjia@126.com, qemu-devel@nongnu.org, Max Reitz , andrey.shinkevich@virtuozzo.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 23.11.2020 um 16:49 hat Maxim Levitsky geschrieben: > Commit 205fa50750 ("qcow2: Add subcluster support to zero_in_l2_slice()") > introduced a subtle change to code in zero_in_l2_slice: > > It swapped the order of > > 1. qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); > 2. set_l2_entry(s, l2_slice, l2_index + i, QCOW_OFLAG_ZERO); > 3. qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST); > > To > > 1. qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); > 2. qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST); > 3. set_l2_entry(s, l2_slice, l2_index + i, QCOW_OFLAG_ZERO); > > It seems harmless, however the call to qcow2_free_any_clusters > can trigger a cache flush which can mark the L2 table as clean, > and assuming that this was the last write to it, > a stale version of it will remain on the disk. > > Now we have a valid L2 entry pointing to a freed cluster. Oops. > > Fixes: 205fa50750 ("qcow2: Add subcluster support to zero_in_l2_slice()") > Signed-off-by: Maxim Levitsky > --- > block/qcow2-cluster.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c > index 485b4cb92e..267b46a4ca 100644 > --- a/block/qcow2-cluster.c > +++ b/block/qcow2-cluster.c > @@ -2010,11 +2010,11 @@ static int zero_in_l2_slice(BlockDriverState *bs, uint64_t offset, > continue; > } > > - qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); > if (unmap) { > qcow2_free_any_cluster(bs, old_l2_entry, QCOW2_DISCARD_REQUEST); > } > set_l2_entry(s, l2_slice, l2_index + i, new_l2_entry); > + qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); Good catch, but I think your order is wrong, too. We need the original order from before 205fa50750: 1. qcow2_cache_entry_mark_dirty() set_l2_entry() + set_l2_bitmap() 2. qcow2_free_any_cluster() The order between qcow2_cache_entry_mark_dirty() and set_l2_entry() shouldn't matter, but it's important that we update the refcount table only after the L2 table has been updated to not reference the cluster any more. Otherwise a crash could lead to a situation where the cluster is allocated (because it has refcount 0), but it was still in use in an L2 table. This is a classic corruption scenario. Kevin