Add missing trace points in emulator path
cover Add missing trace points in emulator path
Some existed trace points are missing in emulator path, e.g., RDMSR/WRMSR emulation and CR read/write emulation. However, if add those trace points in emulator common interfaces in arch/x86/kvm/x86.c, other instruction emulation may use those interfaces too and cause too much trace records. But add those trace points in em_* functions in arch/x86/kvm/emulate.c seems to be ugly. Luckily, RDMSR/WRMSR emulation uses a sepreate interface, so add trace points for RDMSR/WRMSR in emulator path is acceptable like normal path.
Hou Wenlong (2):
KVM: x86: Return emulator error if RDMSR/WRMSR emulation failed
KVM: x86: Add missing trace points for RDMSR/WRMSR in emulator path
arch/x86/kvm/x86.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
--
2.31.1
PATCH 1/2 KVM: x86: Return emulator error if RDMSR/WRMSR emulation failed
The return value of emulator_{get|set}_mst_with_filter() is confused, since msr access error and emulator error are mixed. Although, KVM_MSR_RET_* doesn't conflict with X86EMUL_IO_NEEDED at present, it is better to convert msr access error to emulator error if error value is needed.
--- arch/x86/kvm/x86.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/x86/kvm/x86.c +12 -10
@@ -7908,11 +7908,12 @@ static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_get_msr_with_filter (vcpu, msr_index, pdata); - -if (r &&kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , - complete_emulated_rdmsr, r)) { -/* Bounce to user space */ -return X86EMUL_IO_NEEDED ; +if (r) { +if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , + complete_emulated_rdmsr, r)) + r =X86EMUL_IO_NEEDED ; +else + r =X86EMUL_UNHANDLEABLE ; }return r;
@@ -7925,11 +7926,12 @@ static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_set_msr_with_filter (vcpu, msr_index, data); - -if (r &&kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_WRMSR , data, - complete_emulated_msr_access, r)) { -/* Bounce to user space */ -return X86EMUL_IO_NEEDED ; +if (r >0 ) { +if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_WRMSR , data, + complete_emulated_msr_access, r)) + r =X86EMUL_IO_NEEDED ; +else + r =X86EMUL_UNHANDLEABLE ; }return r;
Signature · 1 line
2.31.1
Sean Christopherson
maintainerRe: [PATCH 1/2] KVM: x86: Return emulator error if RDMSR/WRMSR emulation failed
Quoted 21 lines · Hou Wenlong
The return value of emulator_{get|set}_mst_with_filter() is confused, since msr access error and emulator error are mixed. Although, KVM_MSR_RET_* doesn't conflict with
X86EMUL_IO_NEEDEDat present, it is better to convert msr access error to emulator error if error value is needed.Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/kvm/x86.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)arch/x86/kvm/x86.c +0
-1@@ -7908,11 +7908,12 @@ static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_get_msr_with_filter (vcpu, msr_index, pdata); -
arch/x86/kvm/x86.c static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt, · line 7916
Quoted 10 lines
arch/x86/kvm/x86.c +6
-4-if (r &&kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , - complete_emulated_rdmsr, r)) { -/* Bounce to user space */ -return X86EMUL_IO_NEEDED ; +if (r) { +if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , + complete_emulated_rdmsr, r)) + r =X86EMUL_IO_NEEDED ; +else + r =X86EMUL_UNHANDLEABLE ;
This should be X86EMUL_PROPAGATE_FAULT, X86EMUL_UNHANDLEABLE is used to indicate that KVM needs to bail all the way to userspace.
I definitely like the idea of converting to X86EMUL_* here instead of spreading it across these helpers and the emulator, but in that case should convert _all_ types.
And I think it makes sense to opportunistically handle "r < 0" in the get helper. KVM may not return -errno today, but assuming that will always hold true is unnecessarily risking.
E.g. what about:
static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 *pdata)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_get_msr_with_filter(vcpu, msr_index, pdata);
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_RDMSR, 0,
complete_emulated_rdmsr, r))
return X86EMUL_IO_NEEDED;
else
return X86EMUL_PROPAGATE_FAULT;
}
return X86EMUL_CONTINUE;
}static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 data)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_set_msr_with_filter(vcpu, msr_index, data);
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_WRMSR, data,
complete_emulated_msr_access, r))
return X86EMUL_IO_NEEDED;
else
return X86EMUL_PROPAGATE_FAULT;
}
return X86EMUL_CONTINUE;
}Or maybe even add a helper to do the translation? Can't tell if this is a net positive or not. It's a bit gratuitous, but it does ensure consistent behavior for RDMSR vs. WRMSR.
static int emulator_handle_msr_return(struct kvm_vcpu *vcpu *, int r,
u32 msr, u64 data, u32 exit_reason,
int (*comp)(struct kvm_vcpu *vcpu))
{
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr, exit_reason, data, comp, r))
return X86EMUL_IO_NEEDED;
else
return X86EMUL_UNHANDLEABLE;
}
return X86EMUL_CONTINUE;
}static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 *pdata)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_get_msr_with_filter(vcpu, msr_index, pdata);
return emulator_handle_msr_return(vcpu, r, msr_index, 0,
KVM_EXIT_X86_RDMSR,
complete_emulated_rdmsr);
}static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 data)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_set_msr_with_filter(vcpu, msr_index, data);
return emulator_handle_msr_return(vcpu, r, msr_index, data,
KVM_EXIT_X86_WRMSR,
complete_emulated_msr_access);
}And then the emulator side of things can be:
static int em_wrmsr(struct x86_emulate_ctxt *ctxt)
{
u64 msr_index = reg_read(ctxt, VCPU_REGS_RCX);
u64 msr_data;
int r;
msr_data = (u32)reg_read(ctxt, VCPU_REGS_RAX)
| ((u64)reg_read(ctxt, VCPU_REGS_RDX) << 32);
r = ctxt->ops->set_msr_with_filter(ctxt, msr_index, msr_data);
if (r == X86EMUL_PROPAGATE_FAULT)
return emulate_gp(ctxt, 0);
return r;
}static int em_rdmsr(struct x86_emulate_ctxt *ctxt)
{
u64 msr_index = reg_read(ctxt, VCPU_REGS_RCX);
u64 msr_data;
int r;
r = ctxt->ops->get_msr_with_filter(ctxt, msr_index, &msr_data);
if (r == X86EMUL_PROPAGATE_FAULT)
return emulate_gp(ctxt, 0);
if (r == X86EMUL_CONTINUE) {
*reg_write(ctxt, VCPU_REGS_RAX) = (u32)msr_data;
*reg_write(ctxt, VCPU_REGS_RDX) = msr_data >> 32;
}
return r;
}Re: [PATCH 1/2] KVM: x86: Return emulator error if RDMSR/WRMSR emulation failed
Quoted 36 lines · Sean Christopherson
Quoted 21 lines · Hou Wenlong
The return value of emulator_{get|set}_mst_with_filter() is confused, since msr access error and emulator error are mixed. Although, KVM_MSR_RET_* doesn't conflict with
X86EMUL_IO_NEEDEDat present, it is better to convert msr access error to emulator error if error value is needed.Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/kvm/x86.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)arch/x86/kvm/x86.c +0
-1@@ -7908,11 +7908,12 @@ static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_get_msr_with_filter (vcpu, msr_index, pdata); -arch/x86/kvm/x86.c static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt, · line 7916
Quoted 10 lines
arch/x86/kvm/x86.c +6
-4-if (r &&kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , - complete_emulated_rdmsr, r)) { -/* Bounce to user space */ -return X86EMUL_IO_NEEDED ; +if (r) { +if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , + complete_emulated_rdmsr, r)) + r =X86EMUL_IO_NEEDED ; +else + r =X86EMUL_UNHANDLEABLE ;This should be
X86EMUL_PROPAGATE_FAULT,X86EMUL_UNHANDLEABLEis used to indicate that KVM needs to bail all the way to userspace.
Quoted 7 lines
I definitely like the idea of converting to X86EMUL_* here instead of spreading it across these helpers and the emulator, but in that case should convert _all_ types.
And I think it makes sense to opportunistically handle "r < 0" in the get helper. KVM may not return -errno today, but assuming that will always hold true is unnecessarily risking.
I agree. The original commit 7dffecaf4eab wanted to report negative values to userspace, but the emulator actually didn't propagate -errno to the caller. So handling "r < 0" in the set helper is better, then only X86EMUL_* is returned.
Quoted 37 lines
E.g. what about:
static int emulator_get_msr_with_filter(struct
x86_emulate_ctxt*ctxt,u32 msr_index, u64 *pdata) { struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); int r; r = kvm_get_msr_with_filter(vcpu, msr_index, pdata); if (r < 0) return X86EMUL_UNHANDLEABLE; if (r) { if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_RDMSR, 0, complete_emulated_rdmsr, r)) return X86EMUL_IO_NEEDED; else return X86EMUL_PROPAGATE_FAULT; } return X86EMUL_CONTINUE; }static int emulator_set_msr_with_filter(struct
x86_emulate_ctxt*ctxt,u32 msr_index, u64 data) { struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); int r; r = kvm_set_msr_with_filter(vcpu, msr_index, data); if (r < 0) return X86EMUL_UNHANDLEABLE; if (r) { if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_WRMSR, data,
Quoted 9 lines
complete_emulated_msr_access, r)) return X86EMUL_IO_NEEDED; else return X86EMUL_PROPAGATE_FAULT; } return X86EMUL_CONTINUE; }
I'll take this in the v2. Thanks.
Quoted 82 lines
Or maybe even add a helper to do the translation? Can't tell if this is a net positive or not. It's a bit gratuitous, but it does ensure consistent behavior for RDMSR vs. WRMSR.
static int emulator_handle_msr_return(struct
kvm_vcpu*vcpu *, int r,u32 msr, u64 data, u32 exit_reason, int (*comp)(struct kvm_vcpu *vcpu)) { if (r < 0) return X86EMUL_UNHANDLEABLE; if (r) { if (kvm_msr_user_space(vcpu, msr, exit_reason, data, comp, r)) return X86EMUL_IO_NEEDED; else return X86EMUL_UNHANDLEABLE; } return X86EMUL_CONTINUE; }static int emulator_get_msr_with_filter(struct
x86_emulate_ctxt*ctxt,u32 msr_index, u64 *pdata) { struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); int r; r = kvm_get_msr_with_filter(vcpu, msr_index, pdata); return emulator_handle_msr_return(vcpu, r, msr_index, 0, KVM_EXIT_X86_RDMSR, complete_emulated_rdmsr); }static int emulator_set_msr_with_filter(struct
x86_emulate_ctxt*ctxt,u32 msr_index, u64 data) { struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); int r; r = kvm_set_msr_with_filter(vcpu, msr_index, data); return emulator_handle_msr_return(vcpu, r, msr_index, data, KVM_EXIT_X86_WRMSR, complete_emulated_msr_access); }And then the emulator side of things can be:
static int
em_wrmsr(struct x86_emulate_ctxt *ctxt){ u64 msr_index = reg_read(ctxt, VCPU_REGS_RCX); u64 msr_data; int r; msr_data = (u32)reg_read(ctxt, VCPU_REGS_RAX) | ((u64)reg_read(ctxt, VCPU_REGS_RDX) << 32); r = ctxt->ops->set_msr_with_filter(ctxt, msr_index, msr_data); if (r == X86EMUL_PROPAGATE_FAULT) return emulate_gp(ctxt, 0); return r; }static int
em_rdmsr(struct x86_emulate_ctxt *ctxt){ u64 msr_index = reg_read(ctxt, VCPU_REGS_RCX); u64 msr_data; int r; r = ctxt->ops->get_msr_with_filter(ctxt, msr_index, &msr_data); if (r == X86EMUL_PROPAGATE_FAULT) return emulate_gp(ctxt, 0); if (r == X86EMUL_CONTINUE) { *reg_write(ctxt, VCPU_REGS_RAX) = (u32)msr_data; *reg_write(ctxt, VCPU_REGS_RDX) = msr_data >> 32; } return r; }
PATCH 2/2 KVM: x86: Add missing trace points for RDMSR/WRMSR in emulator path
In reply to Hou WenlongSince the RDMSR/WRMSR emulation uses a sepearte emualtor interface, the trace points for RDMSR/WRMSR can be added in emulator path like normal path.
--- arch/x86/kvm/x86.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
arch/x86/kvm/x86.c +14 -6
@@ -7908,12 +7908,16 @@ static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_get_msr_with_filter (vcpu, msr_index, pdata); -if (r) { +if (!r) { +trace_kvm_msr_read (msr_index, *pdata); + }else {if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , - complete_emulated_rdmsr, r)) + complete_emulated_rdmsr, r)) { r =X86EMUL_IO_NEEDED ; -else + }else { +trace_kvm_msr_read_ex (msr_index); r =X86EMUL_UNHANDLEABLE ; + } }return r;
@@ -7926,12 +7930,16 @@ static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_set_msr_with_filter (vcpu, msr_index, data); -if (r >0 ) { +if (!r) { +trace_kvm_msr_write (msr_index, data); + }else if (r >0 ) {if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_WRMSR , data, - complete_emulated_msr_access, r)) + complete_emulated_msr_access, r)) { r =X86EMUL_IO_NEEDED ; -else + }else { +trace_kvm_msr_write_ex (msr_index, data); r =X86EMUL_UNHANDLEABLE ; + } }return r;
Signature · 1 line
2.31.1
Sean Christopherson
maintainerRe: [PATCH 2/2] KVM: x86: Add missing trace points for RDMSR/WRMSR in emulator path
Quoted 18 lines · Hou Wenlong
Since the RDMSR/WRMSR emulation uses a sepearte emualtor interface, the trace points for RDMSR/WRMSR can be added in emulator path like normal path.
Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/kvm/x86.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)arch/x86/kvm/x86.c +0
-1@@ -7908,12 +7908,16 @@ static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,int r; r =kvm_get_msr_with_filter (vcpu, msr_index, pdata); -if (r) {
arch/x86/kvm/x86.c static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt, · line 7918
Quoted 10 lines
arch/x86/kvm/x86.c +6
-2+if (!r) { +trace_kvm_msr_read (msr_index, *pdata); + }else {if (kvm_msr_user_space (vcpu, msr_index,KVM_EXIT_X86_RDMSR ,0 , - complete_emulated_rdmsr, r)) + complete_emulated_rdmsr, r)) { r =X86EMUL_IO_NEEDED ; -else + }else { +trace_kvm_msr_read_ex (msr_index);
Drat, I suspected this patch would make adding a helper a mess. We could use trace_kvm_msr() directly, using @exit_reason to select between "rdmsr" and "wrmsr", but I think the end result is less readable and not worth the small amount of deduplication. E.g. this is rather hard to read.
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr, exit_reason, data, comp, r))
return X86EMUL_IO_NEEDED;
trace_kvm_msr(exit_reason == KVM_EXIT_X86_WRMSR,
msr, data, true);
return X86EMUL_PROPAGATE_FAULT;
}
trace_kvm_msr(exit_reason == KVM_EXIT_X86_WRMSR, msr, data, false);
return X86EMUL_CONTINUE;Aha! If there "error" paths return directly, then the "else" paths go away and this is all (IMO) a bit cleaner. And the diff for this patch should be much smaller since there won't be any curly brace changes.
How about this for a final product?
static int emulator_get_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 *pdata)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_get_msr_with_filter(vcpu, msr_index, pdata);
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_RDMSR, 0,
complete_emulated_rdmsr, r))
return X86EMUL_IO_NEEDED;
trace_kvm_msr_read_ex(msr_index);
return X86EMUL_PROPAGATE_FAULT;
}
trace_kvm_msr_read(msr_index, *pdata);
return X86EMUL_CONTINUE;
}static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,
u32 msr_index, u64 data)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
int r;
r = kvm_set_msr_with_filter(vcpu, msr_index, data);
if (r < 0)
return X86EMUL_UNHANDLEABLE;
if (r) {
if (kvm_msr_user_space(vcpu, msr_index, KVM_EXIT_X86_WRMSR, data,
complete_emulated_msr_access, r))
return X86EMUL_IO_NEEDED;
trace_kvm_msr_write_ex(msr_index, data);
return X86EMUL_PROPAGATE_FAULT;
}
trace_kvm_msr_write(msr_index, data);
return X86EMUL_CONTINUE;
}