From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
groug@kaod.org, "Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v4 16/19] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass
Date: Wed, 9 Oct 2019 18:01:39 +0200 [thread overview]
Message-ID: <5cc759a5-43ef-a453-82cb-5cd162494e35@kaod.org> (raw)
In-Reply-To: <20191009060818.29719-17-david@gibson.dropbear.id.au>
On 09/10/2019 08:08, David Gibson wrote:
> For the benefit of peripheral device allocation, the number of available
> irqs really wants to be the same on a given machine type version,
> regardless of what irq backends we are using. That's the case now, but
> only because we make sure the different SpaprIrq instances have the same
> value except for the special legacy one.
>
> Since this really only depends on machine type version, move the value to
> SpaprMachineClass instead of SpaprIrq. This also puts the code to set it
> to the lower value on old machine types right next to setting
> legacy_irq_allocation, which needs to go hand in hand.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/ppc/spapr.c | 2 ++
> hw/ppc/spapr_irq.c | 33 ++++++++++++++++-----------------
> include/hw/ppc/spapr.h | 1 +
> include/hw/ppc/spapr_irq.h | 1 -
> 4 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 153cc54354..e1ff03152e 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4443,6 +4443,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
> smc->irq = &spapr_irq_dual;
> smc->dr_phb_enabled = true;
> smc->linux_pci_probe = true;
> + smc->nr_xirqs = SPAPR_NR_XIRQS;
> }
>
> static const TypeInfo spapr_machine_info = {
> @@ -4578,6 +4579,7 @@ static void spapr_machine_3_0_class_options(MachineClass *mc)
> compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
>
> smc->legacy_irq_allocation = true;
> + smc->nr_xirqs = 0x400;
> smc->irq = &spapr_irq_xics_legacy;
yes. this is clearly better to this constant at the machine level.
c.
> }
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 076da31501..2768f9a765 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -106,7 +106,6 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
> */
>
> SpaprIrq spapr_irq_xics = {
> - .nr_xirqs = SPAPR_NR_XIRQS,
> .xics = true,
> .xive = false,
> };
> @@ -116,7 +115,6 @@ SpaprIrq spapr_irq_xics = {
> */
>
> SpaprIrq spapr_irq_xive = {
> - .nr_xirqs = SPAPR_NR_XIRQS,
> .xics = false,
> .xive = true,
> };
> @@ -134,7 +132,6 @@ SpaprIrq spapr_irq_xive = {
> * Define values in sync with the XIVE and XICS backend
> */
> SpaprIrq spapr_irq_dual = {
> - .nr_xirqs = SPAPR_NR_XIRQS,
> .xics = true,
> .xive = true,
> };
> @@ -251,16 +248,19 @@ void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers,
>
> uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
> {
> - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
> - return spapr->irq->nr_xirqs;
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
> +
> + if (smc->legacy_irq_allocation) {
> + return smc->nr_xirqs;
> } else {
> - return SPAPR_XIRQ_BASE + spapr->irq->nr_xirqs - SPAPR_IRQ_MSI;
> + return SPAPR_XIRQ_BASE + smc->nr_xirqs - SPAPR_IRQ_MSI;
> }
> }
>
> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> {
> MachineState *machine = MACHINE(spapr);
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>
> if (machine_kernel_irqchip_split(machine)) {
> error_setg(errp, "kernel_irqchip split mode not supported on pseries");
> @@ -298,8 +298,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> return;
> }
>
> - object_property_set_int(obj, spapr->irq->nr_xirqs, "nr-irqs",
> - &local_err);
> + object_property_set_int(obj, smc->nr_xirqs, "nr-irqs", &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> return;
> @@ -320,8 +319,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> int i;
>
> dev = qdev_create(NULL, TYPE_SPAPR_XIVE);
> - qdev_prop_set_uint32(dev, "nr-irqs",
> - spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> + qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_XIRQ_BASE);
> /*
> * 8 XIVE END structures per CPU. One for each available
> * priority
> @@ -346,17 +344,18 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> }
>
> spapr->qirqs = qemu_allocate_irqs(spapr_set_irq, spapr,
> - spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> + smc->nr_xirqs + SPAPR_XIRQ_BASE);
> }
>
> int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
> {
> SpaprInterruptController *intcs[] = ALL_INTCS(spapr);
> int i;
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
> int rc;
>
> assert(irq >= SPAPR_XIRQ_BASE);
> - assert(irq < (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
> + assert(irq < (smc->nr_xirqs + SPAPR_XIRQ_BASE));
>
> for (i = 0; i < ARRAY_SIZE(intcs); i++) {
> SpaprInterruptController *intc = intcs[i];
> @@ -376,9 +375,10 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
> {
> SpaprInterruptController *intcs[] = ALL_INTCS(spapr);
> int i, j;
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>
> assert(irq >= SPAPR_XIRQ_BASE);
> - assert((irq + num) <= (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
> + assert((irq + num) <= (smc->nr_xirqs + SPAPR_XIRQ_BASE));
>
> for (i = irq; i < (irq + num); i++) {
> for (j = 0; j < ARRAY_SIZE(intcs); j++) {
> @@ -395,6 +395,8 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
>
> qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq)
> {
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
> +
> /*
> * This interface is basically for VIO and PHB devices to find the
> * right qemu_irq to manipulate, so we only allow access to the
> @@ -403,7 +405,7 @@ qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq)
> * interfaces, we can change this if we need to in future.
> */
> assert(irq >= SPAPR_XIRQ_BASE);
> - assert(irq < (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
> + assert(irq < (smc->nr_xirqs + SPAPR_XIRQ_BASE));
>
> if (spapr->ics) {
> assert(ics_valid_irq(spapr->ics, irq));
> @@ -556,10 +558,7 @@ int spapr_irq_find(SpaprMachineState *spapr, int num, bool align, Error **errp)
> return first + ics->offset;
> }
>
> -#define SPAPR_IRQ_XICS_LEGACY_NR_XIRQS 0x400
> -
> SpaprIrq spapr_irq_xics_legacy = {
> - .nr_xirqs = SPAPR_IRQ_XICS_LEGACY_NR_XIRQS,
> .xics = true,
> .xive = false,
> };
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 763da757f0..623e8e3f93 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -119,6 +119,7 @@ struct SpaprMachineClass {
> bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */
> bool pre_2_10_has_unused_icps;
> bool legacy_irq_allocation;
> + uint32_t nr_xirqs;
> bool broken_host_serial_model; /* present real host info to the guest */
> bool pre_4_1_migration; /* don't migrate hpt-max-page-size */
> bool linux_pci_probe;
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index befe8e01dc..5e150a6679 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -78,7 +78,6 @@ int spapr_irq_msi_alloc(SpaprMachineState *spapr, uint32_t num, bool align,
> void spapr_irq_msi_free(SpaprMachineState *spapr, int irq, uint32_t num);
>
> typedef struct SpaprIrq {
> - uint32_t nr_xirqs;
> bool xics;
> bool xive;
> } SpaprIrq;
>
next prev parent reply other threads:[~2019-10-09 19:17 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 6:07 [PATCH v4 00/19] spapr: IRQ subsystem cleanup David Gibson
2019-10-09 6:08 ` [PATCH v4 01/19] xive: Make some device types not user creatable David Gibson
2019-10-09 6:08 ` [PATCH v4 02/19] xics: " David Gibson
2019-10-09 6:08 ` [PATCH v4 03/19] target/ppc: Fix for optimized vsl/vsr instructions David Gibson
2019-10-09 6:08 ` [PATCH v4 04/19] spapr, xics, xive: Introduce SpaprInterruptController QOM interface David Gibson
2019-10-09 6:08 ` [PATCH v4 05/19] spapr, xics, xive: Move cpu_intc_create from SpaprIrq to SpaprInterruptController David Gibson
2019-10-09 6:08 ` [PATCH v4 06/19] spapr, xics, xive: Move irq claim and free " David Gibson
2019-10-09 6:08 ` [PATCH v4 07/19] spapr: Formalize notion of active interrupt controller David Gibson
2019-10-09 9:16 ` Cédric Le Goater
2019-10-09 9:19 ` Cédric Le Goater
2019-10-09 11:38 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 08/19] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController David Gibson
2019-10-09 9:18 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 09/19] spapr, xics, xive: Move print_info " David Gibson
2019-10-09 9:19 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 10/19] spapr, xics, xive: Move dt_populate " David Gibson
2019-10-09 9:20 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 11/19] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines David Gibson
2019-10-09 6:08 ` [PATCH v4 12/19] spapr: Remove SpaprIrq::init_kvm hook David Gibson
2019-10-09 6:08 ` [PATCH v4 13/19] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate David Gibson
2019-10-09 14:25 ` Greg Kurz
2019-10-09 15:56 ` Cédric Le Goater
2019-10-09 15:56 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 14/19] spapr, xics, xive: Move SpaprIrq::post_load hook to backends David Gibson
2019-10-09 15:57 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 15/19] spapr: Remove SpaprIrq::nr_msis David Gibson
2019-10-09 15:59 ` Cédric Le Goater
2019-10-10 1:56 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 16/19] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass David Gibson
2019-10-09 16:01 ` Cédric Le Goater [this message]
2019-10-09 6:08 ` [PATCH v4 17/19] spapr: Remove last pieces of SpaprIrq David Gibson
2019-10-09 16:44 ` Cédric Le Goater
2019-10-10 1:59 ` David Gibson
2019-10-09 17:02 ` Greg Kurz
2019-10-10 2:02 ` David Gibson
2019-10-10 6:29 ` Greg Kurz
2019-10-10 20:33 ` Greg Kurz
2019-10-11 5:07 ` David Gibson
2019-10-11 6:13 ` Greg Kurz
2019-10-11 8:33 ` Greg Kurz
2019-10-12 0:00 ` David Gibson
2019-10-14 9:15 ` Greg Kurz
2019-11-20 5:38 ` David Gibson
2019-11-20 8:36 ` Greg Kurz
2019-10-09 6:08 ` [PATCH v4 18/19] spapr: Handle irq backend changes with VFIO PCI devices David Gibson
2019-10-09 8:57 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 19/19] spapr: Work around spurious warnings from vfio INTx initialization David Gibson
2019-10-09 8:37 ` Greg Kurz
2019-10-09 8:52 ` David Gibson
2019-10-09 17:16 ` Greg Kurz
2019-10-10 2:02 ` David Gibson
2019-10-09 9:02 ` [PATCH v4 00/19] spapr: IRQ subsystem cleanup David Gibson
2019-10-16 16:04 ` Greg Kurz
2019-10-17 0:26 ` 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=5cc759a5-43ef-a453-82cb-5cd162494e35@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).