KVM: arm/arm64: Get rid of vgic_cpu->nr_lr

The number of list registers is a property of the underlying system, not
of emulated VGIC CPU interface.

As we are about to move this variable to global state in the new vgic
for clarity, move it from the legacy implementation as well to make the
merge of the new code easier.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 3e17fb4e64b7b290cd3d6e227ca302e08c32f369..67a66371356d6db8fcef654f82108b807dc23152 100644 (file)
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -304,9 +304,6 @@ struct vgic_cpu {
        unsigned long   *active_shared;
        unsigned long   *pend_act_shared;
 
-       /* Number of list registers on this CPU */
-       int             nr_lr;
-
        /* CPU vif control registers for world switch */
        union {
                struct vgic_v2_cpu_if   vgic_v2;

diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c
index 674bdf8ecf4f9d1e27a1d74e54cd9053cbbf5818..caac41f4881579e8163a6c092b92ca8c3426d880 100644 (file)
--- a/virt/kvm/arm/hyp/vgic-v2-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v2-sr.c
@@ -21,11 +21,13 @@
 
 #include <asm/kvm_hyp.h>
 
+extern struct vgic_params vgic_v2_params;
+
 static void __hyp_text save_maint_int_state(struct kvm_vcpu *vcpu,
                                            void __iomem *base)
 {
        struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;
-       int nr_lr = vcpu->arch.vgic_cpu.nr_lr;
+       int nr_lr = (kern_hyp_va(&vgic_v2_params))->nr_lr;
        u32 eisr0, eisr1;
        int i;
        bool expect_mi;
@@ -67,7 +69,7 @@ static void __hyp_text save_maint_int_state(struct kvm_vcpu *vcpu,
 static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base)
 {
        struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;
-       int nr_lr = vcpu->arch.vgic_cpu.nr_lr;
+       int nr_lr = (kern_hyp_va(&vgic_v2_params))->nr_lr;
        u32 elrsr0, elrsr1;
 
        elrsr0 = readl_relaxed(base + GICH_ELRSR0);
@@ -86,7 +88,7 @@ static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base)
 static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base)
 {
        struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;
-       int nr_lr = vcpu->arch.vgic_cpu.nr_lr;
+       int nr_lr = (kern_hyp_va(&vgic_v2_params))->nr_lr;
        int i;
 
        for (i = 0; i < nr_lr; i++) {
@@ -141,13 +143,13 @@ void __hyp_text __vgic_v2_restore_state(struct kvm_vcpu *vcpu)
        struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;
        struct vgic_dist *vgic = &kvm->arch.vgic;
        void __iomem *base = kern_hyp_va(vgic->vctrl_base);
-       int i, nr_lr;
+       int nr_lr = (kern_hyp_va(&vgic_v2_params))->nr_lr;
+       int i;
        u64 live_lrs = 0;
 
        if (!base)
                return;
 
-       nr_lr = vcpu->arch.vgic_cpu.nr_lr;
 
        for (i = 0; i < nr_lr; i++)
                if (cpu_if->vgic_lr[i] & GICH_LR_STATE)

diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c
index 7e826c9b2b0a3caeee4174531be51413aa6bd747..334cd7a891066d6dbef3af2944204fe3000c3d81 100644 (file)
--- a/virt/kvm/arm/vgic-v2.c
+++ b/virt/kvm/arm/vgic-v2.c
@@ -171,7 +171,7 @@ static const struct vgic_ops vgic_v2_ops = {
        .enable                 = vgic_v2_enable,
 };
 
-static struct vgic_params vgic_v2_params;
+struct vgic_params __section(.hyp.text) vgic_v2_params;
 
 static void vgic_cpu_init_lrs(void *params)
 {
@@ -201,6 +201,8 @@ int vgic_v2_probe(const struct gic_kvm_info *gic_kvm_info,
        const struct resource *vctrl_res = &gic_kvm_info->vctrl;
        const struct resource *vcpu_res = &gic_kvm_info->vcpu;
 
+       memset(vgic, 0, sizeof(*vgic));
+
        if (!gic_kvm_info->maint_irq) {
                kvm_err("error getting vgic maintenance irq\n");
                ret = -ENXIO;

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 91d42a8a5f725913a81afbfcbb8e8a827f54cd4a..f76bb640724325b7801e4193469324e0df4ff158 100644 (file)
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -690,12 +690,11 @@ bool vgic_handle_cfg_reg(u32 *reg, struct kvm_exit_mmio *mmio,
  */
 void vgic_unqueue_irqs(struct kvm_vcpu *vcpu)
 {
-       struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
        u64 elrsr = vgic_get_elrsr(vcpu);
        unsigned long *elrsr_ptr = u64_to_bitmask(&elrsr);
        int i;
 
-       for_each_clear_bit(i, elrsr_ptr, vgic_cpu->nr_lr) {
+       for_each_clear_bit(i, elrsr_ptr, vgic->nr_lr) {
                struct vgic_lr lr = vgic_get_lr(vcpu, i);
 
                /*
@@ -1106,7 +1105,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq)
 {
        int i;
 
-       for (i = 0; i < vcpu->arch.vgic_cpu.nr_lr; i++) {
+       for (i = 0; i < vgic->nr_lr; i++) {
                struct vgic_lr vlr = vgic_get_lr(vcpu, i);
 
                if (vlr.irq == virt_irq && vlr.state & LR_STATE_ACTIVE)
@@ -1866,13 +1865,6 @@ static int vgic_vcpu_init_maps(struct kvm_vcpu *vcpu, int nr_irqs)
                return -ENOMEM;
        }
 
-       /*
-        * Store the number of LRs per vcpu, so we don't have to go
-        * all the way to the distributor structure to find out. Only
-        * assembly code should use this one.
-        */
-       vgic_cpu->nr_lr = vgic->nr_lr;
-
        return 0;
 }