Merge branch 'kvm-fixes' into 'next'

Pick up bugfixes from 5.9, otherwise various tests fail.

diff --cc arch/arm64/kvm/hyp/nvhe/tlb.c
Simple merge

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

diff --cc arch/x86/kvm/vmx/vmx.c
index 544a35b8d7fe87e2c652198d966b36e01d2fa916,f4e9c310032a7db631592694b1b2763a07104e69..755896797a813c9334f914ba6ebf259c27e34e74
--- 1/arch/x86/kvm/vmx/vmx.c
--- 2/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -5343,7 -5337,7 +5349,7 @@@ static int handle_ept_violation(struct 
         * would also use advanced VM-exit information for EPT violations to
         * reconstruct the page fault error code.
         */
-       if (unlikely(kvm_vcpu_is_illegal_gpa(vcpu, gpa)))
 -      if (unlikely(allow_smaller_maxphyaddr && kvm_mmu_is_illegal_gpa(vcpu, gpa)))
++      if (unlikely(allow_smaller_maxphyaddr && kvm_vcpu_is_illegal_gpa(vcpu, gpa)))
                return kvm_emulate_instruction(vcpu, 0);
  
        return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);

diff --cc arch/x86/kvm/vmx/vmx.h
index 64ff2c0322c32be12403dd41b38e347061362f10,a0e47720f60cdf4846c46ab10e700c828a5ffd4f..f6f66e5c65104890ae82739ae7ed685ba21f03c5
--- 1/arch/x86/kvm/vmx/vmx.h
--- 2/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@@ -470,22 -552,12 +470,25 @@@ static inline bool vmx_has_waitpkg(stru
  
  static inline bool vmx_need_pf_intercept(struct kvm_vcpu *vcpu)
  {
-       return !enable_ept || cpuid_maxphyaddr(vcpu) < boot_cpu_data.x86_phys_bits;
+       if (!enable_ept)
+               return true;
+ 
+       return allow_smaller_maxphyaddr && cpuid_maxphyaddr(vcpu) < boot_cpu_data.x86_phys_bits;
  }
  
 +static inline bool is_unrestricted_guest(struct kvm_vcpu *vcpu)
 +{
 +      return enable_unrestricted_guest && (!is_guest_mode(vcpu) ||
 +          (secondary_exec_controls_get(to_vmx(vcpu)) &
 +          SECONDARY_EXEC_UNRESTRICTED_GUEST));
 +}
 +
 +bool __vmx_guest_state_valid(struct kvm_vcpu *vcpu);
 +static inline bool vmx_guest_state_valid(struct kvm_vcpu *vcpu)
 +{
 +      return is_unrestricted_guest(vcpu) || __vmx_guest_state_valid(vcpu);
 +}
 +
  void dump_vmcs(void);
  
  #endif /* __KVM_X86_VMX_H */

diff --cc arch/x86/kvm/x86.c
index 51f75c21c86f83d0b58093ccab72470f72ad1ff5,58fa354b144690e0628d8b9e0e225919f434995a..397f599b20e5a8aeb4ff1423a346d1c4d2c1e2c4
--- 1/arch/x86/kvm/x86.c
--- 2/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -3400,9 -3231,9 +3401,9 @@@ int kvm_get_msr_common(struct kvm_vcpu 
                 * even when not intercepted. AMD manual doesn't explicitly
                 * state this but appears to behave the same.
                 *
-                * Unconditionally return L1's TSC offset on userspace reads
-                * so that userspace reads and writes always operate on L1's
-                * offset, e.g. to ensure deterministic behavior for migration.
+                * On userspace reads and writes, however, we unconditionally
 -               * operate L1's TSC value to ensure backwards-compatible
++               * return L1's TSC value to ensure backwards-compatible
+                * behavior for migration.
                 */
                u64 tsc_offset = msr_info->host_initiated ? vcpu->arch.l1_tsc_offset :
                                                            vcpu->arch.tsc_offset;