diff mbox series

[bpf-next,v2,3/4] selftests/bpf: Monitor traffic for sockmap_listen.

Message ID 20240723182439.1434795-4-thinker.li@gmail.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series monitor network traffic for flaky test cases | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 7 this patch: 7
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 12 maintainers not CCed: kpsingh@kernel.org shuah@kernel.org haoluo@google.com daniel@iogearbox.net john.fastabend@gmail.com jolsa@kernel.org linux-kselftest@vger.kernel.org yonghong.song@linux.dev xukuohai@huawei.com mykolal@fb.com eddyz87@gmail.com geliang@kernel.org
netdev/build_clang success Errors and warnings before: 7 this patch: 7
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 7 this patch: 7
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 28 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 fail Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-9 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-PR fail PR summary
bpf/vmtest-bpf-next-VM_Test-8 fail Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-13 fail Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for x86_64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-15 success Logs for x86_64-gcc / test
bpf/vmtest-bpf-next-VM_Test-14 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for s390x-gcc / test
bpf/vmtest-bpf-next-VM_Test-12 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-21 fail Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-17 fail Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-llvm-18 / test
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-llvm-17 / test
bpf/vmtest-bpf-next-VM_Test-18 fail Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-22 fail Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / veristat

Commit Message

Kui-Feng Lee July 23, 2024, 6:24 p.m. UTC 
Enable traffic monitor for each subtest of sockmap_listen.

Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
---
 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Geliang Tang July 24, 2024, 9:32 a.m. UTC | #1 
