diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-05-24 21:11:13 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-08-10 15:33:49 +0100 |
| commit | b8557d9117093ebe17320d36dadd47fc742820c9 (patch) | |
| tree | e494687bdf7a41319f818818ef4b46e34ad75fd5 /arch/arm64/kernel | |
| parent | 62f0b42355e0b5f73456ce8df0e926749d8fdf7e (diff) | |
arm64: text replication: add node text patching
Add support for text patching on our replicated texts.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/alternative.c | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/patching.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index 7bbf5104b7b7..b4bf3c24668c 100644 --- a/arch/arm64/kernel/alternative.c +++ b/arch/arm64/kernel/alternative.c @@ -14,6 +14,7 @@ #include <asm/alternative.h> #include <asm/cpufeature.h> #include <asm/insn.h> +#include <asm/ktext.h> #include <asm/sections.h> #include <linux/stop_machine.h> @@ -170,6 +171,7 @@ static void __nocfi __apply_alternatives(struct alt_region *region, bool is_modu alt_cb(alt, origptr, updptr, nr_inst); if (!is_module) { + ktext_replication_patch_alternative(updptr, nr_inst); clean_dcache_range_nopatch((u64)origptr, (u64)(origptr + nr_inst)); } diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c index 33e0fabc0b79..0805440aa3c1 100644 --- a/arch/arm64/kernel/patching.c +++ b/arch/arm64/kernel/patching.c @@ -10,6 +10,7 @@ #include <asm/fixmap.h> #include <asm/insn.h> #include <asm/kprobes.h> +#include <asm/ktext.h> #include <asm/patching.h> #include <asm/sections.h> @@ -98,9 +99,13 @@ int __kprobes aarch64_insn_patch_text_nosync(void *addr, u32 insn) return -EINVAL; ret = aarch64_insn_write(tp, insn); - if (ret == 0) + if (ret == 0) { + /* Also patch the other nodes */ + ktext_replication_patch(tp, cpu_to_le32(insn)); + caches_clean_inval_pou((uintptr_t)tp, (uintptr_t)tp + AARCH64_INSN_SIZE); + } return ret; } |