Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c30a358d authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: MMU: Add infrastructure for two-level page walker 



This patch introduces a mmu-callback to translate gpa
addresses in the walk_addr code. This is later used to
translate l2_gpa addresses into l1_gpa addresses.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1e301feb

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ struct kvm_mmu { 
	void (*free)(struct kvm_vcpu *vcpu);

	gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva, u32 access,

			    u32 *error);

	gpa_t (*translate_gpa)(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access);

	void (*prefetch_page)(struct kvm_vcpu *vcpu,

			      struct kvm_mmu_page *page);

	int (*sync_page)(struct kvm_vcpu *vcpu,

arch/x86/kvm/x86.c

+6 −0
Original line number Diff line number Diff line
@@ -3448,6 +3448,11 @@ void kvm_get_segment(struct kvm_vcpu *vcpu, 
	kvm_x86_ops->get_segment(vcpu, var, seg);

}



static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)

{

	return gpa;

}



gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva, u32 *error)

{

	u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;
@@ -5659,6 +5664,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 


	vcpu->arch.emulate_ctxt.ops = &emulate_ops;

	vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	vcpu->arch.mmu.translate_gpa = translate_gpa;

	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;

	else

include/linux/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -534,6 +534,11 @@ static inline gpa_t gfn_to_gpa(gfn_t gfn) 
	return (gpa_t)gfn << PAGE_SHIFT;

}



static inline gfn_t gpa_to_gfn(gpa_t gpa)

{

	return (gfn_t)(gpa >> PAGE_SHIFT);

}



static inline hpa_t pfn_to_hpa(pfn_t pfn)

{

	return (hpa_t)pfn << PAGE_SHIFT;