On Mon, Mar 13, 2023 at 02:56:26PM -0600, Ross Zwisler wrote: > From: Ross Zwisler <zwisler@xxxxxxxxxx> > > v3 here: > https://lore.kernel.org/all/20230310192050.4096886-1-zwisler@xxxxxxxxxx/ Sorry, this should have been: https://lore.kernel.org/all/20230310175209.2130880-1-zwisler@xxxxxxxxxx/ > > Changes since v3: > * Added braces around a few multi-line if/else statements (Steven Rostedt) > * Added Reviewed-by from Steven to patch 1 > * Rebased onto the current bpf/bpf-next > > Ross Zwisler (2): > bpf: use canonical ftrace path > selftests/bpf: use canonical ftrace path > > include/uapi/linux/bpf.h | 8 ++++---- > samples/bpf/cpustat_kern.c | 4 ++-- > samples/bpf/hbm.c | 4 ++-- > samples/bpf/ibumad_kern.c | 4 ++-- > samples/bpf/lwt_len_hist.sh | 2 +- > samples/bpf/offwaketime_kern.c | 2 +- > samples/bpf/task_fd_query_user.c | 4 ++-- > samples/bpf/test_lwt_bpf.sh | 2 +- > samples/bpf/test_overhead_tp.bpf.c | 4 ++-- > tools/include/uapi/linux/bpf.h | 8 ++++---- > tools/testing/selftests/bpf/get_cgroup_id_user.c | 9 +++++++-- > .../selftests/bpf/prog_tests/kprobe_multi_test.c | 7 ++++++- > .../selftests/bpf/prog_tests/task_fd_query_tp.c | 9 +++++++-- > .../selftests/bpf/prog_tests/tp_attach_query.c | 9 +++++++-- > .../testing/selftests/bpf/prog_tests/trace_printk.c | 10 +++++++--- > .../selftests/bpf/prog_tests/trace_vprintk.c | 10 +++++++--- > .../selftests/bpf/progs/test_stacktrace_map.c | 2 +- > tools/testing/selftests/bpf/progs/test_tracepoint.c | 2 +- > tools/testing/selftests/bpf/test_ftrace.sh | 7 ++++++- > tools/testing/selftests/bpf/test_tunnel.sh | 13 +++++++++---- > tools/testing/selftests/bpf/trace_helpers.c | 8 ++++++-- > 21 files changed, 85 insertions(+), 43 deletions(-) > > > base-commit: 22df776a9a866713d9decfb92b633bcfdb571954 > -- > 2.40.0.rc1.284.g88254d51c5-goog >