From c9defeda8047399982c2d9a356a736c01b95d27e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 May 2024 20:32:06 +0200 Subject: [PATCH] fix up bpftool patch for quilt --- ...ol-fix-missing-pids-during-link-show.patch | 22 +++++++++---------- ...ol-fix-missing-pids-during-link-show.patch | 22 +++++++++---------- ...ol-fix-missing-pids-during-link-show.patch | 22 +++++++++---------- ...ol-fix-missing-pids-during-link-show.patch | 22 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch index 885bebcac71..64ab5d74fc0 100644 --- a/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch +++ b/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch @@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g., target_obj_id 1 target_btf_id 31320 Hack the following change to enable normal libbpf debug output, - --- a/tools/bpf/bpftool/pids.c - +++ b/tools/bpf/bpftool/pids.c - @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) - /* we don't want output polluted with libbpf errors if bpf_iter is not - * supported - */ - - default_print = libbpf_set_print(libbpf_print_none); - + /* default_print = libbpf_set_print(libbpf_print_none); */ - err = pid_iter_bpf__load(skel); - - libbpf_set_print(default_print); - + /* libbpf_set_print(default_print); */ +# --- a/tools/bpf/bpftool/pids.c +# +++ b/tools/bpf/bpftool/pids.c +# @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) +# /* we don't want output polluted with libbpf errors if bpf_iter is not +# * supported +# */ +# - default_print = libbpf_set_print(libbpf_print_none); +# + /* default_print = libbpf_set_print(libbpf_print_none); */ +# err = pid_iter_bpf__load(skel); +# - libbpf_set_print(default_print); +# + /* libbpf_set_print(default_print); */ Rerun the above bpftool command: $ tools/build/bpftool/bpftool link diff --git a/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch index a3ca74d6e25..4acab1ff769 100644 --- a/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch +++ b/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch @@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g., target_obj_id 1 target_btf_id 31320 Hack the following change to enable normal libbpf debug output, - --- a/tools/bpf/bpftool/pids.c - +++ b/tools/bpf/bpftool/pids.c - @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) - /* we don't want output polluted with libbpf errors if bpf_iter is not - * supported - */ - - default_print = libbpf_set_print(libbpf_print_none); - + /* default_print = libbpf_set_print(libbpf_print_none); */ - err = pid_iter_bpf__load(skel); - - libbpf_set_print(default_print); - + /* libbpf_set_print(default_print); */ +# --- a/tools/bpf/bpftool/pids.c +# +++ b/tools/bpf/bpftool/pids.c +# @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) +# /* we don't want output polluted with libbpf errors if bpf_iter is not +# * supported +# */ +# - default_print = libbpf_set_print(libbpf_print_none); +# + /* default_print = libbpf_set_print(libbpf_print_none); */ +# err = pid_iter_bpf__load(skel); +# - libbpf_set_print(default_print); +# + /* libbpf_set_print(default_print); */ Rerun the above bpftool command: $ tools/build/bpftool/bpftool link diff --git a/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch index 686f5c8ecd1..704f3b6a241 100644 --- a/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch +++ b/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch @@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g., target_obj_id 1 target_btf_id 31320 Hack the following change to enable normal libbpf debug output, - --- a/tools/bpf/bpftool/pids.c - +++ b/tools/bpf/bpftool/pids.c - @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) - /* we don't want output polluted with libbpf errors if bpf_iter is not - * supported - */ - - default_print = libbpf_set_print(libbpf_print_none); - + /* default_print = libbpf_set_print(libbpf_print_none); */ - err = pid_iter_bpf__load(skel); - - libbpf_set_print(default_print); - + /* libbpf_set_print(default_print); */ +# --- a/tools/bpf/bpftool/pids.c +# +++ b/tools/bpf/bpftool/pids.c +# @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) +# /* we don't want output polluted with libbpf errors if bpf_iter is not +# * supported +# */ +# - default_print = libbpf_set_print(libbpf_print_none); +# + /* default_print = libbpf_set_print(libbpf_print_none); */ +# err = pid_iter_bpf__load(skel); +# - libbpf_set_print(default_print); +# + /* libbpf_set_print(default_print); */ Rerun the above bpftool command: $ tools/build/bpftool/bpftool link diff --git a/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch index f1ad2f74c72..70bd5f31b37 100644 --- a/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch +++ b/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch @@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g., target_obj_id 1 target_btf_id 31320 Hack the following change to enable normal libbpf debug output, - --- a/tools/bpf/bpftool/pids.c - +++ b/tools/bpf/bpftool/pids.c - @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) - /* we don't want output polluted with libbpf errors if bpf_iter is not - * supported - */ - - default_print = libbpf_set_print(libbpf_print_none); - + /* default_print = libbpf_set_print(libbpf_print_none); */ - err = pid_iter_bpf__load(skel); - - libbpf_set_print(default_print); - + /* libbpf_set_print(default_print); */ +# --- a/tools/bpf/bpftool/pids.c +# +++ b/tools/bpf/bpftool/pids.c +# @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) +# /* we don't want output polluted with libbpf errors if bpf_iter is not +# * supported +# */ +# - default_print = libbpf_set_print(libbpf_print_none); +# + /* default_print = libbpf_set_print(libbpf_print_none); */ +# err = pid_iter_bpf__load(skel); +# - libbpf_set_print(default_print); +# + /* libbpf_set_print(default_print); */ Rerun the above bpftool command: $ tools/build/bpftool/bpftool link -- 2.47.3