From 3b86b565d3a416a250772bd6bf4ea282bd856fe9 Mon Sep 17 00:00:00 2001 From: yonghong-song Date: Wed, 13 Jun 2018 06:12:43 -0700 Subject: [PATCH] make tcpdrop and zfsslower python3 compatible (#1817) Make the input string of get_kprobe_functions as bytes literal in tcpdrop and zfsslower so the tool can be python3 compatible. Signed-off-by: Yonghong Song --- tools/tcpdrop.py | 2 +- tools/zfsslower.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tcpdrop.py b/tools/tcpdrop.py index 6f01f8d56dca..77ad75274a1f 100755 --- a/tools/tcpdrop.py +++ b/tools/tcpdrop.py @@ -202,7 +202,7 @@ def print_ipv6_event(cpu, data, size): # initialize BPF b = BPF(text=bpf_text) -if b.get_kprobe_functions("tcp_drop"): +if b.get_kprobe_functions(b"tcp_drop"): b.attach_kprobe(event="tcp_drop", fn_name="trace_tcp_drop") else: print("ERROR: tcp_drop() kernel function not found or traceable. " diff --git a/tools/zfsslower.py b/tools/zfsslower.py index 5e1c32849b1f..8e1a0de8997d 100755 --- a/tools/zfsslower.py +++ b/tools/zfsslower.py @@ -276,10 +276,10 @@ def print_event(cpu, data, size): b = BPF(text=bpf_text) # common file functions -if BPF.get_kprobe_functions('zpl_iter'): +if BPF.get_kprobe_functions(b'zpl_iter'): b.attach_kprobe(event="zpl_iter_read", fn_name="trace_rw_entry") b.attach_kprobe(event="zpl_iter_write", fn_name="trace_rw_entry") -elif BPF.get_kprobe_functions('zpl_aio'): +elif BPF.get_kprobe_functions(b'zpl_aio'): b.attach_kprobe(event="zpl_aio_read", fn_name="trace_rw_entry") b.attach_kprobe(event="zpl_aio_write", fn_name="trace_rw_entry") else: @@ -287,10 +287,10 @@ def print_event(cpu, data, size): b.attach_kprobe(event="zpl_write", fn_name="trace_rw_entry") b.attach_kprobe(event="zpl_open", fn_name="trace_open_entry") b.attach_kprobe(event="zpl_fsync", fn_name="trace_fsync_entry") -if BPF.get_kprobe_functions('zpl_iter'): +if BPF.get_kprobe_functions(b'zpl_iter'): b.attach_kretprobe(event="zpl_iter_read", fn_name="trace_read_return") b.attach_kretprobe(event="zpl_iter_write", fn_name="trace_write_return") -elif BPF.get_kprobe_functions('zpl_aio'): +elif BPF.get_kprobe_functions(b'zpl_aio'): b.attach_kretprobe(event="zpl_aio_read", fn_name="trace_read_return") b.attach_kretprobe(event="zpl_aio_write", fn_name="trace_write_return") else: