From: Martynas Pumputis <m@lambda.lt>
Date: Wed, 21 Jul 2021 16:09:41 +0200
Subject: selftests/bpf: Mute expected invalid map creation error msg
Patch-mainline: v5.15-rc1
Git-commit: 9907442fcddbdacf55fa22e31f2306ae0d6172d6
References: jsc#PED-1377
Previously, the newly introduced test case in test_map_in_map(), which
checks whether the inner map is destroyed after unsuccessful creation of
the outer map, logged the following harmless and expected error:
libbpf: map 'mim': failed to create: Invalid argument(-22) libbpf:
failed to load object './test_map_in_map_invalid.o'
To avoid any possible confusion, mute the logging during loading of the
prog.
Fixes: 08f71a1e39a1 ("selftests/bpf: Check inner map deletion")
Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210721140941.563175-1-m@lambda.lt
Acked-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
---
tools/testing/selftests/bpf/test_maps.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -1163,6 +1163,7 @@ static void test_map_in_map(void)
struct bpf_map_info info = {};
__u32 len = sizeof(info);
__u32 id = 0;
+ libbpf_print_fn_t old_print_fn;
obj = bpf_object__open(MAPINMAP_PROG);
@@ -1250,12 +1251,16 @@ static void test_map_in_map(void)
goto out_map_in_map;
}
+ old_print_fn = libbpf_set_print(NULL);
+
err = bpf_object__load(obj);
if (!err) {
printf("Loading obj supposed to fail\n");
goto out_map_in_map;
}
+ libbpf_set_print(old_print_fn);
+
/* Iterate over all maps to check whether the internal map
* ("mim.internal") has been destroyed.
*/