Skip to content

Netfilter/IPVS updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 0 repliesNew 17 of 18 applied

Patches in v1 17 of 18 applied

#Subject and filesSizeRepliesApplied
1/18netfilter: conntrack: use fallthrough to cleanupnet/netfilter/nf_conntrack_core.c+3 -50 repliesApplied
2/18netfilter: conntrack: use correct format charactersnet/netfilter/nf_conntrack_helper.c+1 -10 repliesApplied
3/18net/sched: act_ct: set 'net' pointer when creating new nf_flow_tablenet/sched/act_ct.c+3 -20 repliesApplied
4/18netfilter: nf_flow_table: count pending offload workqueue tasksinclude/net/net_namespace.h include/net/netfilter/nf_flow_table.h include/net/netns/flow_table.h +5 more+206 -40 repliesApplied
5/18netfilter: nf_conntrack: add missing __rcu annotationsinclude/linux/netfilter/nf_conntrack_sip.h include/net/netfilter/nf_conntrack_timeout.h net/netfilter/nf_conntrack_pptp.c +2 more+5 -50 repliesApplied
6/18netfilter: nf_conntrack: use rcu accessors where needednet/netfilter/nf_conntrack_broadcast.c net/netfilter/nf_conntrack_helper.c net/netfilter/nf_conntrack_netlink.c +4 more+57 -160 repliesApplied
7/18netfilter: h323: merge nat hook pointers into oneinclude/linux/netfilter/nf_conntrack_h323.h net/ipv4/netfilter/nf_nat_h323.c net/netfilter/nf_conntrack_h323_main.c+169 -2420 repliesApplied
8/18netfilter: nft_set_bitmap: Fix spelling mistakenet/netfilter/nft_set_bitmap.c+2 -20 repliesApplied
9/18netfilter: nfnetlink: add missing __be16 castnet/netfilter/nfnetlink.c+1 -10 repliesApplied
10/18netfilter: x_tables: use correct integer typesnet/netfilter/xt_DSCP.c net/netfilter/xt_TCPMSS.c net/netfilter/xt_connlimit.c+9 -90 repliesApplied
11/18netfilter: nf_tables: use the correct get/put helpersnet/netfilter/nft_byteorder.c net/netfilter/nft_osf.c net/netfilter/nft_socket.c +1 more+11 -100 repliesApplied
12/18netfilter: nf_tables: add and use BE register load-store helpersinclude/net/netfilter/nf_tables.h net/bridge/netfilter/nft_meta_bridge.c net/netfilter/nft_tproxy.c+19 -40 repliesApplied
13/18netfilter: nf_tables: use correct integer typesnet/netfilter/nft_cmp.c net/netfilter/nft_ct.c net/netfilter/nft_exthdr.c +1 more+12 -110 repliesApplied
14/18netfilter: nf_tables: move nft_cmp_fast_mask to where its usedinclude/net/netfilter/nf_tables_core.h net/netfilter/nft_cmp.c+12 -100 repliesApplied
15/18netfilter: nf_nat: in nf_nat_initialized(), use const struct nf_conn *include/net/netfilter/nf_nat.h+1 -10 repliesApplied
16/18netfilter: ipvs: Use the bitmap API to allocate bitmapsnet/netfilter/ipvs/ip_vs_mh.c+2 -30 repliesApplied
17/18netfilter: flowtable: prefer refcount_incnet/netfilter/nf_flow_table_core.c+3 -80 repliesApplied
18/18netfilter: xt_TPROXY: remove pr_debug invocationsnet/netfilter/xt_TPROXY.c+2 -230 replies

Reviews trailers per patch

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

PatchJulian AnastasovSimon HormanNathan Chancellor
1/18
2/18
3/18
4/18
5/18
6/18
7/18
8/18
9/18
10/18
11/18
12/18
13/18
14/18
15/18
16/18A-b A-b
17/18
18/18R-b

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

Hi,

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

1) Simplify nf_ct_get_tuple(), from Jackie Liu.

2) Add format to request_module() call, from Bill Wendling.

3) Add /proc/net/stats/nf_flowtable to monitor in-flight pending hardware offload objects to be processed, from Vlad Buslov.

4) Missing rcu annotation and accessors in the netfilter tree, from Florian Westphal.

5) Merge h323 conntrack helper nat hooks into single object, also from Florian.

6) A batch of update to fix sparse warnings treewide, from Florian Westphal.

7) Move nft_cmp_fast_mask() where it used, from Florian.

8) Missing const in nf_nat_initialized(), from James Yonan.

9) Use bitmap API for Maglev IPVS scheduler, from Christophe Jaillet.

10) Use refcount_inc instead of _inc_not_zero in flowtable, from Florian Westphal.

11) Remove pr_debug in xt_TPROXY, from Nathan Cancellor.

Please, pull these changes from:

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

Thanks.

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

