* [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test
@ 2022-02-08 6:54 Hou Tao
2022-02-08 15:57 ` Yonghong Song
2022-02-08 20:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Hou Tao @ 2022-02-08 6:54 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Martin KaFai Lau, Yonghong Song, Daniel Borkmann,
Andrii Nakryiko, Song Liu, John Fastabend, netdev, bpf, houtao1
Two subtests in ksyms_module.c are not qualified as static, so these
subtests are exported as standalone tests in tests.h and lead to
confusion for the output of "./test_progs -t ksyms_module".
By using the following command:
grep "^void \(serial_\)\?test_[a-zA-Z0-9_]\+(\(void\)\?)" \
tools/testing/selftests/bpf/prog_tests/*.c | \
awk -F : '{print $1}' | sort | uniq -c | awk '$1 != 1'
find out that other tests also have the similar problem, so fix
these tests by marking subtests in these tests as static.
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
v5:
* keep the only subtest in xdp_adjust_frags.c to follow
the naming convention for test
v4: https://lore.kernel.org/bpf/20220206043107.18549-1-houtao1@huawei.com
* rebased on bpf-next
v3: https://lore.kernel.org/bpf/20220130092917.14544-1-hotforest@gmail.com
* add a new patch to unexport unnecessary subtests
v2: https://lore.kernel.org/bpf/20220127071532.384888-1-houtao1@huawei.com
* add a test to check whether imm will be overflowed for kfunc call
v1: https://lore.kernel.org/bpf/20220119144942.305568-1-houtao1@huawei.com
---
tools/testing/selftests/bpf/prog_tests/ksyms_module.c | 4 ++--
tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c | 2 +-
tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c | 4 ++--
tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c | 4 ++--
tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/ksyms_module.c b/tools/testing/selftests/bpf/prog_tests/ksyms_module.c
index ecc58c9e7631..a1ebac70ec29 100644
--- a/tools/testing/selftests/bpf/prog_tests/ksyms_module.c
+++ b/tools/testing/selftests/bpf/prog_tests/ksyms_module.c
@@ -6,7 +6,7 @@
#include "test_ksyms_module.lskel.h"
#include "test_ksyms_module.skel.h"
-void test_ksyms_module_lskel(void)
+static void test_ksyms_module_lskel(void)
{
struct test_ksyms_module_lskel *skel;
int err;
@@ -33,7 +33,7 @@ void test_ksyms_module_lskel(void)
test_ksyms_module_lskel__destroy(skel);
}
-void test_ksyms_module_libbpf(void)
+static void test_ksyms_module_libbpf(void)
{
struct test_ksyms_module *skel;
int err;
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c
index 134d0ac32f59..d18e6f343c48 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c
@@ -2,7 +2,7 @@
#include <test_progs.h>
#include <network_helpers.h>
-void test_xdp_update_frags(void)
+static void test_xdp_update_frags(void)
{
const char *file = "./test_xdp_update_frags.o";
struct bpf_program *prog;
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
index 528a8c387720..21ceac24e174 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
@@ -133,7 +133,7 @@ static void test_xdp_adjust_tail_grow2(void)
bpf_object__close(obj);
}
-void test_xdp_adjust_frags_tail_shrink(void)
+static void test_xdp_adjust_frags_tail_shrink(void)
{
const char *file = "./test_xdp_adjust_tail_shrink.o";
__u32 exp_size;
@@ -200,7 +200,7 @@ void test_xdp_adjust_frags_tail_shrink(void)
bpf_object__close(obj);
}
-void test_xdp_adjust_frags_tail_grow(void)
+static void test_xdp_adjust_frags_tail_grow(void)
{
const char *file = "./test_xdp_adjust_tail_grow.o";
__u32 exp_size;
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
index b353e1f3acb5..f775a1613833 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
@@ -8,7 +8,7 @@
#define IFINDEX_LO 1
-void test_xdp_with_cpumap_helpers(void)
+static void test_xdp_with_cpumap_helpers(void)
{
struct test_xdp_with_cpumap_helpers *skel;
struct bpf_prog_info info = {};
@@ -68,7 +68,7 @@ void test_xdp_with_cpumap_helpers(void)
test_xdp_with_cpumap_helpers__destroy(skel);
}
-void test_xdp_with_cpumap_frags_helpers(void)
+static void test_xdp_with_cpumap_frags_helpers(void)
{
struct test_xdp_with_cpumap_frags_helpers *skel;
struct bpf_prog_info info = {};
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
index 463a72fc3e70..ead40016c324 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
@@ -81,7 +81,7 @@ static void test_neg_xdp_devmap_helpers(void)
}
}
-void test_xdp_with_devmap_frags_helpers(void)
+static void test_xdp_with_devmap_frags_helpers(void)
{
struct test_xdp_with_devmap_frags_helpers *skel;
struct bpf_prog_info info = {};
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test
2022-02-08 6:54 [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test Hou Tao
@ 2022-02-08 15:57 ` Yonghong Song
2022-02-08 20:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Yonghong Song @ 2022-02-08 15:57 UTC (permalink / raw)
To: Hou Tao, Alexei Starovoitov
Cc: Martin KaFai Lau, Daniel Borkmann, Andrii Nakryiko, Song Liu,
John Fastabend, netdev, bpf
On 2/7/22 10:54 PM, Hou Tao wrote:
> Two subtests in ksyms_module.c are not qualified as static, so these
> subtests are exported as standalone tests in tests.h and lead to
> confusion for the output of "./test_progs -t ksyms_module".
>
> By using the following command:
>
> grep "^void \(serial_\)\?test_[a-zA-Z0-9_]\+(\(void\)\?)" \
> tools/testing/selftests/bpf/prog_tests/*.c | \
> awk -F : '{print $1}' | sort | uniq -c | awk '$1 != 1'
>
> find out that other tests also have the similar problem, so fix
> these tests by marking subtests in these tests as static.
>
> Signed-off-by: Hou Tao <houtao1@huawei.com>
Acked-by: Yonghong Song <yhs@fb.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test
2022-02-08 6:54 [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test Hou Tao
2022-02-08 15:57 ` Yonghong Song
@ 2022-02-08 20:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-02-08 20:30 UTC (permalink / raw)
To: Hou Tao
Cc: ast, kafai, yhs, daniel, andrii, songliubraving, john.fastabend,
netdev, bpf
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Tue, 8 Feb 2022 14:54:44 +0800 you wrote:
> Two subtests in ksyms_module.c are not qualified as static, so these
> subtests are exported as standalone tests in tests.h and lead to
> confusion for the output of "./test_progs -t ksyms_module".
>
> By using the following command:
>
> grep "^void \(serial_\)\?test_[a-zA-Z0-9_]\+(\(void\)\?)" \
> tools/testing/selftests/bpf/prog_tests/*.c | \
> awk -F : '{print $1}' | sort | uniq -c | awk '$1 != 1'
>
> [...]
Here is the summary with links:
- [bpf-next,v5] selftests/bpf: do not export subtest as standalone test
https://git.kernel.org/bpf/bpf-next/c/5912fcb4bee1
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-08 22:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-08 6:54 [PATCH bpf-next v5] selftests/bpf: do not export subtest as standalone test Hou Tao
2022-02-08 15:57 ` Yonghong Song
2022-02-08 20:30 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.