On Fri, Feb 21, 2020 at 02:39:51PM +0100, Vitaly Kuznetsov wrote:
> Sean Christopherson <sean.j.christopherson@xxxxxxxxx> writes:
>
> > Fold vpid_sync_vcpu_global() and vpid_sync_vcpu_single() into their sole
> > caller. KVM should always prefer the single variant, i.e. the only
> > reason to use the global variant is if the CPU doesn't support
> > invalidating a single VPID, which is the entire purpose of wrapping the
> > calls with vpid_sync_context().
> >
> > No functional change intended.
> >
> > Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> > ---
> > arch/x86/kvm/vmx/ops.h | 16 ++--------------
> > 1 file changed, 2 insertions(+), 14 deletions(-)
> >
> > diff --git a/arch/x86/kvm/vmx/ops.h b/arch/x86/kvm/vmx/ops.h
> > index 612df1bdb26b..eb6adc77a55d 100644
> > --- a/arch/x86/kvm/vmx/ops.h
> > +++ b/arch/x86/kvm/vmx/ops.h
> > @@ -253,29 +253,17 @@ static inline void __invept(unsigned long ext, u64 eptp, gpa_t gpa)
> > vmx_asm2(invept, "r"(ext), "m"(operand), ext, eptp, gpa);
> > }
> >
> > -static inline void vpid_sync_vcpu_single(int vpid)
> > +static inline void vpid_sync_context(int vpid)
> > {
> > if (vpid == 0)
> > return;
> >
> > if (cpu_has_vmx_invvpid_single())
> > __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vpid, 0);
> > -}
> > -
> > -static inline void vpid_sync_vcpu_global(void)
> > -{
> > - if (cpu_has_vmx_invvpid_global())
> > + else
> > __invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0);
> > }
> >
> > -static inline void vpid_sync_context(int vpid)
> > -{
> > - if (cpu_has_vmx_invvpid_single())
> > - vpid_sync_vcpu_single(vpid);
> > - else
> > - vpid_sync_vcpu_global();
> > -}
> > -
> > static inline void vpid_sync_vcpu_addr(int vpid, gva_t addr)
> > {
> > if (vpid == 0)
>
> In the original code it's only vpid_sync_vcpu_single() which has 'vpid
> == 0' check, vpid_sync_vcpu_global() doesn't have it. So in the
> hypothetical situation when cpu_has_vmx_invvpid_single() is false AND
> we've e.g. exhausted our VPID space and allocate_vpid() returned zero,
> the new code just won't do anything while the old one would've done
> __invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0), right?
Ah rats. I lost track of that functional change between making the commit
and writing the changelog.
I'll spin a v2 to rewrite the changelog, and maybe add the "vpid == 0"
check in a separate patch.
