diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-10 15:33:01 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-04-29 19:49:54 +0300 |
| commit | 19b5dcc3be2efe93760372f444dec44e77f67146 (patch) | |
| tree | c7caaccefa7b13873441a921c9c91a5a7e578559 /arch/x86 | |
| parent | ec283cb1dcb934d1a861e5e25ce843e033ee4ab7 (diff) | |
| download | linux-19b5dcc3be2efe93760372f444dec44e77f67146.tar.xz | |
KVM: x86/mmu: remove kvm_calc_shadow_root_page_role_common
kvm_calc_shadow_root_page_role_common is the same as
kvm_calc_cpu_role except for the level, which is overwritten
afterwards in kvm_calc_shadow_mmu_root_page_role
and kvm_calc_shadow_npt_root_page_role.
role.base.direct is already set correctly for the CPU role,
and CR0.PG=1 is required for VMRUN so it will also be
correct for nested NPT.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 86d4ee6ea0f9..f65b7e1a5758 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4868,27 +4868,13 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu, } static union kvm_mmu_role -kvm_calc_shadow_root_page_role_common(struct kvm_vcpu *vcpu, - const struct kvm_mmu_role_regs *regs) -{ - union kvm_mmu_role role = kvm_calc_mmu_role_common(vcpu, regs); - - role.base.smep_andnot_wp = role.ext.cr4_smep && !____is_cr0_wp(regs); - role.base.smap_andnot_wp = role.ext.cr4_smap && !____is_cr0_wp(regs); - role.base.has_4_byte_gpte = ____is_cr0_pg(regs) && !____is_cr4_pae(regs); - - return role; -} - -static union kvm_mmu_role kvm_calc_shadow_mmu_root_page_role(struct kvm_vcpu *vcpu, const struct kvm_mmu_role_regs *regs) { - union kvm_mmu_role role = - kvm_calc_shadow_root_page_role_common(vcpu, regs); - - role.base.direct = !____is_cr0_pg(regs); + union kvm_mmu_role cpu_role = kvm_calc_cpu_role(vcpu, regs); + union kvm_mmu_role role; + role = cpu_role; if (!____is_efer_lma(regs)) role.base.level = PT32E_ROOT_LEVEL; else if (____is_cr4_la57(regs)) @@ -4939,10 +4925,11 @@ static union kvm_mmu_role kvm_calc_shadow_npt_root_page_role(struct kvm_vcpu *vcpu, const struct kvm_mmu_role_regs *regs) { - union kvm_mmu_role role = - kvm_calc_shadow_root_page_role_common(vcpu, regs); + union kvm_mmu_role cpu_role = kvm_calc_cpu_role(vcpu, regs); + union kvm_mmu_role role; - role.base.direct = false; + WARN_ON_ONCE(cpu_role.base.direct); + role = cpu_role; role.base.level = kvm_mmu_get_tdp_level(vcpu); return role; |