sh: Implement __get_user_u64() required for 64-bit get_user()
John Paul Adrian Glaubitz
maintainerPATCH v3 1/1 sh: Implement __get_user_u64() required for 64-bit get_user()
Hi!
This is version 3 of my patch to implement __get_user_u64() for SH.
I have asked both Yutaka Niibe and Yoshinori Sato to look over my changes and they both agreed that an entry in __ex_tables for the second access was missing, so I add the missing ".long 1b+2, 3b\n\t".
The changes should be correct now and will hopefully get a positive review by the SH maintainers.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
John Paul Adrian Glaubitz
maintainerPATCH 1/1 sh: Implement __get_user_u64() required for 64-bit get_user()
Trying to build the kernel with CONFIG_INFINIBAND_USER_ACCESS enabled fails
ERROR: "__get_user_unknown" [drivers/infiniband/core/ib_uverbs.ko] undefined!
with on SH since the kernel misses a 64-bit implementation of get_user().
Implement the missing 64-bit get_user() as __get_user_u64(), matching the already existing __put_user_u64() which implements the 64-bit put_user().
--- arch/sh/include/asm/uaccess_32.h | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
arch/sh/include/asm/uaccess_32.h +53 -0
@@ -26,6 +26,9 @@ do { \case 4 : \__get_user_asm (x, ptr, retval,"l" ); \break ; \ +case 8 : \ +__get_user_u64 (x, ptr, retval); \ +break ; \default : \__get_user_unknown (); \break ; \
@@ -66,6 +69,56 @@ do { \extern void __get_user_unknown (void ); +#if defined(CONFIG_CPU_LITTLE_ENDIAN ) +#define __get_user_u64 (x, addr, err) \ +({ \ +__asm__ __volatile__( \ + "1:\n\t" \ + "mov.l %2,%R1\n\t" \ + "mov.l %T2,%S1\n\t" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3:\n\t" \ + "mov #0,%R1\n\t" \ + "mov #0,%S1\n\t" \ + "mov.l 4f, %0\n\t" \ + "jmp @%0\n\t" \ + " mov %3, %0\n\t" \ + ".balign 4\n" \ + "4: .long 2b\n\t" \ + ".previous\n" \ + ".section __ex_table,\"a\"\n\t" \ + ".long 1b, 3b\n\t" \ + ".long 1b + 2, 3b\n\t" \ + ".previous" \ + :"=&r" (err), "=&r" (x) \ + :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); }) +#else +#define __get_user_u64 (x, addr, err) \ +({ \ +__asm__ __volatile__( \ + "1:\n\t" \ + "mov.l %2,%S1\n\t" \ + "mov.l %T2,%R1\n\t" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3:\n\t" \ + "mov #0,%S1\n\t" \ + "mov #0,%R1\n\t" \ + "mov.l 4f, %0\n\t" \ + "jmp @%0\n\t" \ + " mov %3, %0\n\t" \ + ".balign 4\n" \ + "4: .long 2b\n\t" \ + ".previous\n" \ + ".section __ex_table,\"a\"\n\t" \ + ".long 1b, 3b\n\t" \ + ".long 1b + 2, 3b\n\t" \ + ".previous" \ + :"=&r" (err), "=&r" (x) \ + :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); }) +#endif +#define __put_user_size (x,ptr,size,retval) \ do { \ retval = 0; \
Signature · 1 line
2.27.0
Quoted 89 lines · John Paul Adrian Glaubitz
Trying to build the kernel with
CONFIG_INFINIBAND_USER_ACCESSenabled failsERROR: "
__get_user_unknown" [drivers/infiniband/core/ib_uverbs.ko] undefined!with on SH since the kernel misses a 64-bit implementation of
get_user().Implement the missing 64-bit
get_user()as__get_user_u64(), matching the already existing__put_user_u64()which implements the 64-bitput_user().Signed-off-by John Paul Adrian Glaubitz <[email protected]>--- arch/sh/include/asm/uaccess_32.h | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/sh/include/asm/uaccess_32.h +53
-0@@ -26,6 +26,9 @@ do { \case 4 : \__get_user_asm (x, ptr, retval,"l" ); \break ; \ +case 8 : \ +__get_user_u64 (x, ptr, retval); \ +break ; \default : \__get_user_unknown (); \break ; \@@ -66,6 +69,56 @@ do { \extern void __get_user_unknown (void ); +#if defined(CONFIG_CPU_LITTLE_ENDIAN ) +#define __get_user_u64 (x, addr, err) \ +({ \ +__asm__ __volatile__( \ + "1:\n\t" \ + "mov.l %2,%R1\n\t" \ + "mov.l %T2,%S1\n\t" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3:\n\t" \ + "mov #0,%R1\n\t" \ + "mov #0,%S1\n\t" \ + "mov.l 4f, %0\n\t" \ + "jmp @%0\n\t" \ + " mov %3, %0\n\t" \ + ".balign 4\n" \ + "4: .long 2b\n\t" \ + ".previous\n" \ + ".section __ex_table,\"a\"\n\t" \ + ".long 1b, 3b\n\t" \ + ".long 1b + 2, 3b\n\t" \ + ".previous" \ + :"=&r" (err), "=&r" (x) \ + :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); }) +#else +#define __get_user_u64 (x, addr, err) \ +({ \ +__asm__ __volatile__( \ + "1:\n\t" \ + "mov.l %2,%S1\n\t" \ + "mov.l %T2,%R1\n\t" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3:\n\t" \ + "mov #0,%S1\n\t" \ + "mov #0,%R1\n\t" \ + "mov.l 4f, %0\n\t" \ + "jmp @%0\n\t" \ + " mov %3, %0\n\t" \ + ".balign 4\n" \ + "4: .long 2b\n\t" \ + ".previous\n" \ + ".section __ex_table,\"a\"\n\t" \ + ".long 1b, 3b\n\t" \ + ".long 1b + 2, 3b\n\t" \ + ".previous" \ + :"=&r" (err), "=&r" (x) \ + :"m" (__m(addr)), "i" (-EFAULT), "0" (err)); }) +#endif +#define __put_user_size (x,ptr,size,retval) \ do { \ retval = 0; \Signature · 1 line
2.27.0
Signature · 1 line
Yosinori Sato
John Paul Adrian Glaubitz
maintainerQuoted 8 lines · John Paul Adrian Glaubitz
This is version 3 of my patch to implement
__get_user_u64()for SH.I have asked both Yutaka Niibe and Yoshinori Sato to look over my changes and they both agreed that an entry in
__ex_tablesfor the second access was missing, so I add the missing ".long 1b+2, 3b\n\t".The changes should be correct now and will hopefully get a positive review by the SH maintainers.
Ping.
@Rich, @Yoshinori, @Yutaka, @Michael could I get a review if you have some time?
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
John Paul Adrian Glaubitz
maintainerHello!
Quoted 6 lines · John Paul Adrian Glaubitz
Quoted 2 lines
The changes should be correct now and will hopefully get a positive review by the SH maintainers.
Ping.
@Rich, @Yoshinori, @Yutaka, @Michael could I get a review if you have some time?
Can we please move forward with this? I don't want to see another discussion arise whether SH is maintained or not :-(.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913