selftests/bpf: Fix prog numbers in test_sockmap
authorGeliang Tang <tanggeliang@kylinos.cn>
Fri, 17 May 2024 06:21:46 +0000 (14:21 +0800)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 21 May 2024 18:07:21 +0000 (11:07 -0700)
bpf_prog5 and bpf_prog7 are removed from progs/test_sockmap_kern.h in
commit d79a32129b21 ("bpf: Selftests, remove prints from sockmap tests"),
now there are only 9 progs in it, not 11:

SEC("sk_skb1")
int bpf_prog1(struct __sk_buff *skb)
SEC("sk_skb2")
int bpf_prog2(struct __sk_buff *skb)
SEC("sk_skb3")
int bpf_prog3(struct __sk_buff *skb)
SEC("sockops")
int bpf_sockmap(struct bpf_sock_ops *skops)
SEC("sk_msg1")
int bpf_prog4(struct sk_msg_md *msg)
SEC("sk_msg2")
int bpf_prog6(struct sk_msg_md *msg)
SEC("sk_msg3")
int bpf_prog8(struct sk_msg_md *msg)
SEC("sk_msg4")
int bpf_prog9(struct sk_msg_md *msg)
SEC("sk_msg5")
int bpf_prog10(struct sk_msg_md *msg)

This patch updates the array sizes of prog_fd[], prog_attach_type[] and
prog_type[] from 11 to 9 accordingly.

Fixes: d79a32129b21 ("bpf: Selftests, remove prints from sockmap tests")
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/9c10d9f974f07fcb354a43a8eca67acb2fafc587.1715926605.git.tanggeliang@kylinos.cn
tools/testing/selftests/bpf/test_sockmap.c

index 92752f5eededf90514627bec6d2302be5741c61b..4499b3cfc3a68b633261de42ae3ab8df22c6578c 100644 (file)
@@ -63,7 +63,7 @@ int passed;
 int failed;
 int map_fd[9];
 struct bpf_map *maps[9];
-int prog_fd[11];
+int prog_fd[9];
 
 int txmsg_pass;
 int txmsg_redir;
@@ -1793,8 +1793,6 @@ int prog_attach_type[] = {
        BPF_SK_MSG_VERDICT,
        BPF_SK_MSG_VERDICT,
        BPF_SK_MSG_VERDICT,
-       BPF_SK_MSG_VERDICT,
-       BPF_SK_MSG_VERDICT,
 };
 
 int prog_type[] = {
@@ -1807,8 +1805,6 @@ int prog_type[] = {
        BPF_PROG_TYPE_SK_MSG,
        BPF_PROG_TYPE_SK_MSG,
        BPF_PROG_TYPE_SK_MSG,
-       BPF_PROG_TYPE_SK_MSG,
-       BPF_PROG_TYPE_SK_MSG,
 };
 
 static int populate_progs(char *bpf_file)