Drop libbpf-add-bpf_token_create-api.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.8/libbpf-add-bpf_token_create-api.patch b/queue-6.8/libbpf-add-bpf_token_create-api.patch
deleted file mode 100644 (file)
index 0751fe1..0000000
--- a/queue-6.8/libbpf-add-bpf_token_create-api.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 35d25b9121bf859861a2e87169f48d9c4ae877c1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 18:21:09 -0800
-Subject: libbpf: Add bpf_token_create() API
-
-From: Andrii Nakryiko <andrii@kernel.org>
-
-[ Upstream commit 639ecd7d6247c48a0175f5b458b648f5d4b6dc34 ]
-
-Add low-level wrapper API for BPF_TOKEN_CREATE command in bpf() syscall.
-
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/20240124022127.2379740-13-andrii@kernel.org
-Stable-dep-of: c81a8ab196b5 ("libbpf: Add btf__new_split() API that was declared but not implemented")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/lib/bpf/bpf.c      | 17 +++++++++++++++++
- tools/lib/bpf/bpf.h      | 24 ++++++++++++++++++++++++
- tools/lib/bpf/libbpf.map |  1 +
- 3 files changed, 42 insertions(+)
-
-diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
-index 9dc9625651dcf..d4019928a8646 100644
---- a/tools/lib/bpf/bpf.c
-+++ b/tools/lib/bpf/bpf.c
-@@ -1287,3 +1287,20 @@ int bpf_prog_bind_map(int prog_fd, int map_fd,
-       ret = sys_bpf(BPF_PROG_BIND_MAP, &attr, attr_sz);
-       return libbpf_err_errno(ret);
- }
-+
-+int bpf_token_create(int bpffs_fd, struct bpf_token_create_opts *opts)
-+{
-+      const size_t attr_sz = offsetofend(union bpf_attr, token_create);
-+      union bpf_attr attr;
-+      int fd;
-+
-+      if (!OPTS_VALID(opts, bpf_token_create_opts))
-+              return libbpf_err(-EINVAL);
-+
-+      memset(&attr, 0, attr_sz);
-+      attr.token_create.bpffs_fd = bpffs_fd;
-+      attr.token_create.flags = OPTS_GET(opts, flags, 0);
-+
-+      fd = sys_bpf_fd(BPF_TOKEN_CREATE, &attr, attr_sz);
-+      return libbpf_err_errno(fd);
-+}
-diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
-index dad7917903d19..02b0810c8dece 100644
---- a/tools/lib/bpf/bpf.h
-+++ b/tools/lib/bpf/bpf.h
-@@ -640,6 +640,30 @@ struct bpf_test_run_opts {
- LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
-                                     struct bpf_test_run_opts *opts);
- 
-+struct bpf_token_create_opts {
-+      size_t sz; /* size of this struct for forward/backward compatibility */
-+      __u32 flags;
-+      size_t :0;
-+};
-+#define bpf_token_create_opts__last_field flags
-+
-+/**
-+ * @brief **bpf_token_create()** creates a new instance of BPF token derived
-+ * from specified BPF FS mount point.
-+ *
-+ * BPF token created with this API can be passed to bpf() syscall for
-+ * commands like BPF_PROG_LOAD, BPF_MAP_CREATE, etc.
-+ *
-+ * @param bpffs_fd FD for BPF FS instance from which to derive a BPF token
-+ * instance.
-+ * @param opts optional BPF token creation options, can be NULL
-+ *
-+ * @return BPF token FD > 0, on success; negative error code, otherwise (errno
-+ * is also set to the error code)
-+ */
-+LIBBPF_API int bpf_token_create(int bpffs_fd,
-+                              struct bpf_token_create_opts *opts);
-+
- #ifdef __cplusplus
- } /* extern "C" */
- #endif
-diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
-index 91c5aef7dae7d..d9e1f57534fa7 100644
---- a/tools/lib/bpf/libbpf.map
-+++ b/tools/lib/bpf/libbpf.map
-@@ -411,4 +411,5 @@ LIBBPF_1.3.0 {
- } LIBBPF_1.2.0;
- 
- LIBBPF_1.4.0 {
-+              bpf_token_create;
- } LIBBPF_1.3.0;
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index cc173c3a9b833450edc7b2939c30cfd18f44343f..a0bedd2008d76d823ac038c1606102faed7d77b8 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -116,7 +116,6 @@ arm64-dts-imx8mm-kontron-fix-interrupt-for-rtc-on-os.patch
 arm64-dts-imx8qm-align-edma3-power-domains-resources.patch
 arm64-dts-imx8qm-correct-edma3-power-domains-and-int.patch
 libbpf-add-missing-libbpf_api-annotation-to-libbpf_s.patch
-libbpf-add-bpf_token_create-api.patch
 libbpf-add-missed-btf_ext__raw_data-api.patch
 wifi-ath9k-delay-all-of-ath9k_wmi_event_tasklet-unti.patch
 wifi-ath11k-change-to-move-wmi_vdev_param_set_hemu_m.patch