summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tapsets.cxx12
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1054e468..5ed59476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-09 Frank Ch. Eigler <fche@elastic.org>
+
+ PR 6487.
+ * main.cxx (dwarf_query::build_blacklist): Add kernel/relay.c
+ and kernel/timer.c to probing blacklist.
+
2008-05-07 Frank Ch. Eigler <fche@elastic.org>
PR 6492.
diff --git a/tapsets.cxx b/tapsets.cxx
index 7cdf3c32..67412396 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2425,8 +2425,11 @@ dwarf_query::build_blacklist()
// XXX: it would be nice if these blacklisted functions were pulled
// in dynamically, instead of being statically defined here.
- // Perhaps it could be populated from script files. A "noprobe
- // kernel.function("...")" construct might do the trick.
+ // Perhaps it could be populated from script files. A
+ //
+ // noprobe kernel.function("...")"
+ //
+ // construct might do the trick.
// Most of these are marked __kprobes in newer kernels. We list
// them here (anyway) so the translator can block them on older
@@ -2497,6 +2500,11 @@ dwarf_query::build_blacklist()
blfn += "|.*preempt_count.*";
blfn += "|preempt_schedule";
+ // PR 6487, relay/timer interactions
+ blfile += "|kernel/relay.c";
+ blfile += "|kernel/timer.c";
+ // blfile += "|kernel/workqueue.c";
+
// These functions don't return, so return probes would never be recovered
blfn_ret += "do_exit"; // no "|"
blfn_ret += "|sys_exit";