diff options
| author |   Heiko Carstens <hca@linux.ibm.com> | 2025-01-13 13:37:01 +0100 |
|---|---|---|
| committer |   Alexander Gordeev <agordeev@linux.ibm.com> | 2025-01-26 17:24:06 +0100 |
| commit | 5e680e265f46b28bebc652638bc246cf815ed582 (patch) | |
| tree | ef90406bc8064bfcff6d2e5d4bc92aa4ef7af5b3 | |
| parent | s390/uaccess: Use asm goto for __mvc_kernel_nofault() (diff) | |
| download | wireguard-linux-5e680e265f46b28bebc652638bc246cf815ed582.tar.xz wireguard-linux-5e680e265f46b28bebc652638bc246cf815ed582.zip | |
s390/uaccess: Move put_user() / __put_user() close to put_user() asm code
Keep put_user() and get_user() code separated.
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index b96bda0f1275..1bd60e365125 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -160,6 +160,36 @@ static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned lon return rc; } +/* + * These are the main single-value transfer routines. They automatically + * use the right size if we just have the right pointer type. + */ +#define __put_user(x, ptr) \ +({ \ + __typeof__(*(ptr)) __x = (x); \ + int __pu_err = -EFAULT; \ + \ + __chk_user_ptr(ptr); \ + switch (sizeof(*(ptr))) { \ + case 1: \ + case 2: \ + case 4: \ + case 8: \ + __pu_err = __put_user_fn(&__x, ptr, sizeof(*(ptr))); \ + break; \ + default: \ + __put_user_bad(); \ + break; \ + } \ + __builtin_expect(__pu_err, 0); \ +}) + +#define put_user(x, ptr) \ +({ \ + might_fault(); \ + __put_user(x, ptr); \ +}) + int __noreturn __get_user_bad(void); #define DEFINE_GET_USER(type) \ @@ -237,36 +267,6 @@ static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsign return rc; } -/* - * These are the main single-value transfer routines. They automatically - * use the right size if we just have the right pointer type. - */ -#define __put_user(x, ptr) \ -({ \ - __typeof__(*(ptr)) __x = (x); \ - int __pu_err = -EFAULT; \ - \ - __chk_user_ptr(ptr); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - case 2: \ - case 4: \ - case 8: \ - __pu_err = __put_user_fn(&__x, ptr, sizeof(*(ptr))); \ - break; \ - default: \ - __put_user_bad(); \ - break; \ - } \ - __builtin_expect(__pu_err, 0); \ -}) - -#define put_user(x, ptr) \ -({ \ - might_fault(); \ - __put_user(x, ptr); \ -}) - #define __get_user(x, ptr) \ ({ \ int __gu_err = -EFAULT; \ |