Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a9ad965ea9a6d719daf333847a2ceb0e363994bd

Authored by bibo, mao
Committed by Linus Torvalds
1 parent 25c8716cb0
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] IA64: kprobe invalidate icache of jump buffer 

Kprobe inserts breakpoint instruction in probepoint and then jumps to
instruction slot when breakpoint is hit, the instruction slot icache must
be consistent with dcache.  Here is the patch which invalidates instruction
slot icache area.

Without this patch, in some machines there will be fault when executing
instruction slot where icache content is inconsistent with dcache.

Signed-off-by: bibo,mao <bibo.mao@intel.com>
Acked-by: "Luck, Tony" <tony.luck@intel.com>
Acked-by: Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 7 changed files with 15 additions and 0 deletions Side-by-side Diff

arch/ia64/kernel/kprobes.c
Diff comments   View file @ a9ad965
... ... @@ -448,11 +448,20 @@
448 448 return 0;
449 449 }
450 450  
  451 +void __kprobes flush_insn_slot(struct kprobe *p)
  452 +{
  453 + unsigned long arm_addr;
  454 +
  455 + arm_addr = ((unsigned long)&p->opcode.bundle) & ~0xFULL;
  456 + flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
  457 +}
  458 +
451 459 void __kprobes arch_arm_kprobe(struct kprobe *p)
452 460 {
453 461 unsigned long addr = (unsigned long)p->addr;
454 462 unsigned long arm_addr = addr & ~0xFULL;
455 463  
  464 + flush_insn_slot(p);
456 465 memcpy((char *)arm_addr, &p->ainsn.insn.bundle, sizeof(bundle_t));
457 466 flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
458 467 }
include/asm-i386/kprobes.h
Diff comments   View file @ a9ad965
... ... @@ -45,6 +45,7 @@
45 45 #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
46 46 #define ARCH_SUPPORTS_KRETPROBES
47 47 #define ARCH_INACTIVE_KPROBE_COUNT 0
  48 +#define flush_insn_slot(p) do { } while (0)
48 49  
49 50 void arch_remove_kprobe(struct kprobe *p);
50 51 void kretprobe_trampoline(void);
include/asm-ia64/kprobes.h
Diff comments   View file @ a9ad965
... ... @@ -125,6 +125,7 @@
125 125 }
126 126 extern void invalidate_stacked_regs(void);
127 127 extern void flush_register_stack(void);
  128 +extern void flush_insn_slot(struct kprobe *p);
128 129  
129 130 #endif /* _ASM_KPROBES_H */
include/asm-powerpc/kprobes.h
Diff comments   View file @ a9ad965
... ... @@ -51,6 +51,7 @@
51 51  
52 52 #define ARCH_SUPPORTS_KRETPROBES
53 53 #define ARCH_INACTIVE_KPROBE_COUNT 1
  54 +#define flush_insn_slot(p) do { } while (0)
54 55  
55 56 void kretprobe_trampoline(void);
56 57 extern void arch_remove_kprobe(struct kprobe *p);
include/asm-sparc64/kprobes.h
Diff comments   View file @ a9ad965
... ... @@ -13,6 +13,7 @@
13 13 #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
14 14 #define arch_remove_kprobe(p) do {} while (0)
15 15 #define ARCH_INACTIVE_KPROBE_COUNT 0
  16 +#define flush_insn_slot(p) do { } while (0)
16 17  
17 18 /* Architecture specific copy of original instruction*/
18 19 struct arch_specific_insn {
include/asm-x86_64/kprobes.h
Diff comments   View file @ a9ad965
... ... @@ -47,6 +47,7 @@
47 47  
48 48 void kretprobe_trampoline(void);
49 49 extern void arch_remove_kprobe(struct kprobe *p);
  50 +#define flush_insn_slot(p) do { } while (0)
50 51  
51 52 /* Architecture specific copy of original instruction*/
52 53 struct arch_specific_insn {
... ... @@ -393,6 +393,7 @@
393 393 static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p)
394 394 {
395 395 copy_kprobe(p, ap);
  396 + flush_insn_slot(ap);
396 397 ap->addr = p->addr;
397 398 ap->pre_handler = aggr_pre_handler;
398 399 ap->fault_handler = aggr_fault_handler;