Commit 16a660ef authored by Gary Lin's avatar Gary Lin Committed by Alexei Starovoitov

test_bpf: Remove EXPECTED_FAIL flag from bpf_fill_maxinsns11

With NOPs padding, x64 jit now can handle the jump cases like
bpf_fill_maxinsns11().
Signed-off-by: default avatarGary Lin <glin@suse.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210119102501.511-3-glin@suse.com
parent 93c5aecc
...@@ -345,7 +345,7 @@ static int __bpf_fill_ja(struct bpf_test *self, unsigned int len, ...@@ -345,7 +345,7 @@ static int __bpf_fill_ja(struct bpf_test *self, unsigned int len,
static int bpf_fill_maxinsns11(struct bpf_test *self) static int bpf_fill_maxinsns11(struct bpf_test *self)
{ {
/* Hits 70 passes on x86_64, so cannot get JITed there. */ /* Hits 70 passes on x86_64 and triggers NOPs padding. */
return __bpf_fill_ja(self, BPF_MAXINSNS, 68); return __bpf_fill_ja(self, BPF_MAXINSNS, 68);
} }
...@@ -5318,15 +5318,10 @@ static struct bpf_test tests[] = { ...@@ -5318,15 +5318,10 @@ static struct bpf_test tests[] = {
{ {
"BPF_MAXINSNS: Jump, gap, jump, ...", "BPF_MAXINSNS: Jump, gap, jump, ...",
{ }, { },
#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_X86)
CLASSIC | FLAG_NO_DATA | FLAG_EXPECTED_FAIL,
#else
CLASSIC | FLAG_NO_DATA, CLASSIC | FLAG_NO_DATA,
#endif
{ }, { },
{ { 0, 0xababcbac } }, { { 0, 0xababcbac } },
.fill_helper = bpf_fill_maxinsns11, .fill_helper = bpf_fill_maxinsns11,
.expected_errcode = -ENOTSUPP,
}, },
{ {
"BPF_MAXINSNS: jump over MSH", "BPF_MAXINSNS: jump over MSH",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment