|
@@ -26,13 +26,16 @@
|
|
|
|
|
|
#define JUMP_LABEL_NOP_SIZE AARCH64_INSN_SIZE
|
|
|
|
|
|
-static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
|
|
|
+static __always_inline bool arch_static_branch(struct static_key *key,
|
|
|
+ bool branch)
|
|
|
{
|
|
|
- asm_volatile_goto("1: nop\n\t"
|
|
|
- ".pushsection __jump_table, \"aw\"\n\t"
|
|
|
- ".align 3\n\t"
|
|
|
- ".quad 1b, %l[l_yes], %c0\n\t"
|
|
|
- ".popsection\n\t"
|
|
|
+ asm_volatile_goto(
|
|
|
+ "1: nop \n\t"
|
|
|
+ " .pushsection __jump_table, \"aw\" \n\t"
|
|
|
+ " .align 3 \n\t"
|
|
|
+ " .long 1b - ., %l[l_yes] - . \n\t"
|
|
|
+ " .quad %c0 - . \n\t"
|
|
|
+ " .popsection \n\t"
|
|
|
: : "i"(&((char *)key)[branch]) : : l_yes);
|
|
|
|
|
|
return false;
|
|
@@ -40,13 +43,16 @@ l_yes:
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
|
|
|
+static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
|
|
+ bool branch)
|
|
|
{
|
|
|
- asm_volatile_goto("1: b %l[l_yes]\n\t"
|
|
|
- ".pushsection __jump_table, \"aw\"\n\t"
|
|
|
- ".align 3\n\t"
|
|
|
- ".quad 1b, %l[l_yes], %c0\n\t"
|
|
|
- ".popsection\n\t"
|
|
|
+ asm_volatile_goto(
|
|
|
+ "1: b %l[l_yes] \n\t"
|
|
|
+ " .pushsection __jump_table, \"aw\" \n\t"
|
|
|
+ " .align 3 \n\t"
|
|
|
+ " .long 1b - ., %l[l_yes] - . \n\t"
|
|
|
+ " .quad %c0 - . \n\t"
|
|
|
+ " .popsection \n\t"
|
|
|
: : "i"(&((char *)key)[branch]) : : l_yes);
|
|
|
|
|
|
return false;
|
|
@@ -54,13 +60,5 @@ l_yes:
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-typedef u64 jump_label_t;
|
|
|
-
|
|
|
-struct jump_entry {
|
|
|
- jump_label_t code;
|
|
|
- jump_label_t target;
|
|
|
- jump_label_t key;
|
|
|
-};
|
|
|
-
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
#endif /* __ASM_JUMP_LABEL_H */
|