On Tue, Apr 5, 2022 at 6:09 AM Yafang Shao <laoar.shao@xxxxxxxxx> wrote: > > We have switched to memcg based memory accouting and thus the rlimit is > not needed any more. LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK was introduced in > libbpf for backward compatibility, so we can use it instead now. > > This patchset cleanups the usage of RLIMIT_MEMLOCK in tools/bpf/, > tools/testing/selftests/bpf and samples/bpf. The file > tools/testing/selftests/bpf/bpf_rlimit.h is removed. The included header > sys/resource.h is removed from many files as it is useless in these files. > > - v3: Get rid of bpf_rlimit.h and fix some typos (Andrii) > - v2: Use libbpf_set_strict_mode instead. (Andrii) > - v1: https://lore.kernel.org/bpf/20220320060815.7716-2-laoar.shao@xxxxxxxxx/ > > Yafang Shao (27): > bpf: selftests: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK in > xdping > bpf: selftests: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK in > xdpxceiver > bpf: selftests: No need to include bpf_rlimit.h in test_tcpnotify_user > bpf: selftests: No need to include bpf_rlimit.h in flow_dissector_load > bpf: selftests: Set libbpf 1.0 API mode explicitly in > get_cgroup_id_user > bpf: selftests: Set libbpf 1.0 API mode explicitly in > test_cgroup_storage > bpf: selftests: Set libbpf 1.0 API mode explicitly in > get_cgroup_id_user > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_lpm_map > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_lru_map > bpf: selftests: Set libbpf 1.0 API mode explicitly in > test_skb_cgroup_id_user > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_sock_addr > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_sock > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_sockmap > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_sysctl > bpf: selftests: Set libbpf 1.0 API mode explicitly in test_tag > bpf: selftests: Set libbpf 1.0 API mode explicitly in > test_tcp_check_syncookie_user > bpf: selftests: Set libbpf 1.0 API mode explicitly in > test_verifier_log > bpf: samples: Set libbpf 1.0 API mode explicitly in hbm > bpf: selftests: Get rid of bpf_rlimit.h > bpf: selftests: No need to include sys/resource.h in some files > bpf: samples: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK in > xdpsock_user > bpf: samples: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK in > xsk_fwd > bpf: samples: No need to include sys/resource.h in many files > bpf: bpftool: Remove useless return value of libbpf_set_strict_mode > bpf: bpftool: Set LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK for legacy libbpf > bpf: bpftool: remove RLIMIT_MEMLOCK > bpf: runqslower: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK > Hey Yafang, thanks for the clean up! It looks good, but please make it a bit more manageable in terms of number of patches. There is no need to have so many tiny patches. Can you squash together all the samples/bpf changes into one patch, all the selftests/bpf changes into another, bpftool ones still can be just one patch. runqslower makes sense to keep separate. Please also use customary subject prefixes for those: "selftests/bpf: ", "bpftool: ", "samples/bpf: ". For runqslower probably "tools/runqslower: " would be ok as well. > samples/bpf/cpustat_user.c | 1 - > samples/bpf/hbm.c | 5 ++-- > samples/bpf/ibumad_user.c | 1 - > samples/bpf/map_perf_test_user.c | 1 - > samples/bpf/offwaketime_user.c | 1 - > samples/bpf/sockex2_user.c | 1 - > samples/bpf/sockex3_user.c | 1 - > samples/bpf/spintest_user.c | 1 - > samples/bpf/syscall_tp_user.c | 1 - > samples/bpf/task_fd_query_user.c | 1 - > samples/bpf/test_lru_dist.c | 1 - > samples/bpf/test_map_in_map_user.c | 1 - > samples/bpf/test_overhead_user.c | 1 - > samples/bpf/tracex2_user.c | 1 - > samples/bpf/tracex3_user.c | 1 - > samples/bpf/tracex4_user.c | 1 - > samples/bpf/tracex5_user.c | 1 - > samples/bpf/tracex6_user.c | 1 - > samples/bpf/xdp1_user.c | 1 - > samples/bpf/xdp_adjust_tail_user.c | 1 - > samples/bpf/xdp_monitor_user.c | 1 - > samples/bpf/xdp_redirect_cpu_user.c | 1 - > samples/bpf/xdp_redirect_map_multi_user.c | 1 - > samples/bpf/xdp_redirect_user.c | 1 - > samples/bpf/xdp_router_ipv4_user.c | 1 - > samples/bpf/xdp_rxq_info_user.c | 1 - > samples/bpf/xdp_sample_pkts_user.c | 1 - > samples/bpf/xdp_sample_user.c | 1 - > samples/bpf/xdp_tx_iptunnel_user.c | 1 - > samples/bpf/xdpsock_user.c | 9 ++---- > samples/bpf/xsk_fwd.c | 7 ++--- > tools/bpf/bpftool/common.c | 8 ------ > tools/bpf/bpftool/feature.c | 2 -- > tools/bpf/bpftool/main.c | 6 ++-- > tools/bpf/bpftool/main.h | 2 -- > tools/bpf/bpftool/map.c | 2 -- > tools/bpf/bpftool/pids.c | 1 - > tools/bpf/bpftool/prog.c | 3 -- > tools/bpf/bpftool/struct_ops.c | 2 -- > tools/bpf/runqslower/runqslower.c | 18 ++---------- > tools/testing/selftests/bpf/bench.c | 1 - > tools/testing/selftests/bpf/bpf_rlimit.h | 28 ------------------- > .../selftests/bpf/flow_dissector_load.c | 6 ++-- > .../selftests/bpf/get_cgroup_id_user.c | 4 ++- > tools/testing/selftests/bpf/prog_tests/btf.c | 1 - > .../selftests/bpf/test_cgroup_storage.c | 4 ++- > tools/testing/selftests/bpf/test_dev_cgroup.c | 4 ++- > tools/testing/selftests/bpf/test_lpm_map.c | 4 ++- > tools/testing/selftests/bpf/test_lru_map.c | 4 ++- > .../selftests/bpf/test_skb_cgroup_id_user.c | 4 ++- > tools/testing/selftests/bpf/test_sock.c | 4 ++- > tools/testing/selftests/bpf/test_sock_addr.c | 4 ++- > tools/testing/selftests/bpf/test_sockmap.c | 5 ++-- > tools/testing/selftests/bpf/test_sysctl.c | 4 ++- > tools/testing/selftests/bpf/test_tag.c | 4 ++- > .../bpf/test_tcp_check_syncookie_user.c | 4 ++- > .../selftests/bpf/test_tcpnotify_user.c | 1 - > .../testing/selftests/bpf/test_verifier_log.c | 5 ++-- > .../selftests/bpf/xdp_redirect_multi.c | 1 - > tools/testing/selftests/bpf/xdping.c | 8 ++---- > tools/testing/selftests/bpf/xdpxceiver.c | 6 ++-- > 61 files changed, 57 insertions(+), 142 deletions(-) > delete mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h > > -- > 2.17.1 >
