* [PATCH v4 0/12] riscv: switch to relative extable and other improvements
@ 2021-11-18 11:21 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:21 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Similar as other architectures such as arm64, x86 and so on, use
offsets relative to the exception table entry values rather than
absolute addresses for both the exception locationand the fixup.
And recently, arm64 and x86 remove anonymous out-of-line fixups, we
want to acchieve the same result.
patch1 remove unused macro.
patch2 consolidates the __ex_table construction, it's a great code
clean up even w/o the 2nd patch.
patch3 swith to relative extable.
The remaining patches are inspired by arm64 version. They remove
the anonymous out-of-line fixups for risv.
Since v3:
- collect Reviewed-by tag for patch2 and patch3
- add patch1 to remove unused macro
- add patches to remove anonymous out-of-line fixups
Since v2:
- directly check R_RISCV_SUB32 in __ex_table instead of adding
addend_riscv_rela()
Since v1:
- fix build error for NOMMU case, thank lkp@intel.com
Jisheng Zhang (12):
riscv: remove unused __cmpxchg_user() macro
riscv: consolidate __ex_table construction
riscv: switch to relative exception tables
riscv: bpf: move rv_bpf_fixup_exception signature to extable.h
riscv: extable: make fixup_exception() return bool
riscv: extable: use `ex` for `exception_table_entry`
riscv: lib: uaccess: fold fixups into body
riscv: extable: consolidate definitions
riscv: extable: add `type` and `data` fields
riscv: add gpr-num.h
riscv: extable: add a dedicated uaccess handler
riscv: vmlinux.lds.S|vmlinux-xip.lds.S: remove `.fixup` section
arch/riscv/include/asm/Kbuild | 1 -
arch/riscv/include/asm/asm-extable.h | 65 +++++++++++
arch/riscv/include/asm/extable.h | 48 ++++++++
arch/riscv/include/asm/futex.h | 30 ++---
arch/riscv/include/asm/gpr-num.h | 77 +++++++++++++
arch/riscv/include/asm/uaccess.h | 162 ++++-----------------------
arch/riscv/kernel/vmlinux-xip.lds.S | 1 -
arch/riscv/kernel/vmlinux.lds.S | 3 +-
arch/riscv/lib/uaccess.S | 28 +++--
arch/riscv/mm/extable.c | 66 ++++++++---
arch/riscv/net/bpf_jit_comp64.c | 9 +-
scripts/mod/modpost.c | 15 +++
scripts/sorttable.c | 4 +-
13 files changed, 308 insertions(+), 201 deletions(-)
create mode 100644 arch/riscv/include/asm/asm-extable.h
create mode 100644 arch/riscv/include/asm/extable.h
create mode 100644 arch/riscv/include/asm/gpr-num.h
--
2.33.0
^ permalink raw reply [flat|nested] 47+ messages in thread* [PATCH 01/12] riscv: remove unused __cmpxchg_user() macro
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:22 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This macro is defined but not used, remove it.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/uaccess.h | 75 --------------------------------
1 file changed, 75 deletions(-)
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index f314ff44c48d..9f9219545e59 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -388,81 +388,6 @@ unsigned long __must_check clear_user(void __user *to, unsigned long n)
__clear_user(to, n) : n;
}
-/*
- * Atomic compare-and-exchange, but with a fixup for userspace faults. Faults
- * will set "err" to -EFAULT, while successful accesses return the previous
- * value.
- */
-#define __cmpxchg_user(ptr, old, new, err, size, lrb, scb) \
-({ \
- __typeof__(ptr) __ptr = (ptr); \
- __typeof__(*(ptr)) __old = (old); \
- __typeof__(*(ptr)) __new = (new); \
- __typeof__(*(ptr)) __ret; \
- __typeof__(err) __err = 0; \
- register unsigned int __rc; \
- __enable_user_access(); \
- switch (size) { \
- case 4: \
- __asm__ __volatile__ ( \
- "0:\n" \
- " lr.w" #scb " %[ret], %[ptr]\n" \
- " bne %[ret], %z[old], 1f\n" \
- " sc.w" #lrb " %[rc], %z[new], %[ptr]\n" \
- " bnez %[rc], 0b\n" \
- "1:\n" \
- ".section .fixup,\"ax\"\n" \
- ".balign 4\n" \
- "2:\n" \
- " li %[err], %[efault]\n" \
- " jump 1b, %[rc]\n" \
- ".previous\n" \
- ".section __ex_table,\"a\"\n" \
- ".balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 2b\n" \
- ".previous\n" \
- : [ret] "=&r" (__ret), \
- [rc] "=&r" (__rc), \
- [ptr] "+A" (*__ptr), \
- [err] "=&r" (__err) \
- : [old] "rJ" (__old), \
- [new] "rJ" (__new), \
- [efault] "i" (-EFAULT)); \
- break; \
- case 8: \
- __asm__ __volatile__ ( \
- "0:\n" \
- " lr.d" #scb " %[ret], %[ptr]\n" \
- " bne %[ret], %z[old], 1f\n" \
- " sc.d" #lrb " %[rc], %z[new], %[ptr]\n" \
- " bnez %[rc], 0b\n" \
- "1:\n" \
- ".section .fixup,\"ax\"\n" \
- ".balign 4\n" \
- "2:\n" \
- " li %[err], %[efault]\n" \
- " jump 1b, %[rc]\n" \
- ".previous\n" \
- ".section __ex_table,\"a\"\n" \
- ".balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 2b\n" \
- ".previous\n" \
- : [ret] "=&r" (__ret), \
- [rc] "=&r" (__rc), \
- [ptr] "+A" (*__ptr), \
- [err] "=&r" (__err) \
- : [old] "rJ" (__old), \
- [new] "rJ" (__new), \
- [efault] "i" (-EFAULT)); \
- break; \
- default: \
- BUILD_BUG(); \
- } \
- __disable_user_access(); \
- (err) = __err; \
- __ret; \
-})
-
#define HAVE_GET_KERNEL_NOFAULT
#define __get_kernel_nofault(dst, src, type, err_label) \
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 01/12] riscv: remove unused __cmpxchg_user() macro
@ 2021-11-18 11:22 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This macro is defined but not used, remove it.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/uaccess.h | 75 --------------------------------
1 file changed, 75 deletions(-)
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index f314ff44c48d..9f9219545e59 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -388,81 +388,6 @@ unsigned long __must_check clear_user(void __user *to, unsigned long n)
__clear_user(to, n) : n;
}
-/*
- * Atomic compare-and-exchange, but with a fixup for userspace faults. Faults
- * will set "err" to -EFAULT, while successful accesses return the previous
- * value.
- */
-#define __cmpxchg_user(ptr, old, new, err, size, lrb, scb) \
-({ \
- __typeof__(ptr) __ptr = (ptr); \
- __typeof__(*(ptr)) __old = (old); \
- __typeof__(*(ptr)) __new = (new); \
- __typeof__(*(ptr)) __ret; \
- __typeof__(err) __err = 0; \
- register unsigned int __rc; \
- __enable_user_access(); \
- switch (size) { \
- case 4: \
- __asm__ __volatile__ ( \
- "0:\n" \
- " lr.w" #scb " %[ret], %[ptr]\n" \
- " bne %[ret], %z[old], 1f\n" \
- " sc.w" #lrb " %[rc], %z[new], %[ptr]\n" \
- " bnez %[rc], 0b\n" \
- "1:\n" \
- ".section .fixup,\"ax\"\n" \
- ".balign 4\n" \
- "2:\n" \
- " li %[err], %[efault]\n" \
- " jump 1b, %[rc]\n" \
- ".previous\n" \
- ".section __ex_table,\"a\"\n" \
- ".balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 2b\n" \
- ".previous\n" \
- : [ret] "=&r" (__ret), \
- [rc] "=&r" (__rc), \
- [ptr] "+A" (*__ptr), \
- [err] "=&r" (__err) \
- : [old] "rJ" (__old), \
- [new] "rJ" (__new), \
- [efault] "i" (-EFAULT)); \
- break; \
- case 8: \
- __asm__ __volatile__ ( \
- "0:\n" \
- " lr.d" #scb " %[ret], %[ptr]\n" \
- " bne %[ret], %z[old], 1f\n" \
- " sc.d" #lrb " %[rc], %z[new], %[ptr]\n" \
- " bnez %[rc], 0b\n" \
- "1:\n" \
- ".section .fixup,\"ax\"\n" \
- ".balign 4\n" \
- "2:\n" \
- " li %[err], %[efault]\n" \
- " jump 1b, %[rc]\n" \
- ".previous\n" \
- ".section __ex_table,\"a\"\n" \
- ".balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 2b\n" \
- ".previous\n" \
- : [ret] "=&r" (__ret), \
- [rc] "=&r" (__rc), \
- [ptr] "+A" (*__ptr), \
- [err] "=&r" (__err) \
- : [old] "rJ" (__old), \
- [new] "rJ" (__new), \
- [efault] "i" (-EFAULT)); \
- break; \
- default: \
- BUILD_BUG(); \
- } \
- __disable_user_access(); \
- (err) = __err; \
- __ret; \
-})
-
#define HAVE_GET_KERNEL_NOFAULT
#define __get_kernel_nofault(dst, src, type, err_label) \
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 02/12] riscv: consolidate __ex_table construction
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:22 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Consolidate all the __ex_table constuction code with a _ASM_EXTABLE
helper.
There should be no functional change as a result of this patch.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/riscv/include/asm/futex.h | 12 +++---------
arch/riscv/include/asm/uaccess.h | 30 ++++++++++++------------------
2 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 1b00badb9f87..3191574e135c 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -30,10 +30,7 @@
"3: li %[r],%[e] \n" \
" jump 2b,%[t] \n" \
" .previous \n" \
- " .section __ex_table,\"a\" \n" \
- " .balign " RISCV_SZPTR " \n" \
- " " RISCV_PTR " 1b, 3b \n" \
- " .previous \n" \
+ _ASM_EXTABLE(1b, 3b) \
: [r] "+r" (ret), [ov] "=&r" (oldval), \
[u] "+m" (*uaddr), [t] "=&r" (tmp) \
: [op] "Jr" (oparg), [e] "i" (-EFAULT) \
@@ -103,11 +100,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
"4: li %[r],%[e] \n"
" jump 3b,%[t] \n"
" .previous \n"
- " .section __ex_table,\"a\" \n"
- " .balign " RISCV_SZPTR " \n"
- " " RISCV_PTR " 1b, 4b \n"
- " " RISCV_PTR " 2b, 4b \n"
- " .previous \n"
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
: [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
: "memory");
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 9f9219545e59..714cd311d9f1 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -10,6 +10,12 @@
#include <asm/pgtable.h> /* for TASK_SIZE */
+#define _ASM_EXTABLE(from, to) \
+ " .pushsection __ex_table, \"a\"\n" \
+ " .balign " RISCV_SZPTR " \n" \
+ " " RISCV_PTR "(" #from "), (" #to ")\n" \
+ " .popsection\n"
+
/*
* User space memory access functions
*/
@@ -93,10 +99,7 @@ do { \
" li %1, 0\n" \
" jump 2b, %2\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 3b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 3b) \
: "+r" (err), "=&r" (__x), "=r" (__tmp) \
: "m" (*(ptr)), "i" (-EFAULT)); \
(x) = __x; \
@@ -125,11 +128,8 @@ do { \
" li %2, 0\n" \
" jump 3b, %3\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 4b\n" \
- " " RISCV_PTR " 2b, 4b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: "+r" (err), "=&r" (__lo), "=r" (__hi), \
"=r" (__tmp) \
: "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
@@ -233,10 +233,7 @@ do { \
" li %0, %4\n" \
" jump 2b, %1\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 3b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 3b) \
: "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
: "rJ" (__x), "i" (-EFAULT)); \
} while (0)
@@ -262,11 +259,8 @@ do { \
" li %0, %6\n" \
" jump 3b, %1\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 4b\n" \
- " " RISCV_PTR " 2b, 4b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: "+r" (err), "=r" (__tmp), \
"=m" (__ptr[__LSW]), \
"=m" (__ptr[__MSW]) \
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 02/12] riscv: consolidate __ex_table construction
@ 2021-11-18 11:22 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Consolidate all the __ex_table constuction code with a _ASM_EXTABLE
helper.
There should be no functional change as a result of this patch.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/riscv/include/asm/futex.h | 12 +++---------
arch/riscv/include/asm/uaccess.h | 30 ++++++++++++------------------
2 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 1b00badb9f87..3191574e135c 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -30,10 +30,7 @@
"3: li %[r],%[e] \n" \
" jump 2b,%[t] \n" \
" .previous \n" \
- " .section __ex_table,\"a\" \n" \
- " .balign " RISCV_SZPTR " \n" \
- " " RISCV_PTR " 1b, 3b \n" \
- " .previous \n" \
+ _ASM_EXTABLE(1b, 3b) \
: [r] "+r" (ret), [ov] "=&r" (oldval), \
[u] "+m" (*uaddr), [t] "=&r" (tmp) \
: [op] "Jr" (oparg), [e] "i" (-EFAULT) \
@@ -103,11 +100,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
"4: li %[r],%[e] \n"
" jump 3b,%[t] \n"
" .previous \n"
- " .section __ex_table,\"a\" \n"
- " .balign " RISCV_SZPTR " \n"
- " " RISCV_PTR " 1b, 4b \n"
- " " RISCV_PTR " 2b, 4b \n"
- " .previous \n"
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
: [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
: "memory");
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 9f9219545e59..714cd311d9f1 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -10,6 +10,12 @@
#include <asm/pgtable.h> /* for TASK_SIZE */
+#define _ASM_EXTABLE(from, to) \
+ " .pushsection __ex_table, \"a\"\n" \
+ " .balign " RISCV_SZPTR " \n" \
+ " " RISCV_PTR "(" #from "), (" #to ")\n" \
+ " .popsection\n"
+
/*
* User space memory access functions
*/
@@ -93,10 +99,7 @@ do { \
" li %1, 0\n" \
" jump 2b, %2\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 3b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 3b) \
: "+r" (err), "=&r" (__x), "=r" (__tmp) \
: "m" (*(ptr)), "i" (-EFAULT)); \
(x) = __x; \
@@ -125,11 +128,8 @@ do { \
" li %2, 0\n" \
" jump 3b, %3\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 4b\n" \
- " " RISCV_PTR " 2b, 4b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: "+r" (err), "=&r" (__lo), "=r" (__hi), \
"=r" (__tmp) \
: "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
@@ -233,10 +233,7 @@ do { \
" li %0, %4\n" \
" jump 2b, %1\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 3b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 3b) \
: "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
: "rJ" (__x), "i" (-EFAULT)); \
} while (0)
@@ -262,11 +259,8 @@ do { \
" li %0, %6\n" \
" jump 3b, %1\n" \
" .previous\n" \
- " .section __ex_table,\"a\"\n" \
- " .balign " RISCV_SZPTR "\n" \
- " " RISCV_PTR " 1b, 4b\n" \
- " " RISCV_PTR " 2b, 4b\n" \
- " .previous" \
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
: "+r" (err), "=r" (__tmp), \
"=m" (__ptr[__LSW]), \
"=m" (__ptr[__MSW]) \
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 03/12] riscv: switch to relative exception tables
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:22 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Similar as other architectures such as arm64, x86 and so on, use
offsets relative to the exception table entry values rather than
absolute addresses for both the exception locationand the fixup.
However, RISCV label difference will actually produce two relocations,
a pair of R_RISCV_ADD32 and R_RISCV_SUB32. Take below simple code for
example:
$ cat test.S
.section .text
1:
nop
.section __ex_table,"a"
.balign 4
.long (1b - .)
.previous
$ riscv64-linux-gnu-gcc -c test.S
$ riscv64-linux-gnu-readelf -r test.o
Relocation section '.rela__ex_table' at offset 0x100 contains 2 entries:
Offset Info Type Sym. Value Sym. Name + Addend
000000000000 000600000023 R_RISCV_ADD32 0000000000000000 .L1^B1 + 0
000000000000 000500000027 R_RISCV_SUB32 0000000000000000 .L0 + 0
The modpost will complain the R_RISCV_SUB32 relocation, so we need to
patch modpost.c to skip this relocation for .rela__ex_table section.
After this patch, the __ex_table section size of defconfig vmlinux is
reduced from 7072 Bytes to 3536 Bytes.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/riscv/include/asm/Kbuild | 1 -
arch/riscv/include/asm/extable.h | 25 +++++++++++++++++++++++++
arch/riscv/include/asm/uaccess.h | 4 ++--
arch/riscv/lib/uaccess.S | 4 ++--
arch/riscv/mm/extable.c | 2 +-
scripts/mod/modpost.c | 15 +++++++++++++++
scripts/sorttable.c | 2 +-
7 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 arch/riscv/include/asm/extable.h
diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild
index 445ccc97305a..57b86fd9916c 100644
--- a/arch/riscv/include/asm/Kbuild
+++ b/arch/riscv/include/asm/Kbuild
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
generic-y += early_ioremap.h
-generic-y += extable.h
generic-y += flat.h
generic-y += kvm_para.h
generic-y += user.h
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
new file mode 100644
index 000000000000..84760392fc69
--- /dev/null
+++ b/arch/riscv/include/asm/extable.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_RISCV_EXTABLE_H
+#define _ASM_RISCV_EXTABLE_H
+
+/*
+ * The exception table consists of pairs of relative offsets: the first
+ * is the relative offset to an instruction that is allowed to fault,
+ * and the second is the relative offset at which the program should
+ * continue. No registers are modified, so it is entirely up to the
+ * continuation code to figure out what to do.
+ *
+ * All the routines below use bits of fixup code that are out of line
+ * with the main instruction path. This means when everything is well,
+ * we don't even have to jump over them. Further, they do not intrude
+ * on our cache or tlb entries.
+ */
+
+struct exception_table_entry {
+ int insn, fixup;
+};
+
+#define ARCH_HAS_RELATIVE_EXTABLE
+
+int fixup_exception(struct pt_regs *regs);
+#endif
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 714cd311d9f1..0f2c5b9d2e8f 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -12,8 +12,8 @@
#define _ASM_EXTABLE(from, to) \
" .pushsection __ex_table, \"a\"\n" \
- " .balign " RISCV_SZPTR " \n" \
- " " RISCV_PTR "(" #from "), (" #to ")\n" \
+ " .balign 4\n" \
+ " .long (" #from " - .), (" #to " - .)\n" \
" .popsection\n"
/*
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 63bc691cff91..55f80f84e23f 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -7,8 +7,8 @@
100:
\op \reg, \addr
.section __ex_table,"a"
- .balign RISCV_SZPTR
- RISCV_PTR 100b, \lbl
+ .balign 4
+ .long (100b - .), (\lbl - .)
.previous
.endm
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index ddb7d3b99e89..d8d239c2c1bd 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -28,6 +28,6 @@ int fixup_exception(struct pt_regs *regs)
return rv_bpf_fixup_exception(fixup, regs);
#endif
- regs->epc = fixup->fixup;
+ regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
return 1;
}
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index cb8ab7d91d30..6bfa33217914 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1830,6 +1830,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
return 0;
}
+#ifndef EM_RISCV
+#define EM_RISCV 243
+#endif
+
+#ifndef R_RISCV_SUB32
+#define R_RISCV_SUB32 39
+#endif
+
static void section_rela(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr)
{
@@ -1866,6 +1874,13 @@ static void section_rela(const char *modname, struct elf_info *elf,
r_sym = ELF_R_SYM(r.r_info);
#endif
r.r_addend = TO_NATIVE(rela->r_addend);
+ switch (elf->hdr->e_machine) {
+ case EM_RISCV:
+ if (!strcmp("__ex_table", fromsec) &&
+ ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
+ continue;
+ break;
+ }
sym = elf->symtab_start + r_sym;
/* Skip special sections */
if (is_shndx_special(sym->st_shndx))
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index b7c2ad71f9cf..0c031e47a419 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -376,6 +376,7 @@ static int do_file(char const *const fname, void *addr)
case EM_PARISC:
case EM_PPC:
case EM_PPC64:
+ case EM_RISCV:
custom_sort = sort_relative_table;
break;
case EM_ARCOMPACT:
@@ -383,7 +384,6 @@ static int do_file(char const *const fname, void *addr)
case EM_ARM:
case EM_MICROBLAZE:
case EM_MIPS:
- case EM_RISCV:
case EM_XTENSA:
break;
default:
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 03/12] riscv: switch to relative exception tables
@ 2021-11-18 11:22 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:22 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Similar as other architectures such as arm64, x86 and so on, use
offsets relative to the exception table entry values rather than
absolute addresses for both the exception locationand the fixup.
However, RISCV label difference will actually produce two relocations,
a pair of R_RISCV_ADD32 and R_RISCV_SUB32. Take below simple code for
example:
$ cat test.S
.section .text
1:
nop
.section __ex_table,"a"
.balign 4
.long (1b - .)
.previous
$ riscv64-linux-gnu-gcc -c test.S
$ riscv64-linux-gnu-readelf -r test.o
Relocation section '.rela__ex_table' at offset 0x100 contains 2 entries:
Offset Info Type Sym. Value Sym. Name + Addend
000000000000 000600000023 R_RISCV_ADD32 0000000000000000 .L1^B1 + 0
000000000000 000500000027 R_RISCV_SUB32 0000000000000000 .L0 + 0
The modpost will complain the R_RISCV_SUB32 relocation, so we need to
patch modpost.c to skip this relocation for .rela__ex_table section.
After this patch, the __ex_table section size of defconfig vmlinux is
reduced from 7072 Bytes to 3536 Bytes.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/riscv/include/asm/Kbuild | 1 -
arch/riscv/include/asm/extable.h | 25 +++++++++++++++++++++++++
arch/riscv/include/asm/uaccess.h | 4 ++--
arch/riscv/lib/uaccess.S | 4 ++--
arch/riscv/mm/extable.c | 2 +-
scripts/mod/modpost.c | 15 +++++++++++++++
scripts/sorttable.c | 2 +-
7 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 arch/riscv/include/asm/extable.h
diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild
index 445ccc97305a..57b86fd9916c 100644
--- a/arch/riscv/include/asm/Kbuild
+++ b/arch/riscv/include/asm/Kbuild
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
generic-y += early_ioremap.h
-generic-y += extable.h
generic-y += flat.h
generic-y += kvm_para.h
generic-y += user.h
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
new file mode 100644
index 000000000000..84760392fc69
--- /dev/null
+++ b/arch/riscv/include/asm/extable.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_RISCV_EXTABLE_H
+#define _ASM_RISCV_EXTABLE_H
+
+/*
+ * The exception table consists of pairs of relative offsets: the first
+ * is the relative offset to an instruction that is allowed to fault,
+ * and the second is the relative offset at which the program should
+ * continue. No registers are modified, so it is entirely up to the
+ * continuation code to figure out what to do.
+ *
+ * All the routines below use bits of fixup code that are out of line
+ * with the main instruction path. This means when everything is well,
+ * we don't even have to jump over them. Further, they do not intrude
+ * on our cache or tlb entries.
+ */
+
+struct exception_table_entry {
+ int insn, fixup;
+};
+
+#define ARCH_HAS_RELATIVE_EXTABLE
+
+int fixup_exception(struct pt_regs *regs);
+#endif
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 714cd311d9f1..0f2c5b9d2e8f 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -12,8 +12,8 @@
#define _ASM_EXTABLE(from, to) \
" .pushsection __ex_table, \"a\"\n" \
- " .balign " RISCV_SZPTR " \n" \
- " " RISCV_PTR "(" #from "), (" #to ")\n" \
+ " .balign 4\n" \
+ " .long (" #from " - .), (" #to " - .)\n" \
" .popsection\n"
/*
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 63bc691cff91..55f80f84e23f 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -7,8 +7,8 @@
100:
\op \reg, \addr
.section __ex_table,"a"
- .balign RISCV_SZPTR
- RISCV_PTR 100b, \lbl
+ .balign 4
+ .long (100b - .), (\lbl - .)
.previous
.endm
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index ddb7d3b99e89..d8d239c2c1bd 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -28,6 +28,6 @@ int fixup_exception(struct pt_regs *regs)
return rv_bpf_fixup_exception(fixup, regs);
#endif
- regs->epc = fixup->fixup;
+ regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
return 1;
}
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index cb8ab7d91d30..6bfa33217914 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1830,6 +1830,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
return 0;
}
+#ifndef EM_RISCV
+#define EM_RISCV 243
+#endif
+
+#ifndef R_RISCV_SUB32
+#define R_RISCV_SUB32 39
+#endif
+
static void section_rela(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr)
{
@@ -1866,6 +1874,13 @@ static void section_rela(const char *modname, struct elf_info *elf,
r_sym = ELF_R_SYM(r.r_info);
#endif
r.r_addend = TO_NATIVE(rela->r_addend);
+ switch (elf->hdr->e_machine) {
+ case EM_RISCV:
+ if (!strcmp("__ex_table", fromsec) &&
+ ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
+ continue;
+ break;
+ }
sym = elf->symtab_start + r_sym;
/* Skip special sections */
if (is_shndx_special(sym->st_shndx))
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index b7c2ad71f9cf..0c031e47a419 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -376,6 +376,7 @@ static int do_file(char const *const fname, void *addr)
case EM_PARISC:
case EM_PPC:
case EM_PPC64:
+ case EM_RISCV:
custom_sort = sort_relative_table;
break;
case EM_ARCOMPACT:
@@ -383,7 +384,6 @@ static int do_file(char const *const fname, void *addr)
case EM_ARM:
case EM_MICROBLAZE:
case EM_MIPS:
- case EM_RISCV:
case EM_XTENSA:
break;
default:
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH 03/12] riscv: switch to relative exception tables
2021-11-18 11:22 ` Jisheng Zhang
@ 2021-11-19 2:09 ` tongtiangen
-1 siblings, 0 replies; 47+ messages in thread
From: tongtiangen @ 2021-11-19 2:09 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Björn Töpel, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers
Cc: Kefeng Wang, linux-riscv, linux-kernel, netdev, bpf, linux-kbuild
Hi jisheng:
eBPF's exception tables needs to be modified to relative synchronously.
I modified and verified the code as follows:
===================
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -499,7 +499,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
offset = pc - (long)&ex->insn;
if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN))
return -ERANGE;
- ex->insn = pc;
+ ex->insn = offset;
===================
Thanks.
Reviewed-by:Tong Tiangen <tongtiangen@huawei.com>
On 2021/11/18 19:22, Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Similar as other architectures such as arm64, x86 and so on, use
> offsets relative to the exception table entry values rather than
> absolute addresses for both the exception locationand the fixup.
>
> However, RISCV label difference will actually produce two relocations,
> a pair of R_RISCV_ADD32 and R_RISCV_SUB32. Take below simple code for
> example:
>
> $ cat test.S
> .section .text
> 1:
> nop
> .section __ex_table,"a"
> .balign 4
> .long (1b - .)
> .previous
>
> $ riscv64-linux-gnu-gcc -c test.S
> $ riscv64-linux-gnu-readelf -r test.o
> Relocation section '.rela__ex_table' at offset 0x100 contains 2 entries:
> Offset Info Type Sym. Value Sym. Name + Addend
> 000000000000 000600000023 R_RISCV_ADD32 0000000000000000 .L1^B1 + 0
> 000000000000 000500000027 R_RISCV_SUB32 0000000000000000 .L0 + 0
>
> The modpost will complain the R_RISCV_SUB32 relocation, so we need to
> patch modpost.c to skip this relocation for .rela__ex_table section.
>
> After this patch, the __ex_table section size of defconfig vmlinux is
> reduced from 7072 Bytes to 3536 Bytes.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> arch/riscv/include/asm/Kbuild | 1 -
> arch/riscv/include/asm/extable.h | 25 +++++++++++++++++++++++++
> arch/riscv/include/asm/uaccess.h | 4 ++--
> arch/riscv/lib/uaccess.S | 4 ++--
> arch/riscv/mm/extable.c | 2 +-
> scripts/mod/modpost.c | 15 +++++++++++++++
> scripts/sorttable.c | 2 +-
> 7 files changed, 46 insertions(+), 7 deletions(-)
> create mode 100644 arch/riscv/include/asm/extable.h
>
> diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild
> index 445ccc97305a..57b86fd9916c 100644
> --- a/arch/riscv/include/asm/Kbuild
> +++ b/arch/riscv/include/asm/Kbuild
> @@ -1,6 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0
> generic-y += early_ioremap.h
> -generic-y += extable.h
> generic-y += flat.h
> generic-y += kvm_para.h
> generic-y += user.h
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> new file mode 100644
> index 000000000000..84760392fc69
> --- /dev/null
> +++ b/arch/riscv/include/asm/extable.h
> @@ -0,0 +1,25 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _ASM_RISCV_EXTABLE_H
> +#define _ASM_RISCV_EXTABLE_H
> +
> +/*
> + * The exception table consists of pairs of relative offsets: the first
> + * is the relative offset to an instruction that is allowed to fault,
> + * and the second is the relative offset at which the program should
> + * continue. No registers are modified, so it is entirely up to the
> + * continuation code to figure out what to do.
> + *
> + * All the routines below use bits of fixup code that are out of line
> + * with the main instruction path. This means when everything is well,
> + * we don't even have to jump over them. Further, they do not intrude
> + * on our cache or tlb entries.
> + */
> +
> +struct exception_table_entry {
> + int insn, fixup;
> +};
> +
> +#define ARCH_HAS_RELATIVE_EXTABLE
> +
> +int fixup_exception(struct pt_regs *regs);
> +#endif
> diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> index 714cd311d9f1..0f2c5b9d2e8f 100644
> --- a/arch/riscv/include/asm/uaccess.h
> +++ b/arch/riscv/include/asm/uaccess.h
> @@ -12,8 +12,8 @@
>
> #define _ASM_EXTABLE(from, to) \
> " .pushsection __ex_table, \"a\"\n" \
> - " .balign " RISCV_SZPTR " \n" \
> - " " RISCV_PTR "(" #from "), (" #to ")\n" \
> + " .balign 4\n" \
> + " .long (" #from " - .), (" #to " - .)\n" \
> " .popsection\n"
>
> /*
> diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
> index 63bc691cff91..55f80f84e23f 100644
> --- a/arch/riscv/lib/uaccess.S
> +++ b/arch/riscv/lib/uaccess.S
> @@ -7,8 +7,8 @@
> 100:
> \op \reg, \addr
> .section __ex_table,"a"
> - .balign RISCV_SZPTR
> - RISCV_PTR 100b, \lbl
> + .balign 4
> + .long (100b - .), (\lbl - .)
> .previous
> .endm
>
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index ddb7d3b99e89..d8d239c2c1bd 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -28,6 +28,6 @@ int fixup_exception(struct pt_regs *regs)
> return rv_bpf_fixup_exception(fixup, regs);
> #endif
>
> - regs->epc = fixup->fixup;
> + regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
> return 1;
> }
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index cb8ab7d91d30..6bfa33217914 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -1830,6 +1830,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
> return 0;
> }
>
> +#ifndef EM_RISCV
> +#define EM_RISCV 243
> +#endif
> +
> +#ifndef R_RISCV_SUB32
> +#define R_RISCV_SUB32 39
> +#endif
> +
> static void section_rela(const char *modname, struct elf_info *elf,
> Elf_Shdr *sechdr)
> {
> @@ -1866,6 +1874,13 @@ static void section_rela(const char *modname, struct elf_info *elf,
> r_sym = ELF_R_SYM(r.r_info);
> #endif
> r.r_addend = TO_NATIVE(rela->r_addend);
> + switch (elf->hdr->e_machine) {
> + case EM_RISCV:
> + if (!strcmp("__ex_table", fromsec) &&
> + ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
> + continue;
> + break;
> + }
> sym = elf->symtab_start + r_sym;
> /* Skip special sections */
> if (is_shndx_special(sym->st_shndx))
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index b7c2ad71f9cf..0c031e47a419 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,6 +376,7 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> + case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> case EM_ARCOMPACT:
> @@ -383,7 +384,6 @@ static int do_file(char const *const fname, void *addr)
> case EM_ARM:
> case EM_MICROBLAZE:
> case EM_MIPS:
> - case EM_RISCV:
> case EM_XTENSA:
> break;
> default:
>
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 03/12] riscv: switch to relative exception tables
@ 2021-11-19 2:09 ` tongtiangen
0 siblings, 0 replies; 47+ messages in thread
From: tongtiangen @ 2021-11-19 2:09 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Björn Töpel, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers
Cc: Kefeng Wang, linux-riscv, linux-kernel, netdev, bpf, linux-kbuild
Hi jisheng:
eBPF's exception tables needs to be modified to relative synchronously.
I modified and verified the code as follows:
===================
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -499,7 +499,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
offset = pc - (long)&ex->insn;
if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN))
return -ERANGE;
- ex->insn = pc;
+ ex->insn = offset;
===================
Thanks.
Reviewed-by:Tong Tiangen <tongtiangen@huawei.com>
On 2021/11/18 19:22, Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Similar as other architectures such as arm64, x86 and so on, use
> offsets relative to the exception table entry values rather than
> absolute addresses for both the exception locationand the fixup.
>
> However, RISCV label difference will actually produce two relocations,
> a pair of R_RISCV_ADD32 and R_RISCV_SUB32. Take below simple code for
> example:
>
> $ cat test.S
> .section .text
> 1:
> nop
> .section __ex_table,"a"
> .balign 4
> .long (1b - .)
> .previous
>
> $ riscv64-linux-gnu-gcc -c test.S
> $ riscv64-linux-gnu-readelf -r test.o
> Relocation section '.rela__ex_table' at offset 0x100 contains 2 entries:
> Offset Info Type Sym. Value Sym. Name + Addend
> 000000000000 000600000023 R_RISCV_ADD32 0000000000000000 .L1^B1 + 0
> 000000000000 000500000027 R_RISCV_SUB32 0000000000000000 .L0 + 0
>
> The modpost will complain the R_RISCV_SUB32 relocation, so we need to
> patch modpost.c to skip this relocation for .rela__ex_table section.
>
> After this patch, the __ex_table section size of defconfig vmlinux is
> reduced from 7072 Bytes to 3536 Bytes.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> arch/riscv/include/asm/Kbuild | 1 -
> arch/riscv/include/asm/extable.h | 25 +++++++++++++++++++++++++
> arch/riscv/include/asm/uaccess.h | 4 ++--
> arch/riscv/lib/uaccess.S | 4 ++--
> arch/riscv/mm/extable.c | 2 +-
> scripts/mod/modpost.c | 15 +++++++++++++++
> scripts/sorttable.c | 2 +-
> 7 files changed, 46 insertions(+), 7 deletions(-)
> create mode 100644 arch/riscv/include/asm/extable.h
>
> diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild
> index 445ccc97305a..57b86fd9916c 100644
> --- a/arch/riscv/include/asm/Kbuild
> +++ b/arch/riscv/include/asm/Kbuild
> @@ -1,6 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0
> generic-y += early_ioremap.h
> -generic-y += extable.h
> generic-y += flat.h
> generic-y += kvm_para.h
> generic-y += user.h
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> new file mode 100644
> index 000000000000..84760392fc69
> --- /dev/null
> +++ b/arch/riscv/include/asm/extable.h
> @@ -0,0 +1,25 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _ASM_RISCV_EXTABLE_H
> +#define _ASM_RISCV_EXTABLE_H
> +
> +/*
> + * The exception table consists of pairs of relative offsets: the first
> + * is the relative offset to an instruction that is allowed to fault,
> + * and the second is the relative offset at which the program should
> + * continue. No registers are modified, so it is entirely up to the
> + * continuation code to figure out what to do.
> + *
> + * All the routines below use bits of fixup code that are out of line
> + * with the main instruction path. This means when everything is well,
> + * we don't even have to jump over them. Further, they do not intrude
> + * on our cache or tlb entries.
> + */
> +
> +struct exception_table_entry {
> + int insn, fixup;
> +};
> +
> +#define ARCH_HAS_RELATIVE_EXTABLE
> +
> +int fixup_exception(struct pt_regs *regs);
> +#endif
> diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> index 714cd311d9f1..0f2c5b9d2e8f 100644
> --- a/arch/riscv/include/asm/uaccess.h
> +++ b/arch/riscv/include/asm/uaccess.h
> @@ -12,8 +12,8 @@
>
> #define _ASM_EXTABLE(from, to) \
> " .pushsection __ex_table, \"a\"\n" \
> - " .balign " RISCV_SZPTR " \n" \
> - " " RISCV_PTR "(" #from "), (" #to ")\n" \
> + " .balign 4\n" \
> + " .long (" #from " - .), (" #to " - .)\n" \
> " .popsection\n"
>
> /*
> diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
> index 63bc691cff91..55f80f84e23f 100644
> --- a/arch/riscv/lib/uaccess.S
> +++ b/arch/riscv/lib/uaccess.S
> @@ -7,8 +7,8 @@
> 100:
> \op \reg, \addr
> .section __ex_table,"a"
> - .balign RISCV_SZPTR
> - RISCV_PTR 100b, \lbl
> + .balign 4
> + .long (100b - .), (\lbl - .)
> .previous
> .endm
>
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index ddb7d3b99e89..d8d239c2c1bd 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -28,6 +28,6 @@ int fixup_exception(struct pt_regs *regs)
> return rv_bpf_fixup_exception(fixup, regs);
> #endif
>
> - regs->epc = fixup->fixup;
> + regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
> return 1;
> }
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index cb8ab7d91d30..6bfa33217914 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -1830,6 +1830,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
> return 0;
> }
>
> +#ifndef EM_RISCV
> +#define EM_RISCV 243
> +#endif
> +
> +#ifndef R_RISCV_SUB32
> +#define R_RISCV_SUB32 39
> +#endif
> +
> static void section_rela(const char *modname, struct elf_info *elf,
> Elf_Shdr *sechdr)
> {
> @@ -1866,6 +1874,13 @@ static void section_rela(const char *modname, struct elf_info *elf,
> r_sym = ELF_R_SYM(r.r_info);
> #endif
> r.r_addend = TO_NATIVE(rela->r_addend);
> + switch (elf->hdr->e_machine) {
> + case EM_RISCV:
> + if (!strcmp("__ex_table", fromsec) &&
> + ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
> + continue;
> + break;
> + }
> sym = elf->symtab_start + r_sym;
> /* Skip special sections */
> if (is_shndx_special(sym->st_shndx))
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index b7c2ad71f9cf..0c031e47a419 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,6 +376,7 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> + case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> case EM_ARCOMPACT:
> @@ -383,7 +384,6 @@ static int do_file(char const *const fname, void *addr)
> case EM_ARM:
> case EM_MICROBLAZE:
> case EM_MIPS:
> - case EM_RISCV:
> case EM_XTENSA:
> break;
> default:
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH 04/12] riscv: bpf: move rv_bpf_fixup_exception signature to extable.h
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:23 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:23 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is to group riscv related extable related functions signature
into one file.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/extable.h | 12 ++++++++++++
arch/riscv/mm/extable.c | 6 ------
arch/riscv/net/bpf_jit_comp64.c | 2 --
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index 84760392fc69..c48c020fcf4d 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -22,4 +22,16 @@ struct exception_table_entry {
#define ARCH_HAS_RELATIVE_EXTABLE
int fixup_exception(struct pt_regs *regs);
+
+#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
+int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+#else
+static inline int
+rv_bpf_fixup_exception(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ return 0;
+}
+#endif
+
#endif
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index d8d239c2c1bd..cbb0db11b28f 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -11,10 +11,6 @@
#include <linux/module.h>
#include <linux/uaccess.h>
-#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
-#endif
-
int fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *fixup;
@@ -23,10 +19,8 @@ int fixup_exception(struct pt_regs *regs)
if (!fixup)
return 0;
-#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
return rv_bpf_fixup_exception(fixup, regs);
-#endif
regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
return 1;
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index f2a779c7e225..2ca345c7b0bf 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,6 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs);
int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
struct pt_regs *regs)
{
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 04/12] riscv: bpf: move rv_bpf_fixup_exception signature to extable.h
@ 2021-11-18 11:23 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:23 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is to group riscv related extable related functions signature
into one file.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/extable.h | 12 ++++++++++++
arch/riscv/mm/extable.c | 6 ------
arch/riscv/net/bpf_jit_comp64.c | 2 --
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index 84760392fc69..c48c020fcf4d 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -22,4 +22,16 @@ struct exception_table_entry {
#define ARCH_HAS_RELATIVE_EXTABLE
int fixup_exception(struct pt_regs *regs);
+
+#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
+int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+#else
+static inline int
+rv_bpf_fixup_exception(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ return 0;
+}
+#endif
+
#endif
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index d8d239c2c1bd..cbb0db11b28f 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -11,10 +11,6 @@
#include <linux/module.h>
#include <linux/uaccess.h>
-#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
-#endif
-
int fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *fixup;
@@ -23,10 +19,8 @@ int fixup_exception(struct pt_regs *regs)
if (!fixup)
return 0;
-#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
return rv_bpf_fixup_exception(fixup, regs);
-#endif
regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
return 1;
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index f2a779c7e225..2ca345c7b0bf 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,6 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs);
int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
struct pt_regs *regs)
{
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 05/12] riscv: extable: make fixup_exception() return bool
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:24 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:24 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
The return values of fixup_exception() and riscv_bpf_fixup_exception()
represent a boolean condition rather than an error code, so it's better
to return `bool` rather than `int`.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/extable.h | 8 ++++----
arch/riscv/mm/extable.c | 6 +++---
arch/riscv/net/bpf_jit_comp64.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index c48c020fcf4d..e4374dde02b4 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -21,16 +21,16 @@ struct exception_table_entry {
#define ARCH_HAS_RELATIVE_EXTABLE
-int fixup_exception(struct pt_regs *regs);
+bool fixup_exception(struct pt_regs *regs);
#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
#else
-static inline int
+static inline bool
rv_bpf_fixup_exception(const struct exception_table_entry *ex,
struct pt_regs *regs)
{
- return 0;
+ return false;
}
#endif
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index cbb0db11b28f..d41bf38e37e9 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -11,17 +11,17 @@
#include <linux/module.h>
#include <linux/uaccess.h>
-int fixup_exception(struct pt_regs *regs)
+bool fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *fixup;
fixup = search_exception_tables(regs->epc);
if (!fixup)
- return 0;
+ return false;
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
return rv_bpf_fixup_exception(fixup, regs);
regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
- return 1;
+ return true;
}
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index 2ca345c7b0bf..7714081cbb64 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
@@ -468,7 +468,7 @@ int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
*(unsigned long *)((void *)regs + pt_regmap[regs_offset]) = 0;
regs->epc = (unsigned long)&ex->fixup - offset;
- return 1;
+ return true;
}
/* For accesses to BTF pointers, add an entry to the exception table */
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 05/12] riscv: extable: make fixup_exception() return bool
@ 2021-11-18 11:24 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:24 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
The return values of fixup_exception() and riscv_bpf_fixup_exception()
represent a boolean condition rather than an error code, so it's better
to return `bool` rather than `int`.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/extable.h | 8 ++++----
arch/riscv/mm/extable.c | 6 +++---
arch/riscv/net/bpf_jit_comp64.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index c48c020fcf4d..e4374dde02b4 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -21,16 +21,16 @@ struct exception_table_entry {
#define ARCH_HAS_RELATIVE_EXTABLE
-int fixup_exception(struct pt_regs *regs);
+bool fixup_exception(struct pt_regs *regs);
#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
#else
-static inline int
+static inline bool
rv_bpf_fixup_exception(const struct exception_table_entry *ex,
struct pt_regs *regs)
{
- return 0;
+ return false;
}
#endif
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index cbb0db11b28f..d41bf38e37e9 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -11,17 +11,17 @@
#include <linux/module.h>
#include <linux/uaccess.h>
-int fixup_exception(struct pt_regs *regs)
+bool fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *fixup;
fixup = search_exception_tables(regs->epc);
if (!fixup)
- return 0;
+ return false;
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
return rv_bpf_fixup_exception(fixup, regs);
regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
- return 1;
+ return true;
}
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index 2ca345c7b0bf..7714081cbb64 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
@@ -468,7 +468,7 @@ int rv_bpf_fixup_exception(const struct exception_table_entry *ex,
*(unsigned long *)((void *)regs + pt_regmap[regs_offset]) = 0;
regs->epc = (unsigned long)&ex->fixup - offset;
- return 1;
+ return true;
}
/* For accesses to BTF pointers, add an entry to the exception table */
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 06/12] riscv: extable: use `ex` for `exception_table_entry`
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:24 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:24 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
The var name "fixup" is a bit confusing, since this is a
exception_table_entry. Use "ex" instead to refer to an entire entry.
In subsequent patches we'll use `fixup` to refer to the fixup
field specifically.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/mm/extable.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index d41bf38e37e9..3c561f1d0115 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -13,15 +13,15 @@
bool fixup_exception(struct pt_regs *regs)
{
- const struct exception_table_entry *fixup;
+ const struct exception_table_entry *ex;
- fixup = search_exception_tables(regs->epc);
- if (!fixup)
+ ex = search_exception_tables(regs->epc);
+ if (!ex)
return false;
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
- return rv_bpf_fixup_exception(fixup, regs);
+ return rv_bpf_fixup_exception(ex, regs);
- regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
+ regs->epc = (unsigned long)&ex->fixup + ex->fixup;
return true;
}
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 06/12] riscv: extable: use `ex` for `exception_table_entry`
@ 2021-11-18 11:24 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:24 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
The var name "fixup" is a bit confusing, since this is a
exception_table_entry. Use "ex" instead to refer to an entire entry.
In subsequent patches we'll use `fixup` to refer to the fixup
field specifically.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/mm/extable.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index d41bf38e37e9..3c561f1d0115 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -13,15 +13,15 @@
bool fixup_exception(struct pt_regs *regs)
{
- const struct exception_table_entry *fixup;
+ const struct exception_table_entry *ex;
- fixup = search_exception_tables(regs->epc);
- if (!fixup)
+ ex = search_exception_tables(regs->epc);
+ if (!ex)
return false;
if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
- return rv_bpf_fixup_exception(fixup, regs);
+ return rv_bpf_fixup_exception(ex, regs);
- regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
+ regs->epc = (unsigned long)&ex->fixup + ex->fixup;
return true;
}
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 07/12] riscv: lib: uaccess: fold fixups into body
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:25 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:25 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
uaccess functions such __asm_copy_to_user(), __arch_copy_from_user()
and __clear_user() place their exception fixups in the `.fixup` section
without any clear association with themselves. If we backtrace the
fixup code, it will be symbolized as an offset from the nearest prior
symbol.
Similar as arm64 does, we must move fixups into the body of the
functions themselves, after the usual fast-path returns.
Inline assembly will be dealt with in subsequent patches.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/lib/uaccess.S | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 55f80f84e23f..047f517ac780 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -173,6 +173,13 @@ ENTRY(__asm_copy_from_user)
csrc CSR_STATUS, t6
li a0, 0
ret
+
+ /* Exception fixup code */
+10:
+ /* Disable access to user memory */
+ csrs CSR_STATUS, t6
+ mv a0, t5
+ ret
ENDPROC(__asm_copy_to_user)
ENDPROC(__asm_copy_from_user)
EXPORT_SYMBOL(__asm_copy_to_user)
@@ -218,19 +225,12 @@ ENTRY(__clear_user)
addi a0, a0, 1
bltu a0, a3, 5b
j 3b
-ENDPROC(__clear_user)
-EXPORT_SYMBOL(__clear_user)
- .section .fixup,"ax"
- .balign 4
- /* Fixup code for __copy_user(10) and __clear_user(11) */
-10:
- /* Disable access to user memory */
- csrs CSR_STATUS, t6
- mv a0, t5
- ret
+ /* Exception fixup code */
11:
+ /* Disable access to user memory */
csrs CSR_STATUS, t6
mv a0, a1
ret
- .previous
+ENDPROC(__clear_user)
+EXPORT_SYMBOL(__clear_user)
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 07/12] riscv: lib: uaccess: fold fixups into body
@ 2021-11-18 11:25 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:25 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
uaccess functions such __asm_copy_to_user(), __arch_copy_from_user()
and __clear_user() place their exception fixups in the `.fixup` section
without any clear association with themselves. If we backtrace the
fixup code, it will be symbolized as an offset from the nearest prior
symbol.
Similar as arm64 does, we must move fixups into the body of the
functions themselves, after the usual fast-path returns.
Inline assembly will be dealt with in subsequent patches.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/lib/uaccess.S | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 55f80f84e23f..047f517ac780 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -173,6 +173,13 @@ ENTRY(__asm_copy_from_user)
csrc CSR_STATUS, t6
li a0, 0
ret
+
+ /* Exception fixup code */
+10:
+ /* Disable access to user memory */
+ csrs CSR_STATUS, t6
+ mv a0, t5
+ ret
ENDPROC(__asm_copy_to_user)
ENDPROC(__asm_copy_from_user)
EXPORT_SYMBOL(__asm_copy_to_user)
@@ -218,19 +225,12 @@ ENTRY(__clear_user)
addi a0, a0, 1
bltu a0, a3, 5b
j 3b
-ENDPROC(__clear_user)
-EXPORT_SYMBOL(__clear_user)
- .section .fixup,"ax"
- .balign 4
- /* Fixup code for __copy_user(10) and __clear_user(11) */
-10:
- /* Disable access to user memory */
- csrs CSR_STATUS, t6
- mv a0, t5
- ret
+ /* Exception fixup code */
11:
+ /* Disable access to user memory */
csrs CSR_STATUS, t6
mv a0, a1
ret
- .previous
+ENDPROC(__clear_user)
+EXPORT_SYMBOL(__clear_user)
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 08/12] riscv: extable: consolidate definitions
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:25 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:25 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is a riscv port of commit 819771cc2892 ("arm64: extable:
consolidate definitions").
In subsequent patches we'll alter the structure and usage of struct
exception_table_entry.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 33 ++++++++++++++++++++++++++++
arch/riscv/include/asm/futex.h | 1 +
arch/riscv/include/asm/uaccess.h | 7 +-----
arch/riscv/lib/uaccess.S | 6 ++---
4 files changed, 37 insertions(+), 10 deletions(-)
create mode 100644 arch/riscv/include/asm/asm-extable.h
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
new file mode 100644
index 000000000000..b790c02dbdda
--- /dev/null
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __ASM_ASM_EXTABLE_H
+#define __ASM_ASM_EXTABLE_H
+
+#ifdef __ASSEMBLY__
+
+#define __ASM_EXTABLE_RAW(insn, fixup) \
+ .pushsection __ex_table, "a"; \
+ .balign 4; \
+ .long ((insn) - .); \
+ .long ((fixup) - .); \
+ .popsection;
+
+ .macro _asm_extable, insn, fixup
+ __ASM_EXTABLE_RAW(\insn, \fixup)
+ .endm
+
+#else /* __ASSEMBLY__ */
+
+#include <linux/stringify.h>
+
+#define __ASM_EXTABLE_RAW(insn, fixup) \
+ ".pushsection __ex_table, \"a\"\n" \
+ ".balign 4\n" \
+ ".long ((" insn ") - .)\n" \
+ ".long ((" fixup ") - .)\n" \
+ ".popsection\n"
+
+#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_ASM_EXTABLE_H */
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 3191574e135c..2e15e8e89502 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -11,6 +11,7 @@
#include <linux/uaccess.h>
#include <linux/errno.h>
#include <asm/asm.h>
+#include <asm/asm-extable.h>
/* We don't even really need the extable code, but for now keep it simple */
#ifndef CONFIG_MMU
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 0f2c5b9d2e8f..40e6099af488 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -8,14 +8,9 @@
#ifndef _ASM_RISCV_UACCESS_H
#define _ASM_RISCV_UACCESS_H
+#include <asm/asm-extable.h>
#include <asm/pgtable.h> /* for TASK_SIZE */
-#define _ASM_EXTABLE(from, to) \
- " .pushsection __ex_table, \"a\"\n" \
- " .balign 4\n" \
- " .long (" #from " - .), (" #to " - .)\n" \
- " .popsection\n"
-
/*
* User space memory access functions
*/
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 047f517ac780..8c475f4da308 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -1,15 +1,13 @@
#include <linux/linkage.h>
#include <asm-generic/export.h>
#include <asm/asm.h>
+#include <asm/asm-extable.h>
#include <asm/csr.h>
.macro fixup op reg addr lbl
100:
\op \reg, \addr
- .section __ex_table,"a"
- .balign 4
- .long (100b - .), (\lbl - .)
- .previous
+ _asm_extable 100b, \lbl
.endm
ENTRY(__asm_copy_to_user)
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 08/12] riscv: extable: consolidate definitions
@ 2021-11-18 11:25 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:25 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is a riscv port of commit 819771cc2892 ("arm64: extable:
consolidate definitions").
In subsequent patches we'll alter the structure and usage of struct
exception_table_entry.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 33 ++++++++++++++++++++++++++++
arch/riscv/include/asm/futex.h | 1 +
arch/riscv/include/asm/uaccess.h | 7 +-----
arch/riscv/lib/uaccess.S | 6 ++---
4 files changed, 37 insertions(+), 10 deletions(-)
create mode 100644 arch/riscv/include/asm/asm-extable.h
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
new file mode 100644
index 000000000000..b790c02dbdda
--- /dev/null
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __ASM_ASM_EXTABLE_H
+#define __ASM_ASM_EXTABLE_H
+
+#ifdef __ASSEMBLY__
+
+#define __ASM_EXTABLE_RAW(insn, fixup) \
+ .pushsection __ex_table, "a"; \
+ .balign 4; \
+ .long ((insn) - .); \
+ .long ((fixup) - .); \
+ .popsection;
+
+ .macro _asm_extable, insn, fixup
+ __ASM_EXTABLE_RAW(\insn, \fixup)
+ .endm
+
+#else /* __ASSEMBLY__ */
+
+#include <linux/stringify.h>
+
+#define __ASM_EXTABLE_RAW(insn, fixup) \
+ ".pushsection __ex_table, \"a\"\n" \
+ ".balign 4\n" \
+ ".long ((" insn ") - .)\n" \
+ ".long ((" fixup ") - .)\n" \
+ ".popsection\n"
+
+#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_ASM_EXTABLE_H */
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 3191574e135c..2e15e8e89502 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -11,6 +11,7 @@
#include <linux/uaccess.h>
#include <linux/errno.h>
#include <asm/asm.h>
+#include <asm/asm-extable.h>
/* We don't even really need the extable code, but for now keep it simple */
#ifndef CONFIG_MMU
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 0f2c5b9d2e8f..40e6099af488 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -8,14 +8,9 @@
#ifndef _ASM_RISCV_UACCESS_H
#define _ASM_RISCV_UACCESS_H
+#include <asm/asm-extable.h>
#include <asm/pgtable.h> /* for TASK_SIZE */
-#define _ASM_EXTABLE(from, to) \
- " .pushsection __ex_table, \"a\"\n" \
- " .balign 4\n" \
- " .long (" #from " - .), (" #to " - .)\n" \
- " .popsection\n"
-
/*
* User space memory access functions
*/
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 047f517ac780..8c475f4da308 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -1,15 +1,13 @@
#include <linux/linkage.h>
#include <asm-generic/export.h>
#include <asm/asm.h>
+#include <asm/asm-extable.h>
#include <asm/csr.h>
.macro fixup op reg addr lbl
100:
\op \reg, \addr
- .section __ex_table,"a"
- .balign 4
- .long (100b - .), (\lbl - .)
- .previous
+ _asm_extable 100b, \lbl
.endm
ENTRY(__asm_copy_to_user)
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 09/12] riscv: extable: add `type` and `data` fields
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:26 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
and `data` fields").
We will add specialized handlers for fixups, the `type` field is for
fixup handler type, the `data` field is used to pass specific data to
each handler, for example register numbers.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
arch/riscv/kernel/vmlinux.lds.S | 2 +-
arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
arch/riscv/net/bpf_jit_comp64.c | 5 +++--
scripts/sorttable.c | 4 +++-
6 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index b790c02dbdda..1b1f4ffd8d37 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -2,31 +2,40 @@
#ifndef __ASM_ASM_EXTABLE_H
#define __ASM_ASM_EXTABLE_H
+#define EX_TYPE_NONE 0
+#define EX_TYPE_FIXUP 1
+#define EX_TYPE_BPF 2
+
#ifdef __ASSEMBLY__
-#define __ASM_EXTABLE_RAW(insn, fixup) \
- .pushsection __ex_table, "a"; \
- .balign 4; \
- .long ((insn) - .); \
- .long ((fixup) - .); \
+#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
+ .pushsection __ex_table, "a"; \
+ .balign 4; \
+ .long ((insn) - .); \
+ .long ((fixup) - .); \
+ .short (type); \
+ .short (data); \
.popsection;
.macro _asm_extable, insn, fixup
- __ASM_EXTABLE_RAW(\insn, \fixup)
+ __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
.endm
#else /* __ASSEMBLY__ */
#include <linux/stringify.h>
-#define __ASM_EXTABLE_RAW(insn, fixup) \
+#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
".pushsection __ex_table, \"a\"\n" \
".balign 4\n" \
".long ((" insn ") - .)\n" \
".long ((" fixup ") - .)\n" \
+ ".short (" type ")\n" \
+ ".short (" data ")\n" \
".popsection\n"
-#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
+#define _ASM_EXTABLE(insn, fixup) \
+ __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
#endif /* __ASSEMBLY__ */
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index e4374dde02b4..512012d193dc 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -17,18 +17,29 @@
struct exception_table_entry {
int insn, fixup;
+ short type, data;
};
#define ARCH_HAS_RELATIVE_EXTABLE
+#define swap_ex_entry_fixup(a, b, tmp, delta) \
+do { \
+ (a)->fixup = (b)->fixup + (delta); \
+ (b)->fixup = (tmp).fixup - (delta); \
+ (a)->type = (b)->type; \
+ (b)->type = (tmp).type; \
+ (a)->data = (b)->data; \
+ (b)->data = (tmp).data; \
+} while (0)
+
bool fixup_exception(struct pt_regs *regs);
#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
#else
static inline bool
-rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+ex_handler_bpf(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
return false;
}
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 5104f3a871e3..0e5ae851929e 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -4,7 +4,7 @@
* Copyright (C) 2017 SiFive
*/
-#define RO_EXCEPTION_TABLE_ALIGN 16
+#define RO_EXCEPTION_TABLE_ALIGN 4
#ifdef CONFIG_XIP_KERNEL
#include "vmlinux-xip.lds.S"
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index 3c561f1d0115..91e52c4bb33a 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -10,6 +10,20 @@
#include <linux/extable.h>
#include <linux/module.h>
#include <linux/uaccess.h>
+#include <asm/asm-extable.h>
+
+static inline unsigned long
+get_ex_fixup(const struct exception_table_entry *ex)
+{
+ return ((unsigned long)&ex->fixup + ex->fixup);
+}
+
+static bool ex_handler_fixup(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ regs->epc = get_ex_fixup(ex);
+ return true;
+}
bool fixup_exception(struct pt_regs *regs)
{
@@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
if (!ex)
return false;
- if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
- return rv_bpf_fixup_exception(ex, regs);
+ switch (ex->type) {
+ case EX_TYPE_FIXUP:
+ return ex_handler_fixup(ex, regs);
+ case EX_TYPE_BPF:
+ return ex_handler_bpf(ex, regs);
+ }
- regs->epc = (unsigned long)&ex->fixup + ex->fixup;
- return true;
+ BUG();
}
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index 7714081cbb64..69bab7e28f91 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+bool ex_handler_bpf(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
@@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
+ ex->type = EX_TYPE_BPF;
ctx->nexentries++;
return 0;
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index 0c031e47a419..5b5472b543f5 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
case EM_PARISC:
case EM_PPC:
case EM_PPC64:
- case EM_RISCV:
custom_sort = sort_relative_table;
break;
+ case EM_RISCV:
+ custom_sort = arm64_sort_relative_table;
+ break;
case EM_ARCOMPACT:
case EM_ARCV2:
case EM_ARM:
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2021-11-18 11:26 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
and `data` fields").
We will add specialized handlers for fixups, the `type` field is for
fixup handler type, the `data` field is used to pass specific data to
each handler, for example register numbers.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
arch/riscv/kernel/vmlinux.lds.S | 2 +-
arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
arch/riscv/net/bpf_jit_comp64.c | 5 +++--
scripts/sorttable.c | 4 +++-
6 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index b790c02dbdda..1b1f4ffd8d37 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -2,31 +2,40 @@
#ifndef __ASM_ASM_EXTABLE_H
#define __ASM_ASM_EXTABLE_H
+#define EX_TYPE_NONE 0
+#define EX_TYPE_FIXUP 1
+#define EX_TYPE_BPF 2
+
#ifdef __ASSEMBLY__
-#define __ASM_EXTABLE_RAW(insn, fixup) \
- .pushsection __ex_table, "a"; \
- .balign 4; \
- .long ((insn) - .); \
- .long ((fixup) - .); \
+#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
+ .pushsection __ex_table, "a"; \
+ .balign 4; \
+ .long ((insn) - .); \
+ .long ((fixup) - .); \
+ .short (type); \
+ .short (data); \
.popsection;
.macro _asm_extable, insn, fixup
- __ASM_EXTABLE_RAW(\insn, \fixup)
+ __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
.endm
#else /* __ASSEMBLY__ */
#include <linux/stringify.h>
-#define __ASM_EXTABLE_RAW(insn, fixup) \
+#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
".pushsection __ex_table, \"a\"\n" \
".balign 4\n" \
".long ((" insn ") - .)\n" \
".long ((" fixup ") - .)\n" \
+ ".short (" type ")\n" \
+ ".short (" data ")\n" \
".popsection\n"
-#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
+#define _ASM_EXTABLE(insn, fixup) \
+ __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
#endif /* __ASSEMBLY__ */
diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
index e4374dde02b4..512012d193dc 100644
--- a/arch/riscv/include/asm/extable.h
+++ b/arch/riscv/include/asm/extable.h
@@ -17,18 +17,29 @@
struct exception_table_entry {
int insn, fixup;
+ short type, data;
};
#define ARCH_HAS_RELATIVE_EXTABLE
+#define swap_ex_entry_fixup(a, b, tmp, delta) \
+do { \
+ (a)->fixup = (b)->fixup + (delta); \
+ (b)->fixup = (tmp).fixup - (delta); \
+ (a)->type = (b)->type; \
+ (b)->type = (tmp).type; \
+ (a)->data = (b)->data; \
+ (b)->data = (tmp).data; \
+} while (0)
+
bool fixup_exception(struct pt_regs *regs);
#if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
-bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
+bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
#else
static inline bool
-rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+ex_handler_bpf(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
return false;
}
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 5104f3a871e3..0e5ae851929e 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -4,7 +4,7 @@
* Copyright (C) 2017 SiFive
*/
-#define RO_EXCEPTION_TABLE_ALIGN 16
+#define RO_EXCEPTION_TABLE_ALIGN 4
#ifdef CONFIG_XIP_KERNEL
#include "vmlinux-xip.lds.S"
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index 3c561f1d0115..91e52c4bb33a 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -10,6 +10,20 @@
#include <linux/extable.h>
#include <linux/module.h>
#include <linux/uaccess.h>
+#include <asm/asm-extable.h>
+
+static inline unsigned long
+get_ex_fixup(const struct exception_table_entry *ex)
+{
+ return ((unsigned long)&ex->fixup + ex->fixup);
+}
+
+static bool ex_handler_fixup(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ regs->epc = get_ex_fixup(ex);
+ return true;
+}
bool fixup_exception(struct pt_regs *regs)
{
@@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
if (!ex)
return false;
- if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
- return rv_bpf_fixup_exception(ex, regs);
+ switch (ex->type) {
+ case EX_TYPE_FIXUP:
+ return ex_handler_fixup(ex, regs);
+ case EX_TYPE_BPF:
+ return ex_handler_bpf(ex, regs);
+ }
- regs->epc = (unsigned long)&ex->fixup + ex->fixup;
- return true;
+ BUG();
}
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index 7714081cbb64..69bab7e28f91 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
-bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
- struct pt_regs *regs)
+bool ex_handler_bpf(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
{
off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
@@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
+ ex->type = EX_TYPE_BPF;
ctx->nexentries++;
return 0;
diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index 0c031e47a419..5b5472b543f5 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
case EM_PARISC:
case EM_PPC:
case EM_PPC64:
- case EM_RISCV:
custom_sort = sort_relative_table;
break;
+ case EM_RISCV:
+ custom_sort = arm64_sort_relative_table;
+ break;
case EM_ARCOMPACT:
case EM_ARCV2:
case EM_ARM:
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
2021-11-18 11:26 ` Jisheng Zhang
@ 2021-11-18 11:42 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:42 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers, Thomas Gleixner, Mark Rutland
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> and `data` fields").
>
> We will add specialized handlers for fixups, the `type` field is for
> fixup handler type, the `data` field is used to pass specific data to
> each handler, for example register numbers.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
> arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
> arch/riscv/kernel/vmlinux.lds.S | 2 +-
> arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
> arch/riscv/net/bpf_jit_comp64.c | 5 +++--
> scripts/sorttable.c | 4 +++-
> 6 files changed, 59 insertions(+), 19 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index b790c02dbdda..1b1f4ffd8d37 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -2,31 +2,40 @@
> #ifndef __ASM_ASM_EXTABLE_H
> #define __ASM_ASM_EXTABLE_H
>
> +#define EX_TYPE_NONE 0
> +#define EX_TYPE_FIXUP 1
> +#define EX_TYPE_BPF 2
> +
> #ifdef __ASSEMBLY__
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> - .pushsection __ex_table, "a"; \
> - .balign 4; \
> - .long ((insn) - .); \
> - .long ((fixup) - .); \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> + .pushsection __ex_table, "a"; \
> + .balign 4; \
> + .long ((insn) - .); \
> + .long ((fixup) - .); \
> + .short (type); \
> + .short (data); \
> .popsection;
>
> .macro _asm_extable, insn, fixup
> - __ASM_EXTABLE_RAW(\insn, \fixup)
> + __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
> .endm
>
> #else /* __ASSEMBLY__ */
>
> #include <linux/stringify.h>
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> ".balign 4\n" \
> ".long ((" insn ") - .)\n" \
> ".long ((" fixup ") - .)\n" \
> + ".short (" type ")\n" \
> + ".short (" data ")\n" \
> ".popsection\n"
>
> -#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
> +#define _ASM_EXTABLE(insn, fixup) \
> + __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> #endif /* __ASSEMBLY__ */
>
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> index e4374dde02b4..512012d193dc 100644
> --- a/arch/riscv/include/asm/extable.h
> +++ b/arch/riscv/include/asm/extable.h
> @@ -17,18 +17,29 @@
>
> struct exception_table_entry {
> int insn, fixup;
> + short type, data;
> };
>
> #define ARCH_HAS_RELATIVE_EXTABLE
>
> +#define swap_ex_entry_fixup(a, b, tmp, delta) \
> +do { \
> + (a)->fixup = (b)->fixup + (delta); \
> + (b)->fixup = (tmp).fixup - (delta); \
> + (a)->type = (b)->type; \
> + (b)->type = (tmp).type; \
> + (a)->data = (b)->data; \
> + (b)->data = (tmp).data; \
> +} while (0)
> +
> bool fixup_exception(struct pt_regs *regs);
>
> #if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
> +bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
> #else
> static inline bool
> -rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> return false;
> }
> diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
> index 5104f3a871e3..0e5ae851929e 100644
> --- a/arch/riscv/kernel/vmlinux.lds.S
> +++ b/arch/riscv/kernel/vmlinux.lds.S
> @@ -4,7 +4,7 @@
> * Copyright (C) 2017 SiFive
> */
>
> -#define RO_EXCEPTION_TABLE_ALIGN 16
> +#define RO_EXCEPTION_TABLE_ALIGN 4
>
> #ifdef CONFIG_XIP_KERNEL
> #include "vmlinux-xip.lds.S"
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 3c561f1d0115..91e52c4bb33a 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -10,6 +10,20 @@
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> +#include <asm/asm-extable.h>
> +
> +static inline unsigned long
> +get_ex_fixup(const struct exception_table_entry *ex)
> +{
> + return ((unsigned long)&ex->fixup + ex->fixup);
> +}
> +
> +static bool ex_handler_fixup(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
>
> bool fixup_exception(struct pt_regs *regs)
> {
> @@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
> if (!ex)
> return false;
>
> - if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
> - return rv_bpf_fixup_exception(ex, regs);
> + switch (ex->type) {
> + case EX_TYPE_FIXUP:
> + return ex_handler_fixup(ex, regs);
> + case EX_TYPE_BPF:
> + return ex_handler_bpf(ex, regs);
> + }
>
> - regs->epc = (unsigned long)&ex->fixup + ex->fixup;
> - return true;
> + BUG();
> }
> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> index 7714081cbb64..69bab7e28f91 100644
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
> #define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
> #define BPF_FIXUP_REG_MASK GENMASK(31, 27)
>
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +bool ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
> int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
> @@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
>
> ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
> FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
> + ex->type = EX_TYPE_BPF;
>
> ctx->nexentries++;
> return 0;
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index 0c031e47a419..5b5472b543f5 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> - case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> + case EM_RISCV:
> + custom_sort = arm64_sort_relative_table;
Hi Mark, Thomas,
x86 and arm64 version of sort_relative_table routine are the same, I want to
unify them, and then use the common function for riscv, but I'm not sure
which name is better. Could you please suggest?
Thanks
> + break;
> case EM_ARCOMPACT:
> case EM_ARCV2:
> case EM_ARM:
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2021-11-18 11:42 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:42 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers, Thomas Gleixner, Mark Rutland
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> and `data` fields").
>
> We will add specialized handlers for fixups, the `type` field is for
> fixup handler type, the `data` field is used to pass specific data to
> each handler, for example register numbers.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
> arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
> arch/riscv/kernel/vmlinux.lds.S | 2 +-
> arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
> arch/riscv/net/bpf_jit_comp64.c | 5 +++--
> scripts/sorttable.c | 4 +++-
> 6 files changed, 59 insertions(+), 19 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index b790c02dbdda..1b1f4ffd8d37 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -2,31 +2,40 @@
> #ifndef __ASM_ASM_EXTABLE_H
> #define __ASM_ASM_EXTABLE_H
>
> +#define EX_TYPE_NONE 0
> +#define EX_TYPE_FIXUP 1
> +#define EX_TYPE_BPF 2
> +
> #ifdef __ASSEMBLY__
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> - .pushsection __ex_table, "a"; \
> - .balign 4; \
> - .long ((insn) - .); \
> - .long ((fixup) - .); \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> + .pushsection __ex_table, "a"; \
> + .balign 4; \
> + .long ((insn) - .); \
> + .long ((fixup) - .); \
> + .short (type); \
> + .short (data); \
> .popsection;
>
> .macro _asm_extable, insn, fixup
> - __ASM_EXTABLE_RAW(\insn, \fixup)
> + __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
> .endm
>
> #else /* __ASSEMBLY__ */
>
> #include <linux/stringify.h>
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> ".balign 4\n" \
> ".long ((" insn ") - .)\n" \
> ".long ((" fixup ") - .)\n" \
> + ".short (" type ")\n" \
> + ".short (" data ")\n" \
> ".popsection\n"
>
> -#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
> +#define _ASM_EXTABLE(insn, fixup) \
> + __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> #endif /* __ASSEMBLY__ */
>
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> index e4374dde02b4..512012d193dc 100644
> --- a/arch/riscv/include/asm/extable.h
> +++ b/arch/riscv/include/asm/extable.h
> @@ -17,18 +17,29 @@
>
> struct exception_table_entry {
> int insn, fixup;
> + short type, data;
> };
>
> #define ARCH_HAS_RELATIVE_EXTABLE
>
> +#define swap_ex_entry_fixup(a, b, tmp, delta) \
> +do { \
> + (a)->fixup = (b)->fixup + (delta); \
> + (b)->fixup = (tmp).fixup - (delta); \
> + (a)->type = (b)->type; \
> + (b)->type = (tmp).type; \
> + (a)->data = (b)->data; \
> + (b)->data = (tmp).data; \
> +} while (0)
> +
> bool fixup_exception(struct pt_regs *regs);
>
> #if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
> +bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
> #else
> static inline bool
> -rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> return false;
> }
> diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
> index 5104f3a871e3..0e5ae851929e 100644
> --- a/arch/riscv/kernel/vmlinux.lds.S
> +++ b/arch/riscv/kernel/vmlinux.lds.S
> @@ -4,7 +4,7 @@
> * Copyright (C) 2017 SiFive
> */
>
> -#define RO_EXCEPTION_TABLE_ALIGN 16
> +#define RO_EXCEPTION_TABLE_ALIGN 4
>
> #ifdef CONFIG_XIP_KERNEL
> #include "vmlinux-xip.lds.S"
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 3c561f1d0115..91e52c4bb33a 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -10,6 +10,20 @@
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> +#include <asm/asm-extable.h>
> +
> +static inline unsigned long
> +get_ex_fixup(const struct exception_table_entry *ex)
> +{
> + return ((unsigned long)&ex->fixup + ex->fixup);
> +}
> +
> +static bool ex_handler_fixup(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
>
> bool fixup_exception(struct pt_regs *regs)
> {
> @@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
> if (!ex)
> return false;
>
> - if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
> - return rv_bpf_fixup_exception(ex, regs);
> + switch (ex->type) {
> + case EX_TYPE_FIXUP:
> + return ex_handler_fixup(ex, regs);
> + case EX_TYPE_BPF:
> + return ex_handler_bpf(ex, regs);
> + }
>
> - regs->epc = (unsigned long)&ex->fixup + ex->fixup;
> - return true;
> + BUG();
> }
> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> index 7714081cbb64..69bab7e28f91 100644
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
> #define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
> #define BPF_FIXUP_REG_MASK GENMASK(31, 27)
>
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +bool ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
> int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
> @@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
>
> ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
> FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
> + ex->type = EX_TYPE_BPF;
>
> ctx->nexentries++;
> return 0;
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index 0c031e47a419..5b5472b543f5 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> - case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> + case EM_RISCV:
> + custom_sort = arm64_sort_relative_table;
Hi Mark, Thomas,
x86 and arm64 version of sort_relative_table routine are the same, I want to
unify them, and then use the common function for riscv, but I'm not sure
which name is better. Could you please suggest?
Thanks
> + break;
> case EM_ARCOMPACT:
> case EM_ARCV2:
> case EM_ARM:
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
2021-11-18 11:42 ` Jisheng Zhang
@ 2021-11-18 15:21 ` Mark Rutland
-1 siblings, 0 replies; 47+ messages in thread
From: Mark Rutland @ 2021-11-18 15:21 UTC (permalink / raw)
To: Jisheng Zhang, Thomas Gleixner
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers, Kefeng Wang, Tong Tiangen, linux-riscv,
linux-kernel, netdev, bpf, linux-kbuild
On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
> On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
>
> > From: Jisheng Zhang <jszhang@kernel.org>
> >
> > This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> > and `data` fields").
> >
> > We will add specialized handlers for fixups, the `type` field is for
> > fixup handler type, the `data` field is used to pass specific data to
> > each handler, for example register numbers.
> >
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> > index 0c031e47a419..5b5472b543f5 100644
> > --- a/scripts/sorttable.c
> > +++ b/scripts/sorttable.c
> > @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> > case EM_PARISC:
> > case EM_PPC:
> > case EM_PPC64:
> > - case EM_RISCV:
> > custom_sort = sort_relative_table;
> > break;
> > + case EM_RISCV:
> > + custom_sort = arm64_sort_relative_table;
>
> Hi Mark, Thomas,
>
> x86 and arm64 version of sort_relative_table routine are the same, I want to
> unify them, and then use the common function for riscv, but I'm not sure
> which name is better. Could you please suggest?
I sent a patch last week which unifies them as
sort_relative_table_with_data():
https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
Thomas, are you happy with that patch?
With your ack it could go via the riscv tree for v5.17 as a preparatory
cleanup in this series.
Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
Thanks,
Mark.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2021-11-18 15:21 ` Mark Rutland
0 siblings, 0 replies; 47+ messages in thread
From: Mark Rutland @ 2021-11-18 15:21 UTC (permalink / raw)
To: Jisheng Zhang, Thomas Gleixner
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers, Kefeng Wang, Tong Tiangen, linux-riscv,
linux-kernel, netdev, bpf, linux-kbuild
On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
> On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
>
> > From: Jisheng Zhang <jszhang@kernel.org>
> >
> > This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> > and `data` fields").
> >
> > We will add specialized handlers for fixups, the `type` field is for
> > fixup handler type, the `data` field is used to pass specific data to
> > each handler, for example register numbers.
> >
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> > index 0c031e47a419..5b5472b543f5 100644
> > --- a/scripts/sorttable.c
> > +++ b/scripts/sorttable.c
> > @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> > case EM_PARISC:
> > case EM_PPC:
> > case EM_PPC64:
> > - case EM_RISCV:
> > custom_sort = sort_relative_table;
> > break;
> > + case EM_RISCV:
> > + custom_sort = arm64_sort_relative_table;
>
> Hi Mark, Thomas,
>
> x86 and arm64 version of sort_relative_table routine are the same, I want to
> unify them, and then use the common function for riscv, but I'm not sure
> which name is better. Could you please suggest?
I sent a patch last week which unifies them as
sort_relative_table_with_data():
https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
Thomas, are you happy with that patch?
With your ack it could go via the riscv tree for v5.17 as a preparatory
cleanup in this series.
Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
Thanks,
Mark.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
2021-11-18 15:21 ` Mark Rutland
@ 2022-01-06 3:21 ` Palmer Dabbelt
-1 siblings, 0 replies; 47+ messages in thread
From: Palmer Dabbelt @ 2022-01-06 3:21 UTC (permalink / raw)
To: mark.rutland
Cc: jszhang3, tglx, Paul Walmsley, aou, bjorn, ast, daniel, andrii,
john.fastabend, kpsingh, masahiroy, michal.lkml, ndesaulniers,
wangkefeng.wang, tongtiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, 18 Nov 2021 07:21:55 PST (-0800), mark.rutland@arm.com wrote:
> On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
>> On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
>>
>> > From: Jisheng Zhang <jszhang@kernel.org>
>> >
>> > This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
>> > and `data` fields").
>> >
>> > We will add specialized handlers for fixups, the `type` field is for
>> > fixup handler type, the `data` field is used to pass specific data to
>> > each handler, for example register numbers.
>> >
>> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
>
>> > diff --git a/scripts/sorttable.c b/scripts/sorttable.c
>> > index 0c031e47a419..5b5472b543f5 100644
>> > --- a/scripts/sorttable.c
>> > +++ b/scripts/sorttable.c
>> > @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
>> > case EM_PARISC:
>> > case EM_PPC:
>> > case EM_PPC64:
>> > - case EM_RISCV:
>> > custom_sort = sort_relative_table;
>> > break;
>> > + case EM_RISCV:
>> > + custom_sort = arm64_sort_relative_table;
>>
>> Hi Mark, Thomas,
>>
>> x86 and arm64 version of sort_relative_table routine are the same, I want to
>> unify them, and then use the common function for riscv, but I'm not sure
>> which name is better. Could you please suggest?
>
> I sent a patch last week which unifies them as
> sort_relative_table_with_data():
>
> https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
>
> Thomas, are you happy with that patch?
>
> With your ack it could go via the riscv tree for v5.17 as a preparatory
> cleanup in this series.
>
> Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
I don't see anything on that thread, and looks like last time I had to
touch sorttable I just took it via the RISC-V tree. I went ahead and
put Mark's patch, along with this patch set, on my for-next. I had to
fix up a few minor issues, so LMK if anything went off the rails.
Thanks!
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2022-01-06 3:21 ` Palmer Dabbelt
0 siblings, 0 replies; 47+ messages in thread
From: Palmer Dabbelt @ 2022-01-06 3:21 UTC (permalink / raw)
To: mark.rutland
Cc: jszhang3, tglx, Paul Walmsley, aou, bjorn, ast, daniel, andrii,
john.fastabend, kpsingh, masahiroy, michal.lkml, ndesaulniers,
wangkefeng.wang, tongtiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, 18 Nov 2021 07:21:55 PST (-0800), mark.rutland@arm.com wrote:
> On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
>> On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
>>
>> > From: Jisheng Zhang <jszhang@kernel.org>
>> >
>> > This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
>> > and `data` fields").
>> >
>> > We will add specialized handlers for fixups, the `type` field is for
>> > fixup handler type, the `data` field is used to pass specific data to
>> > each handler, for example register numbers.
>> >
>> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
>
>> > diff --git a/scripts/sorttable.c b/scripts/sorttable.c
>> > index 0c031e47a419..5b5472b543f5 100644
>> > --- a/scripts/sorttable.c
>> > +++ b/scripts/sorttable.c
>> > @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
>> > case EM_PARISC:
>> > case EM_PPC:
>> > case EM_PPC64:
>> > - case EM_RISCV:
>> > custom_sort = sort_relative_table;
>> > break;
>> > + case EM_RISCV:
>> > + custom_sort = arm64_sort_relative_table;
>>
>> Hi Mark, Thomas,
>>
>> x86 and arm64 version of sort_relative_table routine are the same, I want to
>> unify them, and then use the common function for riscv, but I'm not sure
>> which name is better. Could you please suggest?
>
> I sent a patch last week which unifies them as
> sort_relative_table_with_data():
>
> https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
>
> Thomas, are you happy with that patch?
>
> With your ack it could go via the riscv tree for v5.17 as a preparatory
> cleanup in this series.
>
> Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
I don't see anything on that thread, and looks like last time I had to
touch sorttable I just took it via the RISC-V tree. I went ahead and
put Mark's patch, along with this patch set, on my for-next. I had to
fix up a few minor issues, so LMK if anything went off the rails.
Thanks!
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
2022-01-06 3:21 ` Palmer Dabbelt
@ 2022-01-06 10:23 ` Mark Rutland
-1 siblings, 0 replies; 47+ messages in thread
From: Mark Rutland @ 2022-01-06 10:23 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: jszhang3, tglx, Paul Walmsley, aou, bjorn, ast, daniel, andrii,
john.fastabend, kpsingh, masahiroy, michal.lkml, ndesaulniers,
wangkefeng.wang, tongtiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Wed, Jan 05, 2022 at 07:21:26PM -0800, Palmer Dabbelt wrote:
> On Thu, 18 Nov 2021 07:21:55 PST (-0800), mark.rutland@arm.com wrote:
> > On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
> > > On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
> > > Hi Mark, Thomas,
> > >
> > > x86 and arm64 version of sort_relative_table routine are the same, I want to
> > > unify them, and then use the common function for riscv, but I'm not sure
> > > which name is better. Could you please suggest?
> >
> > I sent a patch last week which unifies them as
> > sort_relative_table_with_data():
> >
> > https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
> >
> > Thomas, are you happy with that patch?
> >
> > With your ack it could go via the riscv tree for v5.17 as a preparatory
> > cleanup in this series.
> >
> > Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
>
> I don't see anything on that thread, and looks like last time I had to touch
> sorttable I just took it via the RISC-V tree. I went ahead and put Mark's
> patch, along with this patch set, on my for-next.
FWIW, that sounds good to me. Thanks for picking that up!
> I had to fix up a few minor issues, so LMK if anything went off the rails.
I assume that was just for this patch set, as I couldn't spot any change to my
patch in the riscv for-next branch.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2022-01-06 10:23 ` Mark Rutland
0 siblings, 0 replies; 47+ messages in thread
From: Mark Rutland @ 2022-01-06 10:23 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: jszhang3, tglx, Paul Walmsley, aou, bjorn, ast, daniel, andrii,
john.fastabend, kpsingh, masahiroy, michal.lkml, ndesaulniers,
wangkefeng.wang, tongtiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Wed, Jan 05, 2022 at 07:21:26PM -0800, Palmer Dabbelt wrote:
> On Thu, 18 Nov 2021 07:21:55 PST (-0800), mark.rutland@arm.com wrote:
> > On Thu, Nov 18, 2021 at 07:42:49PM +0800, Jisheng Zhang wrote:
> > > On Thu, 18 Nov 2021 19:26:05 +0800 Jisheng Zhang wrote:
> > > Hi Mark, Thomas,
> > >
> > > x86 and arm64 version of sort_relative_table routine are the same, I want to
> > > unify them, and then use the common function for riscv, but I'm not sure
> > > which name is better. Could you please suggest?
> >
> > I sent a patch last week which unifies them as
> > sort_relative_table_with_data():
> >
> > https://lore.kernel.org/linux-arm-kernel/20211108114220.32796-1-mark.rutland@arm.com/
> >
> > Thomas, are you happy with that patch?
> >
> > With your ack it could go via the riscv tree for v5.17 as a preparatory
> > cleanup in this series.
> >
> > Maybe we could get it in as a cleanup for v5.16-rc{2,3} ?
>
> I don't see anything on that thread, and looks like last time I had to touch
> sorttable I just took it via the RISC-V tree. I went ahead and put Mark's
> patch, along with this patch set, on my for-next.
FWIW, that sounds good to me. Thanks for picking that up!
> I had to fix up a few minor issues, so LMK if anything went off the rails.
I assume that was just for this patch set, as I couldn't spot any change to my
patch in the riscv for-next branch.
Thanks,
Mark.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
2021-11-18 11:26 ` Jisheng Zhang
@ 2021-11-19 2:35 ` tongtiangen
-1 siblings, 0 replies; 47+ messages in thread
From: tongtiangen @ 2021-11-19 2:35 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Björn Töpel, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers
Cc: Kefeng Wang, linux-riscv, linux-kernel, netdev, bpf, linux-kbuild
On 2021/11/18 19:26, Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> and `data` fields").
>
> We will add specialized handlers for fixups, the `type` field is for
> fixup handler type, the `data` field is used to pass specific data to
> each handler, for example register numbers.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
> arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
> arch/riscv/kernel/vmlinux.lds.S | 2 +-
> arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
> arch/riscv/net/bpf_jit_comp64.c | 5 +++--
> scripts/sorttable.c | 4 +++-
> 6 files changed, 59 insertions(+), 19 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index b790c02dbdda..1b1f4ffd8d37 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -2,31 +2,40 @@
> #ifndef __ASM_ASM_EXTABLE_H
> #define __ASM_ASM_EXTABLE_H
>
> +#define EX_TYPE_NONE 0
> +#define EX_TYPE_FIXUP 1
> +#define EX_TYPE_BPF 2
> +
> #ifdef __ASSEMBLY__
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> - .pushsection __ex_table, "a"; \
> - .balign 4; \
> - .long ((insn) - .); \
> - .long ((fixup) - .); \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> + .pushsection __ex_table, "a"; \
> + .balign 4; \
> + .long ((insn) - .); \
> + .long ((fixup) - .); \
> + .short (type); \
> + .short (data); \
> .popsection;
>
> .macro _asm_extable, insn, fixup
> - __ASM_EXTABLE_RAW(\insn, \fixup)
> + __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
> .endm
>
> #else /* __ASSEMBLY__ */
>
> #include <linux/stringify.h>
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> ".balign 4\n" \
> ".long ((" insn ") - .)\n" \
> ".long ((" fixup ") - .)\n" \
> + ".short (" type ")\n" \
> + ".short (" data ")\n" \
> ".popsection\n"
>
> -#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
> +#define _ASM_EXTABLE(insn, fixup) \
> + __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> #endif /* __ASSEMBLY__ */
>
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> index e4374dde02b4..512012d193dc 100644
> --- a/arch/riscv/include/asm/extable.h
> +++ b/arch/riscv/include/asm/extable.h
> @@ -17,18 +17,29 @@
>
> struct exception_table_entry {
> int insn, fixup;
> + short type, data;
> };
>
> #define ARCH_HAS_RELATIVE_EXTABLE
>
> +#define swap_ex_entry_fixup(a, b, tmp, delta) \
> +do { \
> + (a)->fixup = (b)->fixup + (delta); \
> + (b)->fixup = (tmp).fixup - (delta); \
> + (a)->type = (b)->type; \
> + (b)->type = (tmp).type; \
> + (a)->data = (b)->data; \
> + (b)->data = (tmp).data; \
> +} while (0)
> +
> bool fixup_exception(struct pt_regs *regs);
>
> #if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
> +bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
> #else
> static inline bool
> -rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> return false;
> }
> diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
> index 5104f3a871e3..0e5ae851929e 100644
> --- a/arch/riscv/kernel/vmlinux.lds.S
> +++ b/arch/riscv/kernel/vmlinux.lds.S
> @@ -4,7 +4,7 @@
> * Copyright (C) 2017 SiFive
> */
>
> -#define RO_EXCEPTION_TABLE_ALIGN 16
> +#define RO_EXCEPTION_TABLE_ALIGN 4
>
> #ifdef CONFIG_XIP_KERNEL
> #include "vmlinux-xip.lds.S"
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 3c561f1d0115..91e52c4bb33a 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -10,6 +10,20 @@
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> +#include <asm/asm-extable.h>
> +
> +static inline unsigned long
> +get_ex_fixup(const struct exception_table_entry *ex)
> +{
> + return ((unsigned long)&ex->fixup + ex->fixup);
> +}
> +
> +static bool ex_handler_fixup(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
>
> bool fixup_exception(struct pt_regs *regs)
> {
> @@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
> if (!ex)
> return false;
>
> - if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
> - return rv_bpf_fixup_exception(ex, regs);
> + switch (ex->type) {
> + case EX_TYPE_FIXUP:
> + return ex_handler_fixup(ex, regs);
> + case EX_TYPE_BPF:
> + return ex_handler_bpf(ex, regs);
> + }
>
> - regs->epc = (unsigned long)&ex->fixup + ex->fixup;
> - return true;
> + BUG();
> }
> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> index 7714081cbb64..69bab7e28f91 100644
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
> #define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
> #define BPF_FIXUP_REG_MASK GENMASK(31, 27)
>
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +bool ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
> int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
> @@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
>
> ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
> FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
> + ex->type = EX_TYPE_BPF;
looks good to me.
Reviewed-by:Tong Tiangen <tongtiangen@huawei.com>
>
> ctx->nexentries++;
> return 0;
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index 0c031e47a419..5b5472b543f5 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> - case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> + case EM_RISCV:
> + custom_sort = arm64_sort_relative_table;
> + break;
> case EM_ARCOMPACT:
> case EM_ARCV2:
> case EM_ARM:
>
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 09/12] riscv: extable: add `type` and `data` fields
@ 2021-11-19 2:35 ` tongtiangen
0 siblings, 0 replies; 47+ messages in thread
From: tongtiangen @ 2021-11-19 2:35 UTC (permalink / raw)
To: Jisheng Zhang, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Björn Töpel, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Martin KaFai Lau, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Masahiro Yamada, Michal Marek,
Nick Desaulniers
Cc: Kefeng Wang, linux-riscv, linux-kernel, netdev, bpf, linux-kbuild
On 2021/11/18 19:26, Jisheng Zhang wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> This is a riscv port of commit d6e2cc564775("arm64: extable: add `type`
> and `data` fields").
>
> We will add specialized handlers for fixups, the `type` field is for
> fixup handler type, the `data` field is used to pass specific data to
> each handler, for example register numbers.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 25 +++++++++++++++++--------
> arch/riscv/include/asm/extable.h | 17 ++++++++++++++---
> arch/riscv/kernel/vmlinux.lds.S | 2 +-
> arch/riscv/mm/extable.c | 25 +++++++++++++++++++++----
> arch/riscv/net/bpf_jit_comp64.c | 5 +++--
> scripts/sorttable.c | 4 +++-
> 6 files changed, 59 insertions(+), 19 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index b790c02dbdda..1b1f4ffd8d37 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -2,31 +2,40 @@
> #ifndef __ASM_ASM_EXTABLE_H
> #define __ASM_ASM_EXTABLE_H
>
> +#define EX_TYPE_NONE 0
> +#define EX_TYPE_FIXUP 1
> +#define EX_TYPE_BPF 2
> +
> #ifdef __ASSEMBLY__
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> - .pushsection __ex_table, "a"; \
> - .balign 4; \
> - .long ((insn) - .); \
> - .long ((fixup) - .); \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> + .pushsection __ex_table, "a"; \
> + .balign 4; \
> + .long ((insn) - .); \
> + .long ((fixup) - .); \
> + .short (type); \
> + .short (data); \
> .popsection;
>
> .macro _asm_extable, insn, fixup
> - __ASM_EXTABLE_RAW(\insn, \fixup)
> + __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
> .endm
>
> #else /* __ASSEMBLY__ */
>
> #include <linux/stringify.h>
>
> -#define __ASM_EXTABLE_RAW(insn, fixup) \
> +#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> ".balign 4\n" \
> ".long ((" insn ") - .)\n" \
> ".long ((" fixup ") - .)\n" \
> + ".short (" type ")\n" \
> + ".short (" data ")\n" \
> ".popsection\n"
>
> -#define _ASM_EXTABLE(insn, fixup) __ASM_EXTABLE_RAW(#insn, #fixup)
> +#define _ASM_EXTABLE(insn, fixup) \
> + __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> #endif /* __ASSEMBLY__ */
>
> diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h
> index e4374dde02b4..512012d193dc 100644
> --- a/arch/riscv/include/asm/extable.h
> +++ b/arch/riscv/include/asm/extable.h
> @@ -17,18 +17,29 @@
>
> struct exception_table_entry {
> int insn, fixup;
> + short type, data;
> };
>
> #define ARCH_HAS_RELATIVE_EXTABLE
>
> +#define swap_ex_entry_fixup(a, b, tmp, delta) \
> +do { \
> + (a)->fixup = (b)->fixup + (delta); \
> + (b)->fixup = (tmp).fixup - (delta); \
> + (a)->type = (b)->type; \
> + (b)->type = (tmp).type; \
> + (a)->data = (b)->data; \
> + (b)->data = (tmp).data; \
> +} while (0)
> +
> bool fixup_exception(struct pt_regs *regs);
>
> #if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I)
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex, struct pt_regs *regs);
> +bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs);
> #else
> static inline bool
> -rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> return false;
> }
> diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
> index 5104f3a871e3..0e5ae851929e 100644
> --- a/arch/riscv/kernel/vmlinux.lds.S
> +++ b/arch/riscv/kernel/vmlinux.lds.S
> @@ -4,7 +4,7 @@
> * Copyright (C) 2017 SiFive
> */
>
> -#define RO_EXCEPTION_TABLE_ALIGN 16
> +#define RO_EXCEPTION_TABLE_ALIGN 4
>
> #ifdef CONFIG_XIP_KERNEL
> #include "vmlinux-xip.lds.S"
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 3c561f1d0115..91e52c4bb33a 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -10,6 +10,20 @@
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> +#include <asm/asm-extable.h>
> +
> +static inline unsigned long
> +get_ex_fixup(const struct exception_table_entry *ex)
> +{
> + return ((unsigned long)&ex->fixup + ex->fixup);
> +}
> +
> +static bool ex_handler_fixup(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
>
> bool fixup_exception(struct pt_regs *regs)
> {
> @@ -19,9 +33,12 @@ bool fixup_exception(struct pt_regs *regs)
> if (!ex)
> return false;
>
> - if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
> - return rv_bpf_fixup_exception(ex, regs);
> + switch (ex->type) {
> + case EX_TYPE_FIXUP:
> + return ex_handler_fixup(ex, regs);
> + case EX_TYPE_BPF:
> + return ex_handler_bpf(ex, regs);
> + }
>
> - regs->epc = (unsigned long)&ex->fixup + ex->fixup;
> - return true;
> + BUG();
> }
> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> index 7714081cbb64..69bab7e28f91 100644
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -459,8 +459,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
> #define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
> #define BPF_FIXUP_REG_MASK GENMASK(31, 27)
>
> -bool rv_bpf_fixup_exception(const struct exception_table_entry *ex,
> - struct pt_regs *regs)
> +bool ex_handler_bpf(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> {
> off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
> int regs_offset = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
> @@ -514,6 +514,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
>
> ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) |
> FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg);
> + ex->type = EX_TYPE_BPF;
looks good to me.
Reviewed-by:Tong Tiangen <tongtiangen@huawei.com>
>
> ctx->nexentries++;
> return 0;
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index 0c031e47a419..5b5472b543f5 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -376,9 +376,11 @@ static int do_file(char const *const fname, void *addr)
> case EM_PARISC:
> case EM_PPC:
> case EM_PPC64:
> - case EM_RISCV:
> custom_sort = sort_relative_table;
> break;
> + case EM_RISCV:
> + custom_sort = arm64_sort_relative_table;
> + break;
> case EM_ARCOMPACT:
> case EM_ARCV2:
> case EM_ARM:
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH 10/12] riscv: add gpr-num.h
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:26 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Next patch will use the gpr-num to pass the register number to exception
fixup handler which sits in inline assembly routines.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/gpr-num.h | 77 ++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100644 arch/riscv/include/asm/gpr-num.h
diff --git a/arch/riscv/include/asm/gpr-num.h b/arch/riscv/include/asm/gpr-num.h
new file mode 100644
index 000000000000..dfee2829fc7c
--- /dev/null
+++ b/arch/riscv/include/asm/gpr-num.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __ASM_GPR_NUM_H
+#define __ASM_GPR_NUM_H
+
+#ifdef __ASSEMBLY__
+ .equ .L__gpr_num_zero, 0
+ .equ .L__gpr_num_ra, 1
+ .equ .L__gpr_num_sp, 2
+ .equ .L__gpr_num_gp, 3
+ .equ .L__gpr_num_tp, 4
+ .equ .L__gpr_num_t0, 5
+ .equ .L__gpr_num_t1, 6
+ .equ .L__gpr_num_t2, 7
+ .equ .L__gpr_num_s0, 8
+ .equ .L__gpr_num_s1, 9
+ .equ .L__gpr_num_a0, 10
+ .equ .L__gpr_num_a1, 11
+ .equ .L__gpr_num_a2, 12
+ .equ .L__gpr_num_a3, 13
+ .equ .L__gpr_num_a4, 14
+ .equ .L__gpr_num_a5, 15
+ .equ .L__gpr_num_a6, 16
+ .equ .L__gpr_num_a7, 17
+ .equ .L__gpr_num_s2, 18
+ .equ .L__gpr_num_s3, 19
+ .equ .L__gpr_num_s4, 20
+ .equ .L__gpr_num_s5, 21
+ .equ .L__gpr_num_s6, 22
+ .equ .L__gpr_num_s7, 23
+ .equ .L__gpr_num_s8, 24
+ .equ .L__gpr_num_s9, 25
+ .equ .L__gpr_num_s10, 26
+ .equ .L__gpr_num_s11, 27
+ .equ .L__gpr_num_t3, 28
+ .equ .L__gpr_num_t4, 29
+ .equ .L__gpr_num_t5, 30
+ .equ .L__gpr_num_t6, 31
+
+#else /* __ASSEMBLY__ */
+
+#define __DEFINE_ASM_GPR_NUMS \
+" .equ .L__gpr_num_zero, 0\n" \
+" .equ .L__gpr_num_ra, 1\n" \
+" .equ .L__gpr_num_sp, 2\n" \
+" .equ .L__gpr_num_gp, 3\n" \
+" .equ .L__gpr_num_tp, 4\n" \
+" .equ .L__gpr_num_t0, 5\n" \
+" .equ .L__gpr_num_t1, 6\n" \
+" .equ .L__gpr_num_t2, 7\n" \
+" .equ .L__gpr_num_s0, 8\n" \
+" .equ .L__gpr_num_s1, 9\n" \
+" .equ .L__gpr_num_a0, 10\n" \
+" .equ .L__gpr_num_a1, 11\n" \
+" .equ .L__gpr_num_a2, 12\n" \
+" .equ .L__gpr_num_a3, 13\n" \
+" .equ .L__gpr_num_a4, 14\n" \
+" .equ .L__gpr_num_a5, 15\n" \
+" .equ .L__gpr_num_a6, 16\n" \
+" .equ .L__gpr_num_a7, 17\n" \
+" .equ .L__gpr_num_s2, 18\n" \
+" .equ .L__gpr_num_s3, 19\n" \
+" .equ .L__gpr_num_s4, 20\n" \
+" .equ .L__gpr_num_s5, 21\n" \
+" .equ .L__gpr_num_s6, 22\n" \
+" .equ .L__gpr_num_s7, 23\n" \
+" .equ .L__gpr_num_s8, 24\n" \
+" .equ .L__gpr_num_s9, 25\n" \
+" .equ .L__gpr_num_s10, 26\n" \
+" .equ .L__gpr_num_s11, 27\n" \
+" .equ .L__gpr_num_t3, 28\n" \
+" .equ .L__gpr_num_t4, 29\n" \
+" .equ .L__gpr_num_t5, 30\n" \
+" .equ .L__gpr_num_t6, 31\n"
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_GPR_NUM_H */
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 10/12] riscv: add gpr-num.h
@ 2021-11-18 11:26 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Next patch will use the gpr-num to pass the register number to exception
fixup handler which sits in inline assembly routines.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/gpr-num.h | 77 ++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100644 arch/riscv/include/asm/gpr-num.h
diff --git a/arch/riscv/include/asm/gpr-num.h b/arch/riscv/include/asm/gpr-num.h
new file mode 100644
index 000000000000..dfee2829fc7c
--- /dev/null
+++ b/arch/riscv/include/asm/gpr-num.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __ASM_GPR_NUM_H
+#define __ASM_GPR_NUM_H
+
+#ifdef __ASSEMBLY__
+ .equ .L__gpr_num_zero, 0
+ .equ .L__gpr_num_ra, 1
+ .equ .L__gpr_num_sp, 2
+ .equ .L__gpr_num_gp, 3
+ .equ .L__gpr_num_tp, 4
+ .equ .L__gpr_num_t0, 5
+ .equ .L__gpr_num_t1, 6
+ .equ .L__gpr_num_t2, 7
+ .equ .L__gpr_num_s0, 8
+ .equ .L__gpr_num_s1, 9
+ .equ .L__gpr_num_a0, 10
+ .equ .L__gpr_num_a1, 11
+ .equ .L__gpr_num_a2, 12
+ .equ .L__gpr_num_a3, 13
+ .equ .L__gpr_num_a4, 14
+ .equ .L__gpr_num_a5, 15
+ .equ .L__gpr_num_a6, 16
+ .equ .L__gpr_num_a7, 17
+ .equ .L__gpr_num_s2, 18
+ .equ .L__gpr_num_s3, 19
+ .equ .L__gpr_num_s4, 20
+ .equ .L__gpr_num_s5, 21
+ .equ .L__gpr_num_s6, 22
+ .equ .L__gpr_num_s7, 23
+ .equ .L__gpr_num_s8, 24
+ .equ .L__gpr_num_s9, 25
+ .equ .L__gpr_num_s10, 26
+ .equ .L__gpr_num_s11, 27
+ .equ .L__gpr_num_t3, 28
+ .equ .L__gpr_num_t4, 29
+ .equ .L__gpr_num_t5, 30
+ .equ .L__gpr_num_t6, 31
+
+#else /* __ASSEMBLY__ */
+
+#define __DEFINE_ASM_GPR_NUMS \
+" .equ .L__gpr_num_zero, 0\n" \
+" .equ .L__gpr_num_ra, 1\n" \
+" .equ .L__gpr_num_sp, 2\n" \
+" .equ .L__gpr_num_gp, 3\n" \
+" .equ .L__gpr_num_tp, 4\n" \
+" .equ .L__gpr_num_t0, 5\n" \
+" .equ .L__gpr_num_t1, 6\n" \
+" .equ .L__gpr_num_t2, 7\n" \
+" .equ .L__gpr_num_s0, 8\n" \
+" .equ .L__gpr_num_s1, 9\n" \
+" .equ .L__gpr_num_a0, 10\n" \
+" .equ .L__gpr_num_a1, 11\n" \
+" .equ .L__gpr_num_a2, 12\n" \
+" .equ .L__gpr_num_a3, 13\n" \
+" .equ .L__gpr_num_a4, 14\n" \
+" .equ .L__gpr_num_a5, 15\n" \
+" .equ .L__gpr_num_a6, 16\n" \
+" .equ .L__gpr_num_a7, 17\n" \
+" .equ .L__gpr_num_s2, 18\n" \
+" .equ .L__gpr_num_s3, 19\n" \
+" .equ .L__gpr_num_s4, 20\n" \
+" .equ .L__gpr_num_s5, 21\n" \
+" .equ .L__gpr_num_s6, 22\n" \
+" .equ .L__gpr_num_s7, 23\n" \
+" .equ .L__gpr_num_s8, 24\n" \
+" .equ .L__gpr_num_s9, 25\n" \
+" .equ .L__gpr_num_s10, 26\n" \
+" .equ .L__gpr_num_s11, 27\n" \
+" .equ .L__gpr_num_t3, 28\n" \
+" .equ .L__gpr_num_t4, 29\n" \
+" .equ .L__gpr_num_t5, 30\n" \
+" .equ .L__gpr_num_t6, 31\n"
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_GPR_NUM_H */
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:26 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
uaccess handler"), do similar to riscv to add a dedicated uaccess
exception handler to update registers in exception context and
subsequently return back into the function which faulted, so we remove
the need for fixups specialized to each faulting instruction.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 23 +++++++++
arch/riscv/include/asm/futex.h | 23 +++------
arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
arch/riscv/mm/extable.c | 27 ++++++++++
4 files changed, 78 insertions(+), 69 deletions(-)
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index 1b1f4ffd8d37..14be0673f5b5 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -5,6 +5,7 @@
#define EX_TYPE_NONE 0
#define EX_TYPE_FIXUP 1
#define EX_TYPE_BPF 2
+#define EX_TYPE_UACCESS_ERR_ZERO 3
#ifdef __ASSEMBLY__
@@ -23,7 +24,9 @@
#else /* __ASSEMBLY__ */
+#include <linux/bits.h>
#include <linux/stringify.h>
+#include <asm/gpr-num.h>
#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
".pushsection __ex_table, \"a\"\n" \
@@ -37,6 +40,26 @@
#define _ASM_EXTABLE(insn, fixup) \
__ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
+#define EX_DATA_REG_ERR_SHIFT 0
+#define EX_DATA_REG_ERR GENMASK(4, 0)
+#define EX_DATA_REG_ZERO_SHIFT 5
+#define EX_DATA_REG_ZERO GENMASK(9, 5)
+
+#define EX_DATA_REG(reg, gpr) \
+ "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
+
+#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
+ __DEFINE_ASM_GPR_NUMS \
+ __ASM_EXTABLE_RAW(#insn, #fixup, \
+ __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
+ "(" \
+ EX_DATA_REG(ERR, err) " | " \
+ EX_DATA_REG(ZERO, zero) \
+ ")")
+
+#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
+
#endif /* __ASSEMBLY__ */
#endif /* __ASM_ASM_EXTABLE_H */
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 2e15e8e89502..fc8130f995c1 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -21,20 +21,14 @@
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
{ \
- uintptr_t tmp; \
__enable_user_access(); \
__asm__ __volatile__ ( \
"1: " insn " \n" \
"2: \n" \
- " .section .fixup,\"ax\" \n" \
- " .balign 4 \n" \
- "3: li %[r],%[e] \n" \
- " jump 2b,%[t] \n" \
- " .previous \n" \
- _ASM_EXTABLE(1b, 3b) \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
: [r] "+r" (ret), [ov] "=&r" (oldval), \
- [u] "+m" (*uaddr), [t] "=&r" (tmp) \
- : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
+ [u] "+m" (*uaddr) \
+ : [op] "Jr" (oparg) \
: "memory"); \
__disable_user_access(); \
}
@@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
"2: sc.w.aqrl %[t],%z[nv],%[u] \n"
" bnez %[t],1b \n"
"3: \n"
- " .section .fixup,\"ax\" \n"
- " .balign 4 \n"
- "4: li %[r],%[e] \n"
- " jump 3b,%[t] \n"
- " .previous \n"
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
+ _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
: [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
- : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
+ : [ov] "Jr" (oldval), [nv] "Jr" (newval)
: "memory");
__disable_user_access();
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 40e6099af488..a4716c026386 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
#define __get_user_asm(insn, x, ptr, err) \
do { \
- uintptr_t __tmp; \
__typeof__(x) __x; \
__asm__ __volatile__ ( \
"1:\n" \
- " " insn " %1, %3\n" \
+ " " insn " %1, %2\n" \
"2:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "3:\n" \
- " li %0, %4\n" \
- " li %1, 0\n" \
- " jump 2b, %2\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "+r" (err), "=&r" (__x), "=r" (__tmp) \
- : "m" (*(ptr)), "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
+ : "+r" (err), "=&r" (__x) \
+ : "m" (*(ptr))); \
(x) = __x; \
} while (0)
@@ -108,27 +100,18 @@ do { \
do { \
u32 __user *__ptr = (u32 __user *)(ptr); \
u32 __lo, __hi; \
- uintptr_t __tmp; \
__asm__ __volatile__ ( \
"1:\n" \
- " lw %1, %4\n" \
+ " lw %1, %3\n" \
"2:\n" \
- " lw %2, %5\n" \
+ " lw %2, %4\n" \
"3:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "4:\n" \
- " li %0, %6\n" \
- " li %1, 0\n" \
- " li %2, 0\n" \
- " jump 3b, %3\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "+r" (err), "=&r" (__lo), "=r" (__hi), \
- "=r" (__tmp) \
- : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
- "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
+ : "+r" (err), "=&r" (__lo), "=r" (__hi) \
+ : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
+ if (err) \
+ __hi = 0; \
(x) = (__typeof__(x))((__typeof__((x)-(x)))( \
(((u64)__hi << 32) | __lo))); \
} while (0)
@@ -216,21 +199,14 @@ do { \
#define __put_user_asm(insn, x, ptr, err) \
do { \
- uintptr_t __tmp; \
__typeof__(*(ptr)) __x = x; \
__asm__ __volatile__ ( \
"1:\n" \
- " " insn " %z3, %2\n" \
+ " " insn " %z2, %1\n" \
"2:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "3:\n" \
- " li %0, %4\n" \
- " jump 2b, %1\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
- : "rJ" (__x), "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
+ : "+r" (err), "=m" (*(ptr)) \
+ : "rJ" (__x)); \
} while (0)
#ifdef CONFIG_64BIT
@@ -244,22 +220,16 @@ do { \
uintptr_t __tmp; \
__asm__ __volatile__ ( \
"1:\n" \
- " sw %z4, %2\n" \
+ " sw %z3, %1\n" \
"2:\n" \
- " sw %z5, %3\n" \
+ " sw %z4, %2\n" \
"3:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "4:\n" \
- " li %0, %6\n" \
- " jump 3b, %1\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "+r" (err), "=r" (__tmp), \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
+ _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
+ : "+r" (err), \
"=m" (__ptr[__LSW]), \
"=m" (__ptr[__MSW]) \
- : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
+ : "rJ" (__x), "rJ" (__x >> 32)); \
} while (0)
#endif /* CONFIG_64BIT */
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index 91e52c4bb33a..05978f78579f 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -7,10 +7,12 @@
*/
+#include <linux/bitfield.h>
#include <linux/extable.h>
#include <linux/module.h>
#include <linux/uaccess.h>
#include <asm/asm-extable.h>
+#include <asm/ptrace.h>
static inline unsigned long
get_ex_fixup(const struct exception_table_entry *ex)
@@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
return true;
}
+static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
+ unsigned long val)
+{
+ if (unlikely(offset > MAX_REG_OFFSET))
+ return;
+
+ if (!offset)
+ *(unsigned long *)((unsigned long)regs + offset) = val;
+}
+
+static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
+ int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
+
+ regs_set_gpr(regs, reg_err, -EFAULT);
+ regs_set_gpr(regs, reg_zero, 0);
+
+ regs->epc = get_ex_fixup(ex);
+ return true;
+}
+
bool fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *ex;
@@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
return ex_handler_fixup(ex, regs);
case EX_TYPE_BPF:
return ex_handler_bpf(ex, regs);
+ case EX_TYPE_UACCESS_ERR_ZERO:
+ return ex_handler_uaccess_err_zero(ex, regs);
}
BUG();
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
@ 2021-11-18 11:26 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:26 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
uaccess handler"), do similar to riscv to add a dedicated uaccess
exception handler to update registers in exception context and
subsequently return back into the function which faulted, so we remove
the need for fixups specialized to each faulting instruction.
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/include/asm/asm-extable.h | 23 +++++++++
arch/riscv/include/asm/futex.h | 23 +++------
arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
arch/riscv/mm/extable.c | 27 ++++++++++
4 files changed, 78 insertions(+), 69 deletions(-)
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index 1b1f4ffd8d37..14be0673f5b5 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -5,6 +5,7 @@
#define EX_TYPE_NONE 0
#define EX_TYPE_FIXUP 1
#define EX_TYPE_BPF 2
+#define EX_TYPE_UACCESS_ERR_ZERO 3
#ifdef __ASSEMBLY__
@@ -23,7 +24,9 @@
#else /* __ASSEMBLY__ */
+#include <linux/bits.h>
#include <linux/stringify.h>
+#include <asm/gpr-num.h>
#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
".pushsection __ex_table, \"a\"\n" \
@@ -37,6 +40,26 @@
#define _ASM_EXTABLE(insn, fixup) \
__ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
+#define EX_DATA_REG_ERR_SHIFT 0
+#define EX_DATA_REG_ERR GENMASK(4, 0)
+#define EX_DATA_REG_ZERO_SHIFT 5
+#define EX_DATA_REG_ZERO GENMASK(9, 5)
+
+#define EX_DATA_REG(reg, gpr) \
+ "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
+
+#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
+ __DEFINE_ASM_GPR_NUMS \
+ __ASM_EXTABLE_RAW(#insn, #fixup, \
+ __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
+ "(" \
+ EX_DATA_REG(ERR, err) " | " \
+ EX_DATA_REG(ZERO, zero) \
+ ")")
+
+#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
+
#endif /* __ASSEMBLY__ */
#endif /* __ASM_ASM_EXTABLE_H */
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
index 2e15e8e89502..fc8130f995c1 100644
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
@@ -21,20 +21,14 @@
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
{ \
- uintptr_t tmp; \
__enable_user_access(); \
__asm__ __volatile__ ( \
"1: " insn " \n" \
"2: \n" \
- " .section .fixup,\"ax\" \n" \
- " .balign 4 \n" \
- "3: li %[r],%[e] \n" \
- " jump 2b,%[t] \n" \
- " .previous \n" \
- _ASM_EXTABLE(1b, 3b) \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
: [r] "+r" (ret), [ov] "=&r" (oldval), \
- [u] "+m" (*uaddr), [t] "=&r" (tmp) \
- : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
+ [u] "+m" (*uaddr) \
+ : [op] "Jr" (oparg) \
: "memory"); \
__disable_user_access(); \
}
@@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
"2: sc.w.aqrl %[t],%z[nv],%[u] \n"
" bnez %[t],1b \n"
"3: \n"
- " .section .fixup,\"ax\" \n"
- " .balign 4 \n"
- "4: li %[r],%[e] \n"
- " jump 3b,%[t] \n"
- " .previous \n"
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
+ _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
: [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
- : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
+ : [ov] "Jr" (oldval), [nv] "Jr" (newval)
: "memory");
__disable_user_access();
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
index 40e6099af488..a4716c026386 100644
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
@@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
#define __get_user_asm(insn, x, ptr, err) \
do { \
- uintptr_t __tmp; \
__typeof__(x) __x; \
__asm__ __volatile__ ( \
"1:\n" \
- " " insn " %1, %3\n" \
+ " " insn " %1, %2\n" \
"2:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "3:\n" \
- " li %0, %4\n" \
- " li %1, 0\n" \
- " jump 2b, %2\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "+r" (err), "=&r" (__x), "=r" (__tmp) \
- : "m" (*(ptr)), "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
+ : "+r" (err), "=&r" (__x) \
+ : "m" (*(ptr))); \
(x) = __x; \
} while (0)
@@ -108,27 +100,18 @@ do { \
do { \
u32 __user *__ptr = (u32 __user *)(ptr); \
u32 __lo, __hi; \
- uintptr_t __tmp; \
__asm__ __volatile__ ( \
"1:\n" \
- " lw %1, %4\n" \
+ " lw %1, %3\n" \
"2:\n" \
- " lw %2, %5\n" \
+ " lw %2, %4\n" \
"3:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "4:\n" \
- " li %0, %6\n" \
- " li %1, 0\n" \
- " li %2, 0\n" \
- " jump 3b, %3\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "+r" (err), "=&r" (__lo), "=r" (__hi), \
- "=r" (__tmp) \
- : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
- "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
+ _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
+ : "+r" (err), "=&r" (__lo), "=r" (__hi) \
+ : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
+ if (err) \
+ __hi = 0; \
(x) = (__typeof__(x))((__typeof__((x)-(x)))( \
(((u64)__hi << 32) | __lo))); \
} while (0)
@@ -216,21 +199,14 @@ do { \
#define __put_user_asm(insn, x, ptr, err) \
do { \
- uintptr_t __tmp; \
__typeof__(*(ptr)) __x = x; \
__asm__ __volatile__ ( \
"1:\n" \
- " " insn " %z3, %2\n" \
+ " " insn " %z2, %1\n" \
"2:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "3:\n" \
- " li %0, %4\n" \
- " jump 2b, %1\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
- : "rJ" (__x), "i" (-EFAULT)); \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
+ : "+r" (err), "=m" (*(ptr)) \
+ : "rJ" (__x)); \
} while (0)
#ifdef CONFIG_64BIT
@@ -244,22 +220,16 @@ do { \
uintptr_t __tmp; \
__asm__ __volatile__ ( \
"1:\n" \
- " sw %z4, %2\n" \
+ " sw %z3, %1\n" \
"2:\n" \
- " sw %z5, %3\n" \
+ " sw %z4, %2\n" \
"3:\n" \
- " .section .fixup,\"ax\"\n" \
- " .balign 4\n" \
- "4:\n" \
- " li %0, %6\n" \
- " jump 3b, %1\n" \
- " .previous\n" \
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "+r" (err), "=r" (__tmp), \
+ _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
+ _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
+ : "+r" (err), \
"=m" (__ptr[__LSW]), \
"=m" (__ptr[__MSW]) \
- : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
+ : "rJ" (__x), "rJ" (__x >> 32)); \
} while (0)
#endif /* CONFIG_64BIT */
diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index 91e52c4bb33a..05978f78579f 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -7,10 +7,12 @@
*/
+#include <linux/bitfield.h>
#include <linux/extable.h>
#include <linux/module.h>
#include <linux/uaccess.h>
#include <asm/asm-extable.h>
+#include <asm/ptrace.h>
static inline unsigned long
get_ex_fixup(const struct exception_table_entry *ex)
@@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
return true;
}
+static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
+ unsigned long val)
+{
+ if (unlikely(offset > MAX_REG_OFFSET))
+ return;
+
+ if (!offset)
+ *(unsigned long *)((unsigned long)regs + offset) = val;
+}
+
+static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
+ struct pt_regs *regs)
+{
+ int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
+ int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
+
+ regs_set_gpr(regs, reg_err, -EFAULT);
+ regs_set_gpr(regs, reg_zero, 0);
+
+ regs->epc = get_ex_fixup(ex);
+ return true;
+}
+
bool fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *ex;
@@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
return ex_handler_fixup(ex, regs);
case EX_TYPE_BPF:
return ex_handler_bpf(ex, regs);
+ case EX_TYPE_UACCESS_ERR_ZERO:
+ return ex_handler_uaccess_err_zero(ex, regs);
}
BUG();
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2021-11-18 11:26 ` Jisheng Zhang
(?)
@ 2021-11-18 17:31 ` kernel test robot
-1 siblings, 0 replies; 47+ messages in thread
From: kernel test robot @ 2021-11-18 17:31 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 27794 bytes --]
Hi Jisheng,
I love your patch! Yet something to improve:
[auto build test ERROR on bpf-next/master]
[also build test ERROR on bpf/master linus/master v5.16-rc1 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jisheng-Zhang/riscv-switch-to-relative-extable-and-other-improvements/20211118-193905
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
config: riscv-rv32_defconfig (attached as .config)
compiler: riscv32-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/011a843af8007bfb9ff01a537e46e2ab6967dd23
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jisheng-Zhang/riscv-switch-to-relative-extable-and-other-improvements/20211118-193905
git checkout 011a843af8007bfb9ff01a537e46e2ab6967dd23
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=riscv SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from include/linux/uaccess.h:11,
from include/linux/sched/task.h:11,
from include/linux/sched/signal.h:9,
from include/linux/rcuwait.h:6,
from include/linux/percpu-rwsem.h:7,
from include/linux/fs.h:33,
from include/linux/tty.h:5,
from init/do_mounts.c:6:
include/asm-generic/termios.h: In function 'user_termio_to_kernel_termios':
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:25:13: note: in expansion of macro 'get_user'
25 | if (get_user(tmp, &termio->c_iflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:29:13: note: in expansion of macro 'get_user'
29 | if (get_user(tmp, &termio->c_oflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:33:13: note: in expansion of macro 'get_user'
33 | if (get_user(tmp, &termio->c_cflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:37:13: note: in expansion of macro 'get_user'
37 | if (get_user(tmp, &termio->c_lflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:41:13: note: in expansion of macro 'get_user'
41 | if (get_user(termios->c_line, &termio->c_line) < 0)
| ^~~~~~~~
include/asm-generic/termios.h: In function 'kernel_termios_to_user_termio':
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:59:13: note: in expansion of macro 'put_user'
59 | if (put_user(termios->c_iflag, &termio->c_iflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:60:13: note: in expansion of macro 'put_user'
60 | put_user(termios->c_oflag, &termio->c_oflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:61:13: note: in expansion of macro 'put_user'
61 | put_user(termios->c_cflag, &termio->c_cflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:62:13: note: in expansion of macro 'put_user'
62 | put_user(termios->c_lflag, &termio->c_lflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:63:13: note: in expansion of macro 'put_user'
63 | put_user(termios->c_line, &termio->c_line) < 0 ||
| ^~~~~~~~
--
In file included from include/linux/uaccess.h:11,
from arch/riscv/kernel/signal.c:10:
arch/riscv/kernel/signal.c: In function 'restore_fp_state':
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/kernel/signal.c:50:23: note: in expansion of macro '__get_user'
50 | err = __get_user(value, &sc_fpregs->q.reserved[i]);
| ^~~~~~~~~~
arch/riscv/kernel/signal.c: In function 'save_fp_state':
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/kernel/signal.c:74:23: note: in expansion of macro '__put_user'
74 | err = __put_user(0, &sc_fpregs->q.reserved[i]);
| ^~~~~~~~~~
arch/riscv/kernel/signal.c: In function 'setup_rt_frame':
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/kernel/signal.c:187:16: note: in expansion of macro '__put_user'
187 | err |= __put_user(0, &frame->uc.uc_flags);
| ^~~~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/kernel/signal.c:188:16: note: in expansion of macro '__put_user'
188 | err |= __put_user(NULL, &frame->uc.uc_link);
| ^~~~~~~~~~
arch/riscv/kernel/signal.c: At top level:
arch/riscv/kernel/signal.c:309:27: warning: no previous prototype for 'do_notify_resume' [-Wmissing-prototypes]
309 | asmlinkage __visible void do_notify_resume(struct pt_regs *regs,
| ^~~~~~~~~~~~~~~~
--
In file included from include/linux/uaccess.h:11,
from include/linux/sched/task.h:11,
from kernel/fork.c:23:
include/asm-generic/termios.h: In function 'user_termio_to_kernel_termios':
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:25:13: note: in expansion of macro 'get_user'
25 | if (get_user(tmp, &termio->c_iflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:29:13: note: in expansion of macro 'get_user'
29 | if (get_user(tmp, &termio->c_oflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:33:13: note: in expansion of macro 'get_user'
33 | if (get_user(tmp, &termio->c_cflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:37:13: note: in expansion of macro 'get_user'
37 | if (get_user(tmp, &termio->c_lflag) < 0)
| ^~~~~~~~
>> arch/riscv/include/asm/uaccess.h:113:9: error: expected ';' before 'if'
113 | if (err) \
| ^~
arch/riscv/include/asm/uaccess.h:133:17: note: in expansion of macro '__get_user_8'
133 | __get_user_8((x), __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:168:9: note: in expansion of macro '__get_user_nocheck'
168 | __get_user_nocheck(x, __gu_ptr, __gu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:196:17: note: in expansion of macro '__get_user'
196 | __get_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:41:13: note: in expansion of macro 'get_user'
41 | if (get_user(termios->c_line, &termio->c_line) < 0)
| ^~~~~~~~
include/asm-generic/termios.h: In function 'kernel_termios_to_user_termio':
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:59:13: note: in expansion of macro 'put_user'
59 | if (put_user(termios->c_iflag, &termio->c_iflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:60:13: note: in expansion of macro 'put_user'
60 | put_user(termios->c_oflag, &termio->c_oflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:61:13: note: in expansion of macro 'put_user'
61 | put_user(termios->c_cflag, &termio->c_cflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:62:13: note: in expansion of macro 'put_user'
62 | put_user(termios->c_lflag, &termio->c_lflag) < 0 ||
| ^~~~~~~~
arch/riscv/include/asm/uaccess.h:220:19: warning: unused variable '__tmp' [-Wunused-variable]
220 | uintptr_t __tmp; \
| ^~~~~
arch/riscv/include/asm/uaccess.h:249:17: note: in expansion of macro '__put_user_8'
249 | __put_user_8((x), __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:286:9: note: in expansion of macro '__put_user_nocheck'
286 | __put_user_nocheck(__val, __gu_ptr, __pu_err); \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/uaccess.h:313:17: note: in expansion of macro '__put_user'
313 | __put_user((x), __p) : \
| ^~~~~~~~~~
include/asm-generic/termios.h:63:13: note: in expansion of macro 'put_user'
63 | put_user(termios->c_line, &termio->c_line) < 0 ||
| ^~~~~~~~
kernel/fork.c: At top level:
kernel/fork.c:161:13: warning: no previous prototype for 'arch_release_task_struct' [-Wmissing-prototypes]
161 | void __weak arch_release_task_struct(struct task_struct *tsk)
| ^~~~~~~~~~~~~~~~~~~~~~~~
kernel/fork.c:763:20: warning: no previous prototype for 'arch_task_cache_init' [-Wmissing-prototypes]
763 | void __init __weak arch_task_cache_init(void) { }
| ^~~~~~~~~~~~~~~~~~~~
In file included from include/linux/uaccess.h:11,
from include/linux/sched/task.h:11,
from kernel/fork.c:23:
..
vim +113 arch/riscv/include/asm/uaccess.h
94
95 #ifdef CONFIG_64BIT
96 #define __get_user_8(x, ptr, err) \
97 __get_user_asm("ld", x, ptr, err)
98 #else /* !CONFIG_64BIT */
99 #define __get_user_8(x, ptr, err) \
100 do { \
101 u32 __user *__ptr = (u32 __user *)(ptr); \
102 u32 __lo, __hi; \
103 __asm__ __volatile__ ( \
104 "1:\n" \
105 " lw %1, %3\n" \
106 "2:\n" \
107 " lw %2, %4\n" \
108 "3:\n" \
109 _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
110 _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
111 : "+r" (err), "=&r" (__lo), "=r" (__hi) \
112 : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
> 113 if (err) \
114 __hi = 0; \
115 (x) = (__typeof__(x))((__typeof__((x)-(x)))( \
116 (((u64)__hi << 32) | __lo))); \
117 } while (0)
118 #endif /* CONFIG_64BIT */
119
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 20905 bytes --]
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2021-11-18 11:26 ` Jisheng Zhang
@ 2022-01-20 18:15 ` Mayuresh Chitale
-1 siblings, 0 replies; 47+ messages in thread
From: Mayuresh Chitale @ 2022-01-20 18:15 UTC (permalink / raw)
To: Jisheng Zhang
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
Hello Jisheng,
Just wanted to inform you that this patch breaks the writev02 test
case in LTP and if it is reverted then the test passes. If we run the
test through strace then we see that the test hangs and following is
the last line printed by strace:
"writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
iov_len=0}]"
Thanks,
Mayuresh.
On Thu, Nov 18, 2021 at 5:05 PM Jisheng Zhang <jszhang3@mail.ustc.edu.cn> wrote:
>
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
> uaccess handler"), do similar to riscv to add a dedicated uaccess
> exception handler to update registers in exception context and
> subsequently return back into the function which faulted, so we remove
> the need for fixups specialized to each faulting instruction.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 23 +++++++++
> arch/riscv/include/asm/futex.h | 23 +++------
> arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
> arch/riscv/mm/extable.c | 27 ++++++++++
> 4 files changed, 78 insertions(+), 69 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index 1b1f4ffd8d37..14be0673f5b5 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -5,6 +5,7 @@
> #define EX_TYPE_NONE 0
> #define EX_TYPE_FIXUP 1
> #define EX_TYPE_BPF 2
> +#define EX_TYPE_UACCESS_ERR_ZERO 3
>
> #ifdef __ASSEMBLY__
>
> @@ -23,7 +24,9 @@
>
> #else /* __ASSEMBLY__ */
>
> +#include <linux/bits.h>
> #include <linux/stringify.h>
> +#include <asm/gpr-num.h>
>
> #define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> @@ -37,6 +40,26 @@
> #define _ASM_EXTABLE(insn, fixup) \
> __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> +#define EX_DATA_REG_ERR_SHIFT 0
> +#define EX_DATA_REG_ERR GENMASK(4, 0)
> +#define EX_DATA_REG_ZERO_SHIFT 5
> +#define EX_DATA_REG_ZERO GENMASK(9, 5)
> +
> +#define EX_DATA_REG(reg, gpr) \
> + "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
> +
> +#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
> + __DEFINE_ASM_GPR_NUMS \
> + __ASM_EXTABLE_RAW(#insn, #fixup, \
> + __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
> + "(" \
> + EX_DATA_REG(ERR, err) " | " \
> + EX_DATA_REG(ZERO, zero) \
> + ")")
> +
> +#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
> +
> #endif /* __ASSEMBLY__ */
>
> #endif /* __ASM_ASM_EXTABLE_H */
> diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
> index 2e15e8e89502..fc8130f995c1 100644
> --- a/arch/riscv/include/asm/futex.h
> +++ b/arch/riscv/include/asm/futex.h
> @@ -21,20 +21,14 @@
>
> #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
> { \
> - uintptr_t tmp; \
> __enable_user_access(); \
> __asm__ __volatile__ ( \
> "1: " insn " \n" \
> "2: \n" \
> - " .section .fixup,\"ax\" \n" \
> - " .balign 4 \n" \
> - "3: li %[r],%[e] \n" \
> - " jump 2b,%[t] \n" \
> - " .previous \n" \
> - _ASM_EXTABLE(1b, 3b) \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
> : [r] "+r" (ret), [ov] "=&r" (oldval), \
> - [u] "+m" (*uaddr), [t] "=&r" (tmp) \
> - : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
> + [u] "+m" (*uaddr) \
> + : [op] "Jr" (oparg) \
> : "memory"); \
> __disable_user_access(); \
> }
> @@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
> "2: sc.w.aqrl %[t],%z[nv],%[u] \n"
> " bnez %[t],1b \n"
> "3: \n"
> - " .section .fixup,\"ax\" \n"
> - " .balign 4 \n"
> - "4: li %[r],%[e] \n"
> - " jump 3b,%[t] \n"
> - " .previous \n"
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
> + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
> : [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
> - : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
> + : [ov] "Jr" (oldval), [nv] "Jr" (newval)
> : "memory");
> __disable_user_access();
>
> diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> index 40e6099af488..a4716c026386 100644
> --- a/arch/riscv/include/asm/uaccess.h
> +++ b/arch/riscv/include/asm/uaccess.h
> @@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
>
> #define __get_user_asm(insn, x, ptr, err) \
> do { \
> - uintptr_t __tmp; \
> __typeof__(x) __x; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " " insn " %1, %3\n" \
> + " " insn " %1, %2\n" \
> "2:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "3:\n" \
> - " li %0, %4\n" \
> - " li %1, 0\n" \
> - " jump 2b, %2\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 3b) \
> - : "+r" (err), "=&r" (__x), "=r" (__tmp) \
> - : "m" (*(ptr)), "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
> + : "+r" (err), "=&r" (__x) \
> + : "m" (*(ptr))); \
> (x) = __x; \
> } while (0)
>
> @@ -108,27 +100,18 @@ do { \
> do { \
> u32 __user *__ptr = (u32 __user *)(ptr); \
> u32 __lo, __hi; \
> - uintptr_t __tmp; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " lw %1, %4\n" \
> + " lw %1, %3\n" \
> "2:\n" \
> - " lw %2, %5\n" \
> + " lw %2, %4\n" \
> "3:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "4:\n" \
> - " li %0, %6\n" \
> - " li %1, 0\n" \
> - " li %2, 0\n" \
> - " jump 3b, %3\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> - : "+r" (err), "=&r" (__lo), "=r" (__hi), \
> - "=r" (__tmp) \
> - : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
> - "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
> + : "+r" (err), "=&r" (__lo), "=r" (__hi) \
> + : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
> + if (err) \
> + __hi = 0; \
> (x) = (__typeof__(x))((__typeof__((x)-(x)))( \
> (((u64)__hi << 32) | __lo))); \
> } while (0)
> @@ -216,21 +199,14 @@ do { \
>
> #define __put_user_asm(insn, x, ptr, err) \
> do { \
> - uintptr_t __tmp; \
> __typeof__(*(ptr)) __x = x; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " " insn " %z3, %2\n" \
> + " " insn " %z2, %1\n" \
> "2:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "3:\n" \
> - " li %0, %4\n" \
> - " jump 2b, %1\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 3b) \
> - : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
> - : "rJ" (__x), "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
> + : "+r" (err), "=m" (*(ptr)) \
> + : "rJ" (__x)); \
> } while (0)
>
> #ifdef CONFIG_64BIT
> @@ -244,22 +220,16 @@ do { \
> uintptr_t __tmp; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " sw %z4, %2\n" \
> + " sw %z3, %1\n" \
> "2:\n" \
> - " sw %z5, %3\n" \
> + " sw %z4, %2\n" \
> "3:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "4:\n" \
> - " li %0, %6\n" \
> - " jump 3b, %1\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> - : "+r" (err), "=r" (__tmp), \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
> + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
> + : "+r" (err), \
> "=m" (__ptr[__LSW]), \
> "=m" (__ptr[__MSW]) \
> - : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
> + : "rJ" (__x), "rJ" (__x >> 32)); \
> } while (0)
> #endif /* CONFIG_64BIT */
>
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 91e52c4bb33a..05978f78579f 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -7,10 +7,12 @@
> */
>
>
> +#include <linux/bitfield.h>
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> #include <asm/asm-extable.h>
> +#include <asm/ptrace.h>
>
> static inline unsigned long
> get_ex_fixup(const struct exception_table_entry *ex)
> @@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
> return true;
> }
>
> +static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
> + unsigned long val)
> +{
> + if (unlikely(offset > MAX_REG_OFFSET))
> + return;
> +
> + if (!offset)
> + *(unsigned long *)((unsigned long)regs + offset) = val;
> +}
> +
> +static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
> + int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
> +
> + regs_set_gpr(regs, reg_err, -EFAULT);
> + regs_set_gpr(regs, reg_zero, 0);
> +
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
> +
> bool fixup_exception(struct pt_regs *regs)
> {
> const struct exception_table_entry *ex;
> @@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
> return ex_handler_fixup(ex, regs);
> case EX_TYPE_BPF:
> return ex_handler_bpf(ex, regs);
> + case EX_TYPE_UACCESS_ERR_ZERO:
> + return ex_handler_uaccess_err_zero(ex, regs);
> }
>
> BUG();
> --
> 2.33.0
>
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
@ 2022-01-20 18:15 ` Mayuresh Chitale
0 siblings, 0 replies; 47+ messages in thread
From: Mayuresh Chitale @ 2022-01-20 18:15 UTC (permalink / raw)
To: Jisheng Zhang
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
Hello Jisheng,
Just wanted to inform you that this patch breaks the writev02 test
case in LTP and if it is reverted then the test passes. If we run the
test through strace then we see that the test hangs and following is
the last line printed by strace:
"writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
iov_len=0}]"
Thanks,
Mayuresh.
On Thu, Nov 18, 2021 at 5:05 PM Jisheng Zhang <jszhang3@mail.ustc.edu.cn> wrote:
>
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
> uaccess handler"), do similar to riscv to add a dedicated uaccess
> exception handler to update registers in exception context and
> subsequently return back into the function which faulted, so we remove
> the need for fixups specialized to each faulting instruction.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/include/asm/asm-extable.h | 23 +++++++++
> arch/riscv/include/asm/futex.h | 23 +++------
> arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
> arch/riscv/mm/extable.c | 27 ++++++++++
> 4 files changed, 78 insertions(+), 69 deletions(-)
>
> diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> index 1b1f4ffd8d37..14be0673f5b5 100644
> --- a/arch/riscv/include/asm/asm-extable.h
> +++ b/arch/riscv/include/asm/asm-extable.h
> @@ -5,6 +5,7 @@
> #define EX_TYPE_NONE 0
> #define EX_TYPE_FIXUP 1
> #define EX_TYPE_BPF 2
> +#define EX_TYPE_UACCESS_ERR_ZERO 3
>
> #ifdef __ASSEMBLY__
>
> @@ -23,7 +24,9 @@
>
> #else /* __ASSEMBLY__ */
>
> +#include <linux/bits.h>
> #include <linux/stringify.h>
> +#include <asm/gpr-num.h>
>
> #define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> ".pushsection __ex_table, \"a\"\n" \
> @@ -37,6 +40,26 @@
> #define _ASM_EXTABLE(insn, fixup) \
> __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
>
> +#define EX_DATA_REG_ERR_SHIFT 0
> +#define EX_DATA_REG_ERR GENMASK(4, 0)
> +#define EX_DATA_REG_ZERO_SHIFT 5
> +#define EX_DATA_REG_ZERO GENMASK(9, 5)
> +
> +#define EX_DATA_REG(reg, gpr) \
> + "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
> +
> +#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
> + __DEFINE_ASM_GPR_NUMS \
> + __ASM_EXTABLE_RAW(#insn, #fixup, \
> + __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
> + "(" \
> + EX_DATA_REG(ERR, err) " | " \
> + EX_DATA_REG(ZERO, zero) \
> + ")")
> +
> +#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
> +
> #endif /* __ASSEMBLY__ */
>
> #endif /* __ASM_ASM_EXTABLE_H */
> diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
> index 2e15e8e89502..fc8130f995c1 100644
> --- a/arch/riscv/include/asm/futex.h
> +++ b/arch/riscv/include/asm/futex.h
> @@ -21,20 +21,14 @@
>
> #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
> { \
> - uintptr_t tmp; \
> __enable_user_access(); \
> __asm__ __volatile__ ( \
> "1: " insn " \n" \
> "2: \n" \
> - " .section .fixup,\"ax\" \n" \
> - " .balign 4 \n" \
> - "3: li %[r],%[e] \n" \
> - " jump 2b,%[t] \n" \
> - " .previous \n" \
> - _ASM_EXTABLE(1b, 3b) \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
> : [r] "+r" (ret), [ov] "=&r" (oldval), \
> - [u] "+m" (*uaddr), [t] "=&r" (tmp) \
> - : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
> + [u] "+m" (*uaddr) \
> + : [op] "Jr" (oparg) \
> : "memory"); \
> __disable_user_access(); \
> }
> @@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
> "2: sc.w.aqrl %[t],%z[nv],%[u] \n"
> " bnez %[t],1b \n"
> "3: \n"
> - " .section .fixup,\"ax\" \n"
> - " .balign 4 \n"
> - "4: li %[r],%[e] \n"
> - " jump 3b,%[t] \n"
> - " .previous \n"
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
> + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
> : [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
> - : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
> + : [ov] "Jr" (oldval), [nv] "Jr" (newval)
> : "memory");
> __disable_user_access();
>
> diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> index 40e6099af488..a4716c026386 100644
> --- a/arch/riscv/include/asm/uaccess.h
> +++ b/arch/riscv/include/asm/uaccess.h
> @@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
>
> #define __get_user_asm(insn, x, ptr, err) \
> do { \
> - uintptr_t __tmp; \
> __typeof__(x) __x; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " " insn " %1, %3\n" \
> + " " insn " %1, %2\n" \
> "2:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "3:\n" \
> - " li %0, %4\n" \
> - " li %1, 0\n" \
> - " jump 2b, %2\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 3b) \
> - : "+r" (err), "=&r" (__x), "=r" (__tmp) \
> - : "m" (*(ptr)), "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
> + : "+r" (err), "=&r" (__x) \
> + : "m" (*(ptr))); \
> (x) = __x; \
> } while (0)
>
> @@ -108,27 +100,18 @@ do { \
> do { \
> u32 __user *__ptr = (u32 __user *)(ptr); \
> u32 __lo, __hi; \
> - uintptr_t __tmp; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " lw %1, %4\n" \
> + " lw %1, %3\n" \
> "2:\n" \
> - " lw %2, %5\n" \
> + " lw %2, %4\n" \
> "3:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "4:\n" \
> - " li %0, %6\n" \
> - " li %1, 0\n" \
> - " li %2, 0\n" \
> - " jump 3b, %3\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> - : "+r" (err), "=&r" (__lo), "=r" (__hi), \
> - "=r" (__tmp) \
> - : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
> - "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
> + _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
> + : "+r" (err), "=&r" (__lo), "=r" (__hi) \
> + : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
> + if (err) \
> + __hi = 0; \
> (x) = (__typeof__(x))((__typeof__((x)-(x)))( \
> (((u64)__hi << 32) | __lo))); \
> } while (0)
> @@ -216,21 +199,14 @@ do { \
>
> #define __put_user_asm(insn, x, ptr, err) \
> do { \
> - uintptr_t __tmp; \
> __typeof__(*(ptr)) __x = x; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " " insn " %z3, %2\n" \
> + " " insn " %z2, %1\n" \
> "2:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "3:\n" \
> - " li %0, %4\n" \
> - " jump 2b, %1\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 3b) \
> - : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
> - : "rJ" (__x), "i" (-EFAULT)); \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
> + : "+r" (err), "=m" (*(ptr)) \
> + : "rJ" (__x)); \
> } while (0)
>
> #ifdef CONFIG_64BIT
> @@ -244,22 +220,16 @@ do { \
> uintptr_t __tmp; \
> __asm__ __volatile__ ( \
> "1:\n" \
> - " sw %z4, %2\n" \
> + " sw %z3, %1\n" \
> "2:\n" \
> - " sw %z5, %3\n" \
> + " sw %z4, %2\n" \
> "3:\n" \
> - " .section .fixup,\"ax\"\n" \
> - " .balign 4\n" \
> - "4:\n" \
> - " li %0, %6\n" \
> - " jump 3b, %1\n" \
> - " .previous\n" \
> - _ASM_EXTABLE(1b, 4b) \
> - _ASM_EXTABLE(2b, 4b) \
> - : "+r" (err), "=r" (__tmp), \
> + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
> + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
> + : "+r" (err), \
> "=m" (__ptr[__LSW]), \
> "=m" (__ptr[__MSW]) \
> - : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
> + : "rJ" (__x), "rJ" (__x >> 32)); \
> } while (0)
> #endif /* CONFIG_64BIT */
>
> diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> index 91e52c4bb33a..05978f78579f 100644
> --- a/arch/riscv/mm/extable.c
> +++ b/arch/riscv/mm/extable.c
> @@ -7,10 +7,12 @@
> */
>
>
> +#include <linux/bitfield.h>
> #include <linux/extable.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> #include <asm/asm-extable.h>
> +#include <asm/ptrace.h>
>
> static inline unsigned long
> get_ex_fixup(const struct exception_table_entry *ex)
> @@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
> return true;
> }
>
> +static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
> + unsigned long val)
> +{
> + if (unlikely(offset > MAX_REG_OFFSET))
> + return;
> +
> + if (!offset)
> + *(unsigned long *)((unsigned long)regs + offset) = val;
> +}
> +
> +static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
> + int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
> +
> + regs_set_gpr(regs, reg_err, -EFAULT);
> + regs_set_gpr(regs, reg_zero, 0);
> +
> + regs->epc = get_ex_fixup(ex);
> + return true;
> +}
> +
> bool fixup_exception(struct pt_regs *regs)
> {
> const struct exception_table_entry *ex;
> @@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
> return ex_handler_fixup(ex, regs);
> case EX_TYPE_BPF:
> return ex_handler_bpf(ex, regs);
> + case EX_TYPE_UACCESS_ERR_ZERO:
> + return ex_handler_uaccess_err_zero(ex, regs);
> }
>
> BUG();
> --
> 2.33.0
>
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2022-01-20 18:15 ` Mayuresh Chitale
@ 2022-01-21 12:16 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2022-01-21 12:16 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> Hello Jisheng,
Hi,
>
> Just wanted to inform you that this patch breaks the writev02 test
> case in LTP and if it is reverted then the test passes. If we run the
> test through strace then we see that the test hangs and following is
> the last line printed by strace:
>
> "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> iov_len=0}]"
>
Thanks for the bug report. I will try to fix it.
> Thanks,
> Mayuresh.
>
>
> On Thu, Nov 18, 2021 at 5:05 PM Jisheng Zhang <jszhang3@mail.ustc.edu.cn> wrote:
> >
> > From: Jisheng Zhang <jszhang@kernel.org>
> >
> > Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
> > uaccess handler"), do similar to riscv to add a dedicated uaccess
> > exception handler to update registers in exception context and
> > subsequently return back into the function which faulted, so we remove
> > the need for fixups specialized to each faulting instruction.
> >
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > ---
> > arch/riscv/include/asm/asm-extable.h | 23 +++++++++
> > arch/riscv/include/asm/futex.h | 23 +++------
> > arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
> > arch/riscv/mm/extable.c | 27 ++++++++++
> > 4 files changed, 78 insertions(+), 69 deletions(-)
> >
> > diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> > index 1b1f4ffd8d37..14be0673f5b5 100644
> > --- a/arch/riscv/include/asm/asm-extable.h
> > +++ b/arch/riscv/include/asm/asm-extable.h
> > @@ -5,6 +5,7 @@
> > #define EX_TYPE_NONE 0
> > #define EX_TYPE_FIXUP 1
> > #define EX_TYPE_BPF 2
> > +#define EX_TYPE_UACCESS_ERR_ZERO 3
> >
> > #ifdef __ASSEMBLY__
> >
> > @@ -23,7 +24,9 @@
> >
> > #else /* __ASSEMBLY__ */
> >
> > +#include <linux/bits.h>
> > #include <linux/stringify.h>
> > +#include <asm/gpr-num.h>
> >
> > #define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> > ".pushsection __ex_table, \"a\"\n" \
> > @@ -37,6 +40,26 @@
> > #define _ASM_EXTABLE(insn, fixup) \
> > __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
> >
> > +#define EX_DATA_REG_ERR_SHIFT 0
> > +#define EX_DATA_REG_ERR GENMASK(4, 0)
> > +#define EX_DATA_REG_ZERO_SHIFT 5
> > +#define EX_DATA_REG_ZERO GENMASK(9, 5)
> > +
> > +#define EX_DATA_REG(reg, gpr) \
> > + "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
> > +
> > +#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
> > + __DEFINE_ASM_GPR_NUMS \
> > + __ASM_EXTABLE_RAW(#insn, #fixup, \
> > + __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
> > + "(" \
> > + EX_DATA_REG(ERR, err) " | " \
> > + EX_DATA_REG(ZERO, zero) \
> > + ")")
> > +
> > +#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
> > +
> > #endif /* __ASSEMBLY__ */
> >
> > #endif /* __ASM_ASM_EXTABLE_H */
> > diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
> > index 2e15e8e89502..fc8130f995c1 100644
> > --- a/arch/riscv/include/asm/futex.h
> > +++ b/arch/riscv/include/asm/futex.h
> > @@ -21,20 +21,14 @@
> >
> > #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
> > { \
> > - uintptr_t tmp; \
> > __enable_user_access(); \
> > __asm__ __volatile__ ( \
> > "1: " insn " \n" \
> > "2: \n" \
> > - " .section .fixup,\"ax\" \n" \
> > - " .balign 4 \n" \
> > - "3: li %[r],%[e] \n" \
> > - " jump 2b,%[t] \n" \
> > - " .previous \n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
> > : [r] "+r" (ret), [ov] "=&r" (oldval), \
> > - [u] "+m" (*uaddr), [t] "=&r" (tmp) \
> > - : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
> > + [u] "+m" (*uaddr) \
> > + : [op] "Jr" (oparg) \
> > : "memory"); \
> > __disable_user_access(); \
> > }
> > @@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
> > "2: sc.w.aqrl %[t],%z[nv],%[u] \n"
> > " bnez %[t],1b \n"
> > "3: \n"
> > - " .section .fixup,\"ax\" \n"
> > - " .balign 4 \n"
> > - "4: li %[r],%[e] \n"
> > - " jump 3b,%[t] \n"
> > - " .previous \n"
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
> > + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
> > : [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
> > - : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
> > + : [ov] "Jr" (oldval), [nv] "Jr" (newval)
> > : "memory");
> > __disable_user_access();
> >
> > diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> > index 40e6099af488..a4716c026386 100644
> > --- a/arch/riscv/include/asm/uaccess.h
> > +++ b/arch/riscv/include/asm/uaccess.h
> > @@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
> >
> > #define __get_user_asm(insn, x, ptr, err) \
> > do { \
> > - uintptr_t __tmp; \
> > __typeof__(x) __x; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " " insn " %1, %3\n" \
> > + " " insn " %1, %2\n" \
> > "2:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "3:\n" \
> > - " li %0, %4\n" \
> > - " li %1, 0\n" \
> > - " jump 2b, %2\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > - : "+r" (err), "=&r" (__x), "=r" (__tmp) \
> > - : "m" (*(ptr)), "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
> > + : "+r" (err), "=&r" (__x) \
> > + : "m" (*(ptr))); \
> > (x) = __x; \
> > } while (0)
> >
> > @@ -108,27 +100,18 @@ do { \
> > do { \
> > u32 __user *__ptr = (u32 __user *)(ptr); \
> > u32 __lo, __hi; \
> > - uintptr_t __tmp; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " lw %1, %4\n" \
> > + " lw %1, %3\n" \
> > "2:\n" \
> > - " lw %2, %5\n" \
> > + " lw %2, %4\n" \
> > "3:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "4:\n" \
> > - " li %0, %6\n" \
> > - " li %1, 0\n" \
> > - " li %2, 0\n" \
> > - " jump 3b, %3\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > - : "+r" (err), "=&r" (__lo), "=r" (__hi), \
> > - "=r" (__tmp) \
> > - : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
> > - "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
> > + : "+r" (err), "=&r" (__lo), "=r" (__hi) \
> > + : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
> > + if (err) \
> > + __hi = 0; \
> > (x) = (__typeof__(x))((__typeof__((x)-(x)))( \
> > (((u64)__hi << 32) | __lo))); \
> > } while (0)
> > @@ -216,21 +199,14 @@ do { \
> >
> > #define __put_user_asm(insn, x, ptr, err) \
> > do { \
> > - uintptr_t __tmp; \
> > __typeof__(*(ptr)) __x = x; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " " insn " %z3, %2\n" \
> > + " " insn " %z2, %1\n" \
> > "2:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "3:\n" \
> > - " li %0, %4\n" \
> > - " jump 2b, %1\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > - : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
> > - : "rJ" (__x), "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
> > + : "+r" (err), "=m" (*(ptr)) \
> > + : "rJ" (__x)); \
> > } while (0)
> >
> > #ifdef CONFIG_64BIT
> > @@ -244,22 +220,16 @@ do { \
> > uintptr_t __tmp; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " sw %z4, %2\n" \
> > + " sw %z3, %1\n" \
> > "2:\n" \
> > - " sw %z5, %3\n" \
> > + " sw %z4, %2\n" \
> > "3:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "4:\n" \
> > - " li %0, %6\n" \
> > - " jump 3b, %1\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > - : "+r" (err), "=r" (__tmp), \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
> > + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
> > + : "+r" (err), \
> > "=m" (__ptr[__LSW]), \
> > "=m" (__ptr[__MSW]) \
> > - : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
> > + : "rJ" (__x), "rJ" (__x >> 32)); \
> > } while (0)
> > #endif /* CONFIG_64BIT */
> >
> > diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> > index 91e52c4bb33a..05978f78579f 100644
> > --- a/arch/riscv/mm/extable.c
> > +++ b/arch/riscv/mm/extable.c
> > @@ -7,10 +7,12 @@
> > */
> >
> >
> > +#include <linux/bitfield.h>
> > #include <linux/extable.h>
> > #include <linux/module.h>
> > #include <linux/uaccess.h>
> > #include <asm/asm-extable.h>
> > +#include <asm/ptrace.h>
> >
> > static inline unsigned long
> > get_ex_fixup(const struct exception_table_entry *ex)
> > @@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
> > return true;
> > }
> >
> > +static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
> > + unsigned long val)
> > +{
> > + if (unlikely(offset > MAX_REG_OFFSET))
> > + return;
> > +
> > + if (!offset)
> > + *(unsigned long *)((unsigned long)regs + offset) = val;
> > +}
> > +
> > +static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
> > + struct pt_regs *regs)
> > +{
> > + int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
> > + int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
> > +
> > + regs_set_gpr(regs, reg_err, -EFAULT);
> > + regs_set_gpr(regs, reg_zero, 0);
> > +
> > + regs->epc = get_ex_fixup(ex);
> > + return true;
> > +}
> > +
> > bool fixup_exception(struct pt_regs *regs)
> > {
> > const struct exception_table_entry *ex;
> > @@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
> > return ex_handler_fixup(ex, regs);
> > case EX_TYPE_BPF:
> > return ex_handler_bpf(ex, regs);
> > + case EX_TYPE_UACCESS_ERR_ZERO:
> > + return ex_handler_uaccess_err_zero(ex, regs);
> > }
> >
> > BUG();
> > --
> > 2.33.0
> >
> >
> >
> > _______________________________________________
> > linux-riscv mailing list
> > linux-riscv@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
@ 2022-01-21 12:16 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2022-01-21 12:16 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> Hello Jisheng,
Hi,
>
> Just wanted to inform you that this patch breaks the writev02 test
> case in LTP and if it is reverted then the test passes. If we run the
> test through strace then we see that the test hangs and following is
> the last line printed by strace:
>
> "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> iov_len=0}]"
>
Thanks for the bug report. I will try to fix it.
> Thanks,
> Mayuresh.
>
>
> On Thu, Nov 18, 2021 at 5:05 PM Jisheng Zhang <jszhang3@mail.ustc.edu.cn> wrote:
> >
> > From: Jisheng Zhang <jszhang@kernel.org>
> >
> > Inspired by commit 2e77a62cb3a6("arm64: extable: add a dedicated
> > uaccess handler"), do similar to riscv to add a dedicated uaccess
> > exception handler to update registers in exception context and
> > subsequently return back into the function which faulted, so we remove
> > the need for fixups specialized to each faulting instruction.
> >
> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> > ---
> > arch/riscv/include/asm/asm-extable.h | 23 +++++++++
> > arch/riscv/include/asm/futex.h | 23 +++------
> > arch/riscv/include/asm/uaccess.h | 74 +++++++++-------------------
> > arch/riscv/mm/extable.c | 27 ++++++++++
> > 4 files changed, 78 insertions(+), 69 deletions(-)
> >
> > diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
> > index 1b1f4ffd8d37..14be0673f5b5 100644
> > --- a/arch/riscv/include/asm/asm-extable.h
> > +++ b/arch/riscv/include/asm/asm-extable.h
> > @@ -5,6 +5,7 @@
> > #define EX_TYPE_NONE 0
> > #define EX_TYPE_FIXUP 1
> > #define EX_TYPE_BPF 2
> > +#define EX_TYPE_UACCESS_ERR_ZERO 3
> >
> > #ifdef __ASSEMBLY__
> >
> > @@ -23,7 +24,9 @@
> >
> > #else /* __ASSEMBLY__ */
> >
> > +#include <linux/bits.h>
> > #include <linux/stringify.h>
> > +#include <asm/gpr-num.h>
> >
> > #define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
> > ".pushsection __ex_table, \"a\"\n" \
> > @@ -37,6 +40,26 @@
> > #define _ASM_EXTABLE(insn, fixup) \
> > __ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")
> >
> > +#define EX_DATA_REG_ERR_SHIFT 0
> > +#define EX_DATA_REG_ERR GENMASK(4, 0)
> > +#define EX_DATA_REG_ZERO_SHIFT 5
> > +#define EX_DATA_REG_ZERO GENMASK(9, 5)
> > +
> > +#define EX_DATA_REG(reg, gpr) \
> > + "((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
> > +
> > +#define _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) \
> > + __DEFINE_ASM_GPR_NUMS \
> > + __ASM_EXTABLE_RAW(#insn, #fixup, \
> > + __stringify(EX_TYPE_UACCESS_ERR_ZERO), \
> > + "(" \
> > + EX_DATA_REG(ERR, err) " | " \
> > + EX_DATA_REG(ZERO, zero) \
> > + ")")
> > +
> > +#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero)
> > +
> > #endif /* __ASSEMBLY__ */
> >
> > #endif /* __ASM_ASM_EXTABLE_H */
> > diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
> > index 2e15e8e89502..fc8130f995c1 100644
> > --- a/arch/riscv/include/asm/futex.h
> > +++ b/arch/riscv/include/asm/futex.h
> > @@ -21,20 +21,14 @@
> >
> > #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
> > { \
> > - uintptr_t tmp; \
> > __enable_user_access(); \
> > __asm__ __volatile__ ( \
> > "1: " insn " \n" \
> > "2: \n" \
> > - " .section .fixup,\"ax\" \n" \
> > - " .balign 4 \n" \
> > - "3: li %[r],%[e] \n" \
> > - " jump 2b,%[t] \n" \
> > - " .previous \n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %[r]) \
> > : [r] "+r" (ret), [ov] "=&r" (oldval), \
> > - [u] "+m" (*uaddr), [t] "=&r" (tmp) \
> > - : [op] "Jr" (oparg), [e] "i" (-EFAULT) \
> > + [u] "+m" (*uaddr) \
> > + : [op] "Jr" (oparg) \
> > : "memory"); \
> > __disable_user_access(); \
> > }
> > @@ -96,15 +90,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
> > "2: sc.w.aqrl %[t],%z[nv],%[u] \n"
> > " bnez %[t],1b \n"
> > "3: \n"
> > - " .section .fixup,\"ax\" \n"
> > - " .balign 4 \n"
> > - "4: li %[r],%[e] \n"
> > - " jump 3b,%[t] \n"
> > - " .previous \n"
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %[r]) \
> > + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %[r]) \
> > : [r] "+r" (ret), [v] "=&r" (val), [u] "+m" (*uaddr), [t] "=&r" (tmp)
> > - : [ov] "Jr" (oldval), [nv] "Jr" (newval), [e] "i" (-EFAULT)
> > + : [ov] "Jr" (oldval), [nv] "Jr" (newval)
> > : "memory");
> > __disable_user_access();
> >
> > diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> > index 40e6099af488..a4716c026386 100644
> > --- a/arch/riscv/include/asm/uaccess.h
> > +++ b/arch/riscv/include/asm/uaccess.h
> > @@ -81,22 +81,14 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
> >
> > #define __get_user_asm(insn, x, ptr, err) \
> > do { \
> > - uintptr_t __tmp; \
> > __typeof__(x) __x; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " " insn " %1, %3\n" \
> > + " " insn " %1, %2\n" \
> > "2:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "3:\n" \
> > - " li %0, %4\n" \
> > - " li %1, 0\n" \
> > - " jump 2b, %2\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > - : "+r" (err), "=&r" (__x), "=r" (__tmp) \
> > - : "m" (*(ptr)), "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 2b, %0, %1) \
> > + : "+r" (err), "=&r" (__x) \
> > + : "m" (*(ptr))); \
> > (x) = __x; \
> > } while (0)
> >
> > @@ -108,27 +100,18 @@ do { \
> > do { \
> > u32 __user *__ptr = (u32 __user *)(ptr); \
> > u32 __lo, __hi; \
> > - uintptr_t __tmp; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " lw %1, %4\n" \
> > + " lw %1, %3\n" \
> > "2:\n" \
> > - " lw %2, %5\n" \
> > + " lw %2, %4\n" \
> > "3:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "4:\n" \
> > - " li %0, %6\n" \
> > - " li %1, 0\n" \
> > - " li %2, 0\n" \
> > - " jump 3b, %3\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > - : "+r" (err), "=&r" (__lo), "=r" (__hi), \
> > - "=r" (__tmp) \
> > - : "m" (__ptr[__LSW]), "m" (__ptr[__MSW]), \
> > - "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(1b, 3b, %0, %1) \
> > + _ASM_EXTABLE_UACCESS_ERR_ZERO(2b, 3b, %0, %1) \
> > + : "+r" (err), "=&r" (__lo), "=r" (__hi) \
> > + : "m" (__ptr[__LSW]), "m" (__ptr[__MSW])) \
> > + if (err) \
> > + __hi = 0; \
> > (x) = (__typeof__(x))((__typeof__((x)-(x)))( \
> > (((u64)__hi << 32) | __lo))); \
> > } while (0)
> > @@ -216,21 +199,14 @@ do { \
> >
> > #define __put_user_asm(insn, x, ptr, err) \
> > do { \
> > - uintptr_t __tmp; \
> > __typeof__(*(ptr)) __x = x; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " " insn " %z3, %2\n" \
> > + " " insn " %z2, %1\n" \
> > "2:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "3:\n" \
> > - " li %0, %4\n" \
> > - " jump 2b, %1\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 3b) \
> > - : "+r" (err), "=r" (__tmp), "=m" (*(ptr)) \
> > - : "rJ" (__x), "i" (-EFAULT)); \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 2b, %0) \
> > + : "+r" (err), "=m" (*(ptr)) \
> > + : "rJ" (__x)); \
> > } while (0)
> >
> > #ifdef CONFIG_64BIT
> > @@ -244,22 +220,16 @@ do { \
> > uintptr_t __tmp; \
> > __asm__ __volatile__ ( \
> > "1:\n" \
> > - " sw %z4, %2\n" \
> > + " sw %z3, %1\n" \
> > "2:\n" \
> > - " sw %z5, %3\n" \
> > + " sw %z4, %2\n" \
> > "3:\n" \
> > - " .section .fixup,\"ax\"\n" \
> > - " .balign 4\n" \
> > - "4:\n" \
> > - " li %0, %6\n" \
> > - " jump 3b, %1\n" \
> > - " .previous\n" \
> > - _ASM_EXTABLE(1b, 4b) \
> > - _ASM_EXTABLE(2b, 4b) \
> > - : "+r" (err), "=r" (__tmp), \
> > + _ASM_EXTABLE_UACCESS_ERR(1b, 3b, %0) \
> > + _ASM_EXTABLE_UACCESS_ERR(2b, 3b, %0) \
> > + : "+r" (err), \
> > "=m" (__ptr[__LSW]), \
> > "=m" (__ptr[__MSW]) \
> > - : "rJ" (__x), "rJ" (__x >> 32), "i" (-EFAULT)); \
> > + : "rJ" (__x), "rJ" (__x >> 32)); \
> > } while (0)
> > #endif /* CONFIG_64BIT */
> >
> > diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
> > index 91e52c4bb33a..05978f78579f 100644
> > --- a/arch/riscv/mm/extable.c
> > +++ b/arch/riscv/mm/extable.c
> > @@ -7,10 +7,12 @@
> > */
> >
> >
> > +#include <linux/bitfield.h>
> > #include <linux/extable.h>
> > #include <linux/module.h>
> > #include <linux/uaccess.h>
> > #include <asm/asm-extable.h>
> > +#include <asm/ptrace.h>
> >
> > static inline unsigned long
> > get_ex_fixup(const struct exception_table_entry *ex)
> > @@ -25,6 +27,29 @@ static bool ex_handler_fixup(const struct exception_table_entry *ex,
> > return true;
> > }
> >
> > +static inline void regs_set_gpr(struct pt_regs *regs, unsigned int offset,
> > + unsigned long val)
> > +{
> > + if (unlikely(offset > MAX_REG_OFFSET))
> > + return;
> > +
> > + if (!offset)
> > + *(unsigned long *)((unsigned long)regs + offset) = val;
> > +}
> > +
> > +static bool ex_handler_uaccess_err_zero(const struct exception_table_entry *ex,
> > + struct pt_regs *regs)
> > +{
> > + int reg_err = FIELD_GET(EX_DATA_REG_ERR, ex->data);
> > + int reg_zero = FIELD_GET(EX_DATA_REG_ZERO, ex->data);
> > +
> > + regs_set_gpr(regs, reg_err, -EFAULT);
> > + regs_set_gpr(regs, reg_zero, 0);
> > +
> > + regs->epc = get_ex_fixup(ex);
> > + return true;
> > +}
> > +
> > bool fixup_exception(struct pt_regs *regs)
> > {
> > const struct exception_table_entry *ex;
> > @@ -38,6 +63,8 @@ bool fixup_exception(struct pt_regs *regs)
> > return ex_handler_fixup(ex, regs);
> > case EX_TYPE_BPF:
> > return ex_handler_bpf(ex, regs);
> > + case EX_TYPE_UACCESS_ERR_ZERO:
> > + return ex_handler_uaccess_err_zero(ex, regs);
> > }
> >
> > BUG();
> > --
> > 2.33.0
> >
> >
> >
> > _______________________________________________
> > linux-riscv mailing list
> > linux-riscv@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2022-01-21 12:16 ` Jisheng Zhang
@ 2022-01-23 9:12 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2022-01-23 9:12 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Fri, Jan 21, 2022 at 08:16:51PM +0800, Jisheng Zhang wrote:
> On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> > Hello Jisheng,
>
> Hi,
>
> >
> > Just wanted to inform you that this patch breaks the writev02 test
> > case in LTP and if it is reverted then the test passes. If we run the
> > test through strace then we see that the test hangs and following is
> > the last line printed by strace:
> >
> > "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> > iov_len=0}]"
> >
>
> Thanks for the bug report. I will try to fix it.
Hi Mayuresh,
I just sent out a fix for this bug. Per my test, the issue is fixed.
Could you please try?
Thanks
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
@ 2022-01-23 9:12 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2022-01-23 9:12 UTC (permalink / raw)
To: Mayuresh Chitale
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
On Fri, Jan 21, 2022 at 08:16:51PM +0800, Jisheng Zhang wrote:
> On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> > Hello Jisheng,
>
> Hi,
>
> >
> > Just wanted to inform you that this patch breaks the writev02 test
> > case in LTP and if it is reverted then the test passes. If we run the
> > test through strace then we see that the test hangs and following is
> > the last line printed by strace:
> >
> > "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> > iov_len=0}]"
> >
>
> Thanks for the bug report. I will try to fix it.
Hi Mayuresh,
I just sent out a fix for this bug. Per my test, the issue is fixed.
Could you please try?
Thanks
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
2022-01-23 9:12 ` Jisheng Zhang
@ 2022-01-24 17:02 ` Mayuresh Chitale
-1 siblings, 0 replies; 47+ messages in thread
From: Mayuresh Chitale @ 2022-01-24 17:02 UTC (permalink / raw)
To: Jisheng Zhang
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
Hi Jisheng,
On Sun, Jan 23, 2022 at 2:50 PM Jisheng Zhang <jszhang@kernel.org> wrote:
>
> On Fri, Jan 21, 2022 at 08:16:51PM +0800, Jisheng Zhang wrote:
> > On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> > > Hello Jisheng,
> >
> > Hi,
> >
> > >
> > > Just wanted to inform you that this patch breaks the writev02 test
> > > case in LTP and if it is reverted then the test passes. If we run the
> > > test through strace then we see that the test hangs and following is
> > > the last line printed by strace:
> > >
> > > "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> > > iov_len=0}]"
> > >
> >
> > Thanks for the bug report. I will try to fix it.
>
> Hi Mayuresh,
>
> I just sent out a fix for this bug. Per my test, the issue is fixed.
> Could you please try?
>
> Thanks
Your fix works as expected.
Thanks,
Mayuresh.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH 11/12] riscv: extable: add a dedicated uaccess handler
@ 2022-01-24 17:02 ` Mayuresh Chitale
0 siblings, 0 replies; 47+ messages in thread
From: Mayuresh Chitale @ 2022-01-24 17:02 UTC (permalink / raw)
To: Jisheng Zhang
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers,
Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
Hi Jisheng,
On Sun, Jan 23, 2022 at 2:50 PM Jisheng Zhang <jszhang@kernel.org> wrote:
>
> On Fri, Jan 21, 2022 at 08:16:51PM +0800, Jisheng Zhang wrote:
> > On Thu, Jan 20, 2022 at 11:45:34PM +0530, Mayuresh Chitale wrote:
> > > Hello Jisheng,
> >
> > Hi,
> >
> > >
> > > Just wanted to inform you that this patch breaks the writev02 test
> > > case in LTP and if it is reverted then the test passes. If we run the
> > > test through strace then we see that the test hangs and following is
> > > the last line printed by strace:
> > >
> > > "writev(3, [{iov_base=0x7fff848a6000, iov_len=8192}, {iov_base=NULL,
> > > iov_len=0}]"
> > >
> >
> > Thanks for the bug report. I will try to fix it.
>
> Hi Mayuresh,
>
> I just sent out a fix for this bug. Per my test, the issue is fixed.
> Could you please try?
>
> Thanks
Your fix works as expected.
Thanks,
Mayuresh.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH 12/12] riscv: vmlinux.lds.S|vmlinux-xip.lds.S: remove `.fixup` section
2021-11-18 11:21 ` Jisheng Zhang
@ 2021-11-18 11:27 ` Jisheng Zhang
-1 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:27 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/kernel/vmlinux-xip.lds.S | 1 -
arch/riscv/kernel/vmlinux.lds.S | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S
index f5ed08262139..75e0fa8a700a 100644
--- a/arch/riscv/kernel/vmlinux-xip.lds.S
+++ b/arch/riscv/kernel/vmlinux-xip.lds.S
@@ -45,7 +45,6 @@ SECTIONS
ENTRY_TEXT
IRQENTRY_TEXT
SOFTIRQENTRY_TEXT
- *(.fixup)
_etext = .;
}
RO_DATA(L1_CACHE_BYTES)
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 0e5ae851929e..4e6c88aa4d87 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -48,7 +48,6 @@ SECTIONS
ENTRY_TEXT
IRQENTRY_TEXT
SOFTIRQENTRY_TEXT
- *(.fixup)
_etext = .;
}
--
2.33.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH 12/12] riscv: vmlinux.lds.S|vmlinux-xip.lds.S: remove `.fixup` section
@ 2021-11-18 11:27 ` Jisheng Zhang
0 siblings, 0 replies; 47+ messages in thread
From: Jisheng Zhang @ 2021-11-18 11:27 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Björn Töpel,
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Masahiro Yamada, Michal Marek, Nick Desaulniers
Cc: Kefeng Wang, Tong Tiangen, linux-riscv, linux-kernel, netdev,
bpf, linux-kbuild
From: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
arch/riscv/kernel/vmlinux-xip.lds.S | 1 -
arch/riscv/kernel/vmlinux.lds.S | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S
index f5ed08262139..75e0fa8a700a 100644
--- a/arch/riscv/kernel/vmlinux-xip.lds.S
+++ b/arch/riscv/kernel/vmlinux-xip.lds.S
@@ -45,7 +45,6 @@ SECTIONS
ENTRY_TEXT
IRQENTRY_TEXT
SOFTIRQENTRY_TEXT
- *(.fixup)
_etext = .;
}
RO_DATA(L1_CACHE_BYTES)
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 0e5ae851929e..4e6c88aa4d87 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -48,7 +48,6 @@ SECTIONS
ENTRY_TEXT
IRQENTRY_TEXT
SOFTIRQENTRY_TEXT
- *(.fixup)
_etext = .;
}
--
2.33.0
^ permalink raw reply related [flat|nested] 47+ messages in thread