Skip to content

Commit b240a86

Browse files
committed
ci: fix sk_storage_tracing selftests
Apply temporary patch to fix sk_storage_tracing selftest until upstream fix makes it to both bpf and bpf-next trees. Signed-off-by: Andrii Nakryiko <[email protected]>
1 parent 9390663 commit b240a86

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 0daad0a615e687e1247230f3d0c31ae60ba32314 Mon Sep 17 00:00:00 2001
2+
From: Andrii Nakryiko <[email protected]>
3+
Date: Tue, 28 May 2024 15:29:38 -0700
4+
Subject: [PATCH bpf-next] selftests/bpf: fix inet_csk_accept prototype in
5+
test_sk_storage_tracing.c
6+
7+
Recent kernel change ([0]) changed inet_csk_accept() prototype. Adapt
8+
progs/test_sk_storage_tracing.c to take that into account.
9+
10+
[0] 92ef0fd55ac8 ("net: change proto and proto_ops accept type")
11+
12+
Signed-off-by: Andrii Nakryiko <[email protected]>
13+
---
14+
tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c | 2 +-
15+
1 file changed, 1 insertion(+), 1 deletion(-)
16+
17+
diff --git a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
18+
index 02e718f06e0f..40531e56776e 100644
19+
--- a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
20+
+++ b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
21+
@@ -84,7 +84,7 @@ int BPF_PROG(trace_tcp_connect, struct sock *sk)
22+
}
23+
24+
SEC("fexit/inet_csk_accept")
25+
-int BPF_PROG(inet_csk_accept, struct sock *sk, int flags, int *err, bool kern,
26+
+int BPF_PROG(inet_csk_accept, struct sock *sk, struct proto_accept_arg *arg,
27+
struct sock *accepted_sk)
28+
{
29+
set_task_info(accepted_sk);
30+
--
31+
2.43.0
32+

0 commit comments

Comments
 (0)