Skip to content

libbpf: remove deprecated APIs

Andrii Nakryiko bpf 2 versions – Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest15 patches 3 repliesApplied 15/15
  2. v115 patches 5 repliesSuperseded

Changes in v2 from the cover letter

- rebase on latest bpf-next now that Jiri's perf patches landed;
- fix xsk.o dependency in Makefile to ensure libbpf headers are installed reliably.

Patches in v2 All 15 applied

#Subject and filesSizeRepliesApplied
1/15libbpf: move xsk.{c,h} into selftests/bpftools/lib/bpf/Build tools/lib/bpf/Makefile tools/lib/bpf/libbpf.map +4 more+49 -763 repliesApplied
2/15libbpf: remove deprecated low-level APIstools/lib/bpf/bpf.c tools/lib/bpf/bpf.h tools/lib/bpf/libbpf.c +2 more+4 -3740 repliesApplied
3/15libbpf: remove deprecated XDP APIstools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map tools/lib/bpf/netlink.c+8 -780 repliesApplied
4/15libbpf: remove deprecated probing APIstools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map tools/lib/bpf/libbpf_probes.c+5 -1320 repliesApplied
5/15libbpf: remove deprecated BTF APIstools/lib/bpf/btf.c tools/lib/bpf/btf.h tools/lib/bpf/btf_dump.c +2 more+24 -3250 repliesApplied
6/15libbpf: clean up perfbuf APIstools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map+18 -1120 repliesApplied
7/15libbpf: remove prog_info_linear APIstools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map+0 -3170 repliesApplied
8/15libbpf: remove most other deprecated high-level APIstools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map+26 -4210 repliesApplied
9/15libbpf: remove multi-instance and custom private data APIstools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map+10 -2120 repliesApplied
10/15libbpf: cleanup LIBBPF_DEPRECATED_SINCE supporting macros for v0.xtools/lib/bpf/libbpf_common.h+3 -130 repliesApplied
11/15libbpf: remove internal multi-instance prog supporttools/lib/bpf/libbpf.c+34 -2830 repliesApplied
12/15libbpf: clean up SEC() handlingtools/lib/bpf/libbpf.c+47 -720 repliesApplied
13/15selftests/bpf: remove last tests with legacy BPF map definitionstools/testing/selftests/bpf/bpf_legacy.h tools/testing/selftests/bpf/prog_tests/btf.c tools/testing/selftests/bpf/progs/test_btf_haskv.c +1 more+0 -790 repliesApplied
14/15libbpf: enforce strict libbpf 1.0 behaviorstools/lib/bpf/bpf.c tools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h +2 more+37 -2610 repliesApplied
15/15libbpf: fix up few libbpf.map problemstools/lib/bpf/libbpf.map tools/lib/bpf/libbpf_legacy.h+4 -30 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 bpf-next 00/15] libbpf: remove deprecated APIs

This patch set removes all the deprecated APIs in preparation for 1.0 release. It also makes libbpf_set_strict_mode() a no-op (but keeps it to let per-1.0 applications buildable and dynamically linkable against libbpf 1.0 if they were already libbpf-1.0 ready) and starts enforcing all the behaviors that were previously opt-in through libbpf_set_strict_mode().

xsk.{c,h} parts that are now properly provided by libxdp ([0]) are still used by xdpxceiver.c in selftest/bpf, so I've moved xsk.{c,h} with barely any changes to under selftests/bpf.

Other than that, apart from removing all the LIBBPF_DEPRECATED-marked APIs, there is a bunch of internal clean ups allowed by that. I've also "restored" libbpf.map inheritance chain while removing all the deprecated APIs. I think that's the right way to do this, as applications using libbpf as shared library but not relying on any deprecated APIs (i.e., "good citizens" that prepared for libbpf 1.0 release ahead of time to minimize disruption) should be able to link both against 0.x and 1.x versions. Either way, it doesn't seem to break anything and preserve a history on when each "surviving" API was added.

[0] https://github.com/xdp-project/xdp-tools/tree/master/lib/libxdp

v1->v2:
- rebase on latest bpf-next now that Jiri's perf patches landed;
- fix xsk.o dependency in Makefile to ensure libbpf headers are installed reliably.

Andrii Nakryiko (15):
libbpf: move xsk.{c,h} into selftests/bpf
libbpf: remove deprecated low-level APIs
libbpf: remove deprecated XDP APIs
libbpf: remove deprecated probing APIs
libbpf: remove deprecated BTF APIs
libbpf: clean up perfbuf APIs
libbpf: remove prog_info_linear APIs
libbpf: remove most other deprecated high-level APIs
libbpf: remove multi-instance and custom private data APIs
libbpf: cleanup LIBBPF_DEPRECATED_SINCE supporting macros for v0.x
libbpf: remove internal multi-instance prog support
libbpf: clean up SEC() handling
selftests/bpf: remove last tests with legacy BPF map definitions
libbpf: enforce strict libbpf 1.0 behaviors
libbpf: fix up few libbpf.map problems

 tools/lib/bpf/Build                           |    2 +-
 tools/lib/bpf/Makefile                        |    2 +-
 tools/lib/bpf/bpf.c                           |  178 +-
 tools/lib/bpf/bpf.h                           |   83 -
 tools/lib/bpf/btf.c                           |  183 +--
 tools/lib/bpf/btf.h                           |   86 +-
 tools/lib/bpf/btf_dump.c                      |   23 +-
 tools/lib/bpf/libbpf.c                        | 1429 ++---------------
 tools/lib/bpf/libbpf.h                        |  469 +-----
 tools/lib/bpf/libbpf.map                      |  113 +-
 tools/lib/bpf/libbpf_common.h                 |   16 +-
 tools/lib/bpf/libbpf_internal.h               |   24 +-
 tools/lib/bpf/libbpf_legacy.h                 |   28 +-
 tools/lib/bpf/libbpf_probes.c                 |  125 +-
 tools/lib/bpf/netlink.c                       |   62 +-
 tools/testing/selftests/bpf/Makefile          |    2 +
 tools/testing/selftests/bpf/bpf_legacy.h      |    9 -
 tools/testing/selftests/bpf/prog_tests/btf.c  |    1 -
 .../selftests/bpf/progs/test_btf_haskv.c      |   51 -
 .../selftests/bpf/progs/test_btf_newkv.c      |   18 -
 tools/testing/selftests/bpf/xdpxceiver.c      |    2 +-
 tools/{lib => testing/selftests}/bpf/xsk.c    |   76 +-
 tools/{lib => testing/selftests}/bpf/xsk.h    |   29 +-
 23 files changed, 261 insertions(+), 2750 deletions(-)
 delete mode 100644 tools/testing/selftests/bpf/progs/test_btf_haskv.c
 rename tools/{lib => testing/selftests}/bpf/xsk.c (95%)
 rename tools/{lib => testing/selftests}/bpf/xsk.h (84%)
Signature · 1 line
2.30.2