drop bpftool patch from 5.15 and older

diff --git a/queue-5.10/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch b/queue-5.10/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
deleted file mode 100644 (file)
index 3aadb24..0000000
--- a/queue-5.10/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 073974deac183db58a9aff5010937dcf268e303b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jul 2024 21:11:50 +0800
-Subject: bpftool: Mount bpffs when pinmaps path not under the bpffs
-
-From: Tao Chen <chen.dylane@gmail.com>
-
-[ Upstream commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b ]
-
-As Quentin said [0], BPF map pinning will fail if the pinmaps path is not
-under the bpffs, like:
-
-  libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
-  Error: failed to pin all maps
-
-  [0] https://github.com/libbpf/bpftool/issues/146
-
-Fixes: 3767a94b3253 ("bpftool: add pinmaps argument to the load/loadall")
-Signed-off-by: Tao Chen <chen.dylane@gmail.com>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Tested-by: Quentin Monnet <qmo@kernel.org>
-Reviewed-by: Quentin Monnet <qmo@kernel.org>
-Link: https://lore.kernel.org/bpf/20240702131150.15622-1-chen.dylane@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bpf/bpftool/prog.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
-index d07996e7952f3..469e8db5684aa 100644
---- a/tools/bpf/bpftool/prog.c
-+++ b/tools/bpf/bpftool/prog.c
-@@ -1611,6 +1611,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
-       }
- 
-       if (pinmaps) {
-+              err = create_and_mount_bpffs_dir(pinmaps);
-+              if (err)
-+                      goto err_unpin;
-+
-               err = bpf_object__pin_maps(obj, pinmaps);
-               if (err) {
-                       p_err("failed to pin all maps");
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 8ab18ac12e3a10dafa269331c44b03f4c881a97b..e2aca3d44f7a9c9192a47b30cc280a3f1541c7fd 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -50,7 +50,6 @@ net-fec-refactor-define-magic-constants.patch
 net-fec-fix-fec_ecr_en1588-being-cleared-on-link-dow.patch
 ipvs-avoid-unnecessary-calls-to-skb_is_gso_sctp.patch
 netfilter-nf_tables-rise-cap-on-selinux-secmark-cont.patch
-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
 perf-x86-intel-pt-fix-pt_topa_entry_for_page-address.patch
 perf-fix-perf_aux_size-for-greater-than-32-bit-size.patch
 perf-prevent-passing-zero-nr_pages-to-rb_alloc_aux.patch

diff --git a/queue-5.15/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch b/queue-5.15/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
deleted file mode 100644 (file)
index fa97af0..0000000
--- a/queue-5.15/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0d0f0b1ff512cf2e5a7cb8ab41a736c8214b50a3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jul 2024 21:11:50 +0800
-Subject: bpftool: Mount bpffs when pinmaps path not under the bpffs
-
-From: Tao Chen <chen.dylane@gmail.com>
-
-[ Upstream commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b ]
-
-As Quentin said [0], BPF map pinning will fail if the pinmaps path is not
-under the bpffs, like:
-
-  libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
-  Error: failed to pin all maps
-
-  [0] https://github.com/libbpf/bpftool/issues/146
-
-Fixes: 3767a94b3253 ("bpftool: add pinmaps argument to the load/loadall")
-Signed-off-by: Tao Chen <chen.dylane@gmail.com>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Tested-by: Quentin Monnet <qmo@kernel.org>
-Reviewed-by: Quentin Monnet <qmo@kernel.org>
-Link: https://lore.kernel.org/bpf/20240702131150.15622-1-chen.dylane@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bpf/bpftool/prog.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
-index afb28fcc66786..da1864d28892d 100644
---- a/tools/bpf/bpftool/prog.c
-+++ b/tools/bpf/bpftool/prog.c
-@@ -1627,6 +1627,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
-       }
- 
-       if (pinmaps) {
-+              err = create_and_mount_bpffs_dir(pinmaps);
-+              if (err)
-+                      goto err_unpin;
-+
-               err = bpf_object__pin_maps(obj, pinmaps);
-               if (err) {
-                       p_err("failed to pin all maps");
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 778f977f9c0184ab3aa0cd36f549d16256bdd135..1d54a7a9b74781413fcf4072431c12bd3e422d25 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ net-fec-fix-fec_ecr_en1588-being-cleared-on-link-dow.patch
 libbpf-checking-the-btf_type-kind-when-fixing-variab.patch
 ipvs-avoid-unnecessary-calls-to-skb_is_gso_sctp.patch
 netfilter-nf_tables-rise-cap-on-selinux-secmark-cont.patch
-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
 perf-x86-intel-pt-fix-pt_topa_entry_for_page-address.patch
 perf-fix-perf_aux_size-for-greater-than-32-bit-size.patch
 perf-prevent-passing-zero-nr_pages-to-rb_alloc_aux.patch

diff --git a/queue-5.4/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch b/queue-5.4/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
deleted file mode 100644 (file)
index 033769f..0000000
--- a/queue-5.4/bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fce304c8e466d55695284e01ef61898476658248 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jul 2024 21:11:50 +0800
-Subject: bpftool: Mount bpffs when pinmaps path not under the bpffs
-
-From: Tao Chen <chen.dylane@gmail.com>
-
-[ Upstream commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b ]
-
-As Quentin said [0], BPF map pinning will fail if the pinmaps path is not
-under the bpffs, like:
-
-  libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
-  Error: failed to pin all maps
-
-  [0] https://github.com/libbpf/bpftool/issues/146
-
-Fixes: 3767a94b3253 ("bpftool: add pinmaps argument to the load/loadall")
-Signed-off-by: Tao Chen <chen.dylane@gmail.com>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Tested-by: Quentin Monnet <qmo@kernel.org>
-Reviewed-by: Quentin Monnet <qmo@kernel.org>
-Link: https://lore.kernel.org/bpf/20240702131150.15622-1-chen.dylane@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bpf/bpftool/prog.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
-index 2e388421c32f4..8afdc7573399a 100644
---- a/tools/bpf/bpftool/prog.c
-+++ b/tools/bpf/bpftool/prog.c
-@@ -1340,6 +1340,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
-       }
- 
-       if (pinmaps) {
-+              err = create_and_mount_bpffs_dir(pinmaps);
-+              if (err)
-+                      goto err_unpin;
-+
-               err = bpf_object__pin_maps(obj, pinmaps);
-               if (err) {
-                       p_err("failed to pin all maps");
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d300cf316a80f11fc3ca09da02a0f645296e2c20..8d098fc6a05f6d2c8c9f3bf7d38c92b13afb0cce 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -38,7 +38,6 @@ net-fec-refactor-define-magic-constants.patch
 net-fec-fix-fec_ecr_en1588-being-cleared-on-link-dow.patch
 ipvs-avoid-unnecessary-calls-to-skb_is_gso_sctp.patch
 netfilter-nf_tables-rise-cap-on-selinux-secmark-cont.patch
-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-.patch
 perf-x86-intel-pt-fix-pt_topa_entry_for_page-address.patch
 perf-fix-perf_aux_size-for-greater-than-32-bit-size.patch
 perf-prevent-passing-zero-nr_pages-to-rb_alloc_aux.patch