mirror of https://gitee.com/openkylin/linux.git
KVM: s390: remove old guest access functions
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
parent
645c5bc1d5
commit
3263bd1637
|
@ -56,87 +56,6 @@ static inline unsigned long kvm_s390_logical_to_effective(struct kvm_vcpu *vcpu,
|
||||||
return ga & ((1UL << 24) - 1);
|
return ga & ((1UL << 24) - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void __user *__gptr_to_uptr(struct kvm_vcpu *vcpu,
|
|
||||||
void __user *gptr,
|
|
||||||
int prefixing)
|
|
||||||
{
|
|
||||||
unsigned long gaddr = (unsigned long) gptr;
|
|
||||||
unsigned long uaddr;
|
|
||||||
|
|
||||||
if (prefixing)
|
|
||||||
gaddr = kvm_s390_real_to_abs(vcpu, gaddr);
|
|
||||||
uaddr = gmap_fault(gaddr, vcpu->arch.gmap);
|
|
||||||
if (IS_ERR_VALUE(uaddr))
|
|
||||||
uaddr = -EFAULT;
|
|
||||||
return (void __user *)uaddr;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define get_guest(vcpu, x, gptr) \
|
|
||||||
({ \
|
|
||||||
__typeof__(gptr) __uptr = __gptr_to_uptr(vcpu, gptr, 1);\
|
|
||||||
int __mask = sizeof(__typeof__(*(gptr))) - 1; \
|
|
||||||
int __ret; \
|
|
||||||
\
|
|
||||||
if (IS_ERR((void __force *)__uptr)) { \
|
|
||||||
__ret = PTR_ERR((void __force *)__uptr); \
|
|
||||||
} else { \
|
|
||||||
BUG_ON((unsigned long)__uptr & __mask); \
|
|
||||||
__ret = get_user(x, __uptr); \
|
|
||||||
} \
|
|
||||||
__ret; \
|
|
||||||
})
|
|
||||||
|
|
||||||
#define put_guest(vcpu, x, gptr) \
|
|
||||||
({ \
|
|
||||||
__typeof__(gptr) __uptr = __gptr_to_uptr(vcpu, gptr, 1);\
|
|
||||||
int __mask = sizeof(__typeof__(*(gptr))) - 1; \
|
|
||||||
int __ret; \
|
|
||||||
\
|
|
||||||
if (IS_ERR((void __force *)__uptr)) { \
|
|
||||||
__ret = PTR_ERR((void __force *)__uptr); \
|
|
||||||
} else { \
|
|
||||||
BUG_ON((unsigned long)__uptr & __mask); \
|
|
||||||
__ret = put_user(x, __uptr); \
|
|
||||||
} \
|
|
||||||
__ret; \
|
|
||||||
})
|
|
||||||
|
|
||||||
static inline int __copy_guest(struct kvm_vcpu *vcpu, unsigned long to,
|
|
||||||
unsigned long from, unsigned long len,
|
|
||||||
int to_guest, int prefixing)
|
|
||||||
{
|
|
||||||
unsigned long _len, rc;
|
|
||||||
void __user *uptr;
|
|
||||||
|
|
||||||
while (len) {
|
|
||||||
uptr = to_guest ? (void __user *)to : (void __user *)from;
|
|
||||||
uptr = __gptr_to_uptr(vcpu, uptr, prefixing);
|
|
||||||
if (IS_ERR((void __force *)uptr))
|
|
||||||
return -EFAULT;
|
|
||||||
_len = PAGE_SIZE - ((unsigned long)uptr & (PAGE_SIZE - 1));
|
|
||||||
_len = min(_len, len);
|
|
||||||
if (to_guest)
|
|
||||||
rc = copy_to_user((void __user *) uptr, (void *)from, _len);
|
|
||||||
else
|
|
||||||
rc = copy_from_user((void *)to, (void __user *)uptr, _len);
|
|
||||||
if (rc)
|
|
||||||
return -EFAULT;
|
|
||||||
len -= _len;
|
|
||||||
from += _len;
|
|
||||||
to += _len;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define copy_to_guest(vcpu, to, from, size) \
|
|
||||||
__copy_guest(vcpu, to, (unsigned long)from, size, 1, 1)
|
|
||||||
#define copy_from_guest(vcpu, to, from, size) \
|
|
||||||
__copy_guest(vcpu, (unsigned long)to, from, size, 0, 1)
|
|
||||||
#define copy_to_guest_absolute(vcpu, to, from, size) \
|
|
||||||
__copy_guest(vcpu, to, (unsigned long)from, size, 1, 0)
|
|
||||||
#define copy_from_guest_absolute(vcpu, to, from, size) \
|
|
||||||
__copy_guest(vcpu, (unsigned long)to, from, size, 0, 0)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* put_guest_lc, read_guest_lc and write_guest_lc are guest access functions
|
* put_guest_lc, read_guest_lc and write_guest_lc are guest access functions
|
||||||
* which shall only be used to access the lowcore of a vcpu.
|
* which shall only be used to access the lowcore of a vcpu.
|
||||||
|
|
Loading…
Reference in New Issue