Commit ca3c6dc3 authored by Claudio Imbrenda's avatar Claudio Imbrenda Committed by Heiko Carstens
Browse files

s390/kvm: Remove kvm_arch_fault_in_page() 



kvm_arch_fault_in_page() is a useless wrapper around gmap_fault(); just
use gmap_fault() directly instead.

Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20241022120601.167009-3-imbrenda@linux.ibm.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent f96cb0d6

arch/s390/kvm/intercept.c

+2 −2
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int handle_mvpg_pei(struct kvm_vcpu *vcpu) 
					      reg2, &srcaddr, GACC_FETCH, 0);

	if (rc)

		return kvm_s390_inject_prog_cond(vcpu, rc);

	rc = kvm_arch_fault_in_page(vcpu, srcaddr, 0);

	rc = gmap_fault(vcpu->arch.gmap, srcaddr, 0);

	if (rc != 0)

		return rc;
@@ -376,7 +376,7 @@ static int handle_mvpg_pei(struct kvm_vcpu *vcpu) 
					      reg1, &dstaddr, GACC_STORE, 0);

	if (rc)

		return kvm_s390_inject_prog_cond(vcpu, rc);

	rc = kvm_arch_fault_in_page(vcpu, dstaddr, 1);

	rc = gmap_fault(vcpu->arch.gmap, dstaddr, FAULT_FLAG_WRITE);

	if (rc != 0)

		return rc;

arch/s390/kvm/kvm-s390.c

+1 −17
Original line number Diff line number Diff line
@@ -4579,22 +4579,6 @@ int kvm_s390_try_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clo 
	return 1;

}



/**

 * kvm_arch_fault_in_page - fault-in guest page if necessary

 * @vcpu: The corresponding virtual cpu

 * @gpa: Guest physical address

 * @writable: Whether the page should be writable or not

 *

 * Make sure that a guest page has been faulted-in on the host.

 *

 * Return: Zero on success, negative error code otherwise.

 */

long kvm_arch_fault_in_page(struct kvm_vcpu *vcpu, gpa_t gpa, int writable)

{

	return gmap_fault(vcpu->arch.gmap, gpa,

			  writable ? FAULT_FLAG_WRITE : 0);

}



static void __kvm_inject_pfault_token(struct kvm_vcpu *vcpu, bool start_token,

				      unsigned long token)

{
@@ -4797,7 +4781,7 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason) 
		if (kvm_arch_setup_async_pf(vcpu))

			return 0;

		vcpu->stat.pfault_sync++;

		return kvm_arch_fault_in_page(vcpu, current->thread.gmap_addr, 1);

		return gmap_fault(vcpu->arch.gmap, current->thread.gmap_addr, FAULT_FLAG_WRITE);

	}

	return vcpu_post_run_fault_in_sie(vcpu);

}

arch/s390/kvm/kvm-s390.h

+0 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ int kvm_s390_handle_sigp_pei(struct kvm_vcpu *vcpu); 


/* implemented in kvm-s390.c */

int kvm_s390_try_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clock *gtod);

long kvm_arch_fault_in_page(struct kvm_vcpu *vcpu, gpa_t gpa, int writable);

int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long addr);

int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr);

int kvm_s390_vcpu_start(struct kvm_vcpu *vcpu);