Return-Path: <netfilter-devel-owner@vger.kernel.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by ozlabs.org (Postfix) with ESMTP id 3117E14017A
for <incoming@patchwork.ozlabs.org>;
Tue, 25 Nov 2014 07:46:14 +1100 (AEDT)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1751211AbaKXUqJ (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
Mon, 24 Nov 2014 15:46:09 -0500
Received: from smtp2.kfki.hu ([148.6.0.28]:51790 "EHLO smtp2.kfki.hu"
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
id S1751143AbaKXUqA (ORCPT <rfc822; netfilter-devel@vger.kernel.org>);
Mon, 24 Nov 2014 15:46:00 -0500
Received: from localhost (localhost [127.0.0.1])
by smtp2.kfki.hu (Postfix) with ESMTP id 69645CC00BA;
Mon, 24 Nov 2014 21:45:55 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at smtp2.kfki.hu
Received: from smtp2.kfki.hu ([127.0.0.1])
by localhost (smtp2.kfki.hu [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id xtqa99dLe0RL; Mon, 24 Nov 2014 21:45:53 +0100 (CET)
Received: from blackhole.kfki.hu (blackhole.kfki.hu [148.6.0.114])
by smtp2.kfki.hu (Postfix) with ESMTP id 63C0ECC00AD;
Mon, 24 Nov 2014 21:45:53 +0100 (CET)
Received: by blackhole.kfki.hu (Postfix, from userid 1000)
id 4BFBC2112C; Mon, 24 Nov 2014 21:46:52 +0100 (CET)
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
Message-Id: <1416862012-31139-1-git-send-email-kadlec@blackhole.kfki.hu>
X-Mailer: git-send-email 1.8.5.1
Sender: netfilter-devel-owner@vger.kernel.org
Precedence: bulk
List-ID: <netfilter-devel.vger.kernel.org>
X-Mailing-List: netfilter-devel@vger.kernel.org
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(-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html