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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 A61A8C433DB for ; Mon, 15 Feb 2021 09:23:45 +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 C987764E02 for ; Mon, 15 Feb 2021 09:23:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C987764E02 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]:44606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBa6Z-0002wM-ID for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 04:23:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBa5D-00083M-0I for qemu-devel@nongnu.org; Mon, 15 Feb 2021 04:22:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lBa5A-0003yw-QM for qemu-devel@nongnu.org; Mon, 15 Feb 2021 04:22:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613380936; 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=md9coU6hOcspRgzC851+pEirQTrZtvWLMrFV3ORjmEI=; b=bTG5xLyAA1J95bgzI7WluPR0YwLQoWhS9e68q1W1DLdgp7uoM4MNolWOHS5xcIKkbpHopb vDMqjs22o9QA2w/Y0F+4JzQJr9lFVLuBVcztoHWt/PHEiprUcrbk5YdAGR2Wr9sTDxcT8F qOSTsXThPdvi23zBEMDR1cU3MRySCr8= 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-213-StoDeTRoNlqHb_ulvSkJYQ-1; Mon, 15 Feb 2021 04:22:12 -0500 X-MC-Unique: StoDeTRoNlqHb_ulvSkJYQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E2D9192D78B; Mon, 15 Feb 2021 09:22:10 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-28.ams2.redhat.com [10.36.113.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 819265D9CA; Mon, 15 Feb 2021 09:22:04 +0000 (UTC) Date: Mon, 15 Feb 2021 10:22:03 +0100 From: Kevin Wolf To: Eric Blake Subject: Re: [PATCH v7 03/14] block: check return value of bdrv_open_child and drop error propagation Message-ID: <20210215092203.GA7226@merkur.fritz.box> References: <20210202124956.63146-1-vsementsov@virtuozzo.com> <20210202124956.63146-4-vsementsov@virtuozzo.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Vladimir Sementsov-Ogievskiy , berto@igalia.com, pavel.dovgaluk@ispras.ru, qemu-block@nongnu.org, qemu-devel@nongnu.org, armbru@redhat.com, Greg Kurz , stefanha@redhat.com, pbonzini@redhat.com, mreitz@redhat.com, jsnow@redhat.com, ari@tuxera.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 13.02.2021 um 00:13 hat Eric Blake geschrieben: > On 2/2/21 6:49 AM, Vladimir Sementsov-Ogievskiy wrote: > > This patch is generated by cocci script: > > > > @@ > > symbol bdrv_open_child, errp, local_err; > > expression file; > > @@ > > > > file = bdrv_open_child(..., > > - &local_err > > + errp > > ); > > - if (local_err) > > + if (!file) > > { > > ... > > - error_propagate(errp, local_err); > > ... > > } > > > > with command > > > > spatch --sp-file x.cocci --macro-file scripts/cocci-macro-file.h \ > > --in-place --no-show-diff --max-width 80 --use-gitgrep block > > With this patch applied, 'check unit-test' fails with: > > Running test test-replication > Unexpected error in bdrv_open_driver() at ../block.c:1481: > Could not open '/tmp/p_local_disk.z1Ugyc': Invalid argument > ERROR test-replication - missing test plan > > Directly reverting it has ripple effect on later patches in the series. > > Running test-replication under gdb gives this backtrace: > > Thread 1 "test-replicatio" received signal SIGABRT, Aborted. > 0x00007ffff6f6f9d5 in raise () from /lib64/libc.so.6 > (gdb) bt > #0 0x00007ffff6f6f9d5 in raise () from /lib64/libc.so.6 > #1 0x00007ffff6f588a4 in abort () from /lib64/libc.so.6 > #2 0x00005555556ad820 in error_handle_fatal ( > errp=0x555555790568 , err=0x555555859010) > at ../util/error.c:40 > #3 0x00005555556ae3cf in error_propagate ( > dst_errp=0x555555790568 , local_err=0x555555859010) > at ../util/error.c:286 > #4 0x000055555558cc9e in bdrv_img_create ( > filename=0x555555822500 "/tmp/p_local_disk.DVFoWt", > fmt=0x5555556e809a "qcow2", base_filename=0x0, base_fmt=0x0, > options=0x0, > img_size=67108864, flags=2, quiet=true, errp=0x555555790568 > ) > at ../block.c:6312 The problem is this hunk: diff --git a/block/qcow2.c b/block/qcow2.c index 5d94f45be9..e8dd42d73b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1611,9 +1611,8 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, /* Open external data file */ s->data_file = bdrv_open_child(NULL, options, "data-file", bs, &child_of_bds, BDRV_CHILD_DATA, - true, &local_err); - if (local_err) { - error_propagate(errp, local_err); + true, errp); + if (!s->data_file) { ret = -EINVAL; goto fail; } bdrv_open_child() can return NULL in non-error cases, when the child is optional and it isn't given. The test doesn't use an external data file, so this returns NULL without setting an error, which now gets turned into -EINVAL instead. This makes the most basic tests fail with qcow2 (iotests 001 is enough). The other hunks in this patch don't suffer from the same problem because they pass allow_none=false. Kevin