Skip to content

Netfilter updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest17 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17netfilter: Clean up unnecessary #ifdefnet/core/dev.c+0 -20 replies
2/17netfilter: Document ingress hookinclude/linux/netdevice.h+1 -00 replies
3/17netfilter: nft_tunnel: no need to call htons() when dumping portsnet/netfilter/nft_tunnel.c+2 -20 replies
4/17netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policynet/netfilter/nft_tunnel.c+2 -10 replies
5/17netfilter: nft_tunnel: also dump ERSPAN_VERSIONnet/netfilter/nft_tunnel.c+3 -00 replies
6/17netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLANnet/netfilter/nft_tunnel.c+9 -10 replies
7/17netfilter: nft_tunnel: add the missing nla_nest_cancel()net/netfilter/nft_tunnel.c+26 -120 replies
8/17netfilter: conntrack: remove two export symbolsnet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_extend.c+0 -20 replies
9/17netfilter: nft_meta: move time handling to helpernet/netfilter/nft_meta.c+22 -60 replies
10/17netfilter: nft_meta: move pkttype handling to helpernet/netfilter/nft_meta.c+51 -390 replies
11/17netfilter: nft_meta: move sk uid/git handling to helpernet/netfilter/nft_meta.c+36 -290 replies
12/17netfilter: nft_meta: move cgroup handling to helpernet/netfilter/nft_meta.c+15 -50 replies
13/17netfilter: nft_meta: move interface kind handling to helpernet/netfilter/nft_meta.c+25 -60 replies
14/17netfilter: nft_meta: move all interface related keys to helpernet/netfilter/nft_meta.c+70 -250 replies
15/17netfilter: nft_meta: place prandom handling in a helpernet/netfilter/nft_meta.c+9 -40 replies
16/17netfilter: nft_meta: place rtclassid handling in a helpernet/netfilter/nft_meta.c+16 -60 replies
17/17netfilter: nft_meta: add support for slave device ifindex matchinginclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_meta.c+73 -70 replies

Reviews trailers per patch

5 of 17 patches have a Reviewed-by or Acked-by.

PatchSimon Horman
1/17
2/17
3/17R-b
4/17R-b
5/17R-b
6/17R-b
7/17R-b
8/17
9/17
10/17
11/17
12/17
13/17
14/17
15/17
16/17
17/17

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 00/17] Netfilter updates for net-next

Hi,

The following patchset contains Netfilter updates for net-next:

1) Remove #ifdef pollution around nf_ingress(), from Lukas Wunner.

2) Document ingress hook in netdevice, also from Lukas.

3) Remove htons() in tunnel metadata port netlink attributes, from Xin Long.

4) Missing erspan netlink attribute validation also from Xin Long.

5) Missing erspan version in tunnel, from Xin Long.

6) Missing attribute nest in NFTA_TUNNEL_KEY_OPTS_{VXLAN,ERSPAN} Patch from Xin Long.

7) Missing nla_nest_cancel() in tunnel netlink dump path, from Xin Long.

8) Remove two exported conntrack symbols with no clients, from Florian Westphal.

9) Add nft_meta_get_eval_time() helper to nft_meta, from Florian.

10) Add nft_meta_pkttype helper for loopback, also from Florian.

11) Add nft_meta_socket uid helper, from Florian Westphal.

12) Add nft_meta_cgroup helper, from Florian.

13) Add nft_meta_ifkind helper, from Florian.

14) Group all interface related meta selector, from Florian.

15) Add nft_prandom_u32() helper, from Florian.

16) Add nft_meta_rtclassid helper, from Florian.

17) Add support for matching on the slave device index, from Florian.

This batch, among other things, contains updates for the netfilter tunnel netlink interface: This extension is still incomplete and lacking proper userspace support which is actually my fault, I did not find the time to go back and finish this. This update is breaking tunnel UAPI in some aspects to fix it but do it better sooner than never.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

Thank you.

----------------------------------------------------------------

The following changes since commit 6f6dded1385cfb564de85f86126f1c054c8f47b1:

Merge branch 'WireGuard-CI-and-housekeeping' (2019-12-16 19:22:22 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD

for you to fetch changes up to c14ceb0ec727187f71a487a592ffa91767fed66e:

netfilter: nft_meta: add support for slave device ifindex matching (2019-12-26 17:41:34 +0100)

----------------------------------------------------------------
Florian Westphal (10):
netfilter: conntrack: remove two export symbols
netfilter: nft_meta: move time handling to helper
netfilter: nft_meta: move pkttype handling to helper
netfilter: nft_meta: move sk uid/git handling to helper
netfilter: nft_meta: move cgroup handling to helper
netfilter: nft_meta: move interface kind handling to helper
netfilter: nft_meta: move all interface related keys to helper
netfilter: nft_meta: place prandom handling in a helper
netfilter: nft_meta: place rtclassid handling in a helper
netfilter: nft_meta: add support for slave device ifindex matching

Lukas Wunner (2):
netfilter: Clean up unnecessary #ifdef
netfilter: Document ingress hook

Xin Long (5):
netfilter: nft_tunnel: no need to call htons() when dumping ports
netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy
netfilter: nft_tunnel: also dump ERSPAN_VERSION
netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLAN
netfilter: nft_tunnel: add the missing nla_nest_cancel()

 include/linux/netdevice.h                |   1 +
 include/uapi/linux/netfilter/nf_tables.h |   4 +
 net/core/dev.c                           |   2 -
 net/netfilter/nf_conntrack_core.c        |   1 -
 net/netfilter/nf_conntrack_extend.c      |   1 -
 net/netfilter/nft_meta.c                 | 440 ++++++++++++++++++++++---------
 net/netfilter/nft_tunnel.c               |  52 +++-
 7 files changed, 357 insertions(+), 144 deletions(-)