| Message ID | ce183d47a93012c46472b32077e80dc8b56c88ed.1659854791.git.isaku.yamahata@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM TDX basic feature support | expand |
On Sun, Aug 7, 2022 at 3:03 PM <isaku.yamahata@intel.com> wrote: > > From: Isaku Yamahata <isaku.yamahata@intel.com> > > Wire up TDX PV rdmsr/wrmsr hypercall to the KVM backend function. > > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > --- > arch/x86/kvm/vmx/tdx.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > index 341c29385544..fdd0609bd01b 100644 > --- a/arch/x86/kvm/vmx/tdx.c > +++ b/arch/x86/kvm/vmx/tdx.c > @@ -1157,6 +1157,41 @@ static int tdx_emulate_mmio(struct kvm_vcpu *vcpu) > return 1; > } > > +static int tdx_emulate_rdmsr(struct kvm_vcpu *vcpu) > +{ > + u32 index = tdvmcall_a0_read(vcpu); > + u64 data; > + > + if (!kvm_msr_allowed(vcpu, index, KVM_MSR_FILTER_READ) || > + kvm_get_msr(vcpu, index, &data)) { > + trace_kvm_msr_read_ex(index); > + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_INVALID_OPERAND); > + return 1; > + } > + trace_kvm_msr_read(index, data); > + > + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_SUCCESS); > + tdvmcall_set_return_val(vcpu, data); > + return 1; > +} > + > +static int tdx_emulate_wrmsr(struct kvm_vcpu *vcpu) > +{ > + u32 index = tdvmcall_a0_read(vcpu); > + u64 data = tdvmcall_a1_read(vcpu); > + > + if (!kvm_msr_allowed(vcpu, index, KVM_MSR_FILTER_READ) || ^ This should be KVM_MSR_FILTER_WRITE > + kvm_set_msr(vcpu, index, data)) { > + trace_kvm_msr_write_ex(index, data); > + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_INVALID_OPERAND); > + return 1; > + } > + > + trace_kvm_msr_write(index, data); > + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_SUCCESS); > + return 1; > +} > + > static int handle_tdvmcall(struct kvm_vcpu *vcpu) > { > if (tdvmcall_exit_type(vcpu)) > @@ -1171,6 +1206,10 @@ static int handle_tdvmcall(struct kvm_vcpu *vcpu) > return tdx_emulate_io(vcpu); > case EXIT_REASON_EPT_VIOLATION: > return tdx_emulate_mmio(vcpu); > + case EXIT_REASON_MSR_READ: > + return tdx_emulate_rdmsr(vcpu); > + case EXIT_REASON_MSR_WRITE: > + return tdx_emulate_wrmsr(vcpu); > default: > break; > } > -- > 2.25.1 >
On Wed, Aug 17, 2022 at 03:40:24PM -0700, Sagi Shahar <sagis@google.com> wrote: > On Sun, Aug 7, 2022 at 3:03 PM <isaku.yamahata@intel.com> wrote: > > +static int tdx_emulate_wrmsr(struct kvm_vcpu *vcpu) > > +{ > > + u32 index = tdvmcall_a0_read(vcpu); > > + u64 data = tdvmcall_a1_read(vcpu); > > + > > + if (!kvm_msr_allowed(vcpu, index, KVM_MSR_FILTER_READ) || > ^ > This should be KVM_MSR_FILTER_WRITE Oops. Thanks. I'll fix it.
diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 341c29385544..fdd0609bd01b 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1157,6 +1157,41 @@ static int tdx_emulate_mmio(struct kvm_vcpu *vcpu) return 1; } +static int tdx_emulate_rdmsr(struct kvm_vcpu *vcpu) +{ + u32 index = tdvmcall_a0_read(vcpu); + u64 data; + + if (!kvm_msr_allowed(vcpu, index, KVM_MSR_FILTER_READ) || + kvm_get_msr(vcpu, index, &data)) { + trace_kvm_msr_read_ex(index); + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_INVALID_OPERAND); + return 1; + } + trace_kvm_msr_read(index, data); + + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_SUCCESS); + tdvmcall_set_return_val(vcpu, data); + return 1; +} + +static int tdx_emulate_wrmsr(struct kvm_vcpu *vcpu) +{ + u32 index = tdvmcall_a0_read(vcpu); + u64 data = tdvmcall_a1_read(vcpu); + + if (!kvm_msr_allowed(vcpu, index, KVM_MSR_FILTER_READ) || + kvm_set_msr(vcpu, index, data)) { + trace_kvm_msr_write_ex(index, data); + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_INVALID_OPERAND); + return 1; + } + + trace_kvm_msr_write(index, data); + tdvmcall_set_return_code(vcpu, TDG_VP_VMCALL_SUCCESS); + return 1; +} + static int handle_tdvmcall(struct kvm_vcpu *vcpu) { if (tdvmcall_exit_type(vcpu)) @@ -1171,6 +1206,10 @@ static int handle_tdvmcall(struct kvm_vcpu *vcpu) return tdx_emulate_io(vcpu); case EXIT_REASON_EPT_VIOLATION: return tdx_emulate_mmio(vcpu); + case EXIT_REASON_MSR_READ: + return tdx_emulate_rdmsr(vcpu); + case EXIT_REASON_MSR_WRITE: + return tdx_emulate_wrmsr(vcpu); default: break; }