summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLorenz Bauer <lmb@cloudflare.com>2022-08-01 15:29:15 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:00:52 +0200
commit6d3fad2b44eb9d226a896d1c93909f0fd2e1b9ea (patch)
treecc43704f5380002139c5d1e64bff0ca3bb6f1421 /tools
parent6aad811b37eeeba902b14cc4ab698d2b37bb4fb9 (diff)
downloadlinux-stable-6d3fad2b44eb9d226a896d1c93909f0fd2e1b9ea.tar.gz
linux-stable-6d3fad2b44eb9d226a896d1c93909f0fd2e1b9ea.tar.bz2
linux-stable-6d3fad2b44eb9d226a896d1c93909f0fd2e1b9ea.zip
bpf: Add PROG_TEST_RUN support for sk_lookup programs
commit 7c32e8f8bc33a5f4b113a630857e46634e3e143b upstream. Allow to pass sk_lookup programs to PROG_TEST_RUN. User space provides the full bpf_sk_lookup struct as context. Since the context includes a socket pointer that can't be exposed to user space we define that PROG_TEST_RUN returns the cookie of the selected socket or zero in place of the socket pointer. We don't support testing programs that select a reuseport socket, since this would mean running another (unrelated) BPF program from the sk_lookup test handler. Signed-off-by: Lorenz Bauer <lmb@cloudflare.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20210303101816.36774-3-lmb@cloudflare.com Signed-off-by: Tianchen Ding <dtcccc@linux.alibaba.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/include/uapi/linux/bpf.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index e440cd7f32a6..b9ee2ded381a 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -5006,7 +5006,10 @@ struct bpf_pidns_info {
/* User accessible data for SK_LOOKUP programs. Add new fields at the end. */
struct bpf_sk_lookup {
- __bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
+ union {
+ __bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
+ __u64 cookie; /* Non-zero if socket was selected in PROG_TEST_RUN */
+ };
__u32 family; /* Protocol family (AF_INET, AF_INET6) */
__u32 protocol; /* IP protocol (IPPROTO_TCP, IPPROTO_UDP) */