Home » Mailing list archives » linux-kernel » 2010 » April » 27

[PATCH 03/22] KVM: MMU: Make set_cr3 a function pointer in kvm_mmu

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Joerg Roedel
Subject: [PATCH 03/22] KVM: MMU: Make set_cr3 a function pointer in kvm_mmu
Date: Tuesday, April 27, 2010 - 3:38 am

This is necessary to implement Nested Nested Paging. As a
side effect this allows some cleanups in the SVM nested
paging code.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/mmu.c              |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 44eda9b..04834b0 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -233,6 +233,7 @@ struct kvm_pio_request {
  */
 struct kvm_mmu {
 	void (*new_cr3)(struct kvm_vcpu *vcpu);
+	void (*set_cr3)(struct kvm_vcpu *vcpu, unsigned long root);
 	int (*page_fault)(struct kvm_vcpu *vcpu, gva_t gva, u32 err);
 	void (*free)(struct kvm_vcpu *vcpu);
 	gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva, u32 access,
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 618d25f..6eedcdd 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2386,6 +2386,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
 	context->shadow_root_level = kvm_x86_ops->get_tdp_level();
 	context->root_hpa = INVALID_PAGE;
 	vcpu->arch.mmu.direct_map = true;
+	vcpu->arch.mmu.set_cr3 = kvm_x86_ops->set_cr3;
 
 	if (!is_paging(vcpu)) {
 		context->gva_to_gpa = nonpaging_gva_to_gpa;
@@ -2425,6 +2426,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu)
 
 	vcpu->arch.mmu.base_role.cr4_pae = !!is_pae(vcpu);
 	vcpu->arch.mmu.direct_map        = false;
+	vcpu->arch.mmu.set_cr3           = kvm_x86_ops->set_cr3;
 
 	return r;
 }
@@ -2470,7 +2472,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)
 	if (r)
 		goto out;
 	/* set_cr3() should ensure TLB has been flushed */
-	kvm_x86_ops->set_cr3(vcpu, vcpu->arch.mmu.root_hpa);
+	vcpu->arch.mmu.set_cr3(vcpu, vcpu->arch.mmu.root_hpa);
 out:
 	return r;
 }
-- 
1.7.0.4


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/22] Nested Paging support for Nested SVM v2, Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 01/22] KVM: MMU: Check for root_level instead of lo ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 03/22] KVM: MMU: Make set_cr3 a function pointer in ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 07/22] KVM: SVM: Implement MMU helper functions for ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 09/22] KVM: MMU: Let is_rsvd_bits_set take mmu cont ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 11/22] KVM: MMU: Add infrastructure for two-level p ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 13/22] KVM: X86: Add kvm_read_guest_page_tdp function, Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 14/22] KVM: MMU: Make walk_addr_generic capable for ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 16/22] KVM: MMU: Track page fault data in struct vcpu, Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 19/22] KVM: MMU: Introduce init_kvm_nested_mmu(), Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 20/22] KVM: SVM: Initialize Nested Nested MMU conte ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
[PATCH 21/22] KVM: SVM: Report Nested Paging support to us ..., Joerg Roedel, (Tue Apr 27, 3:38 am)
Re: [PATCH 02/22] KVM: MMU: Make tdp_enabled a mmu-context ..., Avi Kivity, (Tue Apr 27, 5:06 am)
Re: [PATCH 11/22] KVM: MMU: Add infrastructure for two-lev ..., Avi Kivity, (Tue Apr 27, 5:34 am)
Re: [PATCH 12/22] KVM: MMU: Implement nested gva_to_gpa fu ..., Avi Kivity, (Tue Apr 27, 5:37 am)
Re: [PATCH 13/22] KVM: X86: Add kvm_read_guest_page_tdp fu ..., Avi Kivity, (Tue Apr 27, 5:42 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue Apr 27, 5:58 am)
Re: [PATCH 20/22] KVM: SVM: Initialize Nested Nested MMU c ..., Avi Kivity, (Tue Apr 27, 6:01 am)
Re: [PATCH 0/22] Nested Paging support for Nested SVM v2, Avi Kivity, (Tue Apr 27, 6:03 am)
Re: [PATCH 13/22] KVM: X86: Add kvm_read_guest_page_tdp fu ..., Joerg Roedel, (Tue Apr 27, 6:10 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Joerg Roedel, (Tue Apr 27, 6:28 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue Apr 27, 6:37 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Joerg Roedel, (Tue Apr 27, 6:57 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue Apr 27, 9:02 am)
Re: [PATCH 11/22] KVM: MMU: Add infrastructure for two-lev ..., Joerg Roedel, (Wed Apr 28, 3:52 am)
Re: [PATCH 11/22] KVM: MMU: Add infrastructure for two-lev ..., Joerg Roedel, (Wed Apr 28, 4:03 am)
Re: [PATCH 11/22] KVM: MMU: Add infrastructure for two-lev ..., Avi Kivity, (Wed Apr 28, 4:09 am)
Re: [PATCH 11/22] KVM: MMU: Add infrastructure for two-lev ..., Avi Kivity, (Wed Apr 28, 4:24 am)
Re: [PATCH 12/22] KVM: MMU: Implement nested gva_to_gpa fu ..., Joerg Roedel, (Wed Apr 28, 7:20 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Joerg Roedel, (Mon May 3, 9:32 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue May 4, 12:53 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Roedel, Joerg, (Tue May 4, 2:11 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue May 4, 2:20 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Roedel, Joerg, (Tue May 4, 2:37 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue May 4, 2:45 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue May 4, 2:50 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Roedel, Joerg, (Tue May 4, 5:00 am)
Re: [PATCH 16/22] KVM: MMU: Track page fault data in struc ..., Avi Kivity, (Tue May 4, 5:04 am)