Skip to content

introduce support for XDP programs in CPUMAP

Lorenzo Bianconi bpf netdev 7 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest9 patches 11 repliesIn review
  2. v69 patches 1 replySuperseded
  3. v59 patches 5 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v49 patches5 repliesSuperseded
v39 patches10 repliesSuperseded
v28 patches10 repliesSuperseded
v16 patches4 repliesSuperseded

Changes in v7 from the cover letter

- rebase on top of bpf-next
- move bpf_cpumap_val and bpf_prog in the first bpf_cpu_map_entry cache-line

Patches in v7 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9cpumap: use non-locked version __ptr_ring_consume_batchedkernel/bpf/cpumap.c+1 -10 replies
2/9net: refactor xdp_convert_buff_to_frameinclude/net/xdp.h+22 -130 replies
3/9samples/bpf: xdp_redirect_cpu_user: do not update bpf maps in option loopsamples/bpf/xdp_redirect_cpu_user.c+27 -90 replies
4/9cpumap: formalize map value as a named structinclude/uapi/linux/bpf.h kernel/bpf/cpumap.c tools/include/uapi/linux/bpf.h+33 -130 replies
5/9bpf: cpumap: add the possibility to attach an eBPF program to cpumapinclude/linux/bpf.h include/net/xdp.h include/trace/events/xdp.h +4 more+148 -170 replies
6/9bpf: cpumap: implement XDP_REDIRECT for eBPF programs attached to map entriesinclude/net/xdp.h include/trace/events/xdp.h kernel/bpf/cpumap.c+20 -40 replies
7/9libbpf: add SEC name for xdp programs attached to CPUMAPtools/lib/bpf/libbpf.c+2 -00 replies
8/9samples/bpf: xdp_redirect_cpu: load a eBPF program on cpumapsamples/bpf/xdp_redirect_cpu_kern.c samples/bpf/xdp_redirect_cpu_user.c+178 -220 replies
9/9selftest: add tests for XDP programs in CPUMAP entriestools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c+106 -00 replies

Reviews trailers per patch

6 of 9 patches have a Reviewed-by or Acked-by.

PatchJesper Dangaard BrouerAndrii Nakryiko
1/9
2/9A-b
3/9A-b
4/9A-b
5/9A-b
6/9A-b
7/9A-b A-b
8/9
9/9

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v7 thread

Cover letter [PATCH v7 bpf-next 0/9] introduce support for XDP programs in CPUMAP

Similar to what David Ahern proposed in [1] for DEVMAPs, introduce the capability to attach and run a XDP program to CPUMAP entries.
The idea behind this feature is to add the possibility to define on which CPU run the eBPF program if the underlying hw does not support RSS.
I respin patch 1/6 from a previous series sent by David [2].
The functionality has been tested on Marvell Espressobin, i40e and mlx5. Detailed tests results can be found here:
https://github.com/xdp-project/xdp-project/blob/master/areas/cpumap/cpumap04-map-xdp-prog.org

Changes since v6:
- rebase on top of bpf-next
- move bpf_cpumap_val and bpf_prog in the first bpf_cpu_map_entry cache-line

Changes since v5:
- move bpf_prog_put() in put_cpu_map_entry()
- remove READ_ONCE(rcpu->prog) in cpu_map_bpf_prog_run_xdp
- rely on bpf_prog_get_type() instead of bpf_prog_get_type_dev() in __cpu_map_load_bpf_program()

Changes since v4:
- move xdp_clear_return_frame_no_direct inside rcu section
- update David Ahern's email address

Changes since v3:
- fix typo in commit message
- fix access to ctx->ingress_ifindex in cpumap bpf selftest

Changes since v2:
- improved comments
- fix return value in xdp_convert_buff_to_frame
- added patch 1/9: "cpumap: use non-locked version __ptr_ring_consume_batched"
- do not run kmem_cache_alloc_bulk if all frames have been consumed by the XDP program attached to the CPUMAP entry
- removed bpf_trace_printk in kselftest

Changes since v1:
- added performance test results
- added kselftest support
- fixed memory accounting with page_pool
- extended xdp_redirect_cpu_user.c to load an external program to perform redirect
- reported ifindex to attached eBPF program
- moved bpf_cpumap_val definition to include/uapi/linux/bpf.h

[1] https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
[2] https://patchwork.ozlabs.org/project/netdev/patch/[email protected]/

David Ahern (1):
net: refactor xdp_convert_buff_to_frame

Jesper Dangaard Brouer (1):
cpumap: use non-locked version __ptr_ring_consume_batched

Lorenzo Bianconi (7):
samples/bpf: xdp_redirect_cpu_user: do not update bpf maps in option
loop
cpumap: formalize map value as a named struct
bpf: cpumap: add the possibility to attach an eBPF program to cpumap
bpf: cpumap: implement XDP_REDIRECT for eBPF programs attached to map
entries
libbpf: add SEC name for xdp programs attached to CPUMAP samples/bpf: xdp_redirect_cpu: load a eBPF program on cpumap
selftest: add tests for XDP programs in CPUMAP entries

 include/linux/bpf.h                           |   6 +
 include/net/xdp.h                             |  41 ++--
 include/trace/events/xdp.h                    |  16 +-
 include/uapi/linux/bpf.h                      |  14 ++
 kernel/bpf/cpumap.c                           | 162 +++++++++++---
 net/core/dev.c                                |   9 +
 samples/bpf/xdp_redirect_cpu_kern.c           |  25 ++-
 samples/bpf/xdp_redirect_cpu_user.c           | 209 ++++++++++++++++--
 tools/include/uapi/linux/bpf.h                |  14 ++
 tools/lib/bpf/libbpf.c                        |   2 +
 .../bpf/prog_tests/xdp_cpumap_attach.c        |  70 ++++++
 .../bpf/progs/test_xdp_with_cpumap_helpers.c  |  36 +++
 12 files changed, 531 insertions(+), 73 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c
Signature · 1 line
2.26.2