diff options
| author |   Ard Biesheuvel <ardb@kernel.org> | 2022-06-15 17:41:40 +0200 |
|---|---|---|
| committer |   Peter Zijlstra <peterz@infradead.org> | 2022-06-24 09:48:54 +0200 |
| commit | 0c3b61e00a0d0872c521586494ec23f6016c317a (patch) | |
| tree | 615555f1d725b28b547d7c60c9d9d7f45371b76c /arch/s390/include | |
| parent | Linux 5.19-rc3 (diff) | |
| download | linux-dev-0c3b61e00a0d0872c521586494ec23f6016c317a.tar.xz linux-dev-0c3b61e00a0d0872c521586494ec23f6016c317a.zip | |
jump_label: s390: avoid pointless initial NOP patching
Patching NOPs into other NOPs at boot time serves no purpose, so let's
use the same NOP encodings at compile time and runtime.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220615154142.1574619-2-ardb@kernel.org
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/jump_label.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h index 916cfcb36d8a..895f774bbcc5 100644 --- a/arch/s390/include/asm/jump_label.h +++ b/arch/s390/include/asm/jump_label.h @@ -10,7 +10,6 @@ #include <linux/stringify.h> #define JUMP_LABEL_NOP_SIZE 6 -#define JUMP_LABEL_NOP_OFFSET 2 #ifdef CONFIG_CC_IS_CLANG #define JUMP_LABEL_STATIC_KEY_CONSTRAINT "i" @@ -21,12 +20,12 @@ #endif /* - * We use a brcl 0,2 instruction for jump labels at compile time so it + * We use a brcl 0,<offset> instruction for jump labels so it * can be easily distinguished from a hotpatch generated instruction. */ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { - asm_volatile_goto("0: brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n" + asm_volatile_goto("0: brcl 0,%l[label]\n" ".pushsection __jump_table,\"aw\"\n" ".balign 8\n" ".long 0b-.,%l[label]-.\n" |