Merge branch 'kvm-amd-fixes' into HEAD

diff --cc arch/arm64/kvm/guest.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/hyperv.c
index 2f96ff9e60ee0d9a61399aee588cb8c41f29ef8c,54d4b98b49e182ac5abd3910ac7a97ad60c251f1..f9d3b919823c344ecb531cc3c648bebb94f35f3a
--- 1/arch/x86/kvm/hyperv.c
--- 2/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@@ -1425,8 -1425,9 +1425,8 @@@ static u64 kvm_hv_flush_tlb(struct kvm_
         * vcpu->arch.cr3 may not be up-to-date for running vCPUs so we can't
         * analyze it here, flush TLB regardless of the specified address space.
         */
 -      kvm_make_vcpus_request_mask(kvm,
 -                                  KVM_REQ_TLB_FLUSH | KVM_REQUEST_NO_WAKEUP,
 +      kvm_make_vcpus_request_mask(kvm, KVM_REQ_HV_TLB_FLUSH,
-                                   vcpu_mask, &hv_vcpu->tlb_flush);
+                                   NULL, vcpu_mask, &hv_vcpu->tlb_flush);
  
  ret_success:
        /* We always do full TLB flush, set rep_done = rep_cnt. */

diff --cc arch/x86/kvm/svm/nested.c
Simple merge

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx/nested.c
index b516c24494e38a63f89e271cd4474ea33bbf5c3b,e44f33c82332505b057ae016cf0d5a5c0cba23d0..b644bbf85460d41d5c20d1f6c1eb24191ef7bf26
--- 1/arch/x86/kvm/vmx/nested.c
--- 2/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@@ -5208,35 -5156,16 +5208,35 @@@ static int handle_invept(struct kvm_vcp
                return 1;
        }
  
 -      switch (type) {
 -      case VMX_EPT_EXTENT_GLOBAL:
 -      case VMX_EPT_EXTENT_CONTEXT:
        /*
 -       * TODO: Sync the necessary shadow EPT roots here, rather than
 -       * at the next emulated VM-entry.
 +       * Nested EPT roots are always held through guest_mmu,
 +       * not root_mmu.
         */
 +      mmu = &vcpu->arch.guest_mmu;
 +
 +      switch (type) {
 +      case VMX_EPT_EXTENT_CONTEXT:
 +              if (!nested_vmx_check_eptp(vcpu, operand.eptp))
 +                      return nested_vmx_failValid(vcpu,
 +                              VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);
 +
 +              roots_to_free = 0;
 +              if (nested_ept_root_matches(mmu->root_hpa, mmu->root_pgd,
 +                                          operand.eptp))
 +                      roots_to_free |= KVM_MMU_ROOT_CURRENT;
 +
 +              for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) {
 +                      if (nested_ept_root_matches(mmu->prev_roots[i].hpa,
 +                                                  mmu->prev_roots[i].pgd,
 +                                                  operand.eptp))
 +                              roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);
 +              }
 +              break;
 +      case VMX_EPT_EXTENT_GLOBAL:
 +              roots_to_free = KVM_MMU_ROOTS_ALL;
                break;
        default:
-               BUG_ON(1);
+               BUG();
                break;
        }
  

diff --cc arch/x86/kvm/vmx/vmx.c
index 455cd2c8dbce071252d647e3ad81950185a94816,89c766fad889ea2581678d1cd966dea556418529..46aa3ca019290199fdff520650bf91816ed20a4c
--- 1/arch/x86/kvm/vmx/vmx.c
--- 2/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -4710,15 -4672,10 +4729,10 @@@ static int handle_exception_nmi(struct 
                return handle_rmode_exception(vcpu, ex_no, error_code);
  
        switch (ex_no) {
-       case AC_VECTOR:
-               kvm_queue_exception_e(vcpu, AC_VECTOR, error_code);
-               return 1;
        case DB_VECTOR:
 -              dr6 = vmcs_readl(EXIT_QUALIFICATION);
 +              dr6 = vmx_get_exit_qual(vcpu);
                if (!(vcpu->guest_debug &
                      (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) {
-                       vcpu->arch.dr6 &= ~DR_TRAP_BITS;
-                       vcpu->arch.dr6 |= dr6 | DR6_RTM;
                        if (is_icebp(intr_info))
                                WARN_ON(!skip_emulated_instruction(vcpu));
  

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc tools/testing/selftests/kvm/.gitignore
Simple merge

diff --cc tools/testing/selftests/kvm/Makefile
Simple merge

diff --cc tools/testing/selftests/kvm/include/kvm_util.h
Simple merge

diff --cc tools/testing/selftests/kvm/lib/kvm_util.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge