Skip to content

Netfilter/IPVS 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 Latest33 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/33netfilter: nf_tables: prepare nft_object for lookups via hashtableinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nft_objref.c +1 more+32 -180 replies
2/33netfilter: nf_tables: handle nft_object lookups via rhltableinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nft_objref.c+98 -150 replies
3/33netfilter: nf_tables: add direct calls for all builtin expressionsinclude/net/netfilter/nf_tables_core.h net/netfilter/nf_tables_core.c net/netfilter/nft_bitwise.c +7 more+55 -310 replies
4/33netfilter: conntrack: remove helper hook againnet/netfilter/nf_conntrack_proto.c+36 -1060 replies
5/33netfilter: physdev: relax br_netfilter dependencyinclude/net/netfilter/br_netfilter.h net/bridge/br_netfilter_hooks.c net/netfilter/xt_physdev.c+7 -80 replies
6/33netfilter: nf_tables: Support RULE_ID reference in new ruleinclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+11 -02 replies
7/33netfilter: conntrack: handle builtin l4proto packet functions via direct callsinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_dccp.c +5 more+113 -440 replies
8/33netfilter: conntrack: handle icmp pkt_to_tuple helper via direct callsinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_icmp.c +1 more+22 -80 replies
9/33netfilter: conntrack: gre: convert rwlock to rcuinclude/linux/netfilter/nf_conntrack_proto_gre.h net/netfilter/nf_conntrack_proto_gre.c+16 -220 replies
10/33netfilter: conntrack: gre: switch module to be built-ininclude/linux/netfilter/nf_conntrack_proto_gre.h include/net/netfilter/ipv4/nf_conntrack_ipv4.h include/net/netfilter/nf_conntrack_l4proto.h +6 more+55 -980 replies
11/33netfilter: conntrack: remove net_idinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_proto.c+3 -70 replies
12/33netfilter: conntrack: remove pkt_to_tuple callbackinclude/linux/netfilter/nf_conntrack_proto_gre.h include/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c +2 more+8 -210 replies
13/33netfilter: conntrack: remove invert_tuple callbackinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_icmp.c +1 more+15 -140 replies
14/33netfilter: conntrack: remove module owner fieldinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_proto.c net/netfilter/nf_conntrack_proto_gre.c +2 more+0 -210 replies
15/33netfilter: conntrack: remove remaining l4proto indirect packet callsinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_generic.c +1 more+29 -550 replies
16/33netfilter: conntrack: remove pernet l4 proto register interfaceinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_proto.c+12 -280 replies
17/33netfilter: conntrack: avoid unneeded nf_conntrack_l4proto lookupsinclude/net/netfilter/nf_conntrack.h include/net/netfilter/nf_conntrack_core.h net/ipv4/netfilter/nf_nat_l3proto_ipv4.c +7 more+22 -680 replies
18/33netfilter: conntrack: unify sysctl handlingnet/netfilter/nf_conntrack_proto_dccp.c net/netfilter/nf_conntrack_proto_generic.c net/netfilter/nf_conntrack_proto_gre.c +6 more+391 -4600 replies
19/33netfilter: conntrack: remove sysctl registration helpersinclude/net/netns/conntrack.h net/netfilter/nf_conntrack_proto.c+1 -800 replies
20/33netfilter: conntrack: remove l4proto init and get_net callbacksinclude/net/netfilter/nf_conntrack_l4proto.h include/net/netns/conntrack.h net/netfilter/nf_conntrack_proto.c +8 more+65 -2340 replies
21/33netfilter: conntrack: remove l4proto destroy hookinclude/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_gre.c+11 -210 replies
22/33netfilter: conntrack: remove nf_ct_l4proto_find_getinclude/net/netfilter/nf_conntrack_core.h include/net/netfilter/nf_conntrack_l4proto.h net/netfilter/nf_conntrack_core.c +8 more+45 -1820 replies
23/33netfilter: nf_conntrack: provide modparam to always register conntrack hooksnet/netfilter/nf_conntrack_standalone.c+24 -40 replies
24/33netfilter: nft_meta: Add NFT_META_I/OIFKIND meta typeinclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_meta.c+16 -00 replies
25/33netfilter: nat: un-export nf_nat_used_tupleinclude/net/netfilter/nf_nat.h net/netfilter/nf_nat_core.c+1 -60 replies
26/33Revert "netfilter: nft_hash: add map lookups for hashing operations"include/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_hash.c+2 -1230 replies
27/33netfilter: conntrack: fix IPV6=n buildsnet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto.c+10 -00 replies
28/33netfilter: conntrack: fix bogus port values for other l4 protocolsnet/netfilter/nf_conntrack_core.c+35 -110 replies
29/33ipvs: avoid indirect calls when calculating checksumsinclude/net/ip_vs.h net/netfilter/ipvs/ip_vs_proto_ah_esp.c net/netfilter/ipvs/ip_vs_proto_sctp.c +2 more+19 -180 replies
30/33ipvs: use indirect call wrappersnet/netfilter/ipvs/ip_vs_core.c net/netfilter/ipvs/ip_vs_proto_tcp.c net/netfilter/ipvs/ip_vs_proto_udp.c+45 -100 replies
31/33netfilter: nft_counter: remove wrong __percpu of nft_counter_resest()'s argnet/netfilter/nft_counter.c+1 -10 replies
32/33netfilter: conntrack: fix error path in nf_conntrack_pernet_init()net/netfilter/nf_conntrack_standalone.c+2 -20 replies
33/33netfilter: ipv4: remove useless export_symbolinclude/linux/netfilter_ipv4.h net/ipv4/netfilter.c net/netfilter/utils.c+19 -240 replies

