| Message ID | 87a52a66a43bf05ccb8ef3ebd1f93bd00e7b07c4.1637799475.git.isaku.yamahata@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: X86: TDX support | expand |
On Wed, Nov 24 2021 at 16:20, isaku yamahata wrote: > From: Sean Christopherson <sean.j.christopherson@intel.com> > > Add a macro framework to hide VMX vs. TDX details of VMREAD and VMWRITE > so the VMX and TDX can shared common flows, e.g. accessing DTs. s/shared/share/ > Note, the TDX paths are dead code at this time. There is no great way > to deal with the chicken-and-egg scenario of having things in place for > TDX without first having TDX. That's more than obvious and the whole point of building infrastructure in the first place, isn't it? > +#ifdef CONFIG_INTEL_TDX_HOST > +#define VT_BUILD_VMCS_HELPERS(type, bits, tdbits) \ > +static __always_inline type vmread##bits(struct kvm_vcpu *vcpu, \ > + unsigned long field) \ > +{ \ > + if (unlikely(is_td_vcpu(vcpu))) { \ > + if (KVM_BUG_ON(!is_debug_td(vcpu), vcpu->kvm)) \ > + return 0; \ > + return td_vmcs_read##tdbits(to_tdx(vcpu), field); \ > + } \ > + return vmcs_read##bits(field); \ > +} \ New lines exist for a reason to visually separate things and are even possible in macro blocks. This includes the defines. Aside of that is there any reason why the end of the macro block has to be 3 spaces instead of a tab? Thanks, tglx
diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h index 9e5865b05d47..d37ef4dd9d90 100644 --- a/arch/x86/kvm/vmx/common.h +++ b/arch/x86/kvm/vmx/common.h @@ -11,6 +11,47 @@ #include "vmcs.h" #include "vmx.h" #include "x86.h" +#include "tdx.h" + +#ifdef CONFIG_INTEL_TDX_HOST +#define VT_BUILD_VMCS_HELPERS(type, bits, tdbits) \ +static __always_inline type vmread##bits(struct kvm_vcpu *vcpu, \ + unsigned long field) \ +{ \ + if (unlikely(is_td_vcpu(vcpu))) { \ + if (KVM_BUG_ON(!is_debug_td(vcpu), vcpu->kvm)) \ + return 0; \ + return td_vmcs_read##tdbits(to_tdx(vcpu), field); \ + } \ + return vmcs_read##bits(field); \ +} \ +static __always_inline void vmwrite##bits(struct kvm_vcpu *vcpu, \ + unsigned long field, type value) \ +{ \ + if (unlikely(is_td_vcpu(vcpu))) { \ + if (KVM_BUG_ON(!is_debug_td(vcpu), vcpu->kvm)) \ + return; \ + return td_vmcs_write##tdbits(to_tdx(vcpu), field, value); \ + } \ + vmcs_write##bits(field, value); \ +} +#else +#define VT_BUILD_VMCS_HELPERS(type, bits, tdbits) \ +static __always_inline type vmread##bits(struct kvm_vcpu *vcpu, \ + unsigned long field) \ +{ \ + return vmcs_read##bits(field); \ +} \ +static __always_inline void vmwrite##bits(struct kvm_vcpu *vcpu, \ + unsigned long field, type value) \ +{ \ + vmcs_write##bits(field, value); \ +} +#endif /* CONFIG_INTEL_TDX_HOST */ +VT_BUILD_VMCS_HELPERS(u16, 16, 16); +VT_BUILD_VMCS_HELPERS(u32, 32, 32); +VT_BUILD_VMCS_HELPERS(u64, 64, 64); +VT_BUILD_VMCS_HELPERS(unsigned long, l, 64); extern unsigned long vmx_host_idt_base; void vmx_do_interrupt_nmi_irqoff(unsigned long entry);