From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
To: netfilter-devel@vger.kernel.org
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH 00/10] ipset patches for nf-next
Date: Mon, 24 Nov 2014 21:46:42 +0100 [thread overview]
Message-ID: <1416862012-31139-1-git-send-email-kadlec@blackhole.kfki.hu> (raw)
Hi Pablo,
Please consider to apply the next series of patches for ipset:
- Fix parallel resizing and listing of the same set: when adding elements
and listing of the same set were executed parallel, listing could start
to list the original set (before resizing) and continue with the new one.
- Styles warned by checkpatch.pl fixed
- Introduce RCU in all set types instead of rwlock per set. The patch was
performance tested by Jesper Dangaard Brouer:
Generator: sending 12.2Mpps (tx:12264083 pps)
Drop performance in "raw" with ipset: 8Mpps
Drop performance in "raw" with ipset with RCU-locking: 11.3Mpps
- Remove rbtree from hash:net,iface for RCU locking
- Explicitly add padding elements to hash:net,net and hash:net,port,
because the elements must be u32 sized for the used hash function.
- Allocate the proper size of memory when /0 networks are supported
- Simplify cidr handling for hash:*net* types (cleaning it up for RCU)
- Indicate explicitly when /0 networks are supported
- Alignment problem between 64bit kernel 32bit userspace fixed by
introducing a new set match revision, reported by Sven-Haegar Koch
- Support updating element extensions when the set is full (fixes
netfilter bugzilla id 880)
You can pull the changes from
git://blackhole.kfki.hu/nf-next master
The iptables part of the new set match functionality
can be found in the iptables git tree, in the ipset
branch.
Thanks,
Jozsef
============================================================================
The following changes since commit beacd3e8ef237e077c8707395440813feef16d3f:
netfilter: nfnetlink_log: Make use of pr_fmt where applicable (2014-11-20 14:09:01 +0100)
are available in the git repository at:
git://blackhole.kfki.hu/nf-next master
for you to fetch changes up to 4743864b182ce10346e48c03bee5189e8951f460:
netfilter: ipset: Fix parallel resizing and listing of the same set (2014-11-24 21:22:26 +0100)
----------------------------------------------------------------
Jozsef Kadlecsik (10):
netfilter: ipset: Support updating extensions when the set is full
netfilter: ipset: Alignment problem between 64bit kernel 32bit userspace
netfilter: ipset: Indicate when /0 networks are supported
netfilter: ipset: Simplify cidr handling for hash:*net* types
netfilter: ipset: Allocate the proper size of memory when /0 networks are supported
netfilter: ipset: Explicitly add padding elements to hash:net,net and hash:net,port,net
netfilter: ipset: Remove rbtree from hash:net,iface in order to run under RCU
netfilter: ipset: Introduce RCU in all set types instead of rwlock per set
netfilter: ipset: styles warned by checkpatch.pl fixed
netfilter: ipset: Fix parallel resizing and listing of the same set
include/linux/netfilter/ipset/ip_set.h | 102 ++--
include/linux/netfilter/ipset/ip_set_timeout.h | 39 +-
include/uapi/linux/netfilter/ipset/ip_set.h | 8 +-
include/uapi/linux/netfilter/xt_set.h | 13 +-
net/netfilter/ipset/ip_set_bitmap_gen.h | 8 +-
net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +-
net/netfilter/ipset/ip_set_core.c | 72 +--
net/netfilter/ipset/ip_set_hash_gen.h | 636 +++++++++++++++----------
net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +
net/netfilter/ipset/ip_set_hash_net.c | 4 +-
net/netfilter/ipset/ip_set_hash_netiface.c | 159 +------
net/netfilter/ipset/ip_set_hash_netnet.c | 4 +
net/netfilter/ipset/ip_set_hash_netport.c | 2 +
net/netfilter/ipset/ip_set_hash_netportnet.c | 4 +
net/netfilter/ipset/ip_set_list_set.c | 386 +++++++--------
net/netfilter/xt_set.c | 80 +++-
net/sched/em_ipset.c | 5 +-
17 files changed, 842 insertions(+), 684 deletions(-)
next reply other threads:[~2014-11-24 20:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 20:46 Jozsef Kadlecsik [this message]
2014-11-24 20:46 ` [PATCH 01/10] netfilter: ipset: Support updating extensions when the set is full Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 02/10] netfilter: ipset: Alignment problem between 64bit kernel 32bit userspace Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 03/10] netfilter: ipset: Indicate when /0 networks are supported Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 04/10] netfilter: ipset: Simplify cidr handling for hash:*net* types Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 05/10] netfilter: ipset: Allocate the proper size of memory when /0 networks are supported Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 06/10] netfilter: ipset: Explicitly add padding elements to hash:net,net and hash:net,port,net Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 07/10] netfilter: ipset: Remove rbtree from hash:net,iface in order to run under RCU Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 08/10] netfilter: ipset: Introduce RCU in all set types instead of rwlock per set Jozsef Kadlecsik
2014-11-26 13:14 ` Pablo Neira Ayuso
2014-11-26 14:58 ` Jozsef Kadlecsik
2014-11-26 15:41 ` Florian Westphal
2014-11-26 16:01 ` Jozsef Kadlecsik
2014-11-26 17:18 ` Pablo Neira Ayuso
2014-11-27 8:23 ` Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 09/10] netfilter: ipset: styles warned by checkpatch.pl fixed Jozsef Kadlecsik
2014-11-24 20:46 ` [PATCH 10/10] netfilter: ipset: Fix parallel resizing and listing of the same set Jozsef Kadlecsik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416862012-31139-1-git-send-email-kadlec@blackhole.kfki.hu \
--to=kadlec@blackhole.kfki.hu \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).