mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
[PATCH] Kprobes: Make kprobe modules more portable
In an effort to make kprobe modules more portable, here is a patch that: o Introduces the "symbol_name" field to struct kprobe. The symbol->address resolution now happens in the kernel in an architecture agnostic manner. 64-bit powerpc users no longer have to specify the ".symbols" o Introduces the "offset" field to struct kprobe to allow a user to specify an offset into a symbol. o The legacy mechanism of specifying the kprobe.addr is still supported. However, if both the kprobe.addr and kprobe.symbol_name are specified, probe registration fails with an -EINVAL. o The symbol resolution code uses kallsyms_lookup_name(). So CONFIG_KPROBES now depends on CONFIG_KALLSYMS o Apparantly kprobe modules were the only legitimate out-of-tree user of the kallsyms_lookup_name() EXPORT. Now that the symbol resolution happens in-kernel, remove the EXPORT as suggested by Christoph Hellwig o Modify tcp_probe.c that uses the kprobe interface so as to make it work on multiple platforms (in its earlier form, the code wouldn't work, say, on powerpc) Signed-off-by: Ananth N Mavinakayanahalli <[email protected]> Signed-off-by: Prasanna S Panchamukhi <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
782237a241
commit
3a872d89ba
10 changed files with 56 additions and 8 deletions
|
|
@ -44,6 +44,21 @@ typedef unsigned int kprobe_opcode_t;
|
|||
#define IS_TDI(instr) (((instr) & 0xfc000000) == 0x08000000)
|
||||
#define IS_TWI(instr) (((instr) & 0xfc000000) == 0x0c000000)
|
||||
|
||||
/*
|
||||
* 64bit powerpc uses function descriptors.
|
||||
* Handle cases where:
|
||||
* - User passes a <.symbol>
|
||||
* - User passes a <symbol>
|
||||
* - User passes a non-existant symbol, kallsyms_lookup_name
|
||||
* returns 0. Don't deref the NULL pointer in that case
|
||||
*/
|
||||
#define kprobe_lookup_name(name, addr) \
|
||||
{ \
|
||||
addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \
|
||||
if (!(name[0] == '.') && addr) \
|
||||
addr = *(kprobe_opcode_t **)addr; \
|
||||
}
|
||||
|
||||
#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
|
||||
|
||||
#define is_trap(instr) (IS_TW(instr) || IS_TD(instr) || \
|
||||
|
|
|
|||
|
|
@ -77,6 +77,12 @@ struct kprobe {
|
|||
/* location of the probe point */
|
||||
kprobe_opcode_t *addr;
|
||||
|
||||
/* Allow user to indicate symbol name of the probe point */
|
||||
char *symbol_name;
|
||||
|
||||
/* Offset into the symbol */
|
||||
unsigned int offset;
|
||||
|
||||
/* Called before addr is executed. */
|
||||
kprobe_pre_handler_t pre_handler;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue