Commit e63f315d authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paolo Bonzini
Browse files

KVM: X86: Move CR0 pdptr_bits into header file as X86_CR0_PDPTR_BITS 



Not functionality changed.

Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
Message-Id: <20211108124407.12187-7-jiangshanlai@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a37ebdce

arch/x86/kvm/kvm_cache_regs.h

+3 −0
Original line number Diff line number Diff line
@@ -9,9 +9,12 @@ 
	(X86_CR4_PVI | X86_CR4_DE | X86_CR4_PCE | X86_CR4_OSFXSR  \

	 | X86_CR4_OSXMMEXCPT | X86_CR4_PGE | X86_CR4_TSD | X86_CR4_FSGSBASE)



#define X86_CR0_PDPTR_BITS    (X86_CR0_CD | X86_CR0_NW | X86_CR0_PG)

#define X86_CR4_TLBFLUSH_BITS (X86_CR4_PGE | X86_CR4_PCIDE | X86_CR4_PAE | X86_CR4_SMEP)

#define X86_CR4_PDPTR_BITS    (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_SMEP)



static_assert(!(KVM_POSSIBLE_CR0_GUEST_BITS & X86_CR0_PDPTR_BITS));



#define BUILD_KVM_GPR_ACCESSORS(lname, uname)				      \

static __always_inline unsigned long kvm_##lname##_read(struct kvm_vcpu *vcpu)\

{									      \

arch/x86/kvm/x86.c

+1 −2
Original line number Diff line number Diff line
@@ -857,7 +857,6 @@ EXPORT_SYMBOL_GPL(kvm_post_set_cr0); 
int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)

{

	unsigned long old_cr0 = kvm_read_cr0(vcpu);

	unsigned long pdptr_bits = X86_CR0_CD | X86_CR0_NW | X86_CR0_PG;



	cr0 |= X86_CR0_ET;
@@ -887,7 +886,7 @@ int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
	}

#endif

	if (!(vcpu->arch.efer & EFER_LME) && (cr0 & X86_CR0_PG) &&

	    is_pae(vcpu) && ((cr0 ^ old_cr0) & pdptr_bits) &&

	    is_pae(vcpu) && ((cr0 ^ old_cr0) & X86_CR0_PDPTR_BITS) &&

	    !load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu)))

		return 1;