KVM: s390: get rid of gmap_translate()

Add gpa_to_hva(), which uses memslots, and use it to replace all uses
of gmap_translate().

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
Link: https://lore.kernel.org/r/20250123144627.312456-9-imbrenda@linux.ibm.com
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Message-ID: <20250123144627.312456-9-imbrenda@linux.ibm.com>

diff --git a/arch/s390/include/asm/gmap.h b/arch/s390/include/asm/gmap.h
index d4572729269f4fcc363a023e8449b36e277b469e..74b48f2e608a8780acbec0d2ef7e36dcf226c933 100644 (file)
--- a/arch/s390/include/asm/gmap.h
+++ b/arch/s390/include/asm/gmap.h
@@ -111,7 +111,6 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
                     unsigned long to, unsigned long len);
 int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len);
 unsigned long __gmap_translate(struct gmap *, unsigned long gaddr);
-unsigned long gmap_translate(struct gmap *, unsigned long gaddr);
 int __gmap_link(struct gmap *gmap, unsigned long gaddr, unsigned long vmaddr);
 void gmap_discard(struct gmap *, unsigned long from, unsigned long to);
 void __gmap_zap(struct gmap *, unsigned long gaddr);

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index d4f031e086fc38d3f8f8511a0039f7a6147889d3..07ff0e10cb7f5c0294bf85f1d65d1eb124698705 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -2893,7 +2893,8 @@ int kvm_set_routing_entry(struct kvm *kvm,
                          struct kvm_kernel_irq_routing_entry *e,
                          const struct kvm_irq_routing_entry *ue)
 {
-       u64 uaddr;
+       u64 uaddr_s, uaddr_i;
+       int idx;
 
        switch (ue->type) {
        /* we store the userspace addresses instead of the guest addresses */
@@ -2901,14 +2902,16 @@ int kvm_set_routing_entry(struct kvm *kvm,
                if (kvm_is_ucontrol(kvm))
                        return -EINVAL;
                e->set = set_adapter_int;
-               uaddr =  gmap_translate(kvm->arch.gmap, ue->u.adapter.summary_addr);
-               if (uaddr == -EFAULT)
-                       return -EFAULT;
-               e->adapter.summary_addr = uaddr;
-               uaddr =  gmap_translate(kvm->arch.gmap, ue->u.adapter.ind_addr);
-               if (uaddr == -EFAULT)
+
+               idx = srcu_read_lock(&kvm->srcu);
+               uaddr_s = gpa_to_hva(kvm, ue->u.adapter.summary_addr);
+               uaddr_i = gpa_to_hva(kvm, ue->u.adapter.ind_addr);
+               srcu_read_unlock(&kvm->srcu, idx);
+
+               if (kvm_is_error_hva(uaddr_s) || kvm_is_error_hva(uaddr_i))
                        return -EFAULT;
-               e->adapter.ind_addr = uaddr;
+               e->adapter.summary_addr = uaddr_s;
+               e->adapter.ind_addr = uaddr_i;
                e->adapter.summary_offset = ue->u.adapter.summary_offset;
                e->adapter.ind_offset = ue->u.adapter.ind_offset;
                e->adapter.adapter_id = ue->u.adapter.adapter_id;

diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index 3be5291723c8e14a0a73fc0ea1500ae51a7659b0..61e8544924b34417492cfee9b0ba465f4a776eb9 100644 (file)
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -281,6 +281,15 @@ static inline u32 kvm_s390_get_gisa_desc(struct kvm *kvm)
        return gd;
 }
 
+static inline hva_t gpa_to_hva(struct kvm *kvm, gpa_t gpa)
+{
+       hva_t hva = gfn_to_hva(kvm, gpa_to_gfn(gpa));
+
+       if (!kvm_is_error_hva(hva))
+               hva |= offset_in_page(gpa);
+       return hva;
+}
+
 /* implemented in pv.c */
 int kvm_s390_pv_destroy_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc);
 int kvm_s390_pv_create_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc);

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index e124fca1473777fbf3193089156e51addfc2de41..7fd298732d1e79d02806c3ae7afaca9603305473 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -463,26 +463,6 @@ unsigned long __gmap_translate(struct gmap *gmap, unsigned long gaddr)
 }
 EXPORT_SYMBOL_GPL(__gmap_translate);
 
-/**
- * gmap_translate - translate a guest address to a user space address
- * @gmap: pointer to guest mapping meta data structure
- * @gaddr: guest address
- *
- * Returns user space address which corresponds to the guest address or
- * -EFAULT if no such mapping exists.
- * This function does not establish potentially missing page table entries.
- */
-unsigned long gmap_translate(struct gmap *gmap, unsigned long gaddr)
-{
-       unsigned long rc;
-
-       mmap_read_lock(gmap->mm);
-       rc = __gmap_translate(gmap, gaddr);
-       mmap_read_unlock(gmap->mm);
-       return rc;
-}
-EXPORT_SYMBOL_GPL(gmap_translate);
-
 /**
  * gmap_unlink - disconnect a page table from the gmap shadow tables
  * @mm: pointer to the parent mm_struct