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,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v2 27/33] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines
Date: Fri, 27 Sep 2019 16:49:58 +0200 [thread overview]
Message-ID: <20190927164958.4949f83b@bahia.lan> (raw)
In-Reply-To: <20190927055028.11493-28-david@gibson.dropbear.id.au>
On Fri, 27 Sep 2019 15:50:22 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:
> Both XICS and XIVE have routines to connect and disconnect KVM with similar
> but not identical signatures. This adjusts them to match exactly, which
Maybe mention this includes a return value to be able to streamline error
reporting.
> will be useful for further cleanups later.
>
> While we're at it, remove error reporting from the disconnect path. In the
> XICS case this wasn't used at all. In the XIVE case the only error case
> was if the KVM device was set up, but KVM didn't have the capability to do
> so which is pretty obviously impossible.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
Reviewed-by: Greg Kurz <groug@kaod.org>
> hw/intc/spapr_xive_kvm.c | 22 ++++++++++------------
> hw/intc/xics_kvm.c | 9 +++++----
> hw/ppc/spapr_irq.c | 22 +++++-----------------
> include/hw/ppc/spapr_xive.h | 4 ++--
> include/hw/ppc/xics_spapr.h | 4 ++--
> 5 files changed, 24 insertions(+), 37 deletions(-)
>
> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
> index 51b334b676..08012ac7cd 100644
> --- a/hw/intc/spapr_xive_kvm.c
> +++ b/hw/intc/spapr_xive_kvm.c
> @@ -740,8 +740,9 @@ static void *kvmppc_xive_mmap(SpaprXive *xive, int pgoff, size_t len,
> * All the XIVE memory regions are now backed by mappings from the KVM
> * XIVE device.
> */
> -void kvmppc_xive_connect(SpaprXive *xive, Error **errp)
> +int kvmppc_xive_connect(SpaprInterruptController *intc, Error **errp)
> {
> + SpaprXive *xive = SPAPR_XIVE(intc);
> XiveSource *xsrc = &xive->source;
> Error *local_err = NULL;
> size_t esb_len = (1ull << xsrc->esb_shift) * xsrc->nr_irqs;
> @@ -753,19 +754,19 @@ void kvmppc_xive_connect(SpaprXive *xive, Error **errp)
> * rebooting under the XIVE-only interrupt mode.
> */
> if (xive->fd != -1) {
> - return;
> + return 0;
> }
>
> if (!kvmppc_has_cap_xive()) {
> error_setg(errp, "IRQ_XIVE capability must be present for KVM");
> - return;
> + return -1;
> }
>
> /* First, create the KVM XIVE device */
> xive->fd = kvm_create_device(kvm_state, KVM_DEV_TYPE_XIVE, false);
> if (xive->fd < 0) {
> error_setg_errno(errp, -xive->fd, "XIVE: error creating KVM device");
> - return;
> + return -1;
> }
>
> /*
> @@ -821,15 +822,17 @@ void kvmppc_xive_connect(SpaprXive *xive, Error **errp)
> kvm_kernel_irqchip = true;
> kvm_msi_via_irqfd_allowed = true;
> kvm_gsi_direct_mapping = true;
> - return;
> + return 0;
>
> fail:
> error_propagate(errp, local_err);
> - kvmppc_xive_disconnect(xive, NULL);
> + kvmppc_xive_disconnect(intc);
> + return -1;
> }
>
> -void kvmppc_xive_disconnect(SpaprXive *xive, Error **errp)
> +void kvmppc_xive_disconnect(SpaprInterruptController *intc)
> {
> + SpaprXive *xive = SPAPR_XIVE(intc);
> XiveSource *xsrc;
> size_t esb_len;
>
> @@ -838,11 +841,6 @@ void kvmppc_xive_disconnect(SpaprXive *xive, Error **errp)
> return;
> }
>
> - if (!kvmppc_has_cap_xive()) {
> - error_setg(errp, "IRQ_XIVE capability must be present for KVM");
> - return;
> - }
> -
> /* Clear the KVM mapping */
> xsrc = &xive->source;
> esb_len = (1ull << xsrc->esb_shift) * xsrc->nr_irqs;
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index ba90d6dc96..954c424b36 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -342,8 +342,9 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)
> }
> }
>
> -int xics_kvm_connect(SpaprMachineState *spapr, Error **errp)
> +int xics_kvm_connect(SpaprInterruptController *intc, Error **errp)
> {
> + ICSState *ics = ICS_SPAPR(intc);
> int rc;
> CPUState *cs;
> Error *local_err = NULL;
> @@ -413,7 +414,7 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error **errp)
> }
>
> /* Update the KVM sources */
> - ics_set_kvm_state(spapr->ics, &local_err);
> + ics_set_kvm_state(ics, &local_err);
> if (local_err) {
> goto fail;
> }
> @@ -431,11 +432,11 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error **errp)
>
> fail:
> error_propagate(errp, local_err);
> - xics_kvm_disconnect(spapr, NULL);
> + xics_kvm_disconnect(intc);
> return -1;
> }
>
> -void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp)
> +void xics_kvm_disconnect(SpaprInterruptController *intc)
> {
> /*
> * Only on P9 using the XICS-on XIVE KVM device:
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 79cbe8064e..561bdbc4de 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -124,7 +124,7 @@ static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
> static void spapr_irq_init_kvm_xics(SpaprMachineState *spapr, Error **errp)
> {
> if (kvm_enabled()) {
> - xics_kvm_connect(spapr, errp);
> + xics_kvm_connect(SPAPR_INTC(spapr->ics), errp);
> }
> }
>
> @@ -173,7 +173,7 @@ static void spapr_irq_reset_xive(SpaprMachineState *spapr, Error **errp)
> static void spapr_irq_init_kvm_xive(SpaprMachineState *spapr, Error **errp)
> {
> if (kvm_enabled()) {
> - kvmppc_xive_connect(spapr->xive, errp);
> + kvmppc_xive_connect(SPAPR_INTC(spapr->xive), errp);
> }
> }
>
> @@ -215,7 +215,7 @@ static int spapr_irq_post_load_dual(SpaprMachineState *spapr, int version_id)
> */
> if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) {
> if (kvm_irqchip_in_kernel()) {
> - xics_kvm_disconnect(spapr, &error_fatal);
> + xics_kvm_disconnect(SPAPR_INTC(spapr->ics));
> }
> spapr_irq_xive.reset(spapr, &error_fatal);
> }
> @@ -225,8 +225,6 @@ static int spapr_irq_post_load_dual(SpaprMachineState *spapr, int version_id)
>
> static void spapr_irq_reset_dual(SpaprMachineState *spapr, Error **errp)
> {
> - Error *local_err = NULL;
> -
> /*
> * Deactivate the XIVE MMIOs. The XIVE backend will reenable them
> * if selected.
> @@ -235,18 +233,8 @@ static void spapr_irq_reset_dual(SpaprMachineState *spapr, Error **errp)
>
> /* Destroy all KVM devices */
> if (kvm_irqchip_in_kernel()) {
> - xics_kvm_disconnect(spapr, &local_err);
> - if (local_err) {
> - error_propagate(errp, local_err);
> - error_prepend(errp, "KVM XICS disconnect failed: ");
> - return;
> - }
> - kvmppc_xive_disconnect(spapr->xive, &local_err);
> - if (local_err) {
> - error_propagate(errp, local_err);
> - error_prepend(errp, "KVM XIVE disconnect failed: ");
> - return;
> - }
> + xics_kvm_disconnect(SPAPR_INTC(spapr->ics));
> + kvmppc_xive_disconnect(SPAPR_INTC(spapr->xive));
> }
>
> spapr_irq_current(spapr)->reset(spapr, errp);
> diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
> index ebe156eb30..64972754f9 100644
> --- a/include/hw/ppc/spapr_xive.h
> +++ b/include/hw/ppc/spapr_xive.h
> @@ -68,8 +68,8 @@ int spapr_xive_end_to_target(uint8_t end_blk, uint32_t end_idx,
> /*
> * KVM XIVE device helpers
> */
> -void kvmppc_xive_connect(SpaprXive *xive, Error **errp);
> -void kvmppc_xive_disconnect(SpaprXive *xive, Error **errp);
> +int kvmppc_xive_connect(SpaprInterruptController *intc, Error **errp);
> +void kvmppc_xive_disconnect(SpaprInterruptController *intc);
> void kvmppc_xive_reset(SpaprXive *xive, Error **errp);
> void kvmppc_xive_set_source_config(SpaprXive *xive, uint32_t lisn, XiveEAS *eas,
> Error **errp);
> diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
> index 9c9044db65..445beeffef 100644
> --- a/include/hw/ppc/xics_spapr.h
> +++ b/include/hw/ppc/xics_spapr.h
> @@ -33,8 +33,8 @@
> #define ICS_SPAPR(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SPAPR)
>
> void ics_spapr_create(SpaprMachineState *spapr, int nr_xirqs, Error **errp);
> -int xics_kvm_connect(SpaprMachineState *spapr, Error **errp);
> -void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp);
> +int xics_kvm_connect(SpaprInterruptController *intc, Error **errp);
> +void xics_kvm_disconnect(SpaprInterruptController *intc);
> bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr);
>
> #endif /* XICS_SPAPR_H */
next prev parent reply other threads:[~2019-09-27 17:10 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
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 [this message]
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=20190927164958.4949f83b@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).