Abstract kvm_vgic_vcpu_init() by moving it to the irqchip_flow
structure. This results in a minor change of the way we initialize
vcpus:
VCPUs created prior to the creation of the vgic device don't have
their local view of the vgic initialized. This means that on vgic
instantiation, we must "catch up" and initialise the CPU interfaces
for these vcpus. VCPUs created after the vgic device will follow
the unusual flow. Special care must be taken to accomodate the
different locking contexts though.
The function can then be made static and the irqchip_in_kernel()
test dropped, as we only get here if a vgic has been created.
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
---
arch/arm64/include/asm/kvm_irq.h | 4 ++++
arch/arm64/kvm/arm.c | 2 +-
arch/arm64/kvm/vgic/vgic-init.c | 37 +++++++++++++++++++++++++-------
include/kvm/arm_vgic.h | 1 -
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h
index f83594257bc4..09df1f46d4de 100644
--- a/arch/arm64/include/asm/kvm_irq.h
+++ b/arch/arm64/include/asm/kvm_irq.h
@@ -19,6 +19,7 @@ enum kvm_irqchip_type {
struct kvm_irqchip_flow {
void (*irqchip_destroy)(struct kvm *);
+ int (*irqchip_vcpu_init)(struct kvm_vcpu *);
};
/*
@@ -50,4 +51,7 @@ struct kvm_irqchip_flow {
#define kvm_irqchip_destroy(k) \
__kvm_irqchip_action((k), destroy, (k))
+#define kvm_irqchip_vcpu_init(v) \
+ __vcpu_irqchip_action_ret((v), vcpu_init, (v))
+
#endif
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 09b4bcb2c805..d82d348a36c3 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -265,7 +265,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
vcpu->arch.hw_mmu = &vcpu->kvm->arch.mmu;
- err = kvm_vgic_vcpu_init(vcpu);
+ err = kvm_irqchip_vcpu_init(vcpu);
if (err)
return err;
diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index 4e2c23a7dab1..d845699c6966 100644
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -12,10 +12,12 @@
#include <asm/kvm_mmu.h>
#include "vgic.h"
+static int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu);
static void kvm_vgic_destroy(struct kvm *kvm);
static struct kvm_irqchip_flow vgic_irqchip_flow = {
.irqchip_destroy = kvm_vgic_destroy,
+ .irqchip_vcpu_init = kvm_vgic_vcpu_init,
};
/*
@@ -45,6 +47,8 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = {
* allocation is allowed there.
*/
+static int __kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu);
+
/* CREATION */
/**
@@ -110,6 +114,17 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
INIT_LIST_HEAD(&dist->lpi_translation_cache);
raw_spin_lock_init(&dist->lpi_list_lock);
+ /*
+ * vcpus may have been created before the GIC. Initialize
+ * them. Careful that kvm->lock is held already on the
+ * KVM_CREATE_DEVICE path, so use the non-locking version.
+ */
+ kvm_for_each_vcpu(i, vcpu, kvm) {
+ ret = __kvm_vgic_vcpu_init(vcpu);
+ if (ret)
+ break;
+ }
+
out_unlock:
unlock_all_vcpus(kvm);
return ret;
@@ -176,7 +191,7 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis)
* Only do initialization, but do not actually enable the
* VGIC CPU interface
*/
-int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
+static int __kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
{
struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
int ret = 0;
@@ -211,18 +226,24 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
}
}
- if (!irqchip_in_kernel(vcpu->kvm))
- return 0;
-
/*
* If we are creating a VCPU with a GICv3 we must also register the
* KVM io device for the redistributor that belongs to this VCPU.
*/
- if (irqchip_is_gic_v3(vcpu->kvm)) {
- mutex_lock(&vcpu->kvm->lock);
+ if (irqchip_is_gic_v3(vcpu->kvm))
ret = vgic_register_redist_iodev(vcpu);
- mutex_unlock(&vcpu->kvm->lock);
- }
+
+ return ret;
+}
+
+static int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
+{
+ int ret;
+
+ mutex_lock(&vcpu->kvm->lock);
+ ret = __kvm_vgic_vcpu_init(vcpu);
+ mutex_unlock(&vcpu->kvm->lock);
+
return ret;
}
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index e8bdc304ec9b..b2fd0e39af11 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -335,7 +335,6 @@ extern struct static_key_false vgic_v2_cpuif_trap;
extern struct static_key_false vgic_v3_cpuif_trap;
int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);
-int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu);
int kvm_vgic_create(struct kvm *kvm, u32 type);
int kvm_vgic_map_resources(struct kvm *kvm);
int kvm_vgic_hyp_init(void);
--
2.27.0
