Skip to content

Commit a50480c

Browse files
arighiIngo Molnar
authored andcommitted
kprobes/x86: Blacklist non-attachable interrupt functions
These interrupt functions are already non-attachable by kprobes. Blacklist them explicitly so that they can show up in /sys/kernel/debug/kprobes/blacklist and tools like BCC can use this additional information. Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: Borislav Petkov <bp@alien8.de> Cc: David S. Miller <davem@davemloft.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Yonghong Song <yhs@fb.com> Link: http://lkml.kernel.org/r/20181206095648.GA8249@Dell Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 43a1b0c commit a50480c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/entry/entry_64.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ ENTRY(interrupt_entry)
566566

567567
ret
568568
END(interrupt_entry)
569+
_ASM_NOKPROBE(interrupt_entry)
569570

570571

571572
/* Interrupt entry/exit. */
@@ -766,6 +767,7 @@ native_irq_return_ldt:
766767
jmp native_irq_return_iret
767768
#endif
768769
END(common_interrupt)
770+
_ASM_NOKPROBE(common_interrupt)
769771

770772
/*
771773
* APIC interrupts.
@@ -780,6 +782,7 @@ ENTRY(\sym)
780782
call \do_sym /* rdi points to pt_regs */
781783
jmp ret_from_intr
782784
END(\sym)
785+
_ASM_NOKPROBE(\sym)
783786
.endm
784787

785788
/* Make sure APIC interrupt handlers end up in the irqentry section: */
@@ -960,6 +963,7 @@ ENTRY(\sym)
960963

961964
jmp error_exit
962965
.endif
966+
_ASM_NOKPROBE(\sym)
963967
END(\sym)
964968
.endm
965969

0 commit comments

Comments
 (0)