| Message ID | 20210720184832.452430-1-john.fastabend@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c39aa21599748f3845a47645f482d94099b11460 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpf, selftests: fix test_maps now that sockmap supports UDP | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for bpf-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 1 blamed authors not CCed: cong.wang@bytedance.com; 7 maintainers not CCed: linux-kselftest@vger.kernel.org yhs@fb.com kpsingh@kernel.org cong.wang@bytedance.com kafai@fb.com songliubraving@fb.com shuah@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to bpf/bpf-next.git (refs/heads/master): On Tue, 20 Jul 2021 11:48:32 -0700 you wrote: > UDP socket support was added recently so testing UDP insert failure is no > longer correct and causes test_maps failure. The fix is easy though, we > simply need to test that UDP is correctly added instead of blocked. > > Reported-by: Andrii Nakryiko <andrii@kernel.org> > Fixes: 122e6c79efe1c ("sock_map: Update sock type checks for UDP") > Signed-off-by: John Fastabend <john.fastabend@gmail.com> > > [...] Here is the summary with links: - [bpf-next] bpf, selftests: fix test_maps now that sockmap supports UDP https://git.kernel.org/bpf/bpf-next/c/c39aa2159974 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index d832d135211c..5a8e069e64fa 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -764,8 +764,8 @@ static void test_sockmap(unsigned int tasks, void *data) udp = socket(AF_INET, SOCK_DGRAM, 0); i = 0; err = bpf_map_update_elem(fd, &i, &udp, BPF_ANY); - if (!err) { - printf("Failed socket SOCK_DGRAM allowed '%i:%i'\n", + if (err) { + printf("Failed socket update SOCK_DGRAM '%i:%i'\n", i, udp); goto out_sockmap; }
UDP socket support was added recently so testing UDP insert failure is no longer correct and causes test_maps failure. The fix is easy though, we simply need to test that UDP is correctly added instead of blocked. Reported-by: Andrii Nakryiko <andrii@kernel.org> Fixes: 122e6c79efe1c ("sock_map: Update sock type checks for UDP") Signed-off-by: John Fastabend <john.fastabend@gmail.com> --- tools/testing/selftests/bpf/test_maps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)