From: Greg Kurz <groug@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>
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,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v3 30/34] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate
Date: Wed, 2 Oct 2019 11:29:08 +0200 [thread overview]
Message-ID: <20191002112908.2bf1ea0b@bahia.lan> (raw)
In-Reply-To: <20191002025208.3487-31-david@gibson.dropbear.id.au>
On Wed, 2 Oct 2019 12:52:04 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:
> It turns out that all the logic in the SpaprIrq::reset hooks (and some in
> the SpaprIrq::post_load hooks) isn't really related to resetting the irq
> backend (that's handled by the backends' own reset routines). Rather its
> about getting the backend ready to be the active interrupt controller or
> stopping being the active interrupt controller - reset (and post_load) is
> just the only time that changes at present.
>
> To make this flow clearer, move the logic into the explicit backend
> activate and deactivate hooks.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/intc/spapr_xive.c | 35 ++++++++++++++++++++
> hw/intc/xics_spapr.c | 16 +++++++++
> hw/ppc/spapr_irq.c | 67 ++------------------------------------
> include/hw/ppc/spapr_irq.h | 4 ++-
> 4 files changed, 57 insertions(+), 65 deletions(-)
>
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index 37ffb74ca5..e8b946982c 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -640,6 +640,39 @@ static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_servers,
> plat_res_int_priorities, sizeof(plat_res_int_priorities)));
> }
>
> +static void spapr_xive_activate(SpaprInterruptController *intc, Error **errp)
> +{
> + SpaprXive *xive = SPAPR_XIVE(intc);
> + CPUState *cs;
> +
> + CPU_FOREACH(cs) {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> +
> + /* (TCG) Set the OS CAM line of the thread interrupt context. */
> + spapr_xive_set_tctx_os_cam(spapr_cpu_state(cpu)->tctx);
> + }
> +
I think this ^^ can go...
> + if (kvm_enabled()) {
> + if (spapr_irq_init_kvm(kvmppc_xive_connect, intc, errp) < 0) {
> + return;
> + }
> + }
> +
... here. If which case, spapr_irq_init_kvm() could be called from
set_active_intc() instead of being called by each backend if I get
it right. This would avoid the frontend->backend->frontend flow.
> + /* Activate the XIVE MMIOs */
> + spapr_xive_mmio_set_enabled(xive, true);
> +}
> +
> +static void spapr_xive_deactivate(SpaprInterruptController *intc)
> +{
> + SpaprXive *xive = SPAPR_XIVE(intc);
> +
> + spapr_xive_mmio_set_enabled(xive, false);
> +
> + if (kvm_irqchip_in_kernel()) {
> + kvmppc_xive_disconnect(intc);
> + }
> +}
> +
> static void spapr_xive_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -658,6 +691,8 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data)
> xrc->write_nvt = spapr_xive_write_nvt;
> xrc->get_tctx = spapr_xive_get_tctx;
>
> + sicc->activate = spapr_xive_activate;
> + sicc->deactivate = spapr_xive_deactivate;
> sicc->cpu_intc_create = spapr_xive_cpu_intc_create;
> sicc->claim_irq = spapr_xive_claim_irq;
> sicc->free_irq = spapr_xive_free_irq;
> diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> index 4eabafc7e1..8abbc799ba 100644
> --- a/hw/intc/xics_spapr.c
> +++ b/hw/intc/xics_spapr.c
> @@ -395,6 +395,20 @@ static void xics_spapr_print_info(SpaprInterruptController *intc, Monitor *mon)
> ics_pic_print_info(ics, mon);
> }
>
> +static void xics_spapr_activate(SpaprInterruptController *intc, Error **errp)
> +{
> + if (kvm_enabled()) {
> + spapr_irq_init_kvm(xics_kvm_connect, intc, errp);
> + }
> +}
> +
> +static void xics_spapr_deactivate(SpaprInterruptController *intc)
> +{
> + if (kvm_irqchip_in_kernel()) {
> + xics_kvm_disconnect(intc);
> + }
> +}
> +
> static void ics_spapr_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -403,6 +417,8 @@ static void ics_spapr_class_init(ObjectClass *klass, void *data)
>
> device_class_set_parent_realize(dc, ics_spapr_realize,
> &isc->parent_realize);
> + sicc->activate = xics_spapr_activate;
> + sicc->deactivate = xics_spapr_deactivate;
> sicc->cpu_intc_create = xics_spapr_cpu_intc_create;
> sicc->claim_irq = xics_spapr_claim_irq;
> sicc->free_irq = xics_spapr_free_irq;
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 7cd18e5b15..f70b331f44 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -65,9 +65,9 @@ void spapr_irq_msi_free(SpaprMachineState *spapr, int irq, uint32_t num)
> bitmap_clear(spapr->irq_map, irq - SPAPR_IRQ_MSI, num);
> }
>
> -static int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
> - SpaprInterruptController *intc,
> - Error **errp)
> +int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
> + SpaprInterruptController *intc,
> + Error **errp)
> {
> MachineState *machine = MACHINE(qdev_get_machine());
> Error *local_err = NULL;
> @@ -112,11 +112,6 @@ static int spapr_irq_post_load_xics(SpaprMachineState *spapr, int version_id)
> return 0;
> }
>
> -static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
> -{
> - spapr_irq_init_kvm(xics_kvm_connect, SPAPR_INTC(spapr->ics), errp);
> -}
> -
> SpaprIrq spapr_irq_xics = {
> .nr_xirqs = SPAPR_NR_XIRQS,
> .nr_msis = SPAPR_NR_MSIS,
> @@ -124,7 +119,6 @@ SpaprIrq spapr_irq_xics = {
> .xive = false,
>
> .post_load = spapr_irq_post_load_xics,
> - .reset = spapr_irq_reset_xics,
> };
>
> /*
> @@ -136,26 +130,6 @@ static int spapr_irq_post_load_xive(SpaprMachineState *spapr, int version_id)
> return spapr_xive_post_load(spapr->xive, version_id);
> }
>
> -static void spapr_irq_reset_xive(SpaprMachineState *spapr, Error **errp)
> -{
> - CPUState *cs;
> -
> - CPU_FOREACH(cs) {
> - PowerPCCPU *cpu = POWERPC_CPU(cs);
> -
> - /* (TCG) Set the OS CAM line of the thread interrupt context. */
> - spapr_xive_set_tctx_os_cam(spapr_cpu_state(cpu)->tctx);
> - }
> -
> - if (spapr_irq_init_kvm(kvmppc_xive_connect,
> - SPAPR_INTC(spapr->xive), errp) < 0) {
> - return;
> - }
> -
> - /* Activate the XIVE MMIOs */
> - spapr_xive_mmio_set_enabled(spapr->xive, true);
> -}
> -
> SpaprIrq spapr_irq_xive = {
> .nr_xirqs = SPAPR_NR_XIRQS,
> .nr_msis = SPAPR_NR_MSIS,
> @@ -163,7 +137,6 @@ SpaprIrq spapr_irq_xive = {
> .xive = true,
>
> .post_load = spapr_irq_post_load_xive,
> - .reset = spapr_irq_reset_xive,
> };
>
> /*
> @@ -187,37 +160,9 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr)
>
> static int spapr_irq_post_load_dual(SpaprMachineState *spapr, int version_id)
> {
> - /*
> - * Force a reset of the XIVE backend after migration. The machine
> - * defaults to XICS at startup.
> - */
> - if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) {
> - if (kvm_irqchip_in_kernel()) {
> - xics_kvm_disconnect(SPAPR_INTC(spapr->ics));
> - }
> - spapr_irq_xive.reset(spapr, &error_fatal);
> - }
> -
> return spapr_irq_current(spapr)->post_load(spapr, version_id);
> }
>
> -static void spapr_irq_reset_dual(SpaprMachineState *spapr, Error **errp)
> -{
> - /*
> - * Deactivate the XIVE MMIOs. The XIVE backend will reenable them
> - * if selected.
> - */
> - spapr_xive_mmio_set_enabled(spapr->xive, false);
> -
> - /* Destroy all KVM devices */
> - if (kvm_irqchip_in_kernel()) {
> - xics_kvm_disconnect(SPAPR_INTC(spapr->ics));
> - kvmppc_xive_disconnect(SPAPR_INTC(spapr->xive));
> - }
> -
> - spapr_irq_current(spapr)->reset(spapr, errp);
> -}
> -
> /*
> * Define values in sync with the XIVE and XICS backend
> */
> @@ -228,7 +173,6 @@ SpaprIrq spapr_irq_dual = {
> .xive = true,
>
> .post_load = spapr_irq_post_load_dual,
> - .reset = spapr_irq_reset_dual,
> };
>
>
> @@ -512,10 +456,6 @@ void spapr_irq_reset(SpaprMachineState *spapr, Error **errp)
> assert(!spapr->irq_map || bitmap_empty(spapr->irq_map, spapr->irq_map_nr));
>
> spapr_irq_update_active_intc(spapr);
> -
> - if (spapr->irq->reset) {
> - spapr->irq->reset(spapr, errp);
> - }
> }
>
> int spapr_irq_get_phandle(SpaprMachineState *spapr, void *fdt, Error **errp)
> @@ -651,7 +591,6 @@ SpaprIrq spapr_irq_xics_legacy = {
> .xive = false,
>
> .post_load = spapr_irq_post_load_xics,
> - .reset = spapr_irq_reset_xics,
> };
>
> static void spapr_irq_register_types(void)
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index a5fdb963a8..1aff1c2eb7 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -84,7 +84,6 @@ typedef struct SpaprIrq {
> bool xive;
>
> int (*post_load)(SpaprMachineState *spapr, int version_id);
> - void (*reset)(SpaprMachineState *spapr, Error **errp);
> } SpaprIrq;
>
> extern SpaprIrq spapr_irq_xics;
> @@ -99,6 +98,9 @@ qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq);
> int spapr_irq_post_load(SpaprMachineState *spapr, int version_id);
> void spapr_irq_reset(SpaprMachineState *spapr, Error **errp);
> int spapr_irq_get_phandle(SpaprMachineState *spapr, void *fdt, Error **errp);
> +int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
> + SpaprInterruptController *intc,
> + Error **errp);
>
> /*
> * XICS legacy routines
next prev parent reply other threads:[~2019-10-02 9:30 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 2:51 [PATCH v3 00/34] spapr: IRQ subsystem cleanup David Gibson
2019-10-02 2:51 ` [PATCH v3 01/34] xics: Minor fixes for XICSFabric interface David Gibson
2019-10-02 5:51 ` Cédric Le Goater
2019-10-02 5:55 ` Cédric Le Goater
2019-10-02 5:55 ` David Gibson
2019-10-02 6:56 ` Greg Kurz
2019-10-02 2:51 ` [PATCH v3 02/34] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-10-02 2:51 ` [PATCH v3 03/34] xics: Rename misleading ics_simple_*() functions David Gibson
2019-10-02 2:51 ` [PATCH v3 04/34] xics: Eliminate reset hook David Gibson
2019-10-02 2:51 ` [PATCH v3 05/34] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-10-02 2:51 ` [PATCH v3 06/34] xics: Create sPAPR specific ICS subtype David Gibson
2019-10-02 2:51 ` [PATCH v3 07/34] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-10-02 2:51 ` [PATCH v3 08/34] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-10-02 2:51 ` [PATCH v3 09/34] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-10-02 5:57 ` Cédric Le Goater
2019-10-02 2:51 ` [PATCH v3 10/34] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-10-02 2:51 ` [PATCH v3 11/34] spapr: Fix indexing of XICS irqs David Gibson
2019-10-02 2:51 ` [PATCH v3 12/34] spapr: Simplify spapr_qirq() handling David Gibson
2019-10-02 2:51 ` [PATCH v3 13/34] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-10-02 2:51 ` [PATCH v3 14/34] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-10-02 2:51 ` [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-10-02 5:51 ` Greg Kurz
2019-10-02 5:55 ` Cédric Le Goater
2019-10-02 2:51 ` [PATCH v3 16/34] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-10-02 2:51 ` [PATCH v3 17/34] xive: Improve irq claim/free path David Gibson
2019-10-02 2:51 ` [PATCH v3 18/34] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-10-02 2:51 ` [PATCH v3 19/34] spapr: Add return value to spapr_irq_check() David Gibson
2019-10-02 5:58 ` Cédric Le Goater
2019-10-02 6:08 ` Greg Kurz
2019-10-02 2:51 ` [PATCH v3 20/34] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-10-02 2:51 ` [PATCH v3 21/34] spapr, xics, xive: Introduce SpaprInterruptController QOM interface David Gibson
2019-10-02 2:51 ` [PATCH v3 22/34] spapr, xics, xive: Move cpu_intc_create from SpaprIrq to SpaprInterruptController David Gibson
2019-10-02 6:06 ` Cédric Le Goater
2019-10-02 6:10 ` David Gibson
2019-10-02 6:13 ` Cédric Le Goater
2019-10-02 6:40 ` David Gibson
2019-10-02 7:31 ` Cédric Le Goater
2019-10-02 22:28 ` David Gibson
2019-10-02 7:13 ` Greg Kurz
2019-10-02 9:41 ` Cédric Le Goater
2019-10-02 2:51 ` [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free " David Gibson
2019-10-02 6:10 ` Cédric Le Goater
2019-10-02 6:16 ` David Gibson
2019-10-02 7:59 ` Greg Kurz
2019-10-02 22:17 ` David Gibson
2019-10-02 9:23 ` Cédric Le Goater
2019-10-02 2:51 ` [PATCH v3 24/34] spapr: Formalize notion of active interrupt controller David Gibson
2019-10-02 2:51 ` [PATCH v3 25/34] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController David Gibson
2019-10-02 2:52 ` [PATCH v3 26/34] spapr, xics, xive: Move print_info " David Gibson
2019-10-02 2:52 ` [PATCH v3 27/34] spapr, xics, xive: Move dt_populate " David Gibson
2019-10-02 2:52 ` [PATCH v3 28/34] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines David Gibson
2019-10-02 2:52 ` [PATCH v3 29/34] spapr: Remove SpaprIrq::init_kvm hook David Gibson
2019-10-02 2:52 ` [PATCH v3 30/34] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate David Gibson
2019-10-02 9:29 ` Greg Kurz [this message]
2019-10-03 0:22 ` David Gibson
2019-10-02 2:52 ` [PATCH v3 31/34] spapr, xics, xive: Move SpaprIrq::post_load hook to backends David Gibson
2019-10-02 9:50 ` Greg Kurz
2019-10-02 2:52 ` [PATCH v3 32/34] spapr: Remove SpaprIrq::nr_msis David Gibson
2019-10-02 2:52 ` [PATCH v3 33/34] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass David Gibson
2019-10-02 2:52 ` [PATCH v3 34/34] spapr: Remove last pieces of SpaprIrq David Gibson
2019-10-02 10:20 ` Greg Kurz
2019-10-02 22:31 ` David Gibson
2019-10-03 5:19 ` David Gibson
2019-10-03 6:18 ` [PATCH v3 00/34] spapr: IRQ subsystem cleanup 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=20191002112908.2bf1ea0b@bahia.lan \
--to=groug@kaod.org \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--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).