On Tue, 2024-07-23 at 11:24 -0700, Kui-Feng Lee wrote:
> Enable traffic monitor for each subtest of sockmap_listen.
> 
> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
> ---
>  tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> index e91b59366030..62683ccb6d56 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> @@ -28,6 +28,7 @@
>  #include "test_sockmap_listen.skel.h"
>  
>  #include "sockmap_helpers.h"
> +#include "network_helpers.h"
>  
>  static void test_insert_invalid(struct test_sockmap_listen *skel
> __always_unused,
>  				int family, int sotype, int mapfd)
> @@ -1893,14 +1894,21 @@ static void test_udp_unix_redir(struct
> test_sockmap_listen *skel, struct bpf_map
>  {
>  	const char *family_name, *map_name;
>  	char s[MAX_TEST_NAME];
> +	struct tmonitor_ctx *tmon;
>  
>  	family_name = family_str(family);
>  	map_name = map_type_str(map);
>  	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name,
> __func__);
>  	if (!test__start_subtest(s))
>  		return;
> +
> +	tmon = traffic_monitor_start(NULL);
> +	ASSERT_TRUE(tmon, "traffic_monitor_start");

Using ASSERT_TRUE() on a pointer is a bit strange, it's better to use
ASSERT_NEQ(NULL) like patch 2.

> +
>  	inet_unix_skb_redir_to_connected(skel, map, family);
>  	unix_inet_skb_redir_to_connected(skel, map, family);
> +
> +	traffic_monitor_stop(tmon);
>  }
>  
>  static void run_tests(struct test_sockmap_listen *skel, struct
> bpf_map *map,
Kui-Feng Lee July 24, 2024, 4:24 p.m. UTC | #2 
On 7/24/24 02:32, Geliang Tang wrote:
> On Tue, 2024-07-23 at 11:24 -0700, Kui-Feng Lee wrote:
>> Enable traffic monitor for each subtest of sockmap_listen.
>>
>> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
>> ---
>>   tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
>> b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
>> index e91b59366030..62683ccb6d56 100644
>> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
>> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
>> @@ -28,6 +28,7 @@
>>   #include "test_sockmap_listen.skel.h"
>>   
>>   #include "sockmap_helpers.h"
>> +#include "network_helpers.h"
>>   
>>   static void test_insert_invalid(struct test_sockmap_listen *skel
>> __always_unused,
>>   				int family, int sotype, int mapfd)
>> @@ -1893,14 +1894,21 @@ static void test_udp_unix_redir(struct
>> test_sockmap_listen *skel, struct bpf_map
>>   {
>>   	const char *family_name, *map_name;
>>   	char s[MAX_TEST_NAME];
>> +	struct tmonitor_ctx *tmon;
>>   
>>   	family_name = family_str(family);
>>   	map_name = map_type_str(map);
>>   	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name,
>> __func__);
>>   	if (!test__start_subtest(s))
>>   		return;
>> +
>> +	tmon = traffic_monitor_start(NULL);
>> +	ASSERT_TRUE(tmon, "traffic_monitor_start");
> 
> Using ASSERT_TRUE() on a pointer is a bit strange, it's better to use
> ASSERT_NEQ(NULL) like patch 2.

Sure!

> 
>> +
>>   	inet_unix_skb_redir_to_connected(skel, map, family);
>>   	unix_inet_skb_redir_to_connected(skel, map, family);
>> +
>> +	traffic_monitor_stop(tmon);
>>   }
>>   
>>   static void run_tests(struct test_sockmap_listen *skel, struct
>> bpf_map *map,
>
Andrii Nakryiko July 24, 2024, 6:11 p.m. UTC | #3 
On Wed, Jul 24, 2024 at 9:24 AM Kui-Feng Lee <sinquersw@gmail.com> wrote:
>
>
>
> On 7/24/24 02:32, Geliang Tang wrote:
> > On Tue, 2024-07-23 at 11:24 -0700, Kui-Feng Lee wrote:
> >> Enable traffic monitor for each subtest of sockmap_listen.
> >>
> >> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
> >> ---
> >>   tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 8 ++++++++
> >>   1 file changed, 8 insertions(+)
> >>
> >> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> >> b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> >> index e91b59366030..62683ccb6d56 100644
> >> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> >> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
> >> @@ -28,6 +28,7 @@
> >>   #include "test_sockmap_listen.skel.h"
> >>
> >>   #include "sockmap_helpers.h"
> >> +#include "network_helpers.h"
> >>
> >>   static void test_insert_invalid(struct test_sockmap_listen *skel
> >> __always_unused,
> >>                              int family, int sotype, int mapfd)
> >> @@ -1893,14 +1894,21 @@ static void test_udp_unix_redir(struct
> >> test_sockmap_listen *skel, struct bpf_map
> >>   {
> >>      const char *family_name, *map_name;
> >>      char s[MAX_TEST_NAME];
> >> +    struct tmonitor_ctx *tmon;
> >>
> >>      family_name = family_str(family);
> >>      map_name = map_type_str(map);
> >>      snprintf(s, sizeof(s), "%s %s %s", map_name, family_name,
> >> __func__);
> >>      if (!test__start_subtest(s))
> >>              return;
> >> +
> >> +    tmon = traffic_monitor_start(NULL);
> >> +    ASSERT_TRUE(tmon, "traffic_monitor_start");
> >
> > Using ASSERT_TRUE() on a pointer is a bit strange, it's better to use
> > ASSERT_NEQ(NULL) like patch 2.
>
> Sure!

we have ASSERT_OK_PTR() for pointers

>
> >
> >> +
> >>      inet_unix_skb_redir_to_connected(skel, map, family);
> >>      unix_inet_skb_redir_to_connected(skel, map, family);
> >> +
> >> +    traffic_monitor_stop(tmon);
> >>   }
> >>
> >>   static void run_tests(struct test_sockmap_listen *skel, struct
> >> bpf_map *map,
> >
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
index e91b59366030..62683ccb6d56 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
@@ -28,6 +28,7 @@ 
 #include "test_sockmap_listen.skel.h"
 
 #include "sockmap_helpers.h"
+#include "network_helpers.h"
 
 static void test_insert_invalid(struct test_sockmap_listen *skel __always_unused,
 				int family, int sotype, int mapfd)
@@ -1893,14 +1894,21 @@  static void test_udp_unix_redir(struct test_sockmap_listen *skel, struct bpf_map
 {
 	const char *family_name, *map_name;
 	char s[MAX_TEST_NAME];
+	struct tmonitor_ctx *tmon;
 
 	family_name = family_str(family);
 	map_name = map_type_str(map);
 	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);
 	if (!test__start_subtest(s))
 		return;
+
+	tmon = traffic_monitor_start(NULL);
+	ASSERT_TRUE(tmon, "traffic_monitor_start");
+
 	inet_unix_skb_redir_to_connected(skel, map, family);
 	unix_inet_skb_redir_to_connected(skel, map, family);
+
+	traffic_monitor_stop(tmon);
 }
 
 static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,