Netfilter/IPVS fixes for net
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest9 patches 1 replyIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/9 | netfilter: ipvs: fix the issue that sctp_conn_schedule drops non-INIT packetnet/ | +5 | 0 replies | |
| 2/9 | netfilter: ipvs: do not create conn for ABORT packet in sctp_conn_schedulenet/ | +2 | 0 replies | |
| 3/9 | netfilter: nf_nat: don't bug when mapping already existsnet/ | +3 | 0 replies | |
| 4/9 | netfilter: xtables: add scheduling opportunity in get_countersnet/ net/ net/ | +3 | 0 replies | |
| 5/9 | netfilter: nat: Revert "netfilter: nat: convert nat bysrc hash to rhashtable"include/ include/ net/ | +54 | 0 replies | |
| 6/9 | netfilter: nat: use keyed locksnet/ | +24 | 0 replies | |
| 7/9 | netfilter: core: remove erroneous warn_onnet/ | +1 | 0 replies | |
| 8/9 | netfilter: xt_hashlimit: alloc hashtable with right sizenet/ | +2 | 0 replies | |
| 9/9 | netfilter: xt_hashlimit: fix build error caused by 64bit divisionnet/ | +7 | 0 replies |
Reviews trailers per patch
2 of 9 patches have a Reviewed-by or Acked-by.
| Patch | Eric Dumazet | Aaron Conole |
|---|---|---|
| 1/9 | ||
| 2/9 | ||
| 3/9 | ||
| 4/9 | A-b | |
| 5/9 | ||
| 6/9 | ||
| 7/9 | A-b | |
| 8/9 | ||
| 9/9 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/9] Netfilter/IPVS fixes for net
Hi David,
The following patchset contains Netfilter/IPVS fixes for your net tree, they are:
1) Fix SCTP connection setup when IPVS module is loaded and any scheduler is registered, from Xin Long.
2) Don't create a SCTP connection from SCTP ABORT packets, also from Xin Long.
3) WARN_ON() and drop packet, instead of BUG_ON() races when calling nf_nat_setup_info(). This is specifically a longstanding problem when br_netfilter with conntrack support is in place, patch from Florian Westphal.
4) Avoid softlock splats via iptables-restore, also from Florian.
5) Revert NAT hashtable conversion to rhashtable, semantics of rhlist are different from our simple NAT hashtable, this has been causing problems in the recent Linux kernel releases. From Florian.
6) Add per-bucket spinlock for NAT hashtable, so at least we restore one of the benefits we got from the previous rhashtable conversion.
7) Fix incorrect hashtable size in memory allocation in xt_hashlimit, from Zhizhou Tian.
8) Fix build/link problems with hashlimit and 32-bit arches, to address recent fallout from a new hashlimit mode, from Vishwanath Pai.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit 8e0deed92406d93ae0365cb8a6134db5721e7aca:
tipc: remove unnecessary call to dev_net() (2017-09-06 21:25:52 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 90c4ae4e2c1da9f1eaf846136861af43d4c1ff34:
netfilter: xt_hashlimit: fix build error caused by 64bit division (2017-09-08 18:55:53 +0200)
----------------------------------------------------------------
Florian Westphal (5):
netfilter: nf_nat: don't bug when mapping already exists
netfilter: xtables: add scheduling opportunity in get_counters
netfilter: nat: Revert "netfilter: nat: convert nat bysrc hash to rhashtable"
netfilter: nat: use keyed locks
netfilter: core: remove erroneous warn_on
Vishwanath Pai (1):
netfilter: xt_hashlimit: fix build error caused by 64bit division
Xin Long (2):
netfilter: ipvs: fix the issue that sctp_conn_schedule drops non-INIT packet
netfilter: ipvs: do not create conn for ABORT packet in sctp_conn_schedule
Zhizhou Tian (1):
netfilter: xt_hashlimit: alloc hashtable with right size
include/net/netfilter/nf_conntrack.h | 3 +- include/net/netfilter/nf_nat.h | 1 - net/ipv4/netfilter/arp_tables.c | 1 + net/ipv4/netfilter/ip_tables.c | 1 + net/ipv6/netfilter/ip6_tables.c | 1 + net/netfilter/core.c | 2 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 8 +- net/netfilter/nf_nat_core.c | 146 ++++++++++++++++------------------ net/netfilter/xt_hashlimit.c | 16 ++-- 9 files changed, 88 insertions(+), 91 deletions(-)