From: David Gibson <david@gibson.dropbear.id.au>
To: "Cédric Le Goater" <clg@kaod.org>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com, "Laurent Vivier" <laurent@vivier.eu>
Subject: Re: [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook
Date: Thu, 26 Sep 2019 11:13:36 +1000 [thread overview]
Message-ID: <20190926011336.GS17405@umbus> (raw)
In-Reply-To: <1b74c0fc-b318-df5a-d66d-fe59ae562d70@kaod.org>
[-- Attachment #1: Type: text/plain, Size: 10123 bytes --]
On Wed, Sep 25, 2019 at 09:31:54AM +0200, Cédric Le Goater wrote:
> On 25/09/2019 08:45, David Gibson wrote:
> > This method is used to set up the interrupt backends for the current
> > configuration. However, this means some confusing redirection between
> > the "dual" mode init and the init hooks for xics only and xive only modes.
> >
> > Since we now have simple flags indicating whether XICS and/or XIVE are
> > supported, it's easier to just open code each initialization directly in
> > spapr_irq_init(). This will also make some future cleanups simpler.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
>
> one comment below,
>
> > ---
> > hw/ppc/spapr_irq.c | 138 ++++++++++++++++--------------------
> > include/hw/ppc/spapr_irq.h | 1 -
> > include/hw/ppc/xics_spapr.h | 1 +
> > 3 files changed, 63 insertions(+), 77 deletions(-)
> >
> > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > index 073f375ba2..62647dd5a3 100644
> > --- a/hw/ppc/spapr_irq.c
> > +++ b/hw/ppc/spapr_irq.c
> > @@ -91,27 +91,6 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr,
> > /*
> > * XICS IRQ backend.
> > */
> > -
> > -static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp)
> > -{
> > - Object *obj;
> > - Error *local_err = NULL;
> > -
> > - obj = object_new(TYPE_ICS_SPAPR);
> > - object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort);
> > - object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr),
> > - &error_fatal);
> > - object_property_set_int(obj, spapr->irq->nr_xirqs,
> > - "nr-irqs", &error_fatal);
> > - object_property_set_bool(obj, true, "realized", &local_err);
> > - if (local_err) {
> > - error_propagate(errp, local_err);
> > - return;
> > - }
> > -
> > - spapr->ics = ICS_SPAPR(obj);
> > -}
> > -
> > static void spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> > Error **errp)
> > {
> > @@ -212,7 +191,6 @@ SpaprIrq spapr_irq_xics = {
> > .xics = true,
> > .xive = false,
> >
> > - .init = spapr_irq_init_xics,
> > .claim = spapr_irq_claim_xics,
> > .free = spapr_irq_free_xics,
> > .print_info = spapr_irq_print_info_xics,
> > @@ -227,37 +205,6 @@ SpaprIrq spapr_irq_xics = {
> > /*
> > * XIVE IRQ backend.
> > */
> > -static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp)
> > -{
> > - uint32_t nr_servers = spapr_max_server_number(spapr);
> > - DeviceState *dev;
> > - int i;
> > -
> > - dev = qdev_create(NULL, TYPE_SPAPR_XIVE);
> > - qdev_prop_set_uint32(dev, "nr-irqs",
> > - spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> > - /*
> > - * 8 XIVE END structures per CPU. One for each available priority
> > - */
> > - qdev_prop_set_uint32(dev, "nr-ends", nr_servers << 3);
> > - qdev_init_nofail(dev);
> > -
> > - spapr->xive = SPAPR_XIVE(dev);
> > -
> > - /* Enable the CPU IPIs */
> > - for (i = 0; i < nr_servers; ++i) {
> > - 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;
> > - }
> > - }
> > -
> > - spapr_xive_hcall_init(spapr);
> > -}
> > -
> > static void spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool lsi,
> > Error **errp)
> > {
> > @@ -361,7 +308,6 @@ SpaprIrq spapr_irq_xive = {
> > .xics = false,
> > .xive = true,
> >
> > - .init = spapr_irq_init_xive,
> > .claim = spapr_irq_claim_xive,
> > .free = spapr_irq_free_xive,
> > .print_info = spapr_irq_print_info_xive,
> > @@ -392,23 +338,6 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr)
> > &spapr_irq_xive : &spapr_irq_xics;
> > }
> >
> > -static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp)
> > -{
> > - Error *local_err = NULL;
> > -
> > - spapr_irq_xics.init(spapr, &local_err);
> > - if (local_err) {
> > - error_propagate(errp, local_err);
> > - return;
> > - }
> > -
> > - spapr_irq_xive.init(spapr, &local_err);
> > - if (local_err) {
> > - error_propagate(errp, local_err);
> > - return;
> > - }
> > -}
> > -
> > static void spapr_irq_claim_dual(SpaprMachineState *spapr, int irq, bool lsi,
> > Error **errp)
> > {
> > @@ -520,7 +449,6 @@ SpaprIrq spapr_irq_dual = {
> > .xics = true,
> > .xive = true,
> >
> > - .init = spapr_irq_init_dual,
> > .claim = spapr_irq_claim_dual,
> > .free = spapr_irq_free_dual,
> > .print_info = spapr_irq_print_info_dual,
> > @@ -608,8 +536,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> >
> > spapr_irq_check(spapr, &local_err);
> > if (local_err) {
> > - error_propagate(errp, local_err);
> > - return;
> > + goto out;
> > }
> >
> > /* Initialize the MSI IRQ allocator. */
> > @@ -617,10 +544,70 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> > spapr_irq_msi_init(spapr, spapr->irq->nr_msis);
> > }
> >
> > - spapr->irq->init(spapr, errp);
> > + if (spapr->irq->xics) {
> > + Object *obj;
> > +
> > + obj = object_new(TYPE_ICS_SPAPR);
> > + object_property_add_child(OBJECT(spapr), "ics", obj, &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr),
> > + &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + object_property_set_int(obj, spapr->irq->nr_xirqs, "nr-irqs",
> > + &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + object_property_set_bool(obj, true, "realized", &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + spapr->ics = ICS_SPAPR(obj);
> > + }
> > +
> > + if (spapr->irq->xive) {
> > + uint32_t nr_servers = spapr_max_server_number(spapr);
> > + DeviceState *dev;
> > + int i;
> > +
> > + dev = qdev_create(NULL, TYPE_SPAPR_XIVE);
> > + qdev_prop_set_uint32(dev, "nr-irqs",
> > + spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> > + /*
> > + * 8 XIVE END structures per CPU. One for each available
> > + * priority
> > + */
> > + qdev_prop_set_uint32(dev, "nr-ends", nr_servers << 3);
> > + qdev_init_nofail(dev);
> > +
> > + spapr->xive = SPAPR_XIVE(dev);
> > +
> > + /* Enable the CPU IPIs */
> > + for (i = 0; i < nr_servers; ++i) {
> > + Error *local_err = NULL;
> > +
> > + spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i, false, &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > + }
>
> We could move the IPI claim part in the realize routine of SPAPR_XIVE.
Yeah, I know. I thought about this, but there's a slight complication
in that the XIVE part doesn't know nr_servers directly. There's
several possible ways to handle that, but I wasn't 100% happy with any
that I came up with yet.
>
> > + spapr_xive_hcall_init(spapr);
>
> This also.
Right.
> It can be done later one.
That's my intention.
>
> C.
>
> > + }
> >
> > spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr,
> > spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> > +
> > +out:
> > + error_propagate(errp, local_err);
> > }
> >
> > void spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
> > @@ -757,7 +744,6 @@ SpaprIrq spapr_irq_xics_legacy = {
> > .xics = true,
> > .xive = false,
> >
> > - .init = spapr_irq_init_xics,
> > .claim = spapr_irq_claim_xics,
> > .free = spapr_irq_free_xics,
> > .print_info = spapr_irq_print_info_xics,
> > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> > index 6816cb0500..fa862c665b 100644
> > --- a/include/hw/ppc/spapr_irq.h
> > +++ b/include/hw/ppc/spapr_irq.h
> > @@ -42,7 +42,6 @@ typedef struct SpaprIrq {
> > bool xics;
> > bool xive;
> >
> > - void (*init)(SpaprMachineState *spapr, Error **errp);
> > void (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> > void (*free)(SpaprMachineState *spapr, int irq);
> > void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> > diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
> > index 691a6d00f7..267984a97b 100644
> > --- a/include/hw/ppc/xics_spapr.h
> > +++ b/include/hw/ppc/xics_spapr.h
> > @@ -34,6 +34,7 @@
> > #define TYPE_ICS_SPAPR "ics-spapr"
> > #define ICS_SPAPR(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SPAPR)
> >
> > +void ics_spapr_create(SpaprMachineState *spapr, int nr_xirqs, Error **errp);
> > void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt,
> > uint32_t phandle);
> > int xics_kvm_connect(SpaprMachineState *spapr, 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-26 1:34 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 6:45 [PATCH 00/20] spapr: IRQ subsystem cleanups David Gibson
2019-09-25 6:45 ` [PATCH 01/20] xics: Use incomplete type for XICSFabric David Gibson
2019-09-25 6:55 ` Cédric Le Goater
2019-09-25 7:48 ` Greg Kurz
2019-09-25 7:45 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 02/20] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-25 6:45 ` [PATCH 03/20] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-25 6:45 ` [PATCH 04/20] xics: Eliminate reset hook David Gibson
2019-09-25 7:33 ` Cédric Le Goater
2019-09-25 7:59 ` Greg Kurz
2019-09-26 2:54 ` David Gibson
2019-09-25 6:45 ` [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-25 8:16 ` Greg Kurz
2019-09-25 8:31 ` Greg Kurz
2019-09-26 0:55 ` David Gibson
2019-09-26 0:52 ` David Gibson
2019-09-25 12:47 ` Cédric Le Goater
2019-09-25 6:45 ` [PATCH 06/20] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-25 7:34 ` Cédric Le Goater
2019-09-25 8:40 ` Greg Kurz
2019-09-25 8:55 ` Cédric Le Goater
2019-09-25 9:07 ` Greg Kurz
2019-09-26 0:56 ` David Gibson
2019-09-26 7:09 ` Cédric Le Goater
2019-09-27 16:05 ` Greg Kurz
2019-09-30 8:45 ` David Gibson
2019-09-30 17:00 ` Greg Kurz
2019-10-01 1:45 ` David Gibson
2019-09-25 6:45 ` [PATCH 07/20] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:56 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:57 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 09/20] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-25 7:05 ` Cédric Le Goater
2019-09-26 1:03 ` David Gibson
2019-09-26 7:02 ` Cédric Le Goater
2019-09-25 17:13 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 10/20] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-25 7:06 ` Cédric Le Goater
2019-09-25 17:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 11/20] spapr: Fix indexing of XICS irqs David Gibson
2019-09-25 7:11 ` Cédric Le Goater
2019-09-25 20:17 ` Greg Kurz
2019-09-26 1:31 ` David Gibson
2019-09-26 7:21 ` Greg Kurz
2019-09-26 11:32 ` David Gibson
2019-09-26 14:44 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 12/20] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-25 7:16 ` Cédric Le Goater
2019-09-25 20:30 ` Greg Kurz
2019-09-26 7:10 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 13/20] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-25 7:19 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:48 ` Greg Kurz
2019-09-26 11:36 ` David Gibson
2019-09-25 6:45 ` [PATCH 14/20] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-25 7:20 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:50 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 15/20] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-25 7:21 ` Cédric Le Goater
2019-09-26 7:52 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-25 7:22 ` Cédric Le Goater
2019-09-26 8:08 ` Greg Kurz
2019-09-26 11:39 ` David Gibson
2019-09-25 6:45 ` [PATCH 17/20] spapr: Remove unused return value in claim path David Gibson
2019-09-25 7:23 ` Cédric Le Goater
2019-09-26 7:13 ` Philippe Mathieu-Daudé
2019-09-26 8:36 ` Greg Kurz
2019-09-27 1:47 ` David Gibson
2019-09-25 6:45 ` [PATCH 18/20] xive: Improve irq claim/free path David Gibson
2019-09-25 7:25 ` Cédric Le Goater
2019-09-26 1:05 ` David Gibson
2019-09-25 6:45 ` [PATCH 19/20] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-25 7:28 ` Cédric Le Goater
2019-09-26 9:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-25 7:31 ` Cédric Le Goater
2019-09-26 1:13 ` David Gibson [this message]
2019-09-26 7:05 ` Cédric Le Goater
2019-09-26 11:29 ` David Gibson
2019-09-26 15:35 ` Greg Kurz
2019-09-27 5:51 ` David Gibson
2019-09-27 6:23 ` Greg Kurz
2019-09-26 15:39 ` Greg Kurz
2019-09-27 14:12 ` Greg Kurz
2019-09-29 9:34 ` 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=20190926011336.GS17405@umbus \
--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).