| Message ID | 20200201185218.24473-23-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: Introduce KVM cpu caps | expand |
On 2/2/2020 2:51 AM, Sean Christopherson wrote: > Expose kvm_mpx_supported() as a static inline so that it can be inlined > in kvm_intel.ko. > > No functional change intended. > Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/x86/kvm/cpuid.c | 6 ------ > arch/x86/kvm/cpuid.h | 1 - > arch/x86/kvm/x86.h | 5 +++++ > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 84006cc4007c..d3c93b94abc3 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -45,12 +45,6 @@ static u32 xstate_required_size(u64 xstate_bv, bool compacted) > return ret; > } > > -bool kvm_mpx_supported(void) > -{ > - return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); > -} > -EXPORT_SYMBOL_GPL(kvm_mpx_supported); > - > #define F feature_bit > > int kvm_update_cpuid(struct kvm_vcpu *vcpu) > diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h > index 7366c618aa04..c1ac0995843d 100644 > --- a/arch/x86/kvm/cpuid.h > +++ b/arch/x86/kvm/cpuid.h > @@ -7,7 +7,6 @@ > #include <asm/processor.h> > > int kvm_update_cpuid(struct kvm_vcpu *vcpu); > -bool kvm_mpx_supported(void); > struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, > u32 function, u32 index); > int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, > diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h > index 02b49ee49e24..bfac4a80956c 100644 > --- a/arch/x86/kvm/x86.h > +++ b/arch/x86/kvm/x86.h > @@ -283,6 +283,11 @@ enum exit_fastpath_completion handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vc > extern u64 host_xcr0; > extern u64 supported_xcr0; > > +static inline bool kvm_mpx_supported(void) > +{ > + return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); > +} > + > extern unsigned int min_timer_period_us; > > extern bool enable_vmware_backdoor; >
Sean Christopherson <sean.j.christopherson@intel.com> writes: > Expose kvm_mpx_supported() as a static inline so that it can be inlined > in kvm_intel.ko. > > No functional change intended. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/x86/kvm/cpuid.c | 6 ------ > arch/x86/kvm/cpuid.h | 1 - > arch/x86/kvm/x86.h | 5 +++++ > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 84006cc4007c..d3c93b94abc3 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -45,12 +45,6 @@ static u32 xstate_required_size(u64 xstate_bv, bool compacted) > return ret; > } > > -bool kvm_mpx_supported(void) > -{ > - return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); > -} > -EXPORT_SYMBOL_GPL(kvm_mpx_supported); > - > #define F feature_bit > > int kvm_update_cpuid(struct kvm_vcpu *vcpu) > diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h > index 7366c618aa04..c1ac0995843d 100644 > --- a/arch/x86/kvm/cpuid.h > +++ b/arch/x86/kvm/cpuid.h > @@ -7,7 +7,6 @@ > #include <asm/processor.h> > > int kvm_update_cpuid(struct kvm_vcpu *vcpu); > -bool kvm_mpx_supported(void); > struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, > u32 function, u32 index); > int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, > diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h > index 02b49ee49e24..bfac4a80956c 100644 > --- a/arch/x86/kvm/x86.h > +++ b/arch/x86/kvm/x86.h > @@ -283,6 +283,11 @@ enum exit_fastpath_completion handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vc > extern u64 host_xcr0; > extern u64 supported_xcr0; > > +static inline bool kvm_mpx_supported(void) > +{ > + return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); > +} > + > extern unsigned int min_timer_period_us; > > extern bool enable_vmware_backdoor; Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 84006cc4007c..d3c93b94abc3 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -45,12 +45,6 @@ static u32 xstate_required_size(u64 xstate_bv, bool compacted) return ret; } -bool kvm_mpx_supported(void) -{ - return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); -} -EXPORT_SYMBOL_GPL(kvm_mpx_supported); - #define F feature_bit int kvm_update_cpuid(struct kvm_vcpu *vcpu) diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h index 7366c618aa04..c1ac0995843d 100644 --- a/arch/x86/kvm/cpuid.h +++ b/arch/x86/kvm/cpuid.h @@ -7,7 +7,6 @@ #include <asm/processor.h> int kvm_update_cpuid(struct kvm_vcpu *vcpu); -bool kvm_mpx_supported(void); struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, u32 function, u32 index); int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 02b49ee49e24..bfac4a80956c 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -283,6 +283,11 @@ enum exit_fastpath_completion handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vc extern u64 host_xcr0; extern u64 supported_xcr0; +static inline bool kvm_mpx_supported(void) +{ + return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); +} + extern unsigned int min_timer_period_us; extern bool enable_vmware_backdoor;
Expose kvm_mpx_supported() as a static inline so that it can be inlined in kvm_intel.ko. No functional change intended. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/cpuid.c | 6 ------ arch/x86/kvm/cpuid.h | 1 - arch/x86/kvm/x86.h | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-)