Reviews trailers per patch

2 of 33 patches have a Reviewed-by or Acked-by.

PatchJulian AnastasovSimon Horman[email protected]
1/33
2/33
3/33
4/33
5/33
6/33
7/33
8/33
9/33
10/33
11/33
12/33
13/33
14/33
15/33
16/33
17/33
18/33
19/33
20/33
21/33
22/33
23/33
24/33
25/33
26/33
27/33
28/33
29/33A-b A-b
30/33A-b A-b
31/33
32/33Reported-and-tested-by
33/33

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

Read the v1 thread

Cover letter [PATCH 00/33] Netfilter/IPVS updates for net-next

Hi David,

The following patchset contains Netfilter/IPVS updates for your net-next tree:

1) Introduce a hashtable to speed up object lookups, from Florian Westphal.

2) Make direct calls to built-in extension, also from Florian.

3) Call helper before confirming the conntrack as it used to be originally, from Florian.

4) Call request_module() to autoload br_netfilter when physdev is used to relax the dependency, also from Florian.

5) Allow to insert rules at a given position ID that is internal to the batch, from Phil Sutter.

6) Several patches to replace conntrack indirections by direct calls, and to reduce modularization, from Florian. This also includes several follow up patches to deal with minor fallout from this rework.

7) Use RCU from conntrack gre helper, from Florian.

8) GRE conntrack module becomes built-in into nf_conntrack, from Florian.

9) Replace nf_ct_invert_tuplepr() by calls to nf_ct_invert_tuple(), from Florian.

10) Unify sysctl handling at the core of nf_conntrack, from Florian.

11) Provide modparam to register conntrack hooks.

12) Allow to match on the interface kind string, from wenxu.

13) Remove several exported symbols, not required anymore now after a bit of de-modulatization work has been done, from Florian.

14) Remove built-in map support in the hash extension, this can be done with the existing userspace infrastructure, from laura.

15) Remove indirection to calculate checksums in IPVS, from Matteo Croce.

16) Use call wrappers for indirection in IPVS, also from Matteo.

17) Remove superfluous __percpu parameter in nft_counter, patch from Luc Van Oostenryck.

You can pull these changes from:

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

Thanks!

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

The following changes since commit 435f3f267780321a1aff41bdade257722328ead5:

