arm64: KVM: Encapsulate kvm_cpu_context in kvm_host_data

The virt/arm core allocates a kvm_cpu_context_t percpu, at present this is
a typedef to kvm_cpu_context and is used to store host cpu context. The
kvm_cpu_context structure is also used elsewhere to hold vcpu context.
In order to use the percpu to hold additional future host information we
encapsulate kvm_cpu_context in a new structure and rename the typedef and
percpu to match.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 156c09da9e2b..e960b91551d6 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -56,7 +56,7 @@
 __asm__(".arch_extension        virt");
 #endif
 
-DEFINE_PER_CPU(kvm_cpu_context_t, kvm_host_cpu_state);
+DEFINE_PER_CPU(kvm_host_data_t, kvm_host_data);
 static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);
 
 /* Per-CPU variable containing the currently running vcpu. */
@@ -360,8 +360,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
         int *last_ran;
+        kvm_host_data_t *cpu_data;
 
         last_ran = this_cpu_ptr(vcpu->kvm->arch.last_vcpu_ran);
+        cpu_data = this_cpu_ptr(&kvm_host_data);
 
         /*
          * We might get preempted before the vCPU actually runs, but
@@ -373,7 +375,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
         }
 
         vcpu->cpu = cpu;
-        vcpu->arch.host_cpu_context = this_cpu_ptr(&kvm_host_cpu_state);
+        vcpu->arch.host_cpu_context = &cpu_data->host_ctxt;
 
         kvm_arm_set_running_vcpu(vcpu);
         kvm_vgic_load(vcpu);
@@ -1569,11 +1571,11 @@ static int init_hyp_mode(void)
         }
 
         for_each_possible_cpu(cpu) {
-                kvm_cpu_context_t *cpu_ctxt;
+                kvm_host_data_t *cpu_data;
 
-                cpu_ctxt = per_cpu_ptr(&kvm_host_cpu_state, cpu);
-                kvm_init_host_cpu_context(cpu_ctxt, cpu);
-                err = create_hyp_mappings(cpu_ctxt, cpu_ctxt + 1, PAGE_HYP);
+                cpu_data = per_cpu_ptr(&kvm_host_data, cpu);
+                kvm_init_host_cpu_context(&cpu_data->host_ctxt, cpu);
+                err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP);
 
                 if (err) {
                         kvm_err("Cannot map host CPU state: %d\n", err);