Commit de40a8ab authored by Seth Forshee's avatar Seth Forshee Committed by Daniel Borkmann

bpf: revert "test_bpf: Flag tests that cannot be jited on s390"

This reverts commit 3203c901 ("test_bpf: flag tests that cannot
be jited on s390").

The s390 bpf JIT previously had a restriction on the maximum program
size, which required some tests in test_bpf to be flagged as expected
failures. The program size limitation has been removed, and the tests
now pass, so these tests should no longer be flagged.

Fixes: d1242b10 ("s390/bpf: Remove JITed image size limitations")
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Link: https://lore.kernel.org/bpf/20200716143931.330122-1-seth.forshee@canonical.com
parent 05500125
...@@ -5275,31 +5275,21 @@ static struct bpf_test tests[] = { ...@@ -5275,31 +5275,21 @@ static struct bpf_test tests[] = {
{ /* Mainly checking JIT here. */ { /* Mainly checking JIT here. */
"BPF_MAXINSNS: Ctx heavy transformations", "BPF_MAXINSNS: Ctx heavy transformations",
{ }, { },
#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
CLASSIC | FLAG_EXPECTED_FAIL,
#else
CLASSIC, CLASSIC,
#endif
{ }, { },
{ {
{ 1, SKB_VLAN_PRESENT }, { 1, SKB_VLAN_PRESENT },
{ 10, SKB_VLAN_PRESENT } { 10, SKB_VLAN_PRESENT }
}, },
.fill_helper = bpf_fill_maxinsns6, .fill_helper = bpf_fill_maxinsns6,
.expected_errcode = -ENOTSUPP,
}, },
{ /* Mainly checking JIT here. */ { /* Mainly checking JIT here. */
"BPF_MAXINSNS: Call heavy transformations", "BPF_MAXINSNS: Call heavy transformations",
{ }, { },
#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
CLASSIC | FLAG_NO_DATA | FLAG_EXPECTED_FAIL,
#else
CLASSIC | FLAG_NO_DATA, CLASSIC | FLAG_NO_DATA,
#endif
{ }, { },
{ { 1, 0 }, { 10, 0 } }, { { 1, 0 }, { 10, 0 } },
.fill_helper = bpf_fill_maxinsns7, .fill_helper = bpf_fill_maxinsns7,
.expected_errcode = -ENOTSUPP,
}, },
{ /* Mainly checking JIT here. */ { /* Mainly checking JIT here. */
"BPF_MAXINSNS: Jump heavy test", "BPF_MAXINSNS: Jump heavy test",
...@@ -5350,28 +5340,18 @@ static struct bpf_test tests[] = { ...@@ -5350,28 +5340,18 @@ static struct bpf_test tests[] = {
{ {
"BPF_MAXINSNS: exec all MSH", "BPF_MAXINSNS: exec all MSH",
{ }, { },
#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
CLASSIC | FLAG_EXPECTED_FAIL,
#else
CLASSIC, CLASSIC,
#endif
{ 0xfa, 0xfb, 0xfc, 0xfd, }, { 0xfa, 0xfb, 0xfc, 0xfd, },
{ { 4, 0xababab83 } }, { { 4, 0xababab83 } },
.fill_helper = bpf_fill_maxinsns13, .fill_helper = bpf_fill_maxinsns13,
.expected_errcode = -ENOTSUPP,
}, },
{ {
"BPF_MAXINSNS: ld_abs+get_processor_id", "BPF_MAXINSNS: ld_abs+get_processor_id",
{ }, { },
#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
CLASSIC | FLAG_EXPECTED_FAIL,
#else
CLASSIC, CLASSIC,
#endif
{ }, { },
{ { 1, 0xbee } }, { { 1, 0xbee } },
.fill_helper = bpf_fill_ld_abs_get_processor_id, .fill_helper = bpf_fill_ld_abs_get_processor_id,
.expected_errcode = -ENOTSUPP,
}, },
/* /*
* LD_IND / LD_ABS on fragmented SKBs * LD_IND / LD_ABS on fragmented SKBs
......
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