Merge tag 'kvmarm-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for 5.2

- guest SVE support
- guest Pointer Authentication support
- Better discrimination of perf counters between host and guests

Conflicts:
	include/uapi/linux/kvm.h

1 files changed, 34 insertions, 6 deletions

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index be4ec5f3ba5f..e5312f47d8e1 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. */
@@ -357,8 +357,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
@@ -370,18 +372,21 @@ 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);
         kvm_timer_vcpu_load(vcpu);
         kvm_vcpu_load_sysregs(vcpu);
         kvm_arch_vcpu_load_fp(vcpu);
+        kvm_vcpu_pmu_restore_guest(vcpu);
 
         if (single_task_running())
                 vcpu_clear_wfe_traps(vcpu);
         else
                 vcpu_set_wfe_traps(vcpu);
+
+        vcpu_ptrauth_setup_lazy(vcpu);
 }
 
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
@@ -390,6 +395,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
         kvm_vcpu_put_sysregs(vcpu);
         kvm_timer_vcpu_put(vcpu);
         kvm_vgic_put(vcpu);
+        kvm_vcpu_pmu_restore_host(vcpu);
 
         vcpu->cpu = -1;
 
@@ -542,6 +548,9 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
         if (likely(vcpu->arch.has_run_once))
                 return 0;
 
+        if (!kvm_arm_vcpu_is_finalized(vcpu))
+                return -EPERM;
+
         vcpu->arch.has_run_once = true;
 
         if (likely(irqchip_in_kernel(kvm))) {
@@ -1113,6 +1122,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                 if (unlikely(!kvm_vcpu_initialized(vcpu)))
                         break;
 
+                r = -EPERM;
+                if (!kvm_arm_vcpu_is_finalized(vcpu))
+                        break;
+
                 r = -EFAULT;
                 if (copy_from_user(&reg_list, user_list, sizeof(reg_list)))
                         break;
@@ -1166,6 +1179,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 
                 return kvm_arm_vcpu_set_events(vcpu, &events);
         }
+        case KVM_ARM_VCPU_FINALIZE: {
+                int what;
+
+                if (!kvm_vcpu_initialized(vcpu))
+                        return -ENOEXEC;
+
+                if (get_user(what, (const int __user *)argp))
+                        return -EFAULT;
+
+                return kvm_arm_vcpu_finalize(vcpu, what);
+        }
         default:
                 r = -EINVAL;
         }
@@ -1546,11 +1570,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);
@@ -1661,6 +1685,10 @@ int kvm_arch_init(void *opaque)
         if (err)
                 return err;
 
+        err = kvm_arm_init_sve();
+        if (err)
+                return err;
+
         if (!in_hyp_mode) {
                 err = init_hyp_mode();
                 if (err)