From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 23 Apr 2018 16:43:29 +0000 Subject: [RFC PATCH 04/16] KVM: PPC: Book3S HV: export services for the XIVE native exploitation device Message-Id: <20180423164341.15767-5-clg@kaod.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: kvm-ppc@vger.kernel.org The KVM device for the XIVE native exploitation mode will reuse the structures of the XICS-over-XIVE glue implementation. Some code will also be shared : source block creation and destruction, target selection and escalation attachment. Signed-off-by: C=C3=A9dric Le Goater --- arch/powerpc/kvm/book3s_xive.c | 89 ++++++++++++++++++++++++--------------= ---- arch/powerpc/kvm/book3s_xive.h | 11 ++++++ 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index a23ea2f2abe5..10e2ceae7b04 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -103,7 +103,7 @@ static irqreturn_t xive_esc_irq(int irq, void *data) return IRQ_HANDLED; } =20 -static int xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio) +int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio) { struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; struct xive_q *q =3D &xc->queues[prio]; @@ -228,7 +228,7 @@ static int xive_check_provisioning(struct kvm *kvm, u8 = prio) continue; rc =3D xive_provision_queue(vcpu, prio); if (rc =3D 0 && !xive->single_escalation) - xive_attach_escalation(vcpu, prio); + kvmppc_xive_attach_escalation(vcpu, prio); if (rc) return rc; } @@ -279,7 +279,7 @@ static int xive_try_pick_queue(struct kvm_vcpu *vcpu, u= 8 prio) return atomic_add_unless(&q->count, 1, max) ? 0 : -EBUSY; } =20 -static int xive_select_target(struct kvm *kvm, u32 *server, u8 prio) +int kvmppc_xive_select_target(struct kvm *kvm, u32 *server, u8 prio) { struct kvm_vcpu *vcpu; int i, rc; @@ -467,7 +467,7 @@ static int xive_target_interrupt(struct kvm *kvm, * priority. The count for that new target will have * already been incremented. */ - rc =3D xive_select_target(kvm, &server, prio); + rc =3D kvmppc_xive_select_target(kvm, &server, prio); =20 /* * We failed to find a target ? Not much we can do @@ -987,7 +987,7 @@ int kvmppc_xive_clr_mapped(struct kvm *kvm, unsigned lo= ng guest_irq, } EXPORT_SYMBOL_GPL(kvmppc_xive_clr_mapped); =20 -static void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu) +void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu) { struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; struct kvm *kvm =3D vcpu->kvm; @@ -1157,7 +1157,7 @@ int kvmppc_xive_connect_vcpu(struct kvm_device *dev, if (xive->qmap & (1 << i)) { r =3D xive_provision_queue(vcpu, i); if (r =3D 0 && !xive->single_escalation) - xive_attach_escalation(vcpu, i); + kvmppc_xive_attach_escalation(vcpu, i); if (r) goto bail; } else { @@ -1172,7 +1172,7 @@ int kvmppc_xive_connect_vcpu(struct kvm_device *dev, } =20 /* If not done above, attach priority 0 escalation */ - r =3D xive_attach_escalation(vcpu, 0); + r =3D kvmppc_xive_attach_escalation(vcpu, 0); if (r) goto bail; =20 @@ -1423,8 +1423,8 @@ static int xive_get_source(struct kvmppc_xive *xive, = long irq, u64 addr) return 0; } =20 -static struct kvmppc_xive_src_block *xive_create_src_block(struct kvmppc_x= ive *xive, - int irq) +struct kvmppc_xive_src_block *kvmppc_xive_create_src_block( + struct kvmppc_xive *xive, int irq) { struct kvm *kvm =3D xive->kvm; struct kvmppc_xive_src_block *sb; @@ -1503,7 +1503,7 @@ static int xive_set_source(struct kvmppc_xive *xive, = long irq, u64 addr) sb =3D kvmppc_xive_find_source(xive, irq, &idx); if (!sb) { pr_devel("No source, creating source block...\n"); - sb =3D xive_create_src_block(xive, irq); + sb =3D kvmppc_xive_create_src_block(xive, irq); if (!sb) { pr_devel("Failed to create block...\n"); return -ENOMEM; @@ -1727,7 +1727,7 @@ static void kvmppc_xive_cleanup_irq(u32 hw_num, struc= t xive_irq_data *xd) xive_cleanup_irq_data(xd); } =20 -static void kvmppc_xive_free_sources(struct kvmppc_xive_src_block *sb) +void kvmppc_xive_free_sources(struct kvmppc_xive_src_block *sb) { int i; =20 @@ -1756,6 +1756,8 @@ static void kvmppc_xive_free(struct kvm_device *dev) =20 debugfs_remove(xive->dentry); =20 + pr_devel("Destroying xive for partition\n"); + if (kvm) kvm->arch.xive =3D NULL; =20 @@ -1821,6 +1823,43 @@ static int kvmppc_xive_create(struct kvm_device *dev= , u32 type) return 0; } =20 +int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcp= u) +{ + struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; + unsigned int i; + + for (i =3D 0; i < KVMPPC_XIVE_Q_COUNT; i++) { + struct xive_q *q =3D &xc->queues[i]; + u32 i0, i1, idx; + + if (!q->qpage && !xc->esc_virq[i]) + continue; + + seq_printf(m, " [q%d]: ", i); + + if (q->qpage) { + idx =3D q->idx; + i0 =3D be32_to_cpup(q->qpage + idx); + idx =3D (idx + 1) & q->msk; + i1 =3D be32_to_cpup(q->qpage + idx); + seq_printf(m, "T=3D%d %08x %08x...\n", q->toggle, + i0, i1); + } + if (xc->esc_virq[i]) { + struct irq_data *d =3D irq_get_irq_data(xc->esc_virq[i]); + struct xive_irq_data *xd + irq_data_get_irq_handler_data(d); + u64 pq =3D xive_vm_esb_load(xd, XIVE_ESB_GET); + + seq_printf(m, "E:%c%c I(%d:%llx:%llx)", + (pq & XIVE_ESB_VAL_P) ? 'P' : 'p', + (pq & XIVE_ESB_VAL_Q) ? 'Q' : 'q', + xc->esc_virq[i], pq, xd->eoi_page); + seq_puts(m, "\n"); + } + } + return 0; +} =20 static int xive_debug_show(struct seq_file *m, void *private) { @@ -1846,7 +1885,6 @@ static int xive_debug_show(struct seq_file *m, void *= private) =20 kvm_for_each_vcpu(i, vcpu, kvm) { struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; - unsigned int i; =20 if (!xc) continue; @@ -1856,33 +1894,8 @@ static int xive_debug_show(struct seq_file *m, void = *private) xc->server_num, xc->cppr, xc->hw_cppr, xc->mfrr, xc->pending, xc->stat_rm_h_xirr, xc->stat_vm_h_xirr); - for (i =3D 0; i < KVMPPC_XIVE_Q_COUNT; i++) { - struct xive_q *q =3D &xc->queues[i]; - u32 i0, i1, idx; =20 - if (!q->qpage && !xc->esc_virq[i]) - continue; - - seq_printf(m, " [q%d]: ", i); - - if (q->qpage) { - idx =3D q->idx; - i0 =3D be32_to_cpup(q->qpage + idx); - idx =3D (idx + 1) & q->msk; - i1 =3D be32_to_cpup(q->qpage + idx); - seq_printf(m, "T=3D%d %08x %08x... \n", q->toggle, i0, i1); - } - if (xc->esc_virq[i]) { - struct irq_data *d =3D irq_get_irq_data(xc->esc_virq[i]); - struct xive_irq_data *xd =3D irq_data_get_irq_handler_data(d); - u64 pq =3D xive_vm_esb_load(xd, XIVE_ESB_GET); - seq_printf(m, "E:%c%c I(%d:%llx:%llx)", - (pq & XIVE_ESB_VAL_P) ? 'P' : 'p', - (pq & XIVE_ESB_VAL_Q) ? 'Q' : 'q', - xc->esc_virq[i], pq, xd->eoi_page); - seq_printf(m, "\n"); - } - } + kvmppc_xive_debug_show_queues(m, vcpu); =20 t_rm_h_xirr +=3D xc->stat_rm_h_xirr; t_rm_h_ipoll +=3D xc->stat_rm_h_ipoll; diff --git a/arch/powerpc/kvm/book3s_xive.h b/arch/powerpc/kvm/book3s_xive.h index a08ae6fd4c51..10c4aa5cd010 100644 --- a/arch/powerpc/kvm/book3s_xive.h +++ b/arch/powerpc/kvm/book3s_xive.h @@ -248,5 +248,16 @@ extern int (*__xive_vm_h_ipi)(struct kvm_vcpu *vcpu, u= nsigned long server, extern int (*__xive_vm_h_cppr)(struct kvm_vcpu *vcpu, unsigned long cppr); extern int (*__xive_vm_h_eoi)(struct kvm_vcpu *vcpu, unsigned long xirr); =20 +/* + * Common Xive routines for XICS-over-XIVE and XIVE native + */ +struct kvmppc_xive_src_block *kvmppc_xive_create_src_block( + struct kvmppc_xive *xive, int irq); +void kvmppc_xive_free_sources(struct kvmppc_xive_src_block *sb); +int kvmppc_xive_select_target(struct kvm *kvm, u32 *server, u8 prio); +void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu); +int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio); +int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcp= u); + #endif /* CONFIG_KVM_XICS */ #endif /* _KVM_PPC_BOOK3S_XICS_H */ --=20 2.13.6