Commit 6389ee94 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Pull extra page fault information into struct x86_exception 



Currently page fault cr2 and nesting infomation are carried outside
the fault data structure.  Instead they are placed in the vcpu struct,
which results in confusion as global variables are manipulated instead
of passing parameters.

Fix this issue by adding address and nested fields to struct x86_exception,
so this struct can carry all information associated with a fault.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Tested-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Tested-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 8c28d031

arch/x86/include/asm/kvm_emulate.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ struct x86_exception { 
	u8 vector;

	bool error_code_valid;

	u16 error_code;

	bool nested_page_fault;

	u64 address; /* cr2 or nested page fault gpa */

};



/*

arch/x86/include/asm/kvm_host.h

+4 −13
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ 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, bool no_apf);

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

	void (*inject_page_fault)(struct kvm_vcpu *vcpu,

				  struct x86_exception *fault);

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

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

			    struct x86_exception *exception);
@@ -318,16 +319,6 @@ struct kvm_vcpu_arch { 
	 */

	struct kvm_mmu *walk_mmu;



	/*

	 * This struct is filled with the necessary information to propagate a

	 * page fault into the guest

	 */

	struct {

		u64      address;

		unsigned error_code;

		bool     nested;

	} fault;



	/* only needed in kvm_pv_mmu_op() path, but it's hot so

	 * put it here to avoid allocation */

	struct kvm_pv_mmu_op_buffer mmu_op_buffer;
@@ -686,11 +677,11 @@ void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr); 
void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);

void kvm_requeue_exception(struct kvm_vcpu *vcpu, unsigned nr);

void kvm_requeue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);

void kvm_inject_page_fault(struct kvm_vcpu *vcpu);

void kvm_inject_page_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault);

int kvm_read_guest_page_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,

			    gfn_t gfn, void *data, int offset, int len,

			    u32 access);

void kvm_propagate_fault(struct kvm_vcpu *vcpu);

void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault);

bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl);



int kvm_pic_set_irq(void *opaque, int irq, int level);

arch/x86/kvm/mmu.c

+3 −2
Original line number Diff line number Diff line
@@ -2736,9 +2736,10 @@ static unsigned long get_cr3(struct kvm_vcpu *vcpu) 
	return vcpu->arch.cr3;

}



static void inject_page_fault(struct kvm_vcpu *vcpu)

static void inject_page_fault(struct kvm_vcpu *vcpu,

			      struct x86_exception *fault)

{

	vcpu->arch.mmu.inject_page_fault(vcpu);

	vcpu->arch.mmu.inject_page_fault(vcpu, fault);

}



static void paging_free(struct kvm_vcpu *vcpu)

arch/x86/kvm/paging_tmpl.h

+3 −3
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ error: 
	if (rsvd_fault)

		walker->fault.error_code |= PFERR_RSVD_MASK;



	vcpu->arch.fault.address    = addr;

	vcpu->arch.fault.error_code = walker->fault.error_code;

	walker->fault.address = addr;

	walker->fault.nested_page_fault = mmu != vcpu->arch.walk_mmu;



	trace_kvm_mmu_walker_error(walker->fault.error_code);

	return 0;
@@ -568,7 +568,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, 
	 */

	if (!r) {

		pgprintk("%s: guest page fault\n", __func__);

		inject_page_fault(vcpu);

		inject_page_fault(vcpu, &walker.fault);

		vcpu->arch.last_pt_write_count = 0; /* reset fork detector */

		return 0;

	}

arch/x86/kvm/svm.c

+4 −3
Original line number Diff line number Diff line
@@ -1647,14 +1647,15 @@ static void nested_svm_set_tdp_cr3(struct kvm_vcpu *vcpu, 
	force_new_asid(vcpu);

}



static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu)

static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu,

				       struct x86_exception *fault)

{

	struct vcpu_svm *svm = to_svm(vcpu);



	svm->vmcb->control.exit_code = SVM_EXIT_NPF;

	svm->vmcb->control.exit_code_hi = 0;

	svm->vmcb->control.exit_info_1 = vcpu->arch.fault.error_code;

	svm->vmcb->control.exit_info_2 = vcpu->arch.fault.address;

	svm->vmcb->control.exit_info_1 = fault->error_code;

	svm->vmcb->control.exit_info_2 = fault->address;



	nested_svm_vmexit(svm);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE