From: Sean Christopherson Date: Tue, 22 Jun 2021 17:57:15 +0000 (-0700) Subject: KVM: x86/mmu: Use MMU's role to get CR4.PSE for computing rsvd bits X-Git-Tag: accepted/tizen/unified/20230118.172025~6813^2~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e9c0d80dbbd2dd411d726ed10eccaaba6d63a08;p=platform%2Fkernel%2Flinux-rpi.git KVM: x86/mmu: Use MMU's role to get CR4.PSE for computing rsvd bits Use the MMU's role to get CR4.PSE when calculating reserved bits for the guest's PTEs. Practically speaking, this is a glorified nop as the role always come from vCPU state for the relevant flows, but converting to the roles will provide consistency once everything else is converted, and will Just Work if the "always comes from vCPU" behavior were ever to change (unlikely). Signed-off-by: Sean Christopherson Message-Id: <20210622175739.3610207-31-seanjc@google.com> Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index d017352..3a8af50 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4216,7 +4216,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, vcpu->arch.reserved_gpa_bits, context->root_level, context->nx, guest_cpuid_has(vcpu, X86_FEATURE_GBPAGES), - is_pse(vcpu), + is_cr4_pse(context), guest_cpuid_is_amd_or_hygon(vcpu)); }