Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 208320ba authored Jun 27, 2018 by Junaid Shahid Committed by Paolo Bonzini Aug 06, 2018

kvm: x86: Remove CR3_PCID_INVD flag



It is a duplicate of X86_CR3_PCID_NOFLUSH. So just use that instead.

Signed-off-by: Junaid Shahid <junaids@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent b94742c9

arch/x86/include/asm/kvm_host.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@
		\| X86_CR0_ET \| X86_CR0_NE \| X86_CR0_WP \| X86_CR0_AM \
		\| X86_CR0_NW \| X86_CR0_CD \| X86_CR0_PG))

		#define CR3_PCID_INVD BIT_64(63)
		#define CR4_RESERVED_BITS \
		(~(unsigned long)(X86_CR4_VME \| X86_CR4_PVI \| X86_CR4_TSD \| X86_CR4_DE\
		\| X86_CR4_PSE \| X86_CR4_PAE \| X86_CR4_MCE \

arch/x86/kvm/emulate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4191,7 +4191,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
		maxphyaddr = 36;
		rsvd = rsvd_bits(maxphyaddr, 63);
		if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PCIDE)
		rsvd &= ~CR3_PCID_INVD;
		rsvd &= ~X86_CR3_PCID_NOFLUSH;
		}

		if (new_val & rsvd)

arch/x86/kvm/x86.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -852,8 +852,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
		bool pcid_enabled = kvm_read_cr4_bits(vcpu, X86_CR4_PCIDE);

		if (pcid_enabled) {
		skip_tlb_flush = cr3 & CR3_PCID_INVD;
		cr3 &= ~CR3_PCID_INVD;
		skip_tlb_flush = cr3 & X86_CR3_PCID_NOFLUSH;
		cr3 &= ~X86_CR3_PCID_NOFLUSH;
		}
		#endif