Skip to contentSkip to conversation

bpf: selftest: Use static globals in tcp_hdr_options and btf_skc_cls_ingress

PATCH Applied Martin KaFai Lau 3 participants 3 messages Nov 6, 2020 – Nov 10, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: selftest: Use static globals in tcp_hdr_options and btf_skc_cls_ingress

Some globals in the tcp_hdr_options test and btf_skc_cls_ingress test are not using static scope. This patch fixes it.

Targeting bpf-next branch as an improvement since it currently does not break the build.

Fixes ad2f8eb0095e ("bpf: selftests: Tcp header options")
Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")
---
 .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c   |  2 +-
 .../selftests/bpf/prog_tests/tcp_hdr_options.c       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +1 -1
index 86ccf37e26b3..762f6a9da8b5 100644
@@ -17,7 +17,7 @@
 #include "test_btf_skc_cls_ingress.skel.h"
 
 static struct test_btf_skc_cls_ingress *skel;
-struct sockaddr_in6 srv_sa6;
+static struct sockaddr_in6 srv_sa6;
 static __u32 duration;
 
 #define PROG_PIN_FILE "/sys/fs/bpf/btf_skc_cls_ingress"
tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c +6 -6
index c85174cdcb77..08d19cafd5e8 100644
@@ -18,12 +18,12 @@
 #define LO_ADDR6 "::1"
 #define CG_NAME "/tcpbpf-hdr-opt-test"
 
-struct bpf_test_option exp_passive_estab_in;
-struct bpf_test_option exp_active_estab_in;
-struct bpf_test_option exp_passive_fin_in;
-struct bpf_test_option exp_active_fin_in;
-struct hdr_stg exp_passive_hdr_stg;
-struct hdr_stg exp_active_hdr_stg = { .active = true, };
+static struct bpf_test_option exp_passive_estab_in;
+static struct bpf_test_option exp_active_estab_in;
+static struct bpf_test_option exp_passive_fin_in;
+static struct bpf_test_option exp_active_fin_in;
+static struct hdr_stg exp_passive_hdr_stg;
+static struct hdr_stg exp_active_hdr_stg = { .active = true, };
 
 static struct test_misc_tcp_hdr_options *misc_skel;
 static struct test_tcp_hdr_options *skel;
Signature · 1 line
2.24.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Martin KaFai Lau

Some globals in the tcp_hdr_options test and btf_skc_cls_ingress test are not using static scope. This patch fixes it.

Targeting bpf-next branch as an improvement since it currently does not break the build.

Quoted 8 lines
Fixes ad2f8eb0095e ("bpf: selftests: Tcp header options")
Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")
---
 .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c   |  2 +-
 .../selftests/bpf/prog_tests/tcp_hdr_options.c       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
#2 lore raw
In reply to Martin KaFai Lau
This patch was applied to bpf/bpf-next.git (refs/heads/master):

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

Quoted 11 lines · On Fri, 6 Nov 2020 14:54:02 -0800 you wrote:

Some globals in the tcp_hdr_options test and btf_skc_cls_ingress test are not using static scope. This patch fixes it.

Targeting bpf-next branch as an improvement since it currently does not break the build.

Fixes ad2f8eb0095e ("bpf: selftests: Tcp header options")
Fixes 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress")

[...]

Here is the summary with links:
- [bpf-next] bpf: selftest: Use static globals in tcp_hdr_options and btf_skc_cls_ingress

    https://git.kernel.org/bpf/bpf-next/c/f52b8fd33257

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html