powerpc/uaccess: Also perform 64 bits copies in unsafe_copy_from_user() on ppc32

Similarly to commit 5cf773fc8f37 ("powerpc/uaccess: Also perform
64 bits copies in unsafe_copy_to_user() on ppc32")

ppc32 has an efficiant 64 bits unsafe_get_user(), so also use it in
order to unroll loops more.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/308e65d9237a14e8c0e3b22919fcf0b5e5592608.1616151715.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index 77d837b16e4d55776844e0467c915d088e2cfa8c..a4e791bcd3fe24f0dc1bc2a1d17022b0011fbd1e 100644 (file)
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -432,9 +432,9 @@ do {                                                                                        \
        size_t _len = (l);                                                              \
        int _i;                                                                         \
                                                                                        \
-       for (_i = 0; _i < (_len & ~(sizeof(long) - 1)); _i += sizeof(long))             \
-               unsafe_get_user(*(long *)(_dst + _i), (long __user *)(_src + _i), e);   \
-       if (IS_ENABLED(CONFIG_PPC64) && (_len & 4)) {                                   \
+       for (_i = 0; _i < (_len & ~(sizeof(u64) - 1)); _i += sizeof(u64))               \
+               unsafe_get_user(*(u64 *)(_dst + _i), (u64 __user *)(_src + _i), e);     \
+       if (_len & 4) {                                                                 \
                unsafe_get_user(*(u32 *)(_dst + _i), (u32 __user *)(_src + _i), e);     \
                _i += 4;                                                                \
        }                                                                               \