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 Latest20 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20ipvs: fix the IPVS_CMD_ATTR_MAX definitioninclude/uapi/linux/ip_vs.h+1 -10 replies
2/20ipvs: avoid rcu_barrier during netns cleanupinclude/net/ip_vs.h net/netfilter/ipvs/ip_vs_ctl.c net/netfilter/ipvs/ip_vs_lblc.c +1 more+9 -70 replies
3/20ipvs: improved SH fallback strategynet/netfilter/ipvs/ip_vs_sh.c+29 -100 replies
4/20netfilter: xt_socket: use sock_gen_put()net/netfilter/xt_socket.c+2 -110 replies
5/20netfilter: ipt_CLUSTERIP: make proc directory per net namespacenet/ipv4/netfilter/ipt_CLUSTERIP.c+51 -190 replies
6/20netfilter: ipt_CLUSTERIP: make clusterip_list per net namespacenet/ipv4/netfilter/ipt_CLUSTERIP.c+7 -50 replies
7/20netfilter: ipt_CLUSTERIP: make clusterip_lock per net namespacenet/ipv4/netfilter/ipt_CLUSTERIP.c+11 -70 replies
8/20netfilter: ipt_CLUSTERIP: add parameter net in clusterip_config_find_getnet/ipv4/netfilter/ipt_CLUSTERIP.c+6 -60 replies
9/20netfilter: ipt_CLUSTERIP: create proc entry under proper ipt_CLUSTERIP directorynet/ipv4/netfilter/ipt_CLUSTERIP.c+1 -10 replies
10/20netfilter: ipt_CLUSTERIP: use proper net namespace to operate CLUSTERIPnet/ipv4/netfilter/ipt_CLUSTERIP.c+6 -40 replies
11/20netfilter: ipset: Use netlink callback dump args onlyinclude/linux/netfilter/ipset/ip_set.h net/netfilter/ipset/ip_set_bitmap_gen.h net/netfilter/ipset/ip_set_core.c +2 more+68 -540 replies
12/20netfilter: ipset: The unnamed union initialization may lead to compilation errornet/netfilter/ipset/ip_set_hash_netnet.c net/netfilter/ipset/ip_set_hash_netportnet.c+20 -240 replies
13/20netfilter: ip6t_REJECT: skip checksum verification for outgoing ipv6 packetsnet/ipv6/netfilter/ip6t_REJECT.c+3 -40 replies
14/20netfilter:ipset: Fix memory allocation for bitmap:portnet/netfilter/ipset/ip_set_bitmap_port.c+1 -10 replies
15/20netfilter: ipset: remove duplicate definenet/netfilter/ipset/ip_set_hash_gen.h+0 -10 replies
16/20bridge: netfilter: orphan skb before invoking ip netfilter hooksnet/bridge/br_netfilter.c+2 -00 replies
17/20net: ipvs: sctp: add missing verdict assignments in sctp_conn_schedulenet/netfilter/ipvs/ip_vs_proto_sctp.c+7 -20 replies
18/20net: ipvs: sctp: do not recalc sctp csum when ports didn't changenet/netfilter/ipvs/ip_vs_proto_sctp.c+33 -60 replies
19/20netfilter: introduce nf_conn_acct structureinclude/net/netfilter/nf_conntrack_acct.h include/net/netfilter/nf_conntrack_extend.h net/netfilter/nf_conntrack_acct.c +3 more+38 -240 replies
20/20netfilter: ctnetlink: account both directions in one stepnet/netfilter/nf_conntrack_netlink.c+24 -250 replies

Reviews trailers per patch

3 of 20 patches have a Reviewed-by or Acked-by.

PatchJulian AnastasovPekka PietikäinenEric DumazetJesper Dangaard BrouerNeil Horman
1/20
2/20
3/20A-b
4/20
5/20
6/20
7/20
8/20
9/20
10/20
11/20
12/20
13/20
14/20
15/20
16/20Reported-and-tested-by A-b
17/20A-b A-b A-b
18/20
19/20
20/20

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

Read the v1 thread

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

Hi David,

This is another batch containing Netfilter/IPVS updates for your net-next tree, they are:

* Six patches to make the ipt_CLUSTERIP target support netnamespace, from Gao feng.

* Two cleanups for the nf_conntrack_acct infrastructure, introducing a new structure to encapsulate conntrack counters, from Holger Eitzenberger.

* Fix missing verdict in SCTP support for IPVS, from Daniel Borkmann.

* Skip checksum recalculation in SCTP support for IPVS, also from Daniel Borkmann.

* Fix behavioural change in xt_socket after IP early demux, from Florian Westphal.

* Fix bogus large memory allocation in the bitmap port set type in ipset, from Jozsef Kadlecsik.

