selftests/bpf: Make CO-RE reloc test impartial to test_progs flavor

test_core_reloc_kernel test captures its own process name and validates
it as part of the test. Given extra "flavors" of test_progs, this break
for anything by default test_progs binary. Fix the test to cut out
flavor part of the process name.

Fixes: ee2eb063d330 ("selftests/bpf: Add BPF_CORE_READ and BPF_CORE_READ_STR_INTO macro tests")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20191016060051.2024182-3-andriin@fb.com

diff --git a/tools/testing/selftests/bpf/prog_tests/core_reloc.c b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
index 7e2f5b4bf7f375508bb49b969981ad8581cab246..2b3586dc6c865ef9a2404e9d5c4e41ae50990e91 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/core_reloc.c
+++ b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
@@ -211,8 +211,8 @@ static struct core_reloc_test_case test_cases[] = {
                .input_len = 0,
                .output = STRUCT_TO_CHAR_PTR(core_reloc_kernel_output) {
                        .valid = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, },
-                       .comm = "test_progs\0\0\0\0\0",
-                       .comm_len = 11,
+                       .comm = "test_progs",
+                       .comm_len = sizeof("test_progs"),
                },
                .output_len = sizeof(struct core_reloc_kernel_output),
        },

diff --git a/tools/testing/selftests/bpf/progs/core_reloc_types.h b/tools/testing/selftests/bpf/progs/core_reloc_types.h
index ad763ec0ba8f18ccf65179414411f9720f936a5a..f5939d9d5c61516853d86d1c95c4cba202738518 100644 (file)
--- a/tools/testing/selftests/bpf/progs/core_reloc_types.h
+++ b/tools/testing/selftests/bpf/progs/core_reloc_types.h
@@ -6,7 +6,7 @@
 
 struct core_reloc_kernel_output {
        int valid[10];
-       char comm[16];
+       char comm[sizeof("test_progs")];
        int comm_len;
 };
 

diff --git a/tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c b/tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c
index 50f609618b65f443e52ea2fec71f3d88062acaf7..a4b5e0562ed547927b954c92bfefe41f4e591eb8 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c
+++ b/tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c
@@ -15,7 +15,8 @@ static volatile struct data {
 
 struct core_reloc_kernel_output {
        int valid[10];
-       char comm[16];
+       /* we have test_progs[-flavor], so cut flavor part */
+       char comm[sizeof("test_progs")];
        int comm_len;
 };