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

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

KVM: MMU: Introduce inject_page_fault function pointer 



This patch introduces an inject_page_fault function pointer
into struct kvm_mmu which will be used to inject a page
fault. This will be used later when Nested Nested Paging is
implemented.

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

arch/x86/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ struct kvm_mmu { 
	void (*set_cr3)(struct kvm_vcpu *vcpu, unsigned long root);

	unsigned long (*get_cr3)(struct kvm_vcpu *vcpu);

	int (*page_fault)(struct kvm_vcpu *vcpu, gva_t gva, u32 err);

	void (*inject_page_fault)(struct kvm_vcpu *vcpu,

				  unsigned long addr,

				  u32 error_code);

	void (*free)(struct kvm_vcpu *vcpu);

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

			    u32 *error);

arch/x86/kvm/mmu.c

+3 −1
Original line number Diff line number Diff line
@@ -2571,7 +2571,7 @@ static void inject_page_fault(struct kvm_vcpu *vcpu, 
			      u64 addr,

			      u32 err_code)

{

	kvm_inject_page_fault(vcpu, addr, err_code);

	vcpu->arch.mmu.inject_page_fault(vcpu, addr, err_code);

}



static void paging_free(struct kvm_vcpu *vcpu)
@@ -2721,6 +2721,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) 
	context->direct_map = true;

	context->set_cr3 = kvm_x86_ops->set_tdp_cr3;

	context->get_cr3 = get_cr3;

	context->inject_page_fault = kvm_inject_page_fault;



	if (!is_paging(vcpu)) {

		context->gva_to_gpa = nonpaging_gva_to_gpa;
@@ -2762,6 +2763,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu) 
	vcpu->arch.mmu.base_role.cr0_wp  = is_write_protection(vcpu);

	vcpu->arch.mmu.set_cr3           = kvm_x86_ops->set_cr3;

	vcpu->arch.mmu.get_cr3           = get_cr3;

	vcpu->arch.mmu.inject_page_fault = kvm_inject_page_fault;



	return r;

}