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

Commit 78b2c54a authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: rename 'no_apf' to 'prefault' 



It's the speculative path if 'no_apf = 1' and we will specially handle this
speculative path in the later patch, so 'prefault' is better to fit the sense.

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b53ba3f9

arch/x86/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ struct kvm_mmu { 
	void (*new_cr3)(struct kvm_vcpu *vcpu);

	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);

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

			  bool prefault);

	void (*inject_page_fault)(struct kvm_vcpu *vcpu,

				  struct x86_exception *fault);

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

arch/x86/kvm/mmu.c

+9 −9
Original line number Diff line number Diff line
@@ -2284,11 +2284,11 @@ static int kvm_handle_bad_page(struct kvm *kvm, gfn_t gfn, pfn_t pfn) 
	return 1;

}



static bool try_async_pf(struct kvm_vcpu *vcpu, bool no_apf, gfn_t gfn,

static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,

			 gva_t gva, pfn_t *pfn, bool write, bool *writable);



static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn,

			 bool no_apf)

			 bool prefault)

{

	int r;

	int level;
@@ -2310,7 +2310,7 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, int write, gfn_t gfn, 
	mmu_seq = vcpu->kvm->mmu_notifier_seq;

	smp_rmb();



	if (try_async_pf(vcpu, no_apf, gfn, v, &pfn, write, &map_writable))

	if (try_async_pf(vcpu, prefault, gfn, v, &pfn, write, &map_writable))

		return 0;



	/* mmio */
@@ -2584,7 +2584,7 @@ static gpa_t nonpaging_gva_to_gpa_nested(struct kvm_vcpu *vcpu, gva_t vaddr, 
}



static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva,

				u32 error_code, bool no_apf)

				u32 error_code, bool prefault)

{

	gfn_t gfn;

	int r;
@@ -2600,7 +2600,7 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, 
	gfn = gva >> PAGE_SHIFT;



	return nonpaging_map(vcpu, gva & PAGE_MASK,

			     error_code & PFERR_WRITE_MASK, gfn, no_apf);

			     error_code & PFERR_WRITE_MASK, gfn, prefault);

}



static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn)
@@ -2622,7 +2622,7 @@ static bool can_do_async_pf(struct kvm_vcpu *vcpu) 
	return kvm_x86_ops->interrupt_allowed(vcpu);

}



static bool try_async_pf(struct kvm_vcpu *vcpu, bool no_apf, gfn_t gfn,

static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,

			 gva_t gva, pfn_t *pfn, bool write, bool *writable)

{

	bool async;
@@ -2634,7 +2634,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool no_apf, gfn_t gfn, 


	put_page(pfn_to_page(*pfn));



	if (!no_apf && can_do_async_pf(vcpu)) {

	if (!prefault && can_do_async_pf(vcpu)) {

		trace_kvm_try_async_get_page(gva, gfn);

		if (kvm_find_async_pf_gfn(vcpu, gfn)) {

			trace_kvm_async_pf_doublefault(gva, gfn);
@@ -2650,7 +2650,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool no_apf, gfn_t gfn, 
}



static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,

			  bool no_apf)

			  bool prefault)

{

	pfn_t pfn;

	int r;
@@ -2674,7 +2674,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code, 
	mmu_seq = vcpu->kvm->mmu_notifier_seq;

	smp_rmb();



	if (try_async_pf(vcpu, no_apf, gfn, gpa, &pfn, write, &map_writable))

	if (try_async_pf(vcpu, prefault, gfn, gpa, &pfn, write, &map_writable))

		return 0;



	/* mmio */

arch/x86/kvm/paging_tmpl.h

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
 *           a negative value on error.

 */

static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,

			     bool no_apf)

			     bool prefault)

{

	int write_fault = error_code & PFERR_WRITE_MASK;

	int user_fault = error_code & PFERR_USER_MASK;
@@ -581,7 +581,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, 
	mmu_seq = vcpu->kvm->mmu_notifier_seq;

	smp_rmb();



	if (try_async_pf(vcpu, no_apf, walker.gfn, addr, &pfn, write_fault,

	if (try_async_pf(vcpu, prefault, walker.gfn, addr, &pfn, write_fault,

			 &map_writable))

		return 0;