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: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20241022120601.167009-3-imbrenda@linux.ibm.com
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index b16352083ff987277a498532aaf5a7d78bf9b856..5bbaadf75dc64ce33f95fbf8cee27391527f32f9 100644 (file)
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -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;
 

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index bb7134faaebff3d0288f726ffcbaae2f673e018a..08f0c80ef5e9c67fb073f12ba4dba0b904a47567 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -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);
 }

diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index e680c6bf0c9d94dea8dd67657472610ed9a06a37..0765ad1031c4397f9f9680b38b2d7920cc736bda 100644 (file)
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -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);