ACK: [PATCH 2/2] test_bpf: Fix testing with CONFIG_BPF_JIT_ALWAYS_ON=y on other arches

[Colin Ian King]

On 20/04/18 15:14, Stefan Bader wrote:
> From: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
> 
> 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 <cascardo at canonical.com>
> Reviewed-by: Yonghong Song <yhs at fb.com>
> Signed-off-by: Daniel Borkmann <daniel at iogearbox.net>
> 
> BugLink: https://bugs.launchpad.net/bugs/1765698
> 
> (cherry-picked from commit 52fda36d63bfc8c8e8ae5eda8eb5ac6f52cd67ed)
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  lib/test_bpf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/test_bpf.c b/lib/test_bpf.c
> index 2e3e30e..179b7ec 100644
> --- a/lib/test_bpf.c
> +++ b/lib/test_bpf.c
> @@ -4533,7 +4533,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,
> 
Acked-by: Colin Ian King <colin.king at canonical.com>