parisc: Fix lpa and lpa_user defines

While working on the rewrite to the light-weight syscall and futex code, I
experimented with using a hash index based on the user physical address of
atomic variable. This exposed two problems with the lpa and lpa_user defines.

Because of the copy instruction, the pa argument needs to be an early clobber
argument. This prevents gcc from allocating the va and pa arguments to the same
register.

Secondly, the lpa instruction can cause a page fault so we need to catch
exceptions.

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Fixes: 116d753308cf ("parisc: Use lpa instruction to load physical addresses in driver code")
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v5.2+

diff --git a/arch/parisc/include/asm/special_insns.h b/arch/parisc/include/asm/special_insns.h
index a303ae9a77f41fe8ceef5490ab2be5b394fc199d..16ee41e77174f14e016dac77ab6e512c49b02816 100644 (file)
--- a/arch/parisc/include/asm/special_insns.h
+++ b/arch/parisc/include/asm/special_insns.h
@@ -2,28 +2,32 @@
 #ifndef __PARISC_SPECIAL_INSNS_H
 #define __PARISC_SPECIAL_INSNS_H
 
-#define lpa(va)        ({                      \
-       unsigned long pa;               \
-       __asm__ __volatile__(           \
-               "copy %%r0,%0\n\t"      \
-               "lpa %%r0(%1),%0"       \
-               : "=r" (pa)             \
-               : "r" (va)              \
-               : "memory"              \
-       );                              \
-       pa;                             \
+#define lpa(va)        ({                                      \
+       unsigned long pa;                               \
+       __asm__ __volatile__(                           \
+               "copy %%r0,%0\n"                        \
+               "8:\tlpa %%r0(%1),%0\n"                 \
+               "9:\n"                                  \
+               ASM_EXCEPTIONTABLE_ENTRY(8b, 9b)        \
+               : "=&r" (pa)                            \
+               : "r" (va)                              \
+               : "memory"                              \
+       );                                              \
+       pa;                                             \
 })
 
-#define lpa_user(va)   ({              \
-       unsigned long pa;               \
-       __asm__ __volatile__(           \
-               "copy %%r0,%0\n\t"      \
-               "lpa %%r0(%%sr3,%1),%0" \
-               : "=r" (pa)             \
-               : "r" (va)              \
-               : "memory"              \
-       );                              \
-       pa;                             \
+#define lpa_user(va)   ({                              \
+       unsigned long pa;                               \
+       __asm__ __volatile__(                           \
+               "copy %%r0,%0\n"                        \
+               "8:\tlpa %%r0(%%sr3,%1),%0\n"           \
+               "9:\n"                                  \
+               ASM_EXCEPTIONTABLE_ENTRY(8b, 9b)        \
+               : "=&r" (pa)                            \
+               : "r" (va)                              \
+               : "memory"                              \
+       );                                              \
+       pa;                                             \
 })
 
 #define mfctl(reg)     ({              \