Merge branch 'tcp_openreq_child' (2019-01-17 22:19:05 -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 83f529281d7aa42b10c2c5cb64fcbd2c7cab4409:

netfilter: ipv4: remove useless export_symbol (2019-01-28 11:32:58 +0100)

----------------------------------------------------------------
Cong Wang (1):
netfilter: conntrack: fix error path in nf_conntrack_pernet_init()

Florian Westphal (25):
netfilter: nf_tables: prepare nft_object for lookups via hashtable
netfilter: nf_tables: handle nft_object lookups via rhltable
netfilter: nf_tables: add direct calls for all builtin expressions
netfilter: conntrack: remove helper hook again
netfilter: physdev: relax br_netfilter dependency
netfilter: conntrack: handle builtin l4proto packet functions via direct calls
netfilter: conntrack: handle icmp pkt_to_tuple helper via direct calls
netfilter: conntrack: gre: convert rwlock to rcu
netfilter: conntrack: gre: switch module to be built-in
netfilter: conntrack: remove net_id
netfilter: conntrack: remove pkt_to_tuple callback
netfilter: conntrack: remove invert_tuple callback
netfilter: conntrack: remove module owner field
netfilter: conntrack: remove remaining l4proto indirect packet calls
netfilter: conntrack: remove pernet l4 proto register interface
netfilter: conntrack: avoid unneeded nf_conntrack_l4proto lookups
netfilter: conntrack: unify sysctl handling
netfilter: conntrack: remove sysctl registration helpers
netfilter: conntrack: remove l4proto init and get_net callbacks
netfilter: conntrack: remove l4proto destroy hook
netfilter: conntrack: remove nf_ct_l4proto_find_get
netfilter: nat: un-export nf_nat_used_tuple
netfilter: conntrack: fix IPV6=n builds
netfilter: conntrack: fix bogus port values for other l4 protocols
netfilter: ipv4: remove useless export_symbol

Laura Garcia Liebana (1):
Revert "netfilter: nft_hash: add map lookups for hashing operations"

Luc Van Oostenryck (1):
netfilter: nft_counter: remove wrong __percpu of nft_counter_resest()'s arg

Matteo Croce (2):
ipvs: avoid indirect calls when calculating checksums
ipvs: use indirect call wrappers

Pablo Neira Ayuso (1):
netfilter: nf_conntrack: provide modparam to always register conntrack hooks

Phil Sutter (1):
netfilter: nf_tables: Support RULE_ID reference in new rule

wenxu (1):
netfilter: nft_meta: Add NFT_META_I/OIFKIND meta type

 include/linux/netfilter/nf_conntrack_proto_gre.h |  17 +-
 include/linux/netfilter_ipv4.h                   |   6 -
 include/net/ip_vs.h                              |   3 -
 include/net/netfilter/br_netfilter.h             |   1 -
 include/net/netfilter/ipv4/nf_conntrack_ipv4.h   |   3 +
 include/net/netfilter/nf_conntrack.h             |   2 -
 include/net/netfilter/nf_conntrack_core.h        |   5 +-
 include/net/netfilter/nf_conntrack_l4proto.h     | 122 +++---
 include/net/netfilter/nf_nat.h                   |   4 -
 include/net/netfilter/nf_tables.h                |  26 +-
 include/net/netfilter/nf_tables_core.h           |  16 +
 include/net/netns/conntrack.h                    |  30 +-
 include/uapi/linux/netfilter/nf_tables.h         |  10 +-
 net/bridge/br_netfilter_hooks.c                  |   5 -
 net/ipv4/netfilter.c                             |  18 -
 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c         |   2 +-
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c         |   2 +-
 net/netfilter/Kconfig                            |   2 +-
 net/netfilter/Makefile                           |   3 +-
 net/netfilter/ipvs/ip_vs_core.c                  |  49 ++-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c          |   2 -
 net/netfilter/ipvs/ip_vs_proto_sctp.c            |   8 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c             |  15 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c             |  15 +-
 net/netfilter/nf_conntrack_core.c                | 210 +++++----
 net/netfilter/nf_conntrack_expect.c              |   2 +-
 net/netfilter/nf_conntrack_netlink.c             |  14 +-
 net/netfilter/nf_conntrack_pptp.c                |   2 +-
 net/netfilter/nf_conntrack_proto.c               | 514 ++++-------------------
 net/netfilter/nf_conntrack_proto_dccp.c          | 134 +-----
 net/netfilter/nf_conntrack_proto_generic.c       |  85 +---
 net/netfilter/nf_conntrack_proto_gre.c           | 196 ++-------
 net/netfilter/nf_conntrack_proto_icmp.c          |  67 +--
 net/netfilter/nf_conntrack_proto_icmpv6.c        |  69 +--
 net/netfilter/nf_conntrack_proto_sctp.c          | 128 +-----
 net/netfilter/nf_conntrack_proto_tcp.c           | 160 +------
 net/netfilter/nf_conntrack_proto_udp.c           |  80 +---
 net/netfilter/nf_conntrack_standalone.c          | 427 ++++++++++++++++++-
 net/netfilter/nf_flow_table_core.c               |   2 +-
 net/netfilter/nf_nat_core.c                      |  15 +-
 net/netfilter/nf_tables_api.c                    | 137 +++++-
 net/netfilter/nf_tables_core.c                   |  25 +-
 net/netfilter/nfnetlink_cttimeout.c              |  19 +-
 net/netfilter/nft_bitwise.c                      |   5 +-
 net/netfilter/nft_byteorder.c                    |   6 +-
 net/netfilter/nft_cmp.c                          |   6 +-
 net/netfilter/nft_counter.c                      |   2 +-
 net/netfilter/nft_ct.c                           |   4 +-
 net/netfilter/nft_dynset.c                       |   5 +-
 net/netfilter/nft_hash.c                         | 121 ------
 net/netfilter/nft_immediate.c                    |   6 +-
 net/netfilter/nft_meta.c                         |  12 +
 net/netfilter/nft_objref.c                       |   5 +-
 net/netfilter/nft_payload.c                      |   6 +-
 net/netfilter/nft_quota.c                        |   2 +-
 net/netfilter/nft_range.c                        |   5 +-
 net/netfilter/nft_rt.c                           |   6 +-
 net/netfilter/utils.c                            |  19 +
 net/netfilter/xt_CT.c                            |   2 +-
 net/netfilter/xt_physdev.c                       |   9 +-
 net/openvswitch/conntrack.c                      |   2 +-
 61 files changed, 1178 insertions(+), 1697 deletions(-)