[PATCH v4 bpf-next 00/10] libbpf: stricter BPF program section name handling

* [PATCH v4 bpf-next 00/10] libbpf: stricter BPF program section name handling
@ 2021-09-28 16:19 Andrii Nakryiko
  2021-09-28 16:19 ` [PATCH v4 bpf-next 01/10] libbpf: add "tc" SEC_DEF which is a better name for "classifier" Andrii Nakryiko
                   ` (10 more replies)
  0 siblings, 11 replies; 13+ messages in thread
From: Andrii Nakryiko @ 2021-09-28 16:19 UTC (permalink / raw)
  To: bpf, ast, daniel; +Cc: andrii, kernel-team

Implement opt-in stricter BPF program section name (SEC()) handling logic. For
a lot of supported ELF section names, enforce exact section name match with no
arbitrary characters added at the end. See patch #9 for more details.

To allow this, patches #2 through #4 clean up and preventively fix selftests,
normalizing existing SEC() usage across multiple selftests. While at it, those
patches also reduce the amount of remaining bpf_object__find_program_by_title()
uses, which should be completely removed soon, given it's an API with
ambiguous semantics and will be deprecated and eventually removed in libbpf 1.0.

Patch #1 also introduces SEC("tc") as an alias for SEC("classifier"). "tc" is
a better and less misleading name, so patch #3 replaces all classifier* uses
with nice and short SEC("tc").

Last patch is also fixing "sk_lookup/" definition to not require and not allow
extra "/blah" parts after it, which serve no meaning.

All the other patches are gradual internal libbpf changes to:
  - allow this optional strict logic for ELF section name handling;
  - allow new use case (for now for "struct_ops", but that could be extended
    to, say, freplace definitions), in which it can be used stand-alone to
    specify just type (SEC("struct_ops")), or also accept extra parameters
    which can be utilized by libbpf to either get more data or double-check
    valid use (e.g., SEC("struct_ops/dctcp_init") to specify desired
    struct_ops operation that is supposed to be implemented);
  - get libbpf's internal logic ready to allow other libraries and
    applications to specify their custom handlers for ELF section name for BPF
    programs. All the pieces are in place, the only thing preventing making
    this as public libbpf API is reliance on internal type for specifying BPF
    program load attributes. The work is planned to revamp related low-level
    libbpf APIs, at which point it will be possible to just re-use such new
    types for coordination between libbpf and custom handlers.

These changes are a part of libbpf 1.0 effort ([0]). They are also intended to
be applied on top of the previous preparatory series [1], so currently CI will
be failing to apply them to bpf-next until that patch set is landed. Once it
is landed, kernel-patches daemon will automatically retest this patch set.

  [0] https://github.com/libbpf/libbpf/wiki/Libbpf:-the-road-to-v1.0#stricter-and-more-uniform-bpf-program-section-name-sec-handling
  [1] https://patchwork.kernel.org/project/netdevbpf/list/?series=547675&state=*

v3->v4:
  - replace SEC("classifier*") with SEC("tc") (Daniel);
v2->v3:
  - applied acks, addressed most feedback, added comments to new flags (Dave);
v1->v2:
  - rebase onto latest bpf-next and resolve merge conflicts w/ Dave's changes.

