KVM: emulate: Don't inject #GP when emulating RDMPC if CR0.PE=0
PATCH v4 1/1 KVM: emulate: Don't inject #GP when emulating RDMPC if CR0.PE=0
From: Wanpeng Li <[email protected]>
SDM mentioned that we should #GP for rdpmc if ECX is not valid or (CR4.PCE is 0 and CPL is 1, 2, or 3 and CR0.PE is 1).
Let's add the CR0.PE is 1 checking to rdpmc emulate, though this isn't strictly necessary since it's impossible for CPL to be >0 if CR0.PE=0.
---
v3 -> v4:
* add comments instead of pseudocode
v2 -> v3:
* add the missing 'S'
v1 -> v2:
* update patch description
arch/x86/kvm/emulate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/emulate.c +2 -1
@@ -4213,6 +4213,7 @@ static int check_rdtsc(struct x86_emulate_ctxt *ctxt)static int check_rdpmc (struct x86_emulate_ctxt *ctxt) {u64 cr4 = ctxt->ops->get_cr (ctxt,4 ); +u64 cr0 = ctxt->ops->get_cr (ctxt,0 );u64 rcx =reg_read (ctxt,VCPU_REGS_RCX );/*
@@ -4222,7 +4223,7 @@ static int check_rdpmc(struct x86_emulate_ctxt *ctxt)if (enable_vmware_backdoor &&is_vmware_backdoor_pmc (rcx))return X86EMUL_CONTINUE ; -if ((!(cr4 &X86_CR4_PCE ) && ctxt->ops->cpl (ctxt)) || +if ((!(cr4 &X86_CR4_PCE ) && ctxt->ops->cpl (ctxt) && (cr0 &X86_CR0_PE )) || ctxt->ops->check_pmc (ctxt, rcx))return emulate_gp (ctxt,0 );
Signature · 1 line
2.25.1
Paolo Bonzini
maintainerQuoted 5 lines · Wanpeng Li
From: Wanpeng Li<[email protected]>
SDM mentioned that we should #GP for rdpmc if ECX is not valid or (CR4.PCE is 0 and CPL is 1, 2, or 3 and CR0.PE is 1).
Quoted 8 lines
Let's add the CR0.PE is 1 checking to rdpmc emulate, though this isn't strictly necessary since it's impossible for CPL to be >0 if CR0.PE=0.
Reviewed-by Sean Christopherson<[email protected]>Signed-off-by Wanpeng Li<[email protected]>---
v3 -> v4:
* add comments instead of pseudocode
No, the commit message was fine. What I meant is there's no need to change the code. Just add a comment about why CR0.PE isn't tested.
Paolo
Quoted 10 lines · Paolo Bonzini
Quoted 8 lines · Wanpeng Li
From: Wanpeng Li<[email protected]>
SDM mentioned that we should #GP for rdpmc if ECX is not valid or (CR4.PCE is 0 and CPL is 1, 2, or 3 and CR0.PE is 1).
Let's add the CR0.PE is 1 checking to rdpmc emulate, though this isn't strictly necessary since it's impossible for CPL to be >0 if CR0.PE=0.
Quoted 8 lines
Quoted 5 lines
Reviewed-by Sean Christopherson<[email protected]>Signed-off-by Wanpeng Li<[email protected]>---
v3 -> v4:
* add comments instead of pseudocodeNo, the commit message was fine. What I meant is there's no need to change the code. Just add a comment about why CR0.PE isn't tested.
Just sent out a new version.
Wanpeng