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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 9A4B3C4360C for ; Fri, 27 Sep 2019 08:43:10 +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 6D73D2075D for ; Fri, 27 Sep 2019 08:43:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D73D2075D 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]:47988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDlqH-0006uO-Ae for qemu-devel@archiver.kernel.org; Fri, 27 Sep 2019 04:43:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48851) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDlnt-0005Wi-75 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 04:40:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDlnn-0004tG-Vm for qemu-devel@nongnu.org; Fri, 27 Sep 2019 04:40:38 -0400 Received: from 7.mo179.mail-out.ovh.net ([46.105.61.94]:44455) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDlnj-0004mR-Pw for qemu-devel@nongnu.org; Fri, 27 Sep 2019 04:40:34 -0400 Received: from player760.ha.ovh.net (unknown [10.108.57.50]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id 096B214243F for ; Fri, 27 Sep 2019 10:40:27 +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 player760.ha.ovh.net (Postfix) with ESMTPSA id 39D50A50490C; Fri, 27 Sep 2019 08:40:16 +0000 (UTC) Date: Fri, 27 Sep 2019 10:40:14 +0200 From: Greg Kurz To: David Gibson Subject: Re: [PATCH v2 17/33] xive: Improve irq claim/free path Message-ID: <20190927104014.0dc57503@bahia.lan> In-Reply-To: <20190927055028.11493-18-david@gibson.dropbear.id.au> References: <20190927055028.11493-1-david@gibson.dropbear.id.au> <20190927055028.11493-18-david@gibson.dropbear.id.au> 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 14626284218698799590 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrfeeigddtiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.61.94 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: Jason Wang , Riku Voipio , qemu-devel@nongnu.org, Laurent Vivier , qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , Paolo Bonzini , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 27 Sep 2019 15:50:12 +1000 David Gibson wrote: > spapr_xive_irq_claim() returns a bool to indicate if it succeeded. > But most of the callers and one callee use int return values and/or an > Error * with more information instead. In any case, ints are a more > common idiom for success/failure states than bools (one never knows > what sense they'll be in). >=20 > So instead change to an int return value to indicate presence of error > + an Error * to describe the details through that call chain. >=20 > It also didn't actually check if the irq was already claimed, which is > one of the primary purposes of the claim path, so do that. >=20 > spapr_xive_irq_free() also returned a bool... which no callers checked > and was always true, so just drop it. >=20 > Signed-off-by: David Gibson > Reviewed-by: C=C3=A9dric Le Goater > --- > hw/intc/spapr_xive.c | 20 +++++++++----------- > hw/intc/spapr_xive_kvm.c | 8 ++++---- > hw/ppc/spapr_irq.c | 14 ++++++++------ > include/hw/ppc/spapr_xive.h | 4 ++-- > include/hw/ppc/xive.h | 2 +- > 5 files changed, 24 insertions(+), 24 deletions(-) >=20 > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index 47b5ec0b56..04879abf2e 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -528,12 +528,17 @@ static void spapr_xive_register_types(void) > =20 > type_init(spapr_xive_register_types) > =20 > -bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi) > +int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **er= rp) > { > XiveSource *xsrc =3D &xive->source; > =20 > assert(lisn < xive->nr_irqs); > =20 > + if (xive_eas_is_valid(&xive->eat[lisn])) { > + error_setg(errp, "IRQ %d is not free", lisn); > + return -EBUSY; > + } > + > /* > * Set default values when allocating an IRQ number > */ > @@ -543,24 +548,17 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t= lisn, bool lsi) > } > =20 > if (kvm_irqchip_in_kernel()) { > - Error *local_err =3D NULL; > - > - kvmppc_xive_source_reset_one(xsrc, lisn, &local_err); > - if (local_err) { > - error_report_err(local_err); > - return false; > - } > + return kvmppc_xive_source_reset_one(xsrc, lisn, errp); > } > =20 > - return true; > + return 0; > } > =20 > -bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn) > +void spapr_xive_irq_free(SpaprXive *xive, int lisn) > { > assert(lisn < xive->nr_irqs); > =20 > xive->eat[lisn].w &=3D cpu_to_be64(~EAS_VALID); > - return true; > } > =20 > /* > diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c > index 2006f96aec..51b334b676 100644 > --- a/hw/intc/spapr_xive_kvm.c > +++ b/hw/intc/spapr_xive_kvm.c > @@ -232,14 +232,14 @@ void kvmppc_xive_sync_source(SpaprXive *xive, uint3= 2_t lisn, Error **errp) > * only need to inform the KVM XIVE device about their type: LSI or > * MSI. > */ > -void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **e= rrp) > +int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **er= rp) > { > SpaprXive *xive =3D SPAPR_XIVE(xsrc->xive); > uint64_t state =3D 0; > =20 > /* The KVM XIVE device is not in use */ > if (xive->fd =3D=3D -1) { > - return; > + return -ENODEV; > } > =20 > if (xive_source_irq_is_lsi(xsrc, srcno)) { > @@ -249,8 +249,8 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, i= nt srcno, Error **errp) > } > } > =20 > - kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_SOURCE, srcno, &state, > - true, errp); > + return kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_SOURCE, srcno, &= state, > + true, errp); > } > =20 > static void kvmppc_xive_source_reset(XiveSource *xsrc, Error **errp) > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index da9e80b24e..4951329959 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -246,7 +246,13 @@ static void spapr_irq_init_xive(SpaprMachineState *s= papr, Error **errp) > =20 > /* Enable the CPU IPIs */ > for (i =3D 0; i < nr_servers; ++i) { > - spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false); > + Error *local_err =3D NULL; > + > + spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false, &loc= al_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } Quoting the changelog > So instead change to an int return value to indicate presence of error > + an Error * to describe the details through that call chain. Shouldn't this rather be: if (spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false, err= p)) { return; } ? With or without that fixed, Reviewed-by: Greg Kurz > } > =20 > spapr_xive_hcall_init(spapr); > @@ -255,11 +261,7 @@ static void spapr_irq_init_xive(SpaprMachineState *s= papr, Error **errp) > static int spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool = lsi, > Error **errp) > { > - if (!spapr_xive_irq_claim(spapr->xive, irq, lsi)) { > - error_setg(errp, "IRQ %d is invalid", irq); > - return -1; > - } > - return 0; > + return spapr_xive_irq_claim(spapr->xive, irq, lsi, errp); > } > =20 > static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq) > diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h > index bfd40f01d8..0df20a6590 100644 > --- a/include/hw/ppc/spapr_xive.h > +++ b/include/hw/ppc/spapr_xive.h > @@ -54,8 +54,8 @@ typedef struct SpaprXive { > */ > #define SPAPR_XIVE_BLOCK_ID 0x0 > =20 > -bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi); > -bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn); > +int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **er= rp); > +void spapr_xive_irq_free(SpaprXive *xive, int lisn); > void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon); > int spapr_xive_post_load(SpaprXive *xive, int version_id); > =20 > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 6d38755f84..fd3319bd32 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -425,7 +425,7 @@ static inline uint32_t xive_nvt_cam_line(uint8_t nvt_= blk, uint32_t nvt_idx) > * KVM XIVE device helpers > */ > =20 > -void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **e= rrp); > +int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **er= rp); > void kvmppc_xive_source_set_irq(void *opaque, int srcno, int val); > void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp); > void kvmppc_xive_cpu_synchronize_state(XiveTCTX *tctx, Error **errp);