KVM: nVMX: Move nested_get_vpid02() to vmx/nested.h (25d8b843) · Commits · 戴 / test

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@intel.com> Message-Id: <20200320212833.3507-20-sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/vmx/nested.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -1132,13 +1132,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;

arch/x86/kvm/vmx/nested.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,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 */

Admin message