On Tue, Oct 11, 2022 at 11:52:55AM -0500, David Vernet wrote: > The DENYLIST and DENYLIST.s390x files are used to specify testcases > which should not be run on CI. Currently, testcases are appended to the > end of these files as needed. This can make it a pain to resolve merge > conflicts. This patch alphabetizes the DENYLIST files to ease this > burden. > > Signed-off-by: David Vernet <void@xxxxxxxxxxxxx> > --- > tools/testing/selftests/bpf/DENYLIST | 2 +- > tools/testing/selftests/bpf/DENYLIST.s390x | 40 +++++++++++----------- > 2 files changed, 21 insertions(+), 21 deletions(-) > > diff --git a/tools/testing/selftests/bpf/DENYLIST b/tools/testing/selftests/bpf/DENYLIST > index 939de574fc7f..5a07ecacd7b0 100644 > --- a/tools/testing/selftests/bpf/DENYLIST > +++ b/tools/testing/selftests/bpf/DENYLIST > @@ -1,6 +1,6 @@ > # TEMPORARY > get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge > -stacktrace_build_id_nmi > stacktrace_build_id > +stacktrace_build_id_nmi > task_fd_query_rawtp > varlen > diff --git a/tools/testing/selftests/bpf/DENYLIST.s390x b/tools/testing/selftests/bpf/DENYLIST.s390x > index beef1232a47a..19d6f534e5be 100644 > --- a/tools/testing/selftests/bpf/DENYLIST.s390x > +++ b/tools/testing/selftests/bpf/DENYLIST.s390x > @@ -1,13 +1,17 @@ > # TEMPORARY > atomics # attach(add): actual -524 <= expected 0 (trampoline) > -bpf_iter_setsockopt # JIT does not support calling kernel function (kfunc) > bloom_filter_map # failed to find kernel BTF type ID of '__x64_sys_getpgid': -3 (?) > -bpf_tcp_ca # JIT does not support calling kernel function (kfunc) > +bpf_cookie # failed to open_and_load program: -524 (trampoline) > +bpf_iter_setsockopt # JIT does not support calling kernel function (kfunc) > bpf_loop # attaches to __x64_sys_nanosleep > bpf_mod_race # BPF trampoline > bpf_nf # JIT does not support calling kernel function > +bpf_tcp_ca # JIT does not support calling kernel function (kfunc) > +cb_refs # expected error message unexpected error: -524 (trampoline) > +cgroup_hierarchical_stats # JIT does not support calling kernel function (kfunc) > core_read_macros # unknown func bpf_probe_read#4 (overlapping) > d_path # failed to auto-attach program 'prog_stat': -524 (trampoline) > +deny_namespace # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > dummy_st_ops # test_run unexpected error: -524 (errno 524) (trampoline) > fentry_fexit # fentry attach failed: -524 (trampoline) > fentry_test # fentry_first_attach unexpected error: -524 (trampoline) > @@ -18,19 +22,28 @@ fexit_test # fexit_first_attach unexpected error: > get_func_args_test # trampoline > get_func_ip_test # get_func_ip_test__attach unexpected error: -524 (trampoline) > get_stack_raw_tp # user_stack corrupted user stack (no backchain userspace) > +htab_update # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > kfree_skb # attach fentry unexpected error: -524 (trampoline) > kfunc_call # 'bpf_prog_active': not found in kernel BTF (?) > +kfunc_dynptr_param # JIT does not support calling kernel function (kfunc) > +kprobe_multi_test # relies on fentry > ksyms_module # test_ksyms_module__open_and_load unexpected error: -9 (?) > ksyms_module_libbpf # JIT does not support calling kernel function (kfunc) > ksyms_module_lskel # test_ksyms_module_lskel__open_and_load unexpected error: -9 (?) > +libbpf_get_fd_by_id_opts # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > +lookup_key # JIT does not support calling kernel function (kfunc) > +lru_bug # prog 'printk': failed to auto-attach: -524 > +map_kptr # failed to open_and_load program: -524 (trampoline) > modify_return # modify_return attach failed: -524 (trampoline) > module_attach # skel_attach skeleton attach failed: -524 (trampoline) > mptcp > -kprobe_multi_test # relies on fentry > netcnt # failed to load BPF skeleton 'netcnt_prog': -7 (?) > probe_user # check_kprobe_res wrong kprobe res from probe read (?) > recursion # skel_attach unexpected error: -524 (trampoline) > ringbuf # skel_load skeleton load failed (?) > +select_reuseport # intermittently fails on new s390x setup > +send_signal # intermittently fails to receive signal > +setget_sockopt # attach unexpected error: -524 (trampoline) > sk_assign # Can't read on server: Invalid argument (?) > sk_lookup # endianness problem > sk_storage_tracing # test_sk_storage_tracing__attach unexpected error: -524 (trampoline) > @@ -52,28 +65,15 @@ timer_mim # failed to auto-attach program 'test1' > trace_ext # failed to auto-attach program 'test_pkt_md_access_new': -524 (trampoline) > trace_printk # trace_printk__load unexpected error: -2 (errno 2) (?) > trace_vprintk # trace_vprintk__open_and_load unexpected error: -9 (?) > +tracing_struct # failed to auto-attach: -524 (trampoline) > trampoline_count # prog 'prog1': failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > +unpriv_bpf_disabled # fentry > +user_ringbuf # failed to find kernel BTF type ID of '__s390x_sys_prctl': -3 (?) > verif_stats # trace_vprintk__open_and_load unexpected error: -9 (?) > +verify_pkcs7_sig # JIT does not support calling kernel function (kfunc) > vmlinux # failed to auto-attach program 'handle__fentry': -524 (trampoline) > xdp_adjust_tail # case-128 err 0 errno 28 retval 1 size 128 expect-size 3520 (?) > xdp_bonding # failed to auto-attach program 'trace_on_entry': -524 (trampoline) > xdp_bpf2bpf # failed to auto-attach program 'trace_on_entry': -524 (trampoline) > -map_kptr # failed to open_and_load program: -524 (trampoline) > -bpf_cookie # failed to open_and_load program: -524 (trampoline) > xdp_do_redirect # prog_run_max_size unexpected error: -22 (errno 22) > -send_signal # intermittently fails to receive signal > -select_reuseport # intermittently fails on new s390x setup > xdp_synproxy # JIT does not support calling kernel function (kfunc) > -unpriv_bpf_disabled # fentry > -lru_bug # prog 'printk': failed to auto-attach: -524 > -setget_sockopt # attach unexpected error: -524 (trampoline) > -cb_refs # expected error message unexpected error: -524 (trampoline) > -cgroup_hierarchical_stats # JIT does not support calling kernel function (kfunc) > -htab_update # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > -tracing_struct # failed to auto-attach: -524 (trampoline) > -user_ringbuf # failed to find kernel BTF type ID of '__s390x_sys_prctl': -3 (?) > -lookup_key # JIT does not support calling kernel function (kfunc) > -verify_pkcs7_sig # JIT does not support calling kernel function (kfunc) > -kfunc_dynptr_param # JIT does not support calling kernel function (kfunc) > -deny_namespace # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > -libbpf_get_fd_by_id_opts # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) > -- > 2.38.0 Looks good to me, thanks! Not sure if we should add a comment indicating lexical ordering or solely watch out for that through review. Acked-by: Daniel Müller <deso@xxxxxxxxxx>
