diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2013-01-18 04:42:16 -0500 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2013-02-11 09:30:32 -0500 |
| commit | 0a5eae458e923af9968679fd75fd1f7670200bc3 (patch) | |
| tree | 532c2cc732ce69cb15d1746927415a4cc4cc03fa | |
| parent | 05d88a493746819821733e07bed918a6e09f735b (diff) | |
ARC: [optim] uaccess __{get,put}_user() optimised
Override asm-generic implementations. We basically gain on 2 fronts
* checks for alignment no longer needed as we are only doing "unit"
sized copies.
(Careful observer could argue that While the kernel buffers are aligned,
the user buffer in theory might not be - however in that case the
user space is already broken when it tries to deref a hword/word
straddling word boundary - so we are not making it any worse).
* __copy_{to,from}_user( ) returns bytes that couldn't be copied,
whereas get_user() returns 0 for success or -EFAULT (not size). Thus
the code to do leftover bytes calculation can be avoided as well.
The savings were significant: ~17k of code.
bloat-o-meter vmlinux_uaccess_pre vmlinux_uaccess_post
add/remove: 0/4 grow/shrink: 8/118 up/down: 1262/-18758 (-17496)
^^^^^^^^^
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arc/include/asm/uaccess.h | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h index f13bca44f27a..32420824375b 100644 --- a/arch/arc/include/asm/uaccess.h +++ b/arch/arc/include/asm/uaccess.h | |||
| @@ -57,6 +57,111 @@ | |||
| 57 | #define __access_ok(addr, sz) (unlikely(__kernel_ok) || \ | 57 | #define __access_ok(addr, sz) (unlikely(__kernel_ok) || \ |
| 58 | likely(__user_ok((addr), (sz)))) | 58 | likely(__user_ok((addr), (sz)))) |
| 59 | 59 | ||
| 60 | /*********** Single byte/hword/word copies ******************/ | ||
| 61 | |||
| 62 | #define __get_user_fn(sz, u, k) \ | ||
| 63 | ({ \ | ||
| 64 | long __ret = 0; /* success by default */ \ | ||
| 65 | switch (sz) { \ | ||
| 66 | case 1: __arc_get_user_one(*(k), u, "ldb", __ret); break; \ | ||
| 67 | case 2: __arc_get_user_one(*(k), u, "ldw", __ret); break; \ | ||
| 68 | case 4: __arc_get_user_one(*(k), u, "ld", __ret); break; \ | ||
| 69 | case 8: __arc_get_user_one_64(*(k), u, __ret); break; \ | ||
| 70 | } \ | ||
| 71 | __ret; \ | ||
| 72 | }) | ||
| 73 | |||
| 74 | /* | ||
| 75 | * Returns 0 on success, -EFAULT if not. | ||
| 76 | * @ret already contains 0 - given that errors will be less likely | ||
| 77 | * (hence +r asm constraint below). | ||
| 78 | * In case of error, fixup code will make it -EFAULT | ||
| 79 | */ | ||
| 80 | #define __arc_get_user_one(dst, src, op, ret) \ | ||
| 81 | __asm__ __volatile__( \ | ||
| 82 | "1: "op" %1,[%2]\n" \ | ||
| 83 | "2: ;nop\n" \ | ||
| 84 | " .section .fixup, \"ax\"\n" \ | ||
| 85 | " .align 4\n" \ | ||
| 86 | "3: mov %0, %3\n" \ | ||
| 87 | " j 2b\n" \ | ||
| 88 | " .previous\n" \ | ||
| 89 | " .section __ex_table, \"a\"\n" \ | ||
| 90 | " .align 4\n" \ | ||
| 91 | " .word 1b,3b\n" \ | ||
| 92 | " .previous\n" \ | ||
| 93 | \ | ||
| 94 | : "+r" (ret), "=r" (dst) \ | ||
| 95 | : "r" (src), "ir" (-EFAULT)) | ||
| 96 | |||
| 97 | #define __arc_get_user_one_64(dst, src, ret) \ | ||
| 98 | __asm__ __volatile__( \ | ||
| 99 | "1: ld %1,[%2]\n" \ | ||
| 100 | "4: ld %R1,[%2, 4]\n" \ | ||
| 101 | "2: ;nop\n" \ | ||
| 102 | " .section .fixup, \"ax\"\n" \ | ||
| 103 | " .align 4\n" \ | ||
| 104 | "3: mov %0, %3\n" \ | ||
| 105 | " j 2b\n" \ | ||
| 106 | " .previous\n" \ | ||
| 107 | " .section __ex_table, \"a\"\n" \ | ||
| 108 | " .align 4\n" \ | ||
| 109 | " .word 1b,3b\n" \ | ||
| 110 | " .word 4b,3b\n" \ | ||
| 111 | " .previous\n" \ | ||
| 112 | \ | ||
| 113 | : "+r" (ret), "=r" (dst) \ | ||
| 114 | : "r" (src), "ir" (-EFAULT)) | ||
| 115 | |||
| 116 | #define __put_user_fn(sz, u, k) \ | ||
| 117 | ({ \ | ||
| 118 | long __ret = 0; /* success by default */ \ | ||
| 119 | switch (sz) { \ | ||
| 120 | case 1: __arc_put_user_one(*(k), u, "stb", __ret); break; \ | ||
| 121 | case 2: __arc_put_user_one(*(k), u, "stw", __ret); break; \ | ||
| 122 | case 4: __arc_put_user_one(*(k), u, "st", __ret); break; \ | ||
| 123 | case 8: __arc_put_user_one_64(*(k), u, __ret); break; \ | ||
| 124 | } \ | ||
| 125 | __ret; \ | ||
| 126 | }) | ||
| 127 | |||
| 128 | #define __arc_put_user_one(src, dst, op, ret) \ | ||
| 129 | __asm__ __volatile__( \ | ||
| 130 | "1: "op" %1,[%2]\n" \ | ||
| 131 | "2: ;nop\n" \ | ||
| 132 | " .section .fixup, \"ax\"\n" \ | ||
| 133 | " .align 4\n" \ | ||
| 134 | "3: mov %0, %3\n" \ | ||
| 135 | " j 2b\n" \ | ||
| 136 | " .previous\n" \ | ||
| 137 | " .section __ex_table, \"a\"\n" \ | ||
| 138 | " .align 4\n" \ | ||
| 139 | " .word 1b,3b\n" \ | ||
| 140 | " .previous\n" \ | ||
| 141 | \ | ||
| 142 | : "+r" (ret) \ | ||
| 143 | : "r" (src), "r" (dst), "ir" (-EFAULT)) | ||
| 144 | |||
| 145 | #define __arc_put_user_one_64(src, dst, ret) \ | ||
| 146 | __asm__ __volatile__( \ | ||
| 147 | "1: st %1,[%2]\n" \ | ||
| 148 | "4: st %R1,[%2, 4]\n" \ | ||
| 149 | "2: ;nop\n" \ | ||
| 150 | " .section .fixup, \"ax\"\n" \ | ||
| 151 | " .align 4\n" \ | ||
| 152 | "3: mov %0, %3\n" \ | ||
| 153 | " j 2b\n" \ | ||
| 154 | " .previous\n" \ | ||
| 155 | " .section __ex_table, \"a\"\n" \ | ||
| 156 | " .align 4\n" \ | ||
| 157 | " .word 1b,3b\n" \ | ||
| 158 | " .word 4b,3b\n" \ | ||
| 159 | " .previous\n" \ | ||
| 160 | \ | ||
| 161 | : "+r" (ret) \ | ||
| 162 | : "r" (src), "r" (dst), "ir" (-EFAULT)) | ||
| 163 | |||
| 164 | |||
| 60 | static inline unsigned long | 165 | static inline unsigned long |
| 61 | __arc_copy_from_user(void *to, const void __user *from, unsigned long n) | 166 | __arc_copy_from_user(void *to, const void __user *from, unsigned long n) |
| 62 | { | 167 | { |