x86/kvm/mmu.c: add kvm_mmu parameter to kvm_mmu_free_roots()

vittyvk · bonzini · commit 6a82cd1c7b1e · 2018-10-17T00:30:03.000+02:00
Add an option to specify which MMU root we want to free. This will
be used when nested and non-nested MMUs for L1 are split.

Signed-off-by: Vitaly Kuznetsov &lt;vkuznets@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
Reviewed-by: Sean Christopherson &lt;sean.j.christopherson@intel.com&gt;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
@@ -1339,7 +1339,8 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
 int kvm_mmu_load(struct kvm_vcpu *vcpu);
 void kvm_mmu_unload(struct kvm_vcpu *vcpu);
 void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);
-void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, ulong roots_to_free);
+void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
+			ulong roots_to_free);
 gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access,
 			   struct x86_exception *exception);
 gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva,
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
@@ -3480,11 +3480,11 @@ 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, ulong roots_to_free)
+void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
+			ulong roots_to_free)
 {
 	int i;
 	LIST_HEAD(invalid_list);
-	struct kvm_mmu *mmu = vcpu->arch.mmu;
 	bool free_active_root = roots_to_free & KVM_MMU_ROOT_CURRENT;
 
 	BUILD_BUG_ON(KVM_MMU_NUM_PREV_ROOTS >= BITS_PER_LONG);
@@ -4200,7 +4200,8 @@ static void __kvm_mmu_new_cr3(struct kvm_vcpu *vcpu, gpa_t new_cr3,
 			      bool skip_tlb_flush)
 {
 	if (!fast_cr3_switch(vcpu, new_cr3, new_role, skip_tlb_flush))
-		kvm_mmu_free_roots(vcpu, KVM_MMU_ROOT_CURRENT);
+		kvm_mmu_free_roots(vcpu, vcpu->arch.mmu,
+				   KVM_MMU_ROOT_CURRENT);
 }
 
 void kvm_mmu_new_cr3(struct kvm_vcpu *vcpu, gpa_t new_cr3, bool skip_tlb_flush)
@@ -4981,7 +4982,7 @@ EXPORT_SYMBOL_GPL(kvm_mmu_load);
 
 void kvm_mmu_unload(struct kvm_vcpu *vcpu)
 {
-	kvm_mmu_free_roots(vcpu, KVM_MMU_ROOTS_ALL);
+	kvm_mmu_free_roots(vcpu, vcpu->arch.mmu, KVM_MMU_ROOTS_ALL);
 	WARN_ON(VALID_PAGE(vcpu->arch.mmu->root_hpa));
 }
 EXPORT_SYMBOL_GPL(kvm_mmu_unload);
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
@@ -9127,7 +9127,7 @@ static int handle_invpcid(struct kvm_vcpu *vcpu)
 			    == operand.pcid)
 				roots_to_free |= KVM_MMU_ROOT_PREVIOUS(i);
 
-		kvm_mmu_free_roots(vcpu, roots_to_free);
+		kvm_mmu_free_roots(vcpu, vcpu->arch.mmu, roots_to_free);
 		/*
 		 * If neither the current cr3 nor any of the prev_roots use the
 		 * given PCID, then nothing needs to be done here because a

Original file line number	Diff line number	Diff line change
`@@ -3480,11 +3480,11 @@ static void mmu_free_root_page(struct kvm kvm, hpa_t root_hpa,`
`3480`	`3480`	`}`
`3481`	`3481`
`3482`	`3482`	`/* roots_to_free must be some combination of the KVM_MMU_ROOT_* flags */`
`3483`		`-void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, ulong roots_to_free)`
	`3483`	`+void kvm_mmu_free_roots(struct kvm_vcpu vcpu, struct kvm_mmu mmu,`
	`3484`	`+ ulong roots_to_free)`
`3484`	`3485`	`{`
`3485`	`3486`	`int i;`
`3486`	`3487`	`LIST_HEAD(invalid_list);`
`3487`		`- struct kvm_mmu *mmu = vcpu->arch.mmu;`
`3488`	`3488`	`bool free_active_root = roots_to_free & KVM_MMU_ROOT_CURRENT;`
`3489`	`3489`
`3490`	`3490`	`BUILD_BUG_ON(KVM_MMU_NUM_PREV_ROOTS >= BITS_PER_LONG);`
`@@ -4200,7 +4200,8 @@ static void __kvm_mmu_new_cr3(struct kvm_vcpu *vcpu, gpa_t new_cr3,`
`4200`	`4200`	`bool skip_tlb_flush)`
`4201`	`4201`	`{`
`4202`	`4202`	`if (!fast_cr3_switch(vcpu, new_cr3, new_role, skip_tlb_flush))`
`4203`		`- kvm_mmu_free_roots(vcpu, KVM_MMU_ROOT_CURRENT);`
	`4203`	`+ kvm_mmu_free_roots(vcpu, vcpu->arch.mmu,`
	`4204`	`+ KVM_MMU_ROOT_CURRENT);`
`4204`	`4205`	`}`
`4205`	`4206`
`4206`	`4207`	`void kvm_mmu_new_cr3(struct kvm_vcpu *vcpu, gpa_t new_cr3, bool skip_tlb_flush)`
`@@ -4981,7 +4982,7 @@ EXPORT_SYMBOL_GPL(kvm_mmu_load);`
`4981`	`4982`
`4982`	`4983`	`void kvm_mmu_unload(struct kvm_vcpu *vcpu)`
`4983`	`4984`	`{`
`4984`		`- kvm_mmu_free_roots(vcpu, KVM_MMU_ROOTS_ALL);`
	`4985`	`+ kvm_mmu_free_roots(vcpu, vcpu->arch.mmu, KVM_MMU_ROOTS_ALL);`
`4985`	`4986`	`WARN_ON(VALID_PAGE(vcpu->arch.mmu->root_hpa));`
`4986`	`4987`	`}`
`4987`	`4988`	`EXPORT_SYMBOL_GPL(kvm_mmu_unload);`