[S390] use gmap address spaces for kvm guest images

This patch switches kvm from using (Qemu's) user address space to
Martin's gmap address space. This way QEMU does not have to use a
linker script in order to fit large guests at low addresses in its
address space.

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 17 insertions, 1 deletions

diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index b5312050b224..654fc1fa37e7 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -160,6 +160,7 @@ static int handle_stop(struct kvm_vcpu *vcpu)
 
 static int handle_validity(struct kvm_vcpu *vcpu)
 {
+        unsigned long vmaddr;
         int viwhy = vcpu->arch.sie_block->ipb >> 16;
         int rc;
 
@@ -170,12 +171,27 @@ static int handle_validity(struct kvm_vcpu *vcpu)
                          vcpu->arch.sie_block->gmsor +
                          vcpu->arch.sie_block->prefix,
                          2*PAGE_SIZE);
-                if (rc)
+                if (rc) {
                         /* user will receive sigsegv, exit to user */
                         rc = -EOPNOTSUPP;
+                        goto out;
+                }
+                vmaddr = gmap_fault(vcpu->arch.sie_block->prefix,
+                                    vcpu->arch.gmap);
+                if (IS_ERR_VALUE(vmaddr)) {
+                        rc = -EOPNOTSUPP;
+                        goto out;
+                }
+                vmaddr = gmap_fault(vcpu->arch.sie_block->prefix + PAGE_SIZE,
+                                    vcpu->arch.gmap);
+                if (IS_ERR_VALUE(vmaddr)) {
+                        rc = -EOPNOTSUPP;
+                        goto out;
+                }
         } else
                 rc = -EOPNOTSUPP;
 
+out:
         if (rc)
                 VCPU_EVENT(vcpu, 2, "unhandled validity intercept code %d",
                            viwhy);