Skip to content

Various BPF helper improvements

Daniel Borkmann bpf netdev 4 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest6 patches 8 repliesApplied 6/6
  2. v36 patches 5 repliesSuperseded
  3. v26 patches 3 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v16 patches21 repliesSuperseded

Changes in v4 from the cover letter

- Removed out_rec error path (Martin)
- Integrate BPF_F_NEIGH flag into rejecting invalid flags (Martin)
- I think this way it's better to avoid bit overlaps given it's right in the place that would need to be extended on new flags

Patches in v4 All 6 applied

#Subject and filesSizeRepliesApplied
1/6bpf: add classid helper only based on skb->skinclude/uapi/linux/bpf.h net/core/filter.c tools/include/uapi/linux/bpf.h+41 -00 repliesApplied
2/6bpf, net: rework cookie generator as per-cpu oneinclude/linux/cookie.h include/linux/sock_diag.h include/net/net_namespace.h +5 more+86 -181 replyApplied
3/6bpf: add redirect_neigh helper as redirect drop-ininclude/linux/skbuff.h include/uapi/linux/bpf.h net/core/filter.c +1 more+294 -152 repliesApplied
4/6bpf, libbpf: add bpf_tail_call_static helper for bpf programstools/lib/bpf/bpf_helpers.h+46 -00 repliesApplied
5/6bpf, selftests: use bpf_tail_call_static where appropriatesamples/bpf/sockex3_kern.c tools/testing/selftests/bpf/progs/bpf_flow.c tools/testing/selftests/bpf/progs/tailcall1.c +6 more+51 -491 replyApplied
6/6bpf, selftests: add redirect_neigh selftesttools/testing/selftests/bpf/progs/test_tc_neigh.c tools/testing/selftests/bpf/test_tc_neigh.sh+312 -04 repliesApplied

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchMartin KaFai LauAndrii NakryikoEric DumazetDavid Ahern
1/6A-b
2/6A-b R-b
3/6A-b R-b
4/6A-b
5/6A-b
6/6A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v4 thread

Cover letter [PATCH bpf-next v4 0/6] Various BPF helper improvements

This series adds two BPF helpers, that is, one for retrieving the classid of an skb and another one to redirect via the neigh subsystem, and improves also the cookie helpers by removing the atomic counter. I've also added the bpf_tail_call_static() helper to the libbpf API that we've been using in Cilium for a while now, and last but not least the series adds a few selftests. For details, please check individual patches, thanks!

v3 -> v4:
- Removed out_rec error path (Martin)
- Integrate BPF_F_NEIGH flag into rejecting invalid flags (Martin)
- I think this way it's better to avoid bit overlaps given it's right in the place that would need to be extended on new flags
v2 -> v3:
- Removed double skb->dev = dev assignment (David)
- Added headroom check for v6 path (David)
- Set set flowi4_proto for ip_route_output_flow (David)
- Rebased onto latest bpf-next
v1 -> v2:
- Rework cookie generator to support nested contexts (Eric)
- Use ip_neigh_gw6() and container_of() (David)
- Rename __throw_build_bug() and improve comments (Andrii)
- Use bpf_tail_call_static() also in BPF samples (Maciej)

Daniel Borkmann (6):
bpf: add classid helper only based on skb->sk
bpf, net: rework cookie generator as per-cpu one
bpf: add redirect_neigh helper as redirect drop-in bpf, libbpf: add bpf_tail_call_static helper for bpf programs bpf, selftests: use bpf_tail_call_static where appropriate bpf, selftests: add redirect_neigh selftest

 include/linux/cookie.h                        |  51 +++
 include/linux/skbuff.h                        |   5 +
 include/linux/sock_diag.h                     |  14 +-
 include/net/net_namespace.h                   |   2 +-
 include/uapi/linux/bpf.h                      |  24 ++
 kernel/bpf/reuseport_array.c                  |   2 +-
 net/core/filter.c                             | 307 ++++++++++++++++--
 net/core/net_namespace.c                      |  12 +-
 net/core/sock_diag.c                          |   9 +-
 net/core/sock_map.c                           |   4 +-
 samples/bpf/sockex3_kern.c                    |  20 +-
 tools/include/uapi/linux/bpf.h                |  24 ++
 tools/lib/bpf/bpf_helpers.h                   |  46 +++
 tools/testing/selftests/bpf/progs/bpf_flow.c  |  12 +-
 tools/testing/selftests/bpf/progs/tailcall1.c |  28 +-
 tools/testing/selftests/bpf/progs/tailcall2.c |  14 +-
 tools/testing/selftests/bpf/progs/tailcall3.c |   4 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf1.c   |   4 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf2.c   |   6 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf3.c   |   6 +-
 .../selftests/bpf/progs/tailcall_bpf2bpf4.c   |   6 +-
 .../selftests/bpf/progs/test_tc_neigh.c       | 144 ++++++++
 tools/testing/selftests/bpf/test_tc_neigh.sh  | 168 ++++++++++
 23 files changed, 830 insertions(+), 82 deletions(-)
 create mode 100644 include/linux/cookie.h
 create mode 100644 tools/testing/selftests/bpf/progs/test_tc_neigh.c
 create mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh
Signature · 1 line
2.21.0