The following changes since commit edb2c3476db9898a63fb5d0011ecaa43ebf46c9b:

fddi/skfp: fix repeated words in comments (2022-07-11 14:12:54 +0100)

are available in the Git repository at:

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

for you to fetch changes up to aa8c7cdbae58b695ed79a0129b6b8c887b25969f:

netfilter: xt_TPROXY: remove pr_debug invocations (2022-07-21 00:56:00 +0200)

----------------------------------------------------------------
Bill Wendling (1):
netfilter: conntrack: use correct format characters

Christophe JAILLET (1):
netfilter: ipvs: Use the bitmap API to allocate bitmaps

Florian Westphal (10):
netfilter: nf_conntrack: add missing __rcu annotations
netfilter: nf_conntrack: use rcu accessors where needed
netfilter: h323: merge nat hook pointers into one
netfilter: nfnetlink: add missing __be16 cast
netfilter: x_tables: use correct integer types
netfilter: nf_tables: use the correct get/put helpers
netfilter: nf_tables: add and use BE register load-store helpers
netfilter: nf_tables: use correct integer types
netfilter: nf_tables: move nft_cmp_fast_mask to where its used
netfilter: flowtable: prefer refcount_inc

Jackie Liu (1):
netfilter: conntrack: use fallthrough to cleanup

James Yonan (1):
netfilter: nf_nat: in nf_nat_initialized(), use const struct nf_conn *

Justin Stitt (1):
netfilter: xt_TPROXY: remove pr_debug invocations

Vlad Buslov (2):
net/sched: act_ct: set 'net' pointer when creating new nf_flow_table
netfilter: nf_flow_table: count pending offload workqueue tasks

Zhang Jiaming (1):
netfilter: nft_set_bitmap: Fix spelling mistake

 include/linux/netfilter/nf_conntrack_h323.h  | 109 +++++------
 include/linux/netfilter/nf_conntrack_sip.h   |   2 +-
 include/net/net_namespace.h                  |   6 +
 include/net/netfilter/nf_conntrack_timeout.h |   2 +-
 include/net/netfilter/nf_flow_table.h        |  21 +++
 include/net/netfilter/nf_nat.h               |   2 +-
 include/net/netfilter/nf_tables.h            |  15 ++
 include/net/netfilter/nf_tables_core.h       |  10 --
 include/net/netns/flow_table.h               |  14 ++
 net/bridge/netfilter/nft_meta_bridge.c       |   2 +-
 net/ipv4/netfilter/nf_nat_h323.c             |  42 ++---
 net/netfilter/Kconfig                        |   9 +
 net/netfilter/Makefile                       |   1 +
 net/netfilter/ipvs/ip_vs_mh.c                |   5 +-
 net/netfilter/nf_conntrack_broadcast.c       |   6 +-
 net/netfilter/nf_conntrack_core.c            |   8 +-
 net/netfilter/nf_conntrack_h323_main.c       | 260 ++++++++++-----------------
 net/netfilter/nf_conntrack_helper.c          |   4 +-
 net/netfilter/nf_conntrack_netlink.c         |   9 +-
 net/netfilter/nf_conntrack_pptp.c            |   2 +-
 net/netfilter/nf_conntrack_sip.c             |   9 +-
 net/netfilter/nf_conntrack_timeout.c         |  18 +-
 net/netfilter/nf_flow_table_core.c           |  73 +++++++-
 net/netfilter/nf_flow_table_offload.c        |  17 +-
 net/netfilter/nf_flow_table_procfs.c         |  80 +++++++++
 net/netfilter/nfnetlink.c                    |   2 +-
 net/netfilter/nfnetlink_cthelper.c           |  10 +-
 net/netfilter/nft_byteorder.c                |   3 +-
 net/netfilter/nft_cmp.c                      |  18 +-
 net/netfilter/nft_ct.c                       |   4 +-
 net/netfilter/nft_exthdr.c                   |  10 +-
 net/netfilter/nft_osf.c                      |   2 +-
 net/netfilter/nft_set_bitmap.c               |   4 +-
 net/netfilter/nft_socket.c                   |   8 +-
 net/netfilter/nft_tproxy.c                   |   6 +-
 net/netfilter/nft_tunnel.c                   |   3 +-
 net/netfilter/nft_xfrm.c                     |   8 +-
 net/netfilter/xt_CT.c                        |  23 ++-
 net/netfilter/xt_DSCP.c                      |   8 +-
 net/netfilter/xt_TCPMSS.c                    |   4 +-
 net/netfilter/xt_TPROXY.c                    |  25 +--
 net/netfilter/xt_connlimit.c                 |   6 +-
 net/sched/act_ct.c                           |   5 +-
 43 files changed, 518 insertions(+), 357 deletions(-)
 create mode 100644 include/net/netns/flow_table.h
 create mode 100644 net/netfilter/nf_flow_table_procfs.c