Commit c4ed0d73 authored by Tong Tiangen's avatar Tong Tiangen Committed by Will Deacon

arm64: extable: make uaaccess helper use extable type EX_TYPE_UACCESS_ERR_ZERO

Currnetly, the extable type used by __arch_copy_from/to_user() is
EX_TYPE_FIXUP. In fact, It is more clearly to use meaningful
EX_TYPE_UACCESS_*.
Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Link: https://lore.kernel.org/r/20220621072638.1273594-5-tongtiangen@huawei.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent 59e8a1ce
...@@ -63,6 +63,14 @@ ...@@ -63,6 +63,14 @@
_ASM_EXTABLE(\insn, \fixup) _ASM_EXTABLE(\insn, \fixup)
.endm .endm
/*
* Create an exception table entry for uaccess `insn`, which will branch to `fixup`
* when an unhandled fault is taken.
*/
.macro _asm_extable_uaccess, insn, fixup
_ASM_EXTABLE_UACCESS(\insn, \fixup)
.endm
/* /*
* Create an exception table entry for `insn` if `fixup` is provided. Otherwise * Create an exception table entry for `insn` if `fixup` is provided. Otherwise
* do nothing. * do nothing.
......
...@@ -61,7 +61,7 @@ alternative_else_nop_endif ...@@ -61,7 +61,7 @@ alternative_else_nop_endif
#define USER(l, x...) \ #define USER(l, x...) \
9999: x; \ 9999: x; \
_asm_extable 9999b, l _asm_extable_uaccess 9999b, l
/* /*
* Generate the assembly for LDTR/STTR with exception table entries. * Generate the assembly for LDTR/STTR with exception table entries.
...@@ -73,8 +73,8 @@ alternative_else_nop_endif ...@@ -73,8 +73,8 @@ alternative_else_nop_endif
8889: ldtr \reg2, [\addr, #8]; 8889: ldtr \reg2, [\addr, #8];
add \addr, \addr, \post_inc; add \addr, \addr, \post_inc;
_asm_extable 8888b,\l; _asm_extable_uaccess 8888b, \l;
_asm_extable 8889b,\l; _asm_extable_uaccess 8889b, \l;
.endm .endm
.macro user_stp l, reg1, reg2, addr, post_inc .macro user_stp l, reg1, reg2, addr, post_inc
...@@ -82,14 +82,14 @@ alternative_else_nop_endif ...@@ -82,14 +82,14 @@ alternative_else_nop_endif
8889: sttr \reg2, [\addr, #8]; 8889: sttr \reg2, [\addr, #8];
add \addr, \addr, \post_inc; add \addr, \addr, \post_inc;
_asm_extable 8888b,\l; _asm_extable_uaccess 8888b,\l;
_asm_extable 8889b,\l; _asm_extable_uaccess 8889b,\l;
.endm .endm
.macro user_ldst l, inst, reg, addr, post_inc .macro user_ldst l, inst, reg, addr, post_inc
8888: \inst \reg, [\addr]; 8888: \inst \reg, [\addr];
add \addr, \addr, \post_inc; add \addr, \addr, \post_inc;
_asm_extable 8888b,\l; _asm_extable_uaccess 8888b, \l;
.endm .endm
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment