s390/kvm,gaccess: shorten put/get_guest code

[pandora-kernel.git] / arch / s390 / kvm / priv.c

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 0ef9894..cb07147 100644 (file)
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -41,7 +41,7 @@ static int handle_set_prefix(struct kvm_vcpu *vcpu)
        }
 
        /* get the value */
-       if (get_guest_u32(vcpu, operand2, &address)) {
+       if (get_guest(vcpu, address, (u32 *) operand2)) {
                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                goto out;
        }
@@ -82,7 +82,7 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu)
        address = address & 0x7fffe000u;
 
        /* get the value */
-       if (put_guest_u32(vcpu, operand2, address)) {
+       if (put_guest(vcpu, address, (u32 *)operand2)) {
                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                goto out;
        }
@@ -107,8 +107,8 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu)
                goto out;
        }
 
-       rc = put_guest_u16(vcpu, useraddr, vcpu->vcpu_id);
-       if (rc == -EFAULT) {
+       rc = put_guest(vcpu, vcpu->vcpu_id, (u16 *)useraddr);
+       if (rc) {
                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                goto out;
        }
@@ -142,18 +142,18 @@ static int handle_tpi(struct kvm_vcpu *vcpu)
                         * Store the two-word I/O interruption code into the
                         * provided area.
                         */
-                       put_guest_u16(vcpu, addr, inti->io.subchannel_id);
-                       put_guest_u16(vcpu, addr + 2, inti->io.subchannel_nr);
-                       put_guest_u32(vcpu, addr + 4, inti->io.io_int_parm);
+                       put_guest(vcpu, inti->io.subchannel_id, (u16 *) addr);
+                       put_guest(vcpu, inti->io.subchannel_nr, (u16 *) (addr + 2));
+                       put_guest(vcpu, inti->io.io_int_parm, (u32 *) (addr + 4));
                } else {
                        /*
                         * Store the three-word I/O interruption code into
                         * the appropriate lowcore area.
                         */
-                       put_guest_u16(vcpu, 184, inti->io.subchannel_id);
-                       put_guest_u16(vcpu, 186, inti->io.subchannel_nr);
-                       put_guest_u32(vcpu, 188, inti->io.io_int_parm);
-                       put_guest_u32(vcpu, 192, inti->io.io_int_word);
+                       put_guest(vcpu, inti->io.subchannel_id, (u16 *) 184);
+                       put_guest(vcpu, inti->io.subchannel_nr, (u16 *) 186);
+                       put_guest(vcpu, inti->io.io_int_parm, (u32 *) 188);
+                       put_guest(vcpu, inti->io.io_int_word, (u32 *) 192);
                }
                cc = 1;
        } else
@@ -230,7 +230,7 @@ static int handle_stfl(struct kvm_vcpu *vcpu)
 
        rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),
                           &facility_list, sizeof(facility_list));
-       if (rc == -EFAULT)
+       if (rc)
                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
        else {
                VCPU_EVENT(vcpu, 5, "store facility list value %x",
@@ -347,8 +347,8 @@ static int handle_stidp(struct kvm_vcpu *vcpu)
                goto out;
        }
 
-       rc = put_guest_u64(vcpu, operand2, vcpu->arch.stidp_data);
-       if (rc == -EFAULT) {
+       rc = put_guest(vcpu, vcpu->arch.stidp_data, (u64 *)operand2);
+       if (rc) {
                kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                goto out;
        }
@@ -575,20 +575,13 @@ static int handle_tprot(struct kvm_vcpu *vcpu)
        if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_DAT)
                return -EOPNOTSUPP;
 
-
-       /* we must resolve the address without holding the mmap semaphore.
-        * This is ok since the userspace hypervisor is not supposed to change
-        * the mapping while the guest queries the memory. Otherwise the guest
-        * might crash or get wrong info anyway. */
-       user_address = (unsigned long) __guestaddr_to_user(vcpu, address1);
-
        down_read(&current->mm->mmap_sem);
+       user_address = __gmap_translate(address1, vcpu->arch.gmap);
+       if (IS_ERR_VALUE(user_address))
+               goto out_inject;
        vma = find_vma(current->mm, user_address);
-       if (!vma) {
-               up_read(&current->mm->mmap_sem);
-               return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
-       }
-
+       if (!vma)
+               goto out_inject;
        vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);
        if (!(vma->vm_flags & VM_WRITE) && (vma->vm_flags & VM_READ))
                vcpu->arch.sie_block->gpsw.mask |= (1ul << 44);
@@ -597,6 +590,10 @@ static int handle_tprot(struct kvm_vcpu *vcpu)
 
        up_read(&current->mm->mmap_sem);
        return 0;
+
+out_inject:
+       up_read(&current->mm->mmap_sem);
+       return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
 }
 
 int kvm_s390_handle_e5(struct kvm_vcpu *vcpu)