Andrii Nakryiko (10):
  libbpf: add "tc" SEC_DEF which is a better name for "classifier"
  selftests/bpf: normalize XDP section names in selftests
  selftests/bpf: switch SEC("classifier*") usage to a strict SEC("tc")
  selftests/bpf: normalize all the rest SEC() uses
  libbpf: refactor internal sec_def handling to enable pluggability
  libbpf: reduce reliance of attach_fns on sec_def internals
  libbpf: refactor ELF section handler definitions
  libbpf: complete SEC() table unification for
    BPF_APROG_SEC/BPF_EAPROG_SEC
  libbpf: add opt-in strict BPF program section name handling logic
  selftests/bpf: switch sk_lookup selftests to strict SEC("sk_lookup")
    use

 tools/lib/bpf/libbpf.c                        | 518 +++++++++---------
 tools/lib/bpf/libbpf_internal.h               |   7 +
 tools/lib/bpf/libbpf_legacy.h                 |   9 +
 .../selftests/bpf/prog_tests/flow_dissector.c |   4 +-
 .../bpf/prog_tests/reference_tracking.c       |  23 +-
 .../selftests/bpf/prog_tests/sk_assign.c      |   2 +-
 .../selftests/bpf/prog_tests/sockopt_multi.c  |  30 +-
 .../selftests/bpf/prog_tests/tailcalls.c      |  58 +-
 tools/testing/selftests/bpf/progs/bpf_flow.c  |   3 +-
 .../bpf/progs/cg_storage_multi_isolated.c     |   4 +-
 .../bpf/progs/cg_storage_multi_shared.c       |   4 +-
 .../bpf/progs/for_each_array_map_elem.c       |   2 +-
 .../bpf/progs/for_each_hash_map_elem.c        |   2 +-
 .../selftests/bpf/progs/kfunc_call_test.c     |   4 +-
 .../bpf/progs/kfunc_call_test_subprog.c       |   2 +-
 .../testing/selftests/bpf/progs/skb_pkt_end.c |   2 +-
 .../selftests/bpf/progs/sockopt_multi.c       |   5 +-
 tools/testing/selftests/bpf/progs/tailcall1.c |   7 +-
 tools/testing/selftests/bpf/progs/tailcall2.c |  23 +-
 tools/testing/selftests/bpf/progs/tailcall3.c |   7 +-
 tools/testing/selftests/bpf/progs/tailcall4.c |   7 +-
 tools/testing/selftests/bpf/progs/tailcall5.c |   7 +-
 tools/testing/selftests/bpf/progs/tailcall6.c |   6 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf1.c   |   7 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf2.c   |   7 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf3.c   |  11 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf4.c   |  15 +-
 .../bpf/progs/test_btf_skc_cls_ingress.c      |   2 +-
 .../selftests/bpf/progs/test_cgroup_link.c    |   4 +-
 .../selftests/bpf/progs/test_check_mtu.c      |  12 +-
 .../selftests/bpf/progs/test_cls_redirect.c   |   2 +-
 .../selftests/bpf/progs/test_global_data.c    |   2 +-
 .../selftests/bpf/progs/test_global_func1.c   |   2 +-
 .../selftests/bpf/progs/test_global_func3.c   |   2 +-
 .../selftests/bpf/progs/test_global_func5.c   |   2 +-
 .../selftests/bpf/progs/test_global_func6.c   |   2 +-
 .../selftests/bpf/progs/test_global_func7.c   |   2 +-
 .../selftests/bpf/progs/test_map_in_map.c     |   2 +-
 .../bpf/progs/test_misc_tcp_hdr_options.c     |   2 +-
 .../selftests/bpf/progs/test_pkt_access.c     |   2 +-
 .../selftests/bpf/progs/test_pkt_md_access.c  |   4 +-
 .../selftests/bpf/progs/test_sk_assign.c      |   3 +-
 .../selftests/bpf/progs/test_sk_lookup.c      |  44 +-
 .../selftests/bpf/progs/test_sk_lookup_kern.c |  37 +-
 .../selftests/bpf/progs/test_skb_helpers.c    |   2 +-
 .../selftests/bpf/progs/test_sockmap_listen.c |   2 +-
 .../progs/test_sockmap_skb_verdict_attach.c   |   2 +-
 .../selftests/bpf/progs/test_sockmap_update.c |   2 +-
 .../testing/selftests/bpf/progs/test_tc_bpf.c |   2 +-
 .../selftests/bpf/progs/test_tc_neigh.c       |   6 +-
 .../selftests/bpf/progs/test_tc_neigh_fib.c   |   6 +-
 .../selftests/bpf/progs/test_tc_peer.c        |  10 +-
 .../bpf/progs/test_tcp_check_syncookie_kern.c |   4 +-
 .../bpf/progs/test_tcp_hdr_options.c          |   2 +-
 tools/testing/selftests/bpf/progs/test_xdp.c  |   2 +-
 .../bpf/progs/test_xdp_adjust_tail_grow.c     |   2 +-
 .../bpf/progs/test_xdp_adjust_tail_shrink.c   |   4 +-
 .../bpf/progs/test_xdp_devmap_helpers.c       |   2 +-
 .../selftests/bpf/progs/test_xdp_link.c       |   2 +-
 .../selftests/bpf/progs/test_xdp_loop.c       |   2 +-
 .../selftests/bpf/progs/test_xdp_noinline.c   |   4 +-
 .../bpf/progs/test_xdp_with_cpumap_helpers.c  |   4 +-
 .../bpf/progs/test_xdp_with_devmap_helpers.c  |   4 +-
 tools/testing/selftests/bpf/progs/xdp_dummy.c |   2 +-
 .../bpf/progs/xdp_redirect_multi_kern.c       |   4 +-
 .../testing/selftests/bpf/progs/xdping_kern.c |   4 +-
 .../selftests/bpf/test_tcp_check_syncookie.sh |   4 +-
 .../selftests/bpf/test_xdp_redirect.sh        |   4 +-
 .../selftests/bpf/test_xdp_redirect_multi.sh  |   2 +-
 tools/testing/selftests/bpf/test_xdp_veth.sh  |   4 +-
 tools/testing/selftests/bpf/xdping.c          |   5 +-
 71 files changed, 496 insertions(+), 499 deletions(-)

-- 
2.30.2

^ permalink raw reply	[flat|nested] 13+ messages in thread