tools: handle renamed lookup_fast function in dcache tools

The lookup_fast function can be rename lookup_fast.constprop.x by gcc
constant propagation optimization and that breaks dcstat and
dcsnoop. Let's look for both name using a regular expression.

diff --git a/tools/dcsnoop.py b/tools/dcsnoop.py
index 7c50152f38ab2c9aefd308ec55621fe48c13a026..819d4e66540d346e17196ebd151fd737c7518acf 100755 (executable)
--- a/tools/dcsnoop.py
+++ b/tools/dcsnoop.py
@@ -129,7 +129,7 @@ if args.ebpf:
 # initialize BPF
 b = BPF(text=bpf_text)
 if args.all:
-    b.attach_kprobe(event="lookup_fast", fn_name="trace_fast")
+    b.attach_kprobe(event_re="^lookup_fast$|^lookup_fast.constprop.*.\d$", fn_name="trace_fast")
 
 mode_s = {
     0: 'M',

diff --git a/tools/dcstat.py b/tools/dcstat.py
index 5ecddd1a7cf74b485d1d5bbc5de6be4035053940..bd0494cd1429a3395728e67ffbcae8620474245c 100755 (executable)
--- a/tools/dcstat.py
+++ b/tools/dcstat.py
@@ -91,7 +91,7 @@ void count_lookup(struct pt_regs *ctx) {
 
 # load BPF program
 b = BPF(text=bpf_text)
-b.attach_kprobe(event="lookup_fast", fn_name="count_fast")
+b.attach_kprobe(event_re="^lookup_fast$|^lookup_fast.constprop.*.\d$", fn_name="count_fast")
 b.attach_kretprobe(event="d_lookup", fn_name="count_lookup")
 
 # stat column labels and indexes