lkml.org 
[lkml]   [2018]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 072/143] test_bpf: Fix testing with CONFIG_BPF_JIT_ALWAYS_ON=y on other arches
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 52fda36d63bfc8c8e8ae5eda8eb5ac6f52cd67ed ]

    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@canonical.com>
    Reviewed-by: Yonghong Song <yhs@fb.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 64701b4c9900..75ebf2bbc2ee 100644
    --- a/lib/test_bpf.c
    +++ b/lib/test_bpf.c
    @@ -5427,7 +5427,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,
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-02 19:58    [W:3.179 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site