1 files changed, 30 insertions, 63 deletions

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 475d1c948501..e32243eac2f4 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1084,7 +1084,6 @@ static void init_vmcb(struct vcpu_svm *svm)
         if (npt_enabled) {
                 /* Setup VMCB for Nested Paging */
                 control->nested_ctl = 1;
-                clr_intercept(svm, INTERCEPT_TASK_SWITCH);
                 clr_intercept(svm, INTERCEPT_INVLPG);
                 clr_exception_intercept(svm, PF_VECTOR);
                 clr_cr_intercept(svm, INTERCEPT_CR3_READ);
@@ -1844,6 +1843,20 @@ static unsigned long nested_svm_get_tdp_cr3(struct kvm_vcpu *vcpu)
         return svm->nested.nested_cr3;
 }
 
+static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index)
+{
+        struct vcpu_svm *svm = to_svm(vcpu);
+        u64 cr3 = svm->nested.nested_cr3;
+        u64 pdpte;
+        int ret;
+
+        ret = kvm_read_guest_page(vcpu->kvm, gpa_to_gfn(cr3), &pdpte,
+                                  offset_in_page(cr3) + index * 8, 8);
+        if (ret)
+                return 0;
+        return pdpte;
+}
+
 static void nested_svm_set_tdp_cr3(struct kvm_vcpu *vcpu,
                                    unsigned long root)
 {
@@ -1875,6 +1888,7 @@ static int nested_svm_init_mmu_context(struct kvm_vcpu *vcpu)
 
         vcpu->arch.mmu.set_cr3           = nested_svm_set_tdp_cr3;
         vcpu->arch.mmu.get_cr3           = nested_svm_get_tdp_cr3;
+        vcpu->arch.mmu.get_pdptr         = nested_svm_get_tdp_pdptr;
         vcpu->arch.mmu.inject_page_fault = nested_svm_inject_npf_exit;
         vcpu->arch.mmu.shadow_root_level = get_npt_level();
         vcpu->arch.walk_mmu              = &vcpu->arch.nested_mmu;
@@ -2182,7 +2196,8 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
                                        vmcb->control.exit_info_1,
                                        vmcb->control.exit_info_2,
                                        vmcb->control.exit_int_info,
-                                       vmcb->control.exit_int_info_err);
+                                       vmcb->control.exit_int_info_err,
+                                       KVM_ISA_SVM);
 
         nested_vmcb = nested_svm_map(svm, svm->nested.vmcb, &page);
         if (!nested_vmcb)
@@ -2894,15 +2909,20 @@ static int cr8_write_interception(struct vcpu_svm *svm)
         return 0;
 }
 
+u64 svm_read_l1_tsc(struct kvm_vcpu *vcpu)
+{
+        struct vmcb *vmcb = get_host_vmcb(to_svm(vcpu));
+        return vmcb->control.tsc_offset +
+                svm_scale_tsc(vcpu, native_read_tsc());
+}
+
 static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
 {
         struct vcpu_svm *svm = to_svm(vcpu);
 
         switch (ecx) {
         case MSR_IA32_TSC: {
-                struct vmcb *vmcb = get_host_vmcb(svm);
-
-                *data = vmcb->control.tsc_offset +
+                *data = svm->vmcb->control.tsc_offset +
                         svm_scale_tsc(vcpu, native_read_tsc());
 
                 break;
@@ -3314,8 +3334,6 @@ static int handle_exit(struct kvm_vcpu *vcpu)
         struct kvm_run *kvm_run = vcpu->run;
         u32 exit_code = svm->vmcb->control.exit_code;
 
-        trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);
-
         if (!is_cr_intercept(svm, INTERCEPT_CR0_WRITE))
                 vcpu->arch.cr0 = svm->vmcb->save.cr0;
         if (npt_enabled)
@@ -3335,7 +3353,8 @@ static int handle_exit(struct kvm_vcpu *vcpu)
                                         svm->vmcb->control.exit_info_1,
                                         svm->vmcb->control.exit_info_2,
                                         svm->vmcb->control.exit_int_info,
-                                        svm->vmcb->control.exit_int_info_err);
+                                        svm->vmcb->control.exit_int_info_err,
+                                        KVM_ISA_SVM);
 
                 vmexit = nested_svm_exit_special(svm);
 
@@ -3768,6 +3787,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
         vcpu->arch.regs[VCPU_REGS_RSP] = svm->vmcb->save.rsp;
         vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip;
 
+        trace_kvm_exit(svm->vmcb->control.exit_code, vcpu, KVM_ISA_SVM);
+
         if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
                 kvm_before_handle_nmi(&svm->vcpu);
 
@@ -3897,60 +3918,6 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
         }
 }
 
