OSDN Git Service

kill {__,}{get,put}_user_unaligned()
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 3 May 2017 00:06:33 +0000 (20:06 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 3 Jul 2017 22:44:22 +0000 (18:44 -0400)
no users left

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
12 files changed:
arch/arm/include/asm/uaccess.h
arch/arm64/include/asm/uaccess.h
arch/ia64/include/asm/uaccess.h
arch/m68k/include/asm/uaccess.h
arch/mips/include/asm/uaccess.h
arch/parisc/include/asm/uaccess.h
arch/powerpc/include/asm/uaccess.h
arch/s390/include/asm/uaccess.h
arch/sparc/include/asm/uaccess_64.h
arch/tile/include/asm/uaccess.h
arch/x86/include/asm/uaccess.h
include/asm-generic/uaccess-unaligned.h [deleted file]

index 2577405..0726091 100644 (file)
 #include <asm/unified.h>
 #include <asm/compiler.h>
 
-#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
-#include <asm-generic/uaccess-unaligned.h>
-#else
-#define __get_user_unaligned __get_user
-#define __put_user_unaligned __put_user
-#endif
-
 #include <asm/extable.h>
 
 /*
index 7b8a047..f2b465e 100644 (file)
@@ -254,8 +254,6 @@ do {                                                                        \
        (void)0;                                                        \
 })
 
-#define __get_user_unaligned __get_user
-
 #define get_user(x, ptr)                                               \
 ({                                                                     \
        __typeof__(*(ptr)) __user *__p = (ptr);                         \
@@ -320,8 +318,6 @@ do {                                                                        \
        (void)0;                                                        \
 })
 
-#define __put_user_unaligned __put_user
-
 #define put_user(x, ptr)                                               \
 ({                                                                     \
        __typeof__(*(ptr)) __user *__p = (ptr);                         \
index 82a7646..a217bcf 100644 (file)
@@ -87,42 +87,6 @@ static inline int __access_ok(const void __user *p, unsigned long size)
 #define __put_user(x, ptr)     __put_user_nocheck((__typeof__(*(ptr))) (x), (ptr), sizeof(*(ptr)))
 #define __get_user(x, ptr)     __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
 
-extern long __put_user_unaligned_unknown (void);
-
-#define __put_user_unaligned(x, ptr)                                                           \
-({                                                                                             \
-       long __ret;                                                                             \
-       switch (sizeof(*(ptr))) {                                                               \
-               case 1: __ret = __put_user((x), (ptr)); break;                                  \
-               case 2: __ret = (__put_user((x), (u8 __user *)(ptr)))                           \
-                       | (__put_user((x) >> 8, ((u8 __user *)(ptr) + 1))); break;              \
-               case 4: __ret = (__put_user((x), (u16 __user *)(ptr)))                          \
-                       | (__put_user((x) >> 16, ((u16 __user *)(ptr) + 1))); break;            \
-               case 8: __ret = (__put_user((x), (u32 __user *)(ptr)))                          \
-                       | (__put_user((x) >> 32, ((u32 __user *)(ptr) + 1))); break;            \
-               default: __ret = __put_user_unaligned_unknown();                                \
-       }                                                                                       \
-       __ret;                                                                                  \
-})
-
-extern long __get_user_unaligned_unknown (void);
-
-#define __get_user_unaligned(x, ptr)                                                           \
-({                                                                                             \
-       long __ret;                                                                             \
-       switch (sizeof(*(ptr))) {                                                               \
-               case 1: __ret = __get_user((x), (ptr)); break;                                  \
-               case 2: __ret = (__get_user((x), (u8 __user *)(ptr)))                           \
-                       | (__get_user((x) >> 8, ((u8 __user *)(ptr) + 1))); break;              \
-               case 4: __ret = (__get_user((x), (u16 __user *)(ptr)))                          \
-                       | (__get_user((x) >> 16, ((u16 __user *)(ptr) + 1))); break;            \
-               case 8: __ret = (__get_user((x), (u32 __user *)(ptr)))                          \
-                       | (__get_user((x) >> 32, ((u32 __user *)(ptr) + 1))); break;            \
-               default: __ret = __get_user_unaligned_unknown();                                \
-       }                                                                                       \
-       __ret;                                                                                  \
-})
-
 #ifdef ASM_SUPPORTED
   struct __large_struct { unsigned long buf[100]; };
 # define __m(x) (*(struct __large_struct __user *)(x))
index 67b3481..63ba18e 100644 (file)
@@ -3,11 +3,4 @@
 #else
 #include <asm/uaccess_mm.h>
 #endif
-
 #include <asm/extable.h>
-#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
-#include <asm-generic/uaccess-unaligned.h>
-#else
-#define __get_user_unaligned(x, ptr)   __get_user((x), (ptr))
-#define __put_user_unaligned(x, ptr)   __put_user((x), (ptr))
-#endif
index 99e629a..c5fc424 100644 (file)
@@ -497,283 +497,6 @@ do {                                                                      \
 extern void __put_user_unknown(void);
 
 /*
- * ul{b,h,w} are macros and there are no equivalent macros for EVA.
- * EVA unaligned access is handled in the ADE exception handler.
- */
-#ifndef CONFIG_EVA
-/*
- * put_user_unaligned: - Write a simple value into user space.
- * @x:  Value to copy to user space.
- * @ptr: Destination address, in user space.
- *
- * Context: User context only. This function may sleep if pagefaults are
- *          enabled.
- *
- * This macro copies a single simple value from kernel space to user
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and @x must be assignable
- * to the result of dereferencing @ptr.
- *
- * Returns zero on success, or -EFAULT on error.
- */
-#define put_user_unaligned(x,ptr)      \
-       __put_user_unaligned_check((x),(ptr),sizeof(*(ptr)))
-
-/*
- * get_user_unaligned: - Get a simple variable from user space.
- * @x:  Variable to store result.
- * @ptr: Source address, in user space.
- *
- * Context: User context only. This function may sleep if pagefaults are
- *          enabled.
- *
- * This macro copies a single simple variable from user space to kernel
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and the result of
- * dereferencing @ptr must be assignable to @x without a cast.
- *
- * Returns zero on success, or -EFAULT on error.
- * On error, the variable @x is set to zero.
- */
-#define get_user_unaligned(x,ptr) \
-       __get_user_unaligned_check((x),(ptr),sizeof(*(ptr)))
-
-/*
- * __put_user_unaligned: - Write a simple value into user space, with less checking.
- * @x:  Value to copy to user space.
- * @ptr: Destination address, in user space.
- *
- * Context: User context only. This function may sleep if pagefaults are
- *          enabled.
- *
- * This macro copies a single simple value from kernel space to user
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and @x must be assignable
- * to the result of dereferencing @ptr.
- *
- * Caller must check the pointer with access_ok() before calling this
- * function.
- *
- * Returns zero on success, or -EFAULT on error.
- */
-#define __put_user_unaligned(x,ptr) \
-       __put_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr)))
-
-/*
- * __get_user_unaligned: - Get a simple variable from user space, with less checking.
- * @x:  Variable to store result.
- * @ptr: Source address, in user space.
- *
- * Context: User context only. This function may sleep if pagefaults are
- *          enabled.
- *
- * This macro copies a single simple variable from user space to kernel
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and the result of
- * dereferencing @ptr must be assignable to @x without a cast.
- *
- * Caller must check the pointer with access_ok() before calling this
- * function.
- *
- * Returns zero on success, or -EFAULT on error.
- * On error, the variable @x is set to zero.
- */
-#define __get_user_unaligned(x,ptr) \
-       __get_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr)))
-
-/*
- * Yuck.  We need two variants, one for 64bit operation and one
- * for 32 bit mode and old iron.
- */
-#ifdef CONFIG_32BIT
-#define __GET_USER_UNALIGNED_DW(val, ptr)                              \
-       __get_user_unaligned_asm_ll32(val, ptr)
-#endif
-#ifdef CONFIG_64BIT
-#define __GET_USER_UNALIGNED_DW(val, ptr)                              \
-       __get_user_unaligned_asm(val, "uld", ptr)
-#endif
-
-extern void __get_user_unaligned_unknown(void);
-
-#define __get_user_unaligned_common(val, size, ptr)                    \
-do {                                                                   \
-       switch (size) {                                                 \
-       case 1: __get_data_asm(val, "lb", ptr); break;                  \
-       case 2: __get_data_unaligned_asm(val, "ulh", ptr); break;       \
-       case 4: __get_data_unaligned_asm(val, "ulw", ptr); break;       \
-       case 8: __GET_USER_UNALIGNED_DW(val, ptr); break;               \
-       default: __get_user_unaligned_unknown(); break;                 \
-       }                                                               \
-} while (0)
-
-#define __get_user_unaligned_nocheck(x,ptr,size)                       \
-({                                                                     \
-       int __gu_err;                                                   \
-                                                                       \
-       __get_user_unaligned_common((x), size, ptr);                    \
-       __gu_err;                                                       \
-})
-
-#define __get_user_unaligned_check(x,ptr,size)                         \
-({                                                                     \
-       int __gu_err = -EFAULT;                                         \
-       const __typeof__(*(ptr)) __user * __gu_ptr = (ptr);             \
-                                                                       \
-       if (likely(access_ok(VERIFY_READ,  __gu_ptr, size)))            \
-               __get_user_unaligned_common((x), size, __gu_ptr);       \
-                                                                       \
-       __gu_err;                                                       \
-})
-
-#define __get_data_unaligned_asm(val, insn, addr)                      \
-{                                                                      \
-       long __gu_tmp;                                                  \
-                                                                       \
-       __asm__ __volatile__(                                           \
-       "1:     " insn "        %1, %3                          \n"     \
-       "2:                                                     \n"     \
-       "       .insn                                           \n"     \
-       "       .section .fixup,\"ax\"                          \n"     \
-       "3:     li      %0, %4                                  \n"     \
-       "       move    %1, $0                                  \n"     \
-       "       j       2b                                      \n"     \
-       "       .previous                                       \n"     \
-       "       .section __ex_table,\"a\"                       \n"     \
-       "       "__UA_ADDR "\t1b, 3b                            \n"     \
-       "       "__UA_ADDR "\t1b + 4, 3b                        \n"     \
-       "       .previous                                       \n"     \
-       : "=r" (__gu_err), "=r" (__gu_tmp)                              \
-       : "0" (0), "o" (__m(addr)), "i" (-EFAULT));                     \
-                                                                       \
-       (val) = (__typeof__(*(addr))) __gu_tmp;                         \
-}
-
-/*
- * Get a long long 64 using 32 bit registers.
- */
-#define __get_user_unaligned_asm_ll32(val, addr)                       \
-{                                                                      \
-       unsigned long long __gu_tmp;                                    \
-                                                                       \
-       __asm__ __volatile__(                                           \
-       "1:     ulw     %1, (%3)                                \n"     \
-       "2:     ulw     %D1, 4(%3)                              \n"     \
-       "       move    %0, $0                                  \n"     \
-       "3:                                                     \n"     \
-       "       .insn                                           \n"     \
-       "       .section        .fixup,\"ax\"                   \n"     \
-       "4:     li      %0, %4                                  \n"     \
-       "       move    %1, $0                                  \n"     \
-       "       move    %D1, $0                                 \n"     \
-       "       j       3b                                      \n"     \
-       "       .previous                                       \n"     \
-       "       .section        __ex_table,\"a\"                \n"     \
-       "       " __UA_ADDR "   1b, 4b                          \n"     \
-       "       " __UA_ADDR "   1b + 4, 4b                      \n"     \
-       "       " __UA_ADDR "   2b, 4b                          \n"     \
-       "       " __UA_ADDR "   2b + 4, 4b                      \n"     \
-       "       .previous                                       \n"     \
-       : "=r" (__gu_err), "=&r" (__gu_tmp)                             \
-       : "0" (0), "r" (addr), "i" (-EFAULT));                          \
-       (val) = (__typeof__(*(addr))) __gu_tmp;                         \
-}
-
-/*
- * Yuck.  We need two variants, one for 64bit operation and one
- * for 32 bit mode and old iron.
- */
-#ifdef CONFIG_32BIT
-#define __PUT_USER_UNALIGNED_DW(ptr) __put_user_unaligned_asm_ll32(ptr)
-#endif
-#ifdef CONFIG_64BIT
-#define __PUT_USER_UNALIGNED_DW(ptr) __put_user_unaligned_asm("usd", ptr)
-#endif
-
-#define __put_user_unaligned_common(ptr, size)                         \
-do {                                                                   \
-       switch (size) {                                                 \
-       case 1: __put_data_asm("sb", ptr); break;                       \
-       case 2: __put_user_unaligned_asm("ush", ptr); break;            \
-       case 4: __put_user_unaligned_asm("usw", ptr); break;            \
-       case 8: __PUT_USER_UNALIGNED_DW(ptr); break;                    \
-       default: __put_user_unaligned_unknown(); break;                 \
-} while (0)
-
-#define __put_user_unaligned_nocheck(x,ptr,size)                       \
-({                                                                     \
-       __typeof__(*(ptr)) __pu_val;                                    \
-       int __pu_err = 0;                                               \
-                                                                       \
-       __pu_val = (x);                                                 \
-       __put_user_unaligned_common(ptr, size);                         \
-       __pu_err;                                                       \
-})
-
-#define __put_user_unaligned_check(x,ptr,size)                         \
-({                                                                     \
-       __typeof__(*(ptr)) __user *__pu_addr = (ptr);                   \
-       __typeof__(*(ptr)) __pu_val = (x);                              \
-       int __pu_err = -EFAULT;                                         \
-                                                                       \
-       if (likely(access_ok(VERIFY_WRITE,  __pu_addr, size)))          \
-               __put_user_unaligned_common(__pu_addr, size);           \
-                                                                       \
-       __pu_err;                                                       \
-})
-
-#define __put_user_unaligned_asm(insn, ptr)                            \
-{                                                                      \
-       __asm__ __volatile__(                                           \
-       "1:     " insn "        %z2, %3         # __put_user_unaligned_asm\n" \
-       "2:                                                     \n"     \
-       "       .insn                                           \n"     \
-       "       .section        .fixup,\"ax\"                   \n"     \
-       "3:     li      %0, %4                                  \n"     \
-       "       j       2b                                      \n"     \
-       "       .previous                                       \n"     \
-       "       .section        __ex_table,\"a\"                \n"     \
-       "       " __UA_ADDR "   1b, 3b                          \n"     \
-       "       .previous                                       \n"     \
-       : "=r" (__pu_err)                                               \
-       : "0" (0), "Jr" (__pu_val), "o" (__m(ptr)),                     \
-         "i" (-EFAULT));                                               \
-}
-
-#define __put_user_unaligned_asm_ll32(ptr)                             \
-{                                                                      \
-       __asm__ __volatile__(                                           \
-       "1:     sw      %2, (%3)        # __put_user_unaligned_asm_ll32 \n" \
-       "2:     sw      %D2, 4(%3)                              \n"     \
-       "3:                                                     \n"     \
-       "       .insn                                           \n"     \
-       "       .section        .fixup,\"ax\"                   \n"     \
-       "4:     li      %0, %4                                  \n"     \
-       "       j       3b                                      \n"     \
-       "       .previous                                       \n"     \
-       "       .section        __ex_table,\"a\"                \n"     \
-       "       " __UA_ADDR "   1b, 4b                          \n"     \
-       "       " __UA_ADDR "   1b + 4, 4b                      \n"     \
-       "       " __UA_ADDR "   2b, 4b                          \n"     \
-       "       " __UA_ADDR "   2b + 4, 4b                      \n"     \
-       "       .previous"                                              \
-       : "=r" (__pu_err)                                               \
-       : "0" (0), "r" (__pu_val), "r" (ptr),                           \
-         "i" (-EFAULT));                                               \
-}
-
-extern void __put_user_unaligned_unknown(void);
-#endif
-
-/*
  * We're generating jump to subroutines which will be outside the range of
  * jump instructions
  */
index 6b113f3..d24091e 100644 (file)
@@ -6,7 +6,6 @@
  */
 #include <asm/page.h>
 #include <asm/cache.h>
-#include <asm-generic/uaccess-unaligned.h>
 
 #include <linux/bug.h>
 #include <linux/string.h>
index 5c0d8a8..9e7b08b 100644 (file)
@@ -90,9 +90,6 @@
 #define __put_user_inatomic(x, ptr) \
        __put_user_nosleep((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
 
-#define __get_user_unaligned __get_user
-#define __put_user_unaligned __put_user
-
 extern long __put_user_bad(void);
 
 /*
index 78f3f09..fad9df9 100644 (file)
@@ -249,9 +249,6 @@ int __put_user_bad(void) __attribute__((noreturn));
 
 int __get_user_bad(void) __attribute__((noreturn));
 
-#define __put_user_unaligned __put_user
-#define __get_user_unaligned __get_user
-
 unsigned long __must_check
 raw_copy_in_user(void __user *to, const void __user *from, unsigned long n);
 
index 6096d67..b5f976e 100644 (file)
@@ -9,7 +9,6 @@
 #include <linux/string.h>
 #include <asm/asi.h>
 #include <asm/spitfire.h>
-#include <asm-generic/uaccess-unaligned.h>
 #include <asm/extable_64.h>
 
 #include <asm/processor.h>
index a803f6b..7f77741 100644 (file)
@@ -19,7 +19,6 @@
  * User space memory access functions
  */
 #include <linux/mm.h>
-#include <asm-generic/uaccess-unaligned.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 
index 68766b2..fd91722 100644 (file)
@@ -535,9 +535,6 @@ struct __large_struct { unsigned long buf[100]; };
 #define __put_user(x, ptr)                                             \
        __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
 
-#define __get_user_unaligned __get_user
-#define __put_user_unaligned __put_user
-
 /*
  * {get|put}_user_try and catch
  *
diff --git a/include/asm-generic/uaccess-unaligned.h b/include/asm-generic/uaccess-unaligned.h
deleted file mode 100644 (file)
index 67deb89..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H
-#define __ASM_GENERIC_UACCESS_UNALIGNED_H
-
-/*
- * This macro should be used instead of __get_user() when accessing
- * values at locations that are not known to be aligned.
- */
-#define __get_user_unaligned(x, ptr)                                   \
-({                                                                     \
-       __typeof__ (*(ptr)) __x;                                        \
-       __copy_from_user(&__x, (ptr), sizeof(*(ptr))) ? -EFAULT : 0;    \
-       (x) = __x;                                                      \
-})
-
-
-/*
- * This macro should be used instead of __put_user() when accessing
- * values at locations that are not known to be aligned.
- */
-#define __put_user_unaligned(x, ptr)                                   \
-({                                                                     \
-       __typeof__ (*(ptr)) __x = (x);                                  \
-       __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0;      \
-})
-
-#endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */