|
From: Frédéric W. <fwe...@gm...> - 2009-10-12 10:13:02
|
Le 12 octobre 2009 12:10, Frédéric Weisbecker <fwe...@gm...> a écrit : > 2009/10/8 Masami Hiramatsu <mhi...@re...>: >> Check whether the argument name is conflict with other field names. >> >> Changes in v3: >> - Check strcmp() == 0 instead of !strcmp(). >> >> Changes in v2: >> - Add common_lock_depth to reserved name list. >> >> Signed-off-by: Masami Hiramatsu <mhi...@re...> >> Cc: Frederic Weisbecker <fwe...@gm...> >> Cc: Ingo Molnar <mi...@el...> >> Cc: Thomas Gleixner <tg...@li...> >> Cc: Arnaldo Carvalho de Melo <ac...@re...> >> Cc: Steven Rostedt <ro...@go...> >> Cc: Mike Galbraith <ef...@gm...> >> Cc: Paul Mackerras <pa...@sa...> >> Cc: Peter Zijlstra <a.p...@ch...> >> Cc: Christoph Hellwig <hc...@in...> >> Cc: Ananth N Mavinakayanahalli <an...@in...> >> Cc: Jim Keniston <jke...@us...> >> Cc: Frank Ch. Eigler <fc...@re...> >> --- >> >> kernel/trace/trace_kprobe.c | 65 +++++++++++++++++++++++++++++++++++-------- >> 1 files changed, 53 insertions(+), 12 deletions(-) >> >> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c >> index 030f28c..e3b824a 100644 >> --- a/kernel/trace/trace_kprobe.c >> +++ b/kernel/trace/trace_kprobe.c >> @@ -38,6 +38,25 @@ >> #define MAX_EVENT_NAME_LEN 64 >> #define KPROBE_EVENT_SYSTEM "kprobes" >> >> +/* Reserved field names */ >> +#define FIELD_STRING_IP "ip" >> +#define FIELD_STRING_NARGS "nargs" >> +#define FIELD_STRING_RETIP "ret_ip" >> +#define FIELD_STRING_FUNC "func" > > > If it might conflict, then we should minimize the possibilities for > that to happen. > > What if we prefix these fields with kprobed_ ? > > kprobed_ip > kprobed_nargs > kprobed_ret_ip > kprobed_func > > We are lucky there in that kprobe functions in the kernel can't be kprobed > so it's safe wrt the conflict in the same namespace. > > And we can further schrink the kprobed prefixes in userspace post processing. > > (If you agree with the above, that can be done incrementally). > > Thanks. I'm an idiot. I should have looked at the 5/7 patch before sending this reply. Just forget about what I said :-) |