-static const struct trace_print_flags svm_exit_reasons_str[] = {
-        { SVM_EXIT_READ_CR0,                    "read_cr0" },
-        { SVM_EXIT_READ_CR3,                    "read_cr3" },
-        { SVM_EXIT_READ_CR4,                    "read_cr4" },
-        { SVM_EXIT_READ_CR8,                    "read_cr8" },
-        { SVM_EXIT_WRITE_CR0,                   "write_cr0" },
-        { SVM_EXIT_WRITE_CR3,                   "write_cr3" },
-        { SVM_EXIT_WRITE_CR4,                   "write_cr4" },
-        { SVM_EXIT_WRITE_CR8,                   "write_cr8" },
-        { SVM_EXIT_READ_DR0,                    "read_dr0" },
-        { SVM_EXIT_READ_DR1,                    "read_dr1" },
-        { SVM_EXIT_READ_DR2,                    "read_dr2" },
-        { SVM_EXIT_READ_DR3,                    "read_dr3" },
-        { SVM_EXIT_WRITE_DR0,                   "write_dr0" },
-        { SVM_EXIT_WRITE_DR1,                   "write_dr1" },
-        { SVM_EXIT_WRITE_DR2,                   "write_dr2" },
-        { SVM_EXIT_WRITE_DR3,                   "write_dr3" },
-        { SVM_EXIT_WRITE_DR5,                   "write_dr5" },
-        { SVM_EXIT_WRITE_DR7,                   "write_dr7" },
-        { SVM_EXIT_EXCP_BASE + DB_VECTOR,       "DB excp" },
-        { SVM_EXIT_EXCP_BASE + BP_VECTOR,       "BP excp" },
-        { SVM_EXIT_EXCP_BASE + UD_VECTOR,       "UD excp" },
-        { SVM_EXIT_EXCP_BASE + PF_VECTOR,       "PF excp" },
-        { SVM_EXIT_EXCP_BASE + NM_VECTOR,       "NM excp" },
-        { SVM_EXIT_EXCP_BASE + MC_VECTOR,       "MC excp" },
-        { SVM_EXIT_INTR,                        "interrupt" },
-        { SVM_EXIT_NMI,                         "nmi" },
-        { SVM_EXIT_SMI,                         "smi" },
-        { SVM_EXIT_INIT,                        "init" },
-        { SVM_EXIT_VINTR,                       "vintr" },
-        { SVM_EXIT_CPUID,                       "cpuid" },
-        { SVM_EXIT_INVD,                        "invd" },
-        { SVM_EXIT_HLT,                         "hlt" },
-        { SVM_EXIT_INVLPG,                      "invlpg" },
-        { SVM_EXIT_INVLPGA,                     "invlpga" },
-        { SVM_EXIT_IOIO,                        "io" },
-        { SVM_EXIT_MSR,                         "msr" },
-        { SVM_EXIT_TASK_SWITCH,                 "task_switch" },
-        { SVM_EXIT_SHUTDOWN,                    "shutdown" },
-        { SVM_EXIT_VMRUN,                       "vmrun" },
-        { SVM_EXIT_VMMCALL,                     "hypercall" },
-        { SVM_EXIT_VMLOAD,                      "vmload" },
-        { SVM_EXIT_VMSAVE,                      "vmsave" },
-        { SVM_EXIT_STGI,                        "stgi" },
-        { SVM_EXIT_CLGI,                        "clgi" },
-        { SVM_EXIT_SKINIT,                      "skinit" },
-        { SVM_EXIT_WBINVD,                      "wbinvd" },
-        { SVM_EXIT_MONITOR,                     "monitor" },
-        { SVM_EXIT_MWAIT,                       "mwait" },
-        { SVM_EXIT_XSETBV,                      "xsetbv" },
-        { SVM_EXIT_NPF,                         "npf" },
-        { -1, NULL }
-};
-
 static int svm_get_lpage_level(void)
 {
         return PT_PDPE_LEVEL;
@@ -4223,7 +4190,6 @@ static struct kvm_x86_ops svm_x86_ops = {
         .get_mt_mask = svm_get_mt_mask,
 
         .get_exit_info = svm_get_exit_info,
-        .exit_reasons_str = svm_exit_reasons_str,
 
         .get_lpage_level = svm_get_lpage_level,
 
@@ -4239,6 +4205,7 @@ static struct kvm_x86_ops svm_x86_ops = {
         .write_tsc_offset = svm_write_tsc_offset,
         .adjust_tsc_offset = svm_adjust_tsc_offset,
         .compute_tsc_offset = svm_compute_tsc_offset,
+        .read_l1_tsc = svm_read_l1_tsc,
 
         .set_tdp_cr3 = set_tdp_cr3,