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 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController
Date: Mon, 30 Sep 2019 12:41:39 +1000 [thread overview]
Message-ID: <20190930024139.GE11105@umbus.fritz.box> (raw)
In-Reply-To: <20190927162712.049286e1@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 9002 bytes --]
On Fri, Sep 27, 2019 at 04:27:12PM +0200, Greg Kurz wrote:
> On Fri, 27 Sep 2019 15:50:19 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > This method depends only on the active irq controller. Now that we've
> > formalized the notion of active controller we can dispatch directly through
> > that, rather than dispatching via SpaprIrq with the dual version having
> > to do a second conditional dispatch.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > hw/intc/spapr_xive.c | 12 +++++++++++
> > hw/intc/xics_spapr.c | 9 +++++++++
> > hw/ppc/spapr_irq.c | 41 ++++++++++----------------------------
> > include/hw/ppc/spapr_irq.h | 4 +++-
> > 4 files changed, 34 insertions(+), 32 deletions(-)
> >
> > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> > index ff1a175b44..52d5e71793 100644
> > --- a/hw/intc/spapr_xive.c
> > +++ b/hw/intc/spapr_xive.c
> > @@ -553,6 +553,17 @@ static int spapr_xive_cpu_intc_create(SpaprInterruptController *intc,
> > return 0;
> > }
> >
> > +static void spapr_xive_set_irq(SpaprInterruptController *intc, int irq, int val)
> > +{
> > + SpaprXive *xive = SPAPR_XIVE(intc);
> > +
> > + if (kvm_irqchip_in_kernel()) {
> > + kvmppc_xive_source_set_irq(&xive->source, irq, val);
> > + } else {
> > + xive_source_set_irq(&xive->source, irq, val);
> > + }
> > +}
> > +
> > static void spapr_xive_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > @@ -574,6 +585,7 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data)
> > sicc->cpu_intc_create = spapr_xive_cpu_intc_create;
> > sicc->claim_irq = spapr_xive_claim_irq;
> > sicc->free_irq = spapr_xive_free_irq;
> > + sicc->set_irq = spapr_xive_set_irq;
> > }
> >
> > static const TypeInfo spapr_xive_info = {
> > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> > index 224fe1efcd..02372697f6 100644
> > --- a/hw/intc/xics_spapr.c
> > +++ b/hw/intc/xics_spapr.c
> > @@ -373,6 +373,14 @@ static void xics_spapr_free_irq(SpaprInterruptController *intc, int irq)
> > memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> > }
> >
> > +static void xics_spapr_set_irq(SpaprInterruptController *intc, int irq, int val)
> > +{
> > + ICSState *ics = ICS_SPAPR(intc);
> > + uint32_t srcno = irq - ics->offset;
> > +
> > + ics_set_irq(ics, srcno, val);
>
> And we have:
>
> void ics_set_irq(void *opaque, int srcno, int val)
> {
> ICSState *ics = (ICSState *)opaque;
>
> if (kvm_irqchip_in_kernel()) {
> ics_kvm_set_irq(ics, srcno, val);
> return;
> }
>
> if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) {
> ics_set_irq_lsi(ics, srcno, val);
> } else {
> ics_set_irq_msi(ics, srcno, val);
> }
> }
>
> The kvm_irqchip_in_kernel() block would fit better in xics_spapr_set_irq(),
> like it is already the case for XIVE.
Hmm.. I don't really see why you say that.
> Maybe do it now while here ?
>
> Anyway,
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>
> > +}
> > +
> > static void ics_spapr_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > @@ -384,6 +392,7 @@ static void ics_spapr_class_init(ObjectClass *klass, void *data)
> > sicc->cpu_intc_create = xics_spapr_cpu_intc_create;
> > sicc->claim_irq = xics_spapr_claim_irq;
> > sicc->free_irq = xics_spapr_free_irq;
> > + sicc->set_irq = xics_spapr_set_irq;
> > }
> >
> > static const TypeInfo ics_spapr_info = {
> > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > index dfa875b7cd..4922062908 100644
> > --- a/hw/ppc/spapr_irq.c
> > +++ b/hw/ppc/spapr_irq.c
> > @@ -123,14 +123,6 @@ static int spapr_irq_post_load_xics(SpaprMachineState *spapr, int version_id)
> > return 0;
> > }
> >
> > -static void spapr_irq_set_irq_xics(void *opaque, int irq, int val)
> > -{
> > - SpaprMachineState *spapr = opaque;
> > - uint32_t srcno = irq - spapr->ics->offset;
> > -
> > - ics_set_irq(spapr->ics, srcno, val);
> > -}
> > -
> > static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
> > {
> > Error *local_err = NULL;
> > @@ -159,7 +151,6 @@ SpaprIrq spapr_irq_xics = {
> > .dt_populate = spapr_dt_xics,
> > .post_load = spapr_irq_post_load_xics,
> > .reset = spapr_irq_reset_xics,
> > - .set_irq = spapr_irq_set_irq_xics,
> > .init_kvm = spapr_irq_init_kvm_xics,
> > };
> >
> > @@ -208,17 +199,6 @@ static void spapr_irq_reset_xive(SpaprMachineState *spapr, Error **errp)
> > spapr_xive_mmio_set_enabled(spapr->xive, true);
> > }
> >
> > -static void spapr_irq_set_irq_xive(void *opaque, int irq, int val)
> > -{
> > - SpaprMachineState *spapr = opaque;
> > -
> > - if (kvm_irqchip_in_kernel()) {
> > - kvmppc_xive_source_set_irq(&spapr->xive->source, irq, val);
> > - } else {
> > - xive_source_set_irq(&spapr->xive->source, irq, val);
> > - }
> > -}
> > -
> > static void spapr_irq_init_kvm_xive(SpaprMachineState *spapr, Error **errp)
> > {
> > if (kvm_enabled()) {
> > @@ -236,7 +216,6 @@ SpaprIrq spapr_irq_xive = {
> > .dt_populate = spapr_dt_xive,
> > .post_load = spapr_irq_post_load_xive,
> > .reset = spapr_irq_reset_xive,
> > - .set_irq = spapr_irq_set_irq_xive,
> > .init_kvm = spapr_irq_init_kvm_xive,
> > };
> >
> > @@ -316,13 +295,6 @@ static void spapr_irq_reset_dual(SpaprMachineState *spapr, Error **errp)
> > spapr_irq_current(spapr)->reset(spapr, errp);
> > }
> >
> > -static void spapr_irq_set_irq_dual(void *opaque, int irq, int val)
> > -{
> > - SpaprMachineState *spapr = opaque;
> > -
> > - spapr_irq_current(spapr)->set_irq(spapr, irq, val);
> > -}
> > -
> > /*
> > * Define values in sync with the XIVE and XICS backend
> > */
> > @@ -336,7 +308,6 @@ SpaprIrq spapr_irq_dual = {
> > .dt_populate = spapr_irq_dt_populate_dual,
> > .post_load = spapr_irq_post_load_dual,
> > .reset = spapr_irq_reset_dual,
> > - .set_irq = spapr_irq_set_irq_dual,
> > .init_kvm = NULL, /* should not be used */
> > };
> >
> > @@ -422,6 +393,15 @@ int spapr_irq_cpu_intc_create(SpaprMachineState *spapr,
> > return 0;
> > }
> >
> > +static void spapr_set_irq(void *opaque, int irq, int level)
> > +{
> > + SpaprMachineState *spapr = SPAPR_MACHINE(opaque);
> > + SpaprInterruptControllerClass *sicc
> > + = SPAPR_INTC_GET_CLASS(spapr->active_intc);
> > +
> > + sicc->set_irq(spapr->active_intc, irq, level);
> > +}
> > +
> > void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> > {
> > MachineState *machine = MACHINE(spapr);
> > @@ -510,7 +490,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> > spapr_xive_hcall_init(spapr);
> > }
> >
> > - spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr,
> > + spapr->qirqs = qemu_allocate_irqs(spapr_set_irq, spapr,
> > spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> >
> > out:
> > @@ -744,7 +724,6 @@ SpaprIrq spapr_irq_xics_legacy = {
> > .dt_populate = spapr_dt_xics,
> > .post_load = spapr_irq_post_load_xics,
> > .reset = spapr_irq_reset_xics,
> > - .set_irq = spapr_irq_set_irq_xics,
> > .init_kvm = spapr_irq_init_kvm_xics,
> > };
> >
> > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> > index 3102d152b2..8286a9aa63 100644
> > --- a/include/hw/ppc/spapr_irq.h
> > +++ b/include/hw/ppc/spapr_irq.h
> > @@ -56,6 +56,9 @@ typedef struct SpaprInterruptControllerClass {
> > int (*claim_irq)(SpaprInterruptController *intc, int irq, bool lsi,
> > Error **errp);
> > void (*free_irq)(SpaprInterruptController *intc, int irq);
> > +
> > + /* These methods should only be called on the active intc */
> > + void (*set_irq)(SpaprInterruptController *intc, int irq, int val);
> > } SpaprInterruptControllerClass;
> >
> > void spapr_irq_update_active_intc(SpaprMachineState *spapr);
> > @@ -83,7 +86,6 @@ typedef struct SpaprIrq {
> > void *fdt, uint32_t phandle);
> > int (*post_load)(SpaprMachineState *spapr, int version_id);
> > void (*reset)(SpaprMachineState *spapr, Error **errp);
> > - void (*set_irq)(void *opaque, int srcno, int val);
> > void (*init_kvm)(SpaprMachineState *spapr, Error **errp);
> > } SpaprIrq;
> >
>
--
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:24 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
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 [this message]
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=20190930024139.GE11105@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).