[S390] Use gmap translation for accessing guest memory

This patch removes kvm-s390 internal assumption of a linear mapping
of guest address space to user space. Previously, guest memory was
translated to user addresses using a fixed offset (gmsor). The new
code uses gmap_fault to resolve guest addresses.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index 702276f5e2fa..d6a50c1fb2e6 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -189,10 +189,8 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
 
         /* make sure that the new value is valid memory */
         address = address & 0x7fffe000u;
-        if ((copy_from_user(&tmp, (void __user *)
-                (address + vcpu->arch.sie_block->gmsor) , 1)) ||
-           (copy_from_user(&tmp, (void __user *)(address +
-                        vcpu->arch.sie_block->gmsor + PAGE_SIZE), 1))) {
+        if (copy_from_guest_absolute(vcpu, &tmp, address, 1) ||
+           copy_from_guest_absolute(vcpu, &tmp, address + PAGE_SIZE, 1)) {
                 *reg |= SIGP_STAT_INVALID_PARAMETER;
                 return 1; /* invalid parameter */
         }