4 files changed, 21 insertions, 5 deletions

diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index a153257bf7d9..d62fa148558b 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -297,7 +297,7 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
         scb_s->crycbd = 0;
 
         apie_h = vcpu->arch.sie_block->eca & ECA_APIE;
-        if (!apie_h && !key_msk)
+        if (!apie_h && (!key_msk || fmt_o == CRYCB_FORMAT0))
                 return 0;
 
         if (!crycb_addr)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 4660ce90de7f..180373360e34 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -299,6 +299,7 @@ union kvm_mmu_extended_role {
                 unsigned int cr4_smap:1;
                 unsigned int cr4_smep:1;
                 unsigned int cr4_la57:1;
+                unsigned int maxphyaddr:6;
         };
 };
 
@@ -397,6 +398,7 @@ struct kvm_mmu {
         void (*update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
                            u64 *spte, const void *pte);
         hpa_t root_hpa;
+        gpa_t root_cr3;
         union kvm_mmu_role mmu_role;
         u8 root_level;
         u8 shadow_root_level;
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index bbffa6c54697..c07958b59f50 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -335,6 +335,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
         unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0;
         unsigned f_umip = kvm_x86_ops->umip_emulated() ? F(UMIP) : 0;
         unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;
+        unsigned f_la57 = 0;
 
         /* cpuid 1.edx */
         const u32 kvm_cpuid_1_edx_x86_features =
@@ -489,7 +490,10 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                         // TSC_ADJUST is emulated
                         entry->ebx |= F(TSC_ADJUST);
                         entry->ecx &= kvm_cpuid_7_0_ecx_x86_features;
+                        f_la57 = entry->ecx & F(LA57);
                         cpuid_mask(&entry->ecx, CPUID_7_ECX);
+                        /* Set LA57 based on hardware capability. */
+                        entry->ecx |= f_la57;
                         entry->ecx |= f_umip;
                         /* PKU is not yet implemented for shadow paging. */
                         if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE))
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index da9c42349b1f..f2d1d230d5b8 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -3555,6 +3555,7 @@ void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
                                                            &invalid_list);
                         mmu->root_hpa = INVALID_PAGE;
                 }
+                mmu->root_cr3 = 0;
         }
 
         kvm_mmu_commit_zap_page(vcpu->kvm, &invalid_list);
@@ -3610,6 +3611,7 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu)
                 vcpu->arch.mmu->root_hpa = __pa(vcpu->arch.mmu->pae_root);
         } else
                 BUG();
+        vcpu->arch.mmu->root_cr3 = vcpu->arch.mmu->get_cr3(vcpu);
 
         return 0;
 }
@@ -3618,10 +3620,11 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
 {
         struct kvm_mmu_page *sp;
         u64 pdptr, pm_mask;
-        gfn_t root_gfn;
+        gfn_t root_gfn, root_cr3;
         int i;
 
-        root_gfn = vcpu->arch.mmu->get_cr3(vcpu) >> PAGE_SHIFT;
+        root_cr3 = vcpu->arch.mmu->get_cr3(vcpu);
+        root_gfn = root_cr3 >> PAGE_SHIFT;
 
         if (mmu_check_root(vcpu, root_gfn))
                 return 1;
@@ -3646,7 +3649,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
                 ++sp->root_count;
                 spin_unlock(&vcpu->kvm->mmu_lock);
                 vcpu->arch.mmu->root_hpa = root;
-                return 0;
+                goto set_root_cr3;
         }
 
         /*
@@ -3712,6 +3715,9 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
                 vcpu->arch.mmu->root_hpa = __pa(vcpu->arch.mmu->lm_root);
         }
 
+set_root_cr3:
+        vcpu->arch.mmu->root_cr3 = root_cr3;
+
         return 0;
 }
 
@@ -4163,7 +4169,7 @@ static bool cached_root_available(struct kvm_vcpu *vcpu, gpa_t new_cr3,
         struct kvm_mmu_root_info root;
         struct kvm_mmu *mmu = vcpu->arch.mmu;
 
-        root.cr3 = mmu->get_cr3(vcpu);
+        root.cr3 = mmu->root_cr3;
         root.hpa = mmu->root_hpa;
 
         for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) {
@@ -4176,6 +4182,7 @@ static bool cached_root_available(struct kvm_vcpu *vcpu, gpa_t new_cr3,
         }
 
         mmu->root_hpa = root.hpa;
+        mmu->root_cr3 = root.cr3;
 
         return i < KVM_MMU_NUM_PREV_ROOTS;
 }
@@ -4770,6 +4777,7 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu)
         ext.cr4_pse = !!is_pse(vcpu);
         ext.cr4_pke = !!kvm_read_cr4_bits(vcpu, X86_CR4_PKE);
         ext.cr4_la57 = !!kvm_read_cr4_bits(vcpu, X86_CR4_LA57);
+        ext.maxphyaddr = cpuid_maxphyaddr(vcpu);
 
         ext.valid = 1;
 
@@ -5516,11 +5524,13 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu)
         vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;
 
         vcpu->arch.root_mmu.root_hpa = INVALID_PAGE;
+        vcpu->arch.root_mmu.root_cr3 = 0;
         vcpu->arch.root_mmu.translate_gpa = translate_gpa;
         for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
                 vcpu->arch.root_mmu.prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;
 
         vcpu->arch.guest_mmu.root_hpa = INVALID_PAGE;
+        vcpu->arch.guest_mmu.root_cr3 = 0;
         vcpu->arch.guest_mmu.translate_gpa = translate_gpa;
         for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
                 vcpu->arch.guest_mmu.prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;