From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Laurent Vivier" <laurent@vivier.eu>,
groug@kaod.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only
Date: Wed, 2 Oct 2019 07:55:55 +0200 [thread overview]
Message-ID: <983df092-b6c8-1171-7a19-147f9ca667f5@kaod.org> (raw)
In-Reply-To: <20191002025208.3487-16-david@gibson.dropbear.id.au>
On 02/10/2019 04:51, David Gibson wrote:
> spapr_irq_free() can be used to free multiple irqs at once. That's useful
> for its callers, but there's no need to make the individual backend hooks
> handle this. We can loop across the irqs in spapr_irq_free() itself and
> have the hooks just do one at time.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/ppc/spapr_irq.c | 27 ++++++++++++---------------
> include/hw/ppc/spapr_irq.h | 2 +-
> 2 files changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 9919910a86..d2ac35bbe1 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -133,16 +133,13 @@ static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
> {
> ICSState *ics = spapr->ics;
> uint32_t srcno = irq - ics->offset;
> - int i;
>
> if (ics_valid_irq(ics, irq)) {
> - for (i = srcno; i < srcno + num; ++i) {
> - memset(&ics->irqs[i], 0, sizeof(ICSIRQState));
> - }
> + memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> }
> }
>
> @@ -269,13 +266,9 @@ static int spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq)
> {
> - int i;
> -
> - for (i = irq; i < irq + num; ++i) {
> - spapr_xive_irq_free(spapr->xive, i);
> - }
> + spapr_xive_irq_free(spapr->xive, irq);
> }
>
> static void spapr_irq_print_info_xive(SpaprMachineState *spapr,
> @@ -433,10 +426,10 @@ static int spapr_irq_claim_dual(SpaprMachineState *spapr, int irq, bool lsi,
> return ret;
> }
>
> -static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq)
> {
> - spapr_irq_xics.free(spapr, irq, num);
> - spapr_irq_xive.free(spapr, irq, num);
> + spapr_irq_xics.free(spapr, irq);
> + spapr_irq_xive.free(spapr, irq);
> }
>
> static void spapr_irq_print_info_dual(SpaprMachineState *spapr, Monitor *mon)
> @@ -635,7 +628,11 @@ int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
>
> void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
> {
> - spapr->irq->free(spapr, irq, num);
> + int i;
> +
> + for (i = irq; i < (irq + num); i++) {
> + spapr->irq->free(spapr, i);
> + }
> }
>
> qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq)
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 9b60378e28..ed88b4599a 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -43,7 +43,7 @@ typedef struct SpaprIrq {
>
> void (*init)(SpaprMachineState *spapr, Error **errp);
> int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> - void (*free)(SpaprMachineState *spapr, int irq, int num);
> + void (*free)(SpaprMachineState *spapr, int irq);
> void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> void (*dt_populate)(SpaprMachineState *spapr, uint32_t nr_servers,
> void *fdt, uint32_t phandle);
>
next prev parent reply other threads:[~2019-10-02 5:58 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 [this message]
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
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=983df092-b6c8-1171-7a19-147f9ca667f5@kaod.org \
--to=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--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).