Commit 0c1c92f1 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86/mmu: do not pass vcpu to root freeing functions 



These functions only operate on a given MMU, of which there is more
than one in a vCPU (we care about two, because the third does not have
any roots and is only used to walk guest page tables).  They do need a
struct kvm in order to lock the mmu_lock, but they do not needed anything
else in the struct kvm_vcpu.  So, pass the vcpu->kvm directly to them.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 594bef79

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -1777,9 +1777,9 @@ void kvm_inject_nmi(struct kvm_vcpu *vcpu); 
void kvm_update_dr7(struct kvm_vcpu *vcpu);



int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn);

void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,

void kvm_mmu_free_roots(struct kvm *kvm, struct kvm_mmu *mmu,

			ulong roots_to_free);

void kvm_mmu_free_guest_mode_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu);

void kvm_mmu_free_guest_mode_roots(struct kvm *kvm, struct kvm_mmu *mmu);

gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva,

			      struct x86_exception *exception);

gpa_t kvm_mmu_gva_to_gpa_fetch(struct kvm_vcpu *vcpu, gva_t gva,

arch/x86/kvm/mmu/mmu.c

+11 −8
Original line number Diff line number Diff line
@@ -3218,10 +3218,9 @@ static void mmu_free_root_page(struct kvm *kvm, hpa_t *root_hpa, 
}



/* roots_to_free must be some combination of the KVM_MMU_ROOT_* flags */

void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,

void kvm_mmu_free_roots(struct kvm *kvm, struct kvm_mmu *mmu,

			ulong roots_to_free)

{

	struct kvm *kvm = vcpu->kvm;

	int i;

	LIST_HEAD(invalid_list);

	bool free_active_root;
@@ -3271,7 +3270,7 @@ void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, 
}

EXPORT_SYMBOL_GPL(kvm_mmu_free_roots);



void kvm_mmu_free_guest_mode_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)

void kvm_mmu_free_guest_mode_roots(struct kvm *kvm, struct kvm_mmu *mmu)

{

	unsigned long roots_to_free = 0;

	hpa_t root_hpa;
@@ -3293,7 +3292,7 @@ void kvm_mmu_free_guest_mode_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu) 
			roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);

	}



	kvm_mmu_free_roots(vcpu, mmu, roots_to_free);

	kvm_mmu_free_roots(kvm, mmu, roots_to_free);

}

EXPORT_SYMBOL_GPL(kvm_mmu_free_guest_mode_roots);
@@ -3688,7 +3687,7 @@ void kvm_mmu_sync_prev_roots(struct kvm_vcpu *vcpu) 
			roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);



	/* sync prev_roots by simply freeing them */

	kvm_mmu_free_roots(vcpu, vcpu->arch.mmu, roots_to_free);

	kvm_mmu_free_roots(vcpu->kvm, vcpu->arch.mmu, roots_to_free);

}



static gpa_t nonpaging_gva_to_gpa(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
@@ -4137,8 +4136,10 @@ static bool fast_pgd_switch(struct kvm_vcpu *vcpu, gpa_t new_pgd, 
static void __kvm_mmu_new_pgd(struct kvm_vcpu *vcpu, gpa_t new_pgd,

			      union kvm_mmu_page_role new_role)

{

	struct kvm_mmu *mmu = vcpu->arch.mmu;



	if (!fast_pgd_switch(vcpu, new_pgd, new_role)) {

		kvm_mmu_free_roots(vcpu, vcpu->arch.mmu, KVM_MMU_ROOT_CURRENT);

		kvm_mmu_free_roots(vcpu->kvm, mmu, KVM_MMU_ROOT_CURRENT);

		return;

	}
@@ -5063,9 +5064,11 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu) 


void kvm_mmu_unload(struct kvm_vcpu *vcpu)

{

	kvm_mmu_free_roots(vcpu, &vcpu->arch.root_mmu, KVM_MMU_ROOTS_ALL);

	struct kvm *kvm = vcpu->kvm;



	kvm_mmu_free_roots(kvm, &vcpu->arch.root_mmu, KVM_MMU_ROOTS_ALL);

	WARN_ON(VALID_PAGE(vcpu->arch.root_mmu.root.hpa));

	kvm_mmu_free_roots(vcpu, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);

	kvm_mmu_free_roots(kvm, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);

	WARN_ON(VALID_PAGE(vcpu->arch.guest_mmu.root.hpa));

}

arch/x86/kvm/vmx/nested.c

+4 −4
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static void free_nested(struct kvm_vcpu *vcpu) 
	kvm_vcpu_unmap(vcpu, &vmx->nested.pi_desc_map, true);

	vmx->nested.pi_desc = NULL;



	kvm_mmu_free_roots(vcpu, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);

	kvm_mmu_free_roots(vcpu->kvm, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);



	nested_release_evmcs(vcpu);
@@ -5007,7 +5007,7 @@ static inline void nested_release_vmcs12(struct kvm_vcpu *vcpu) 
				  vmx->nested.current_vmptr >> PAGE_SHIFT,

				  vmx->nested.cached_vmcs12, 0, VMCS12_SIZE);



	kvm_mmu_free_roots(vcpu, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);

	kvm_mmu_free_roots(vcpu->kvm, &vcpu->arch.guest_mmu, KVM_MMU_ROOTS_ALL);



	vmx->nested.current_vmptr = INVALID_GPA;

}
@@ -5486,7 +5486,7 @@ static int handle_invept(struct kvm_vcpu *vcpu) 
	}



	if (roots_to_free)

		kvm_mmu_free_roots(vcpu, mmu, roots_to_free);

		kvm_mmu_free_roots(vcpu->kvm, mmu, roots_to_free);



	return nested_vmx_succeed(vcpu);

}
@@ -5575,7 +5575,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) 
	 * TODO: sync only the affected SPTEs for INVDIVIDUAL_ADDR.

	 */

	if (!enable_ept)

		kvm_mmu_free_guest_mode_roots(vcpu, &vcpu->arch.root_mmu);

		kvm_mmu_free_guest_mode_roots(vcpu->kvm, &vcpu->arch.root_mmu);



	return nested_vmx_succeed(vcpu);

}

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3) 
	 * Shadow page roots need to be reconstructed instead.

	 */

	if (!tdp_enabled && memcmp(mmu->pdptrs, pdpte, sizeof(mmu->pdptrs)))

		kvm_mmu_free_roots(vcpu, mmu, KVM_MMU_ROOT_CURRENT);

		kvm_mmu_free_roots(vcpu->kvm, mmu, KVM_MMU_ROOT_CURRENT);



	memcpy(mmu->pdptrs, pdpte, sizeof(mmu->pdptrs));

	kvm_register_mark_dirty(vcpu, VCPU_EXREG_PDPTR);
@@ -1158,7 +1158,7 @@ static void kvm_invalidate_pcid(struct kvm_vcpu *vcpu, unsigned long pcid) 
		if (kvm_get_pcid(vcpu, mmu->prev_roots[i].pgd) == pcid)

			roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);



	kvm_mmu_free_roots(vcpu, mmu, roots_to_free);

	kvm_mmu_free_roots(vcpu->kvm, mmu, roots_to_free);

}



int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)