From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
qemu-ppc@nongnu.org, clg@kaod.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v2 17/33] xive: Improve irq claim/free path
Date: Mon, 30 Sep 2019 11:39:24 +1000 [thread overview]
Message-ID: <20190930013924.GA11105@umbus.fritz.box> (raw)
In-Reply-To: <20190927104014.0dc57503@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 7700 bytes --]
On Fri, Sep 27, 2019 at 10:40:14AM +0200, Greg Kurz wrote:
> On Fri, 27 Sep 2019 15:50:12 +1000
> David Gibson <david@gibson.dropbear.id.au> 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).
> >
> > So instead change to an int return value to indicate presence of error
> > + an Error * to describe the details through that call chain.
> >
> > 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.
> >
> > spapr_xive_irq_free() also returned a bool... which no callers checked
> > and was always true, so just drop it.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > Reviewed-by: Cédric Le Goater <clg@kaod.org>
> > ---
> > 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(-)
> >
> > 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)
> >
> > type_init(spapr_xive_register_types)
> >
> > -bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi)
> > +int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **errp)
> > {
> > XiveSource *xsrc = &xive->source;
> >
> > assert(lisn < xive->nr_irqs);
> >
> > + 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)
> > }
> >
> > if (kvm_irqchip_in_kernel()) {
> > - Error *local_err = 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);
> > }
> >
> > - return true;
> > + return 0;
> > }
> >
> > -bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn)
> > +void spapr_xive_irq_free(SpaprXive *xive, int lisn)
> > {
> > assert(lisn < xive->nr_irqs);
> >
> > xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);
> > - return true;
> > }
> >
> > /*
> > 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, uint32_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 **errp)
> > +int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
> > {
> > SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
> > uint64_t state = 0;
> >
> > /* The KVM XIVE device is not in use */
> > if (xive->fd == -1) {
> > - return;
> > + return -ENODEV;
> > }
> >
> > if (xive_source_irq_is_lsi(xsrc, srcno)) {
> > @@ -249,8 +249,8 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
> > }
> > }
> >
> > - 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);
> > }
> >
> > 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 *spapr, Error **errp)
> >
> > /* Enable the CPU IPIs */
> > for (i = 0; i < nr_servers; ++i) {
> > - spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false);
> > + Error *local_err = NULL;
> > +
> > + spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false, &local_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, errp)) {
> return;
> }
>
> ?
Yes, yes it should. Fixed now.
>
> With or without that fixed,
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>
> > }
> >
> > spapr_xive_hcall_init(spapr);
> > @@ -255,11 +261,7 @@ static void spapr_irq_init_xive(SpaprMachineState *spapr, 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);
> > }
> >
> > 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
> >
> > -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 **errp);
> > +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);
> >
> > 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
> > */
> >
> > -void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp);
> > +int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp);
> > 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);
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-09-30 4:18 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 5:49 [PATCH v2 00/33] spapr: IRQ subsystem cleanup David Gibson
2019-09-27 5:49 ` [PATCH v2 01/33] xics: Minor fixes for XICSFabric interface David Gibson
2019-09-27 7:17 ` Greg Kurz
2019-09-27 5:49 ` [PATCH v2 02/33] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-27 5:49 ` [PATCH v2 03/33] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-27 5:49 ` [PATCH v2 04/33] xics: Eliminate reset hook David Gibson
2019-09-27 7:19 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 05/33] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-27 5:50 ` [PATCH v2 06/33] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-27 7:22 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 07/33] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-27 5:50 ` [PATCH v2 08/33] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-27 5:50 ` [PATCH v2 09/33] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-27 7:53 ` Greg Kurz
2019-09-27 7:58 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 10/33] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-27 7:57 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 11/33] spapr: Fix indexing of XICS irqs David Gibson
2019-09-27 5:50 ` [PATCH v2 12/33] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-27 5:50 ` [PATCH v2 13/33] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-27 5:50 ` [PATCH v2 14/33] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-27 5:50 ` [PATCH v2 15/33] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-27 5:50 ` [PATCH v2 16/33] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-27 5:50 ` [PATCH v2 17/33] xive: Improve irq claim/free path David Gibson
2019-09-27 8:40 ` Greg Kurz
2019-09-30 1:39 ` David Gibson [this message]
2019-09-27 5:50 ` [PATCH v2 18/33] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-27 5:50 ` [PATCH v2 19/33] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-27 5:50 ` [PATCH v2 20/33] spapr, xics, xive: Introduce SpaprInterruptController QOM interface David Gibson
2019-09-27 9:52 ` Greg Kurz
2019-09-30 5:24 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 21/33] spapr, xics, xive: Move cpu_intc_create from SpaprIrq to SpaprInterruptController David Gibson
2019-09-27 10:16 ` Greg Kurz
2019-09-30 1:49 ` David Gibson
2019-09-30 5:28 ` Cédric Le Goater
2019-09-30 6:14 ` David Gibson
2019-09-30 10:13 ` Cédric Le Goater
2019-10-01 2:31 ` David Gibson
2019-10-01 5:43 ` Cédric Le Goater
2019-10-01 6:47 ` David Gibson
2019-10-01 7:41 ` Cédric Le Goater
2019-10-01 8:11 ` David Gibson
2019-10-01 11:43 ` Cédric Le Goater
2019-10-02 1:11 ` David Gibson
2019-09-30 2:37 ` David Gibson
2019-09-30 5:30 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 22/33] spapr, xics, xive: Move irq claim and free " David Gibson
2019-09-27 12:16 ` Greg Kurz
2019-09-30 2:39 ` David Gibson
2019-09-30 5:36 ` Cédric Le Goater
2019-09-30 5:33 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 23/33] spapr: Formalize notion of active interrupt controller David Gibson
2019-09-27 14:16 ` Greg Kurz
2019-09-30 5:39 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController David Gibson
2019-09-27 14:27 ` Greg Kurz
2019-09-30 2:41 ` David Gibson
2019-09-30 7:22 ` Greg Kurz
2019-09-30 8:28 ` David Gibson
2019-09-30 5:48 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 25/33] spapr, xics, xive: Move print_info " David Gibson
2019-09-27 14:31 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 26/33] spapr, xics, xive: Move dt_populate " David Gibson
2019-09-27 14:38 ` Greg Kurz
2019-09-30 5:51 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 27/33] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines David Gibson
2019-09-27 14:49 ` Greg Kurz
2019-09-30 5:52 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 28/33] spapr: Remove SpaprIrq::init_kvm hook David Gibson
2019-09-27 15:04 ` Greg Kurz
2019-09-30 5:55 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 29/33] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate David Gibson
2019-09-30 6:11 ` Cédric Le Goater
2019-09-30 8:25 ` David Gibson
2019-09-30 19:29 ` Cédric Le Goater
2019-10-01 3:07 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 30/33] spapr, xics, xive: Move SpaprIrq::post_load hook to backends David Gibson
2019-09-27 5:50 ` [PATCH v2 31/33] spapr: Remove SpaprIrq::nr_msis David Gibson
2019-09-27 15:17 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 32/33] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass David Gibson
2019-09-27 15:22 ` Greg Kurz
2019-09-30 2:44 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 33/33] spapr: Remove last pieces of SpaprIrq David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190930013924.GA11105@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).