kvm: x86: Remove CR3_PCID_INVD flag

Junaid Shahid · bonzini · commit 208320ba103e · 2018-08-06T17:59:02.000+02:00
It is a duplicate of X86_CR3_PCID_NOFLUSH. So just use that instead.

Signed-off-by: Junaid Shahid &lt;junaids@google.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
@@ -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     \
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
@@ -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)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -4191,7 +4191,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)`
`4191`	`4191`	`maxphyaddr = 36;`
`4192`	`4192`	`rsvd = rsvd_bits(maxphyaddr, 63);`
`4193`	`4193`	`if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PCIDE)`
`4194`		`- rsvd &= ~CR3_PCID_INVD;`
	`4194`	`+ rsvd &= ~X86_CR3_PCID_NOFLUSH;`
`4195`	`4195`	`}`
`4196`	`4196`
`4197`	`4197`	`if (new_val & rsvd)`
Original file line number	Diff line number	Diff line change
`@@ -852,8 +852,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)`
`852`	`852`	`bool pcid_enabled = kvm_read_cr4_bits(vcpu, X86_CR4_PCIDE);`
`853`	`853`
`854`	`854`	`if (pcid_enabled) {`
`855`		`- skip_tlb_flush = cr3 & CR3_PCID_INVD;`
`856`		`- cr3 &= ~CR3_PCID_INVD;`
	`855`	`+ skip_tlb_flush = cr3 & X86_CR3_PCID_NOFLUSH;`
	`856`	`+ cr3 &= ~X86_CR3_PCID_NOFLUSH;`
`857`	`857`	`}`
`858`	`858`	`#endif`
`859`	`859`