* Fix possible compilation issues in the hash netnet set type in ipset, also from Jozsef Kadlecsik.

* Define constants to identify netlink callback data in ipset dumps, again from Jozsef Kadlecsik.

* Use sock_gen_put() in xt_socket to replace xt_socket_put_sk, from Eric Dumazet.

* Improvements for the SH scheduler in IPVS, from Alexander Frolkin.

* Remove extra delay due to unneeded rcu barrier in IPVS net namespace cleanup path, from Julian Anastasov.

* Save some cycles in ip6t_REJECT by skipping checksum validation in packets leaving from our stack, from Stanislav Fomichev.

* Fix IPVS_CMD_ATTR_MAX definition in IPVS, larger that required, from Julian Anastasov.

You can pull these changes from:

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

Thanks!

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

The following changes since commit 58308451e91974267e1f4a618346055342019e02:

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2013-10-10 15:29:44 -0400)

are available in the git repository at:

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

for you to fetch changes up to 4542fa4727f5f83faf9e1f28f35be0b9a2317aec:

netfilter: ctnetlink: account both directions in one step (2013-11-03 21:49:32 +0100)

----------------------------------------------------------------
Alexander Frolkin (1):
ipvs: improved SH fallback strategy

Daniel Borkmann (2):
net: ipvs: sctp: add missing verdict assignments in sctp_conn_schedule
net: ipvs: sctp: do not recalc sctp csum when ports didn't change

Eric Dumazet (1):
netfilter: xt_socket: use sock_gen_put()

Florian Westphal (1):
bridge: netfilter: orphan skb before invoking ip netfilter hooks

Gao feng (6):
netfilter: ipt_CLUSTERIP: make proc directory per net namespace
netfilter: ipt_CLUSTERIP: make clusterip_list per net namespace
netfilter: ipt_CLUSTERIP: make clusterip_lock per net namespace
netfilter: ipt_CLUSTERIP: add parameter net in clusterip_config_find_get
netfilter: ipt_CLUSTERIP: create proc entry under proper ipt_CLUSTERIP directory
netfilter: ipt_CLUSTERIP: use proper net namespace to operate CLUSTERIP

Holger Eitzenberger (2):
netfilter: introduce nf_conn_acct structure
netfilter: ctnetlink: account both directions in one step

Jozsef Kadlecsik (3):
netfilter: ipset: Use netlink callback dump args only
netfilter: ipset: The unnamed union initialization may lead to compilation error netfilter:ipset: Fix memory allocation for bitmap:port

Julian Anastasov (2):
ipvs: fix the IPVS_CMD_ATTR_MAX definition
ipvs: avoid rcu_barrier during netns cleanup

Michael Opdenacker (1):
netfilter: ipset: remove duplicate define

Stanislav Fomichev (1):
netfilter: ip6t_REJECT: skip checksum verification for outgoing ipv6 packets

 include/linux/netfilter/ipset/ip_set.h       |   10 +++
 include/net/ip_vs.h                          |    6 ++
 include/net/netfilter/nf_conntrack_acct.h    |   10 ++-
 include/net/netfilter/nf_conntrack_extend.h  |    2 +-
 include/uapi/linux/ip_vs.h                   |    2 +-
 net/bridge/br_netfilter.c                    |    2 +
 net/ipv4/netfilter/ipt_CLUSTERIP.c           |  110 ++++++++++++++++++--------
 net/ipv6/netfilter/ip6t_REJECT.c             |    7 +-
 net/netfilter/ipset/ip_set_bitmap_gen.h      |   11 +--
 net/netfilter/ipset/ip_set_bitmap_port.c     |    2 +-
 net/netfilter/ipset/ip_set_core.c            |   70 ++++++++--------
 net/netfilter/ipset/ip_set_hash_gen.h        |   21 ++---
 net/netfilter/ipset/ip_set_hash_netnet.c     |   22 +++---
 net/netfilter/ipset/ip_set_hash_netportnet.c |   22 +++---
 net/netfilter/ipset/ip_set_list_set.c        |   11 +--
 net/netfilter/ipvs/ip_vs_ctl.c               |    6 +-
 net/netfilter/ipvs/ip_vs_lblc.c              |    2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c             |    2 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c        |   48 +++++++++--
 net/netfilter/ipvs/ip_vs_sh.c                |   39 ++++++---
 net/netfilter/nf_conntrack_acct.c            |   12 +--
 net/netfilter/nf_conntrack_core.c            |   16 ++--
 net/netfilter/nf_conntrack_netlink.c         |   51 ++++++------
 net/netfilter/xt_connbytes.c                 |    6 +-
 net/netfilter/xt_socket.c                    |   13 +--
 25 files changed, 305 insertions(+), 198 deletions(-)