Sean Christopherson <sean.j.christopherson@xxxxxxxxx> writes:
> Move nested_get_vpid02() to vmx/nested.h so that a future patch can
> reference it from vmx.c to implement context-specific TLB flushing.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> ---
> arch/x86/kvm/vmx/nested.c | 7 -------
> arch/x86/kvm/vmx/nested.h | 7 +++++++
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index 0c71db6fec5a..77819d890088 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -1154,13 +1154,6 @@ static bool nested_has_guest_tlb_tag(struct kvm_vcpu *vcpu)
> (nested_cpu_has_vpid(vmcs12) && to_vmx(vcpu)->nested.vpid02);
> }
>
> -static u16 nested_get_vpid02(struct kvm_vcpu *vcpu)
> -{
> - struct vcpu_vmx *vmx = to_vmx(vcpu);
> -
> - return vmx->nested.vpid02 ? vmx->nested.vpid02 : vmx->vpid;
> -}
> -
> static bool is_bitwise_subset(u64 superset, u64 subset, u64 mask)
> {
> superset &= mask;
> diff --git a/arch/x86/kvm/vmx/nested.h b/arch/x86/kvm/vmx/nested.h
> index 21d36652f213..debc5eeb5757 100644
> --- a/arch/x86/kvm/vmx/nested.h
> +++ b/arch/x86/kvm/vmx/nested.h
> @@ -60,6 +60,13 @@ static inline int vmx_has_valid_vmcs12(struct kvm_vcpu *vcpu)
> vmx->nested.hv_evmcs;
> }
>
> +static inline u16 nested_get_vpid02(struct kvm_vcpu *vcpu)
> +{
> + struct vcpu_vmx *vmx = to_vmx(vcpu);
> +
> + return vmx->nested.vpid02 ? vmx->nested.vpid02 : vmx->vpid;
> +}
> +
> static inline unsigned long nested_ept_get_eptp(struct kvm_vcpu *vcpu)
> {
> /* return the page table to be shadowed - in our case, EPT12 */
Reviewed-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
--
Vitaly
