Add dynamic size check for usercopy functions.
From: Gerald Schaefer <[email protected]>
[S390] Add dynamic size check for usercopy functions.
Use a wrapper for copy_to/from_user to chose the best usercopy method. The mvcos instruction is better for sizes greater than 256 bytes, if mvcos is not available a page table walk is better for sizes greater than 1024 bytes. Also removed the redundant copy_to/from_user_std_small functions.
Signed-off-by Gerald Schaefer <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/lib/Makefile | 2 arch/s390/lib/uaccess_mvcos.c | 27 +++++-- arch/s390/lib/uaccess_pt.c | 153 ++++++++++++++++++++++++++++++++++++++++++ arch/s390/lib/uaccess_std.c | 67 ++++-------------- 4 files changed, 190 insertions(+), 59 deletions(-)
arch/s390/lib/Makefile +1 -1
@@ -4,7 +4,7 @@ EXTRA_AFLAGS := -traditional -lib-y += delay.o string.o uaccess_std.o +lib-y += delay.o string.o uaccess_std.o uaccess_pt.o lib-$(CONFIG_32BIT) += div64.o lib-$(CONFIG_64BIT) += uaccess_mvcos.o lib-$(CONFIG_SMP) += spinlock.o
arch/s390/lib/uaccess_mvcos.c +21 -6
@@ -27,6 +27,9 @@#define SLR "slgr"#endif +extern size_t copy_from_user_std (size_t ,const void __user *,void *); +extern size_t copy_to_user_std (size_t ,void __user *,const void *); +size_t copy_from_user_mvcos (size_t size,const void __user *ptr,void *x) { register unsigned long reg0 asm("0") = 0x81UL;
@@ -66,6 +69,13 @@ size_t copy_from_user_mvcos(size_t size,return size; } +size_t copy_from_user_mvcos_check (size_t size,const void __user *ptr,void *x) +{ +if (size <=256 ) +return copy_from_user_std (size, ptr, x); +return copy_from_user_mvcos (size, ptr, x); +} +size_t copy_to_user_mvcos (size_t size,void __user *ptr,const void *x) { register unsigned long reg0 asm("0") = 0x810000UL;
@@ -95,6 +105,13 @@ size_t copy_to_user_mvcos(size_t size, vreturn size; } +size_t copy_to_user_mvcos_check (size_t size,void __user *ptr,const void *x) +{ +if (size <=256 ) +return copy_to_user_std (size, ptr, x); +return copy_to_user_mvcos (size, ptr, x); +} +size_t copy_in_user_mvcos (size_t size,void __user *to,const void __user *from) { register unsigned long reg0 asm("0") = 0x810081UL;
@@ -145,18 +162,16 @@ size_t clear_user_mvcos(size_t size, voireturn size; } -extern size_t copy_from_user_std_small (size_t ,const void __user *,void *); -extern size_t copy_to_user_std_small (size_t ,void __user *,const void *);extern size_t strnlen_user_std (size_t ,const char __user *);extern size_t strncpy_from_user_std (size_t ,const char __user *,char *);extern int futex_atomic_op (int ,int __user *,int ,int *);extern int futex_atomic_cmpxchg (int __user *,int ,int );struct uaccess_ops uaccess_mvcos = { - .copy_from_user = copy_from_user_mvcos, - .copy_from_user_small = copy_from_user_std_small, - .copy_to_user = copy_to_user_mvcos, - .copy_to_user_small = copy_to_user_std_small, + .copy_from_user = copy_from_user_mvcos_check, + .copy_from_user_small = copy_from_user_std, + .copy_to_user = copy_to_user_mvcos_check, + .copy_to_user_small = copy_to_user_std, .copy_in_user = copy_in_user_mvcos, .clear_user = clear_user_mvcos, .strnlen_user = strnlen_user_std,
arch/s390/lib/uaccess_pt.c +153 -0
153 lines not on this page · raw message
arch/s390/lib/uaccess_std.c +15 -52
93 lines not on this page · raw message