From 4e0502b8b31032abbc0424cff222139288a3891a Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 4 Oct 2021 12:02:35 +0200 Subject: [PATCH] s390/jump_label: make use of HAVE_JUMP_LABEL_BATCH Specify HAVE_JUMP_LABEL_BATCH in header file. This allows to make use of the arch_jump_label_transform_queue()/arch_jump_label_transform_apply() mechanism. However unlike on x86, which currently is the only user of this mechanism, the to be patched instructions are still directly modified. The only difference to before is that serialization is only done after all instructions have been modified. This way the number of serialization/synchronization events is reduced. Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik --- arch/s390/include/asm/jump_label.h | 2 ++ arch/s390/kernel/jump_label.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h index dcb1bba4f406..916cfcb36d8a 100644 --- a/arch/s390/include/asm/jump_label.h +++ b/arch/s390/include/asm/jump_label.h @@ -2,6 +2,8 @@ #ifndef _ASM_S390_JUMP_LABEL_H #define _ASM_S390_JUMP_LABEL_H +#define HAVE_JUMP_LABEL_BATCH + #ifndef __ASSEMBLY__ #include diff --git a/arch/s390/kernel/jump_label.c b/arch/s390/kernel/jump_label.c index 1e245da82197..edefb40f172b 100644 --- a/arch/s390/kernel/jump_label.c +++ b/arch/s390/kernel/jump_label.c @@ -79,8 +79,21 @@ void arch_jump_label_transform(struct jump_entry *entry, text_poke_sync(); } +bool arch_jump_label_transform_queue(struct jump_entry *entry, + enum jump_label_type type) +{ + __jump_label_transform(entry, type, 0); + return true; +} + +void arch_jump_label_transform_apply(void) +{ + text_poke_sync(); +} + void arch_jump_label_transform_static(struct jump_entry *entry, enum jump_label_type type) { __jump_label_transform(entry, type, 1); + text_poke_sync(); }