Skip to content

netfilter: bridge: remove broute hook

Florian Westphal netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4selftests: netfilter: add ebtables broute test casetools/testing/selftests/netfilter/Makefile tools/testing/selftests/netfilter/bridge_brouter.sh+147 -10 replies
2/4bridge: reduce size of input cb to 16 bytesnet/bridge/br_arp_nd_proxy.c net/bridge/br_input.c net/bridge/br_private.h+16 -160 replies
3/4bridge: netfilter: unroll NF_HOOK helper in bridge input pathinclude/net/netfilter/nf_queue.h net/bridge/br_input.c net/netfilter/core.c +2 more+56 -70 replies
4/4bridge: broute: make broute a real ebtables tableinclude/linux/if_bridge.h net/bridge/br_input.c net/bridge/br_private.h +2 more+52 -420 replies

Reviews trailers per patch

None of the 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDavid S. MillerNikolay Aleksandrov
SeriesA-b A-b
1/4
2/4
3/4
4/4

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

Read the v1 thread

Cover letter [PATCH nf-next 0/4] netfilter: bridge: remove broute hook

This series removes the 'broute' hook by promoting ebtables' broute table to a normal ebtables table (invoked via normal PREROUTING netfilter hook).

The downside is that nf_hook_slow() needs to be duplicated in br_input.c (see patch 3).

However, I think its worth the price as this allows to remove the br_should_route_hook.

There are quite some changes in bridge specific code, if you prefer I can re-submit this for net-next instead of nf-next.

Main motivation is to provide 'ebtables -t broute' functionality via nftables later on, this can then be done without touching the bridge or netfilter core infrastructure again.

Florian Westphal (4):
selftests: netfilter: add ebtables broute test case
bridge: reduce size of input cb to 16 bytes
bridge: netfilter: unroll NF_HOOK helper in bridge input path
bridge: broute: make broute a real ebtables table

 include/linux/if_bridge.h                           |    3 
 include/net/netfilter/nf_queue.h                    |    3 
 net/bridge/br_arp_nd_proxy.c                        |   18 +-
 net/bridge/br_input.c                               |   72 +++++++--
 net/bridge/br_private.h                             |   15 +-
 net/bridge/netfilter/ebtable_broute.c               |   63 ++++++--
 net/bridge/netfilter/ebtables.c                     |    7 
 net/netfilter/core.c                                |    1 
 net/netfilter/nf_internals.h                        |    3 
 net/netfilter/nf_queue.c                            |    1 
 tools/testing/selftests/netfilter/Makefile          |    2 
 tools/testing/selftests/netfilter/bridge_brouter.sh |  146 ++++++++++++++++++++
 12 files changed, 268 insertions(+), 66 deletions(-)