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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 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 BAACFC35280 for ; Wed, 2 Oct 2019 09:20:05 +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 8D35E206C0 for ; Wed, 2 Oct 2019 09:20:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D35E206C0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFank-0001n9-Mm for qemu-devel@archiver.kernel.org; Wed, 02 Oct 2019 05:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFan2-0001O4-NJ for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:19:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFan0-0005w0-K2 for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:19:20 -0400 Received: from 3.mo69.mail-out.ovh.net ([188.165.52.203]:41410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFan0-0005tL-Da for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:19:18 -0400 Received: from player746.ha.ovh.net (unknown [10.109.159.69]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id DB0C367799 for ; Wed, 2 Oct 2019 11:19:15 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player746.ha.ovh.net (Postfix) with ESMTPSA id 07977A9111C3; Wed, 2 Oct 2019 09:19:13 +0000 (UTC) Date: Wed, 2 Oct 2019 11:19:12 +0200 From: Greg Kurz To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v4 21/31] virtio-9p: Fix error_append_hint/error_prepend usage Message-ID: <20191002111912.647a4470@bahia.lan> In-Reply-To: <20191001155319.8066-22-vsementsov@virtuozzo.com> References: <20191001155319.8066-1-vsementsov@virtuozzo.com> <20191001155319.8066-22-vsementsov@virtuozzo.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 7751539383945042259 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrgeeigddugecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.52.203 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 1 Oct 2019 18:53:09 +0300 Vladimir Sementsov-Ogievskiy wrote: > If we want to add some info to errp (by error_prepend() or > error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. > Otherwise, this info will not be added when errp == &fatal_err > (the program will exit prior to the error_append_hint() or > error_prepend() call). Fix such cases. > Well... this patch doesn't really fix anything because... > This commit (together with its neighbors) was generated by > > git grep -l 'error_\(append_hint\|prepend\)(errp' | while read f; do \ > spatch --sp-file scripts/coccinelle/fix-error-add-info.cocci \ > --in-place $f; done > > and then > > ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" > > (auto-msg was a file with this commit message) > > and then by hand, for not maintained changed files: > > git commit -m ": $(< auto-msg)" > > Still, for backporting it may be more comfortable to use only the first > command and then do one huge commit. > > Reported-by: Greg Kurz > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > hw/9pfs/9p-local.c | 1 + > hw/9pfs/9p-proxy.c | 1 + > hw/9pfs/9p.c | 1 + > 3 files changed, 3 insertions(+) > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index 08e673a79c..fccbf758bd 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -1471,6 +1471,7 @@ static void local_cleanup(FsContext *ctx) > > static void error_append_security_model_hint(Error **errp) > { > + ERRP_AUTO_PROPAGATE(); > error_append_hint(errp, "Valid options are: security_model=" > "[passthrough|mapped-xattr|mapped-file|none]\n"); > } This function doesn't need auto propagation in the first place. It is simply a wrapper around error_append_hint(). ERRP_AUTO_PROPAGATE() should go to the caller local_parse_opts(). Also some extra care is needed there to handle part [3.] of the cleanup. I understand this is out of the scope of that series, but I'd rather see all of this fixed in the same patch. > diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c > index 57a8c1c808..9291c8efa2 100644 > --- a/hw/9pfs/9p-proxy.c > +++ b/hw/9pfs/9p-proxy.c > @@ -1116,6 +1116,7 @@ static int connect_namedsocket(const char *path, Error **errp) > > static void error_append_socket_sockfd_hint(Error **errp) > { > + ERRP_AUTO_PROPAGATE(); > error_append_hint(errp, "Either specify socket=/some/path where /some/path" > " points to a listening AF_UNIX socket or sock_fd=fd" > " where fd is a file descriptor to a connected AF_UNIX" Same here. ERRP_AUTO_PROPAGATE() should go to proxy_parse_opts(). > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index cce2366219..1df2749e03 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -3552,6 +3552,7 @@ void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr) > int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, > Error **errp) > { > + ERRP_AUTO_PROPAGATE(); This is correct since this function calls error_prepend() but I think errp is never &error_fatal or &error_abort on the realize path. Anyway, better safe than sorry. > int i, len; > struct stat stat; > FsDriverEntry *fse; Please drop this patch from your series and I'll do the change once ERRP_AUTO_PROPAGATE() gets merged. Great thanks for your time in finding a clever way to deal with error propagation. :) Cheers, -- Greg