From: Thadeu Lima de Souza Cascardo Date: Tue, 20 Mar 2018 12:58:51 +0000 (-0300) Subject: test_bpf: Fix testing with CONFIG_BPF_JIT_ALWAYS_ON=y on other arches X-Git-Tag: Ubuntu-4.15.0-14.15~90 X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=32625984fbeb3701d77f38a5817946c11801600e test_bpf: Fix testing with CONFIG_BPF_JIT_ALWAYS_ON=y on other arches BugLink: http://bugs.launchpad.net/bugs/1756150 Function bpf_fill_maxinsns11 is designed to not be able to be JITed on x86_64. So, it fails when CONFIG_BPF_JIT_ALWAYS_ON=y, and commit 09584b406742 ("bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y") makes sure that failure is detected on that case. However, it does not fail on other architectures, which have a different JIT compiler design. So, test_bpf has started to fail to load on those. After this fix, test_bpf loads fine on both x86_64 and ppc64el. Fixes: 09584b406742 ("bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y") Signed-off-by: Thadeu Lima de Souza Cascardo Reviewed-by: Yonghong Song Signed-off-by: Daniel Borkmann (cherry picked from commit 52fda36d63bfc8c8e8ae5eda8eb5ac6f52cd67ed) Signed-off-by: Thadeu Lima de Souza Cascardo --- diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 8076e693f86e..59359aad645d 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -5462,7 +5462,7 @@ static struct bpf_test tests[] = { { "BPF_MAXINSNS: Jump, gap, jump, ...", { }, -#ifdef CONFIG_BPF_JIT_ALWAYS_ON +#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_X86) CLASSIC | FLAG_NO_DATA | FLAG_EXPECTED_FAIL, #else CLASSIC | FLAG_NO_DATA,