Skip to content

Fix broken TC_ACT_REDIRECT from qdiscs

Daniel Borkmann bpf netdev 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 0 repliesNew
  2. v13 patches 10 repliesSuperseded

Changes in v2 from the cover letter

- Added Sebastian's Reviewed-by
- Rebase to latest net, rest is same (Paolo)

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3bpf: Reject redirect helpers without a bpf_net_contextnet/core/filter.c net/sched/cls_api.c+13 -100 replies
2/3net/sched: Handle TC_ACT_REDIRECT from qdisc filter chainsinclude/net/pkt_cls.h net/sched/cls_api.c net/sched/sch_cake.c +12 more+27 -170 replies
3/3selftests/bpf: Add test for redirect from qdisc qevent blocktools/testing/selftests/bpf/config tools/testing/selftests/bpf/prog_tests/tc_qevent.c tools/testing/selftests/bpf/progs/test_tc_qevent.c+137 -00 replies

Reviews trailers per patch

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

PatchSebastian Andrzej SiewiorVictor Nogueira
1/3R-b
2/3R-b T-b
3/3R-b

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

Read the v2 thread

Cover letter [PATCH net v2 0/3] Fix broken TC_ACT_REDIRECT from qdiscs

This is an alternative fix to [0] in order to not uglify __dev_queue_xmit() with sprinkled ifdefs given this can be simplified and isolated through a simple test into the BPF redirect helper itself.

I've also added a proper BPF selftest, so there is no need to check-in a binary BPF object into selftests given we do have BPF infra for all of this.

[0] https://lore.kernel.org/netdev/[email protected]/
[1] https://lore.kernel.org/netdev/[email protected]/

v1 -> v2:
- Added Sebastian's Reviewed-by
- Rebase to latest net, rest is same (Paolo)

Daniel Borkmann (2):
bpf: Reject redirect helpers without a bpf_net_context selftests/bpf: Add test for redirect from qdisc qevent block

Jamal Hadi Salim (1):
net/sched: Handle TC_ACT_REDIRECT from qdisc filter chains

 include/net/pkt_cls.h                         |  14 ++-
 net/core/filter.c                             |  17 ++-
 net/sched/cls_api.c                           |   6 +-
 net/sched/sch_cake.c                          |   2 +-
 net/sched/sch_drr.c                           |   2 +-
 net/sched/sch_dualpi2.c                       |   2 +-
 net/sched/sch_ets.c                           |   2 +-
 net/sched/sch_fq_codel.c                      |   2 +-
 net/sched/sch_fq_pie.c                        |   2 +-
 net/sched/sch_hfsc.c                          |   2 +-
 net/sched/sch_htb.c                           |   2 +-
 net/sched/sch_multiq.c                        |   2 +-
 net/sched/sch_prio.c                          |   2 +-
 net/sched/sch_qfq.c                           |   2 +-
 net/sched/sch_sfb.c                           |   2 +-
 net/sched/sch_sfq.c                           |   2 +-
 tools/testing/selftests/bpf/config            |   1 +
 .../selftests/bpf/prog_tests/tc_qevent.c      | 113 ++++++++++++++++++
 .../selftests/bpf/progs/test_tc_qevent.c      |  23 ++++
 19 files changed, 175 insertions(+), 25 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_qevent.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_tc_qevent.c
Signature · 1 line
2.43.0