[PATCH v6 2/7] arm64: introduce interfaces to hotpatch kernel and module code
From: Will Deacon <hidden>
Date: 2013-12-13 15:55:28
Also in:
lkml
On Tue, Dec 10, 2013 at 04:03:48PM +0000, Jiang Liu wrote:
Introduce three interfaces to patch kernel and module code: aarch64_insn_patch_text_nosync(): patch code without synchronization, it's caller's responsibility to synchronize all CPUs if needed. aarch64_insn_patch_text_sync(): patch code and always synchronize with stop_machine() aarch64_insn_patch_text(): patch code and synchronize with stop_machine() if needed Signed-off-by: Jiang Liu <redacted> --- arch/arm64/include/asm/insn.h | 10 +++- arch/arm64/kernel/insn.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-)
Two comments on the patching callback...
+static int __kprobes aarch64_insn_patch_text_cb(void *arg)
+{
+ int i, ret = 0;
+ struct aarch64_insn_patch *pp = arg;
+
+ /* The first CPU becomes master */
+ if (atomic_inc_return(&pp->cpu_count) == 1) {
+ for (i = 0; ret == 0 && i < pp->insn_cnt; i++)
+ ret = aarch64_insn_patch_text_nosync(pp->text_addrs[i],
+ pp->new_insns[i]);
+ /* Make sure changes are visible to other CPUs and let them continue */
+ smp_wmb();As I mentioned last time, you can rely on aarch64_insn_patch_text_nosync to enforce ordering (flush_icache_range ends with dsb; isb). Just add a comment saying that.
+ atomic_set(&pp->cpu_count, -1);
+ } else {
+ while (atomic_read(&pp->cpu_count) != -1)
+ cpu_relax();
+ smp_rmb();You don't need the smp_rmb here. Will