netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 00/15] Netfilter updates for net-next
Date: Thu, 26 Mar 2015 13:06:47 +0100	[thread overview]
Message-ID: <1427371622-4466-1-git-send-email-pablo@netfilter.org> (raw)

Hi David,

The following patchset contains Netfilter updates for your net-next tree.
Basically, nf_tables updates to add the set extension infrastructure and finish
the transaction for sets from Patrick McHardy. More specifically, they are:

1) Move netns to basechain and use recently added possible_net_t, from
   Patrick McHardy.

2) Use LOGLEVEL_<FOO> from nf_log infrastructure, from Joe Perches.

3) Restore nf_log_trace that was accidentally removed during conflict
   resolution.

4) nft_queue does not depend on NETFILTER_XTABLES, starting from here
   all patches from Patrick McHardy.

5) Use raw_smp_processor_id() in nft_meta.

Then, several patches to prepare ground for the new set extension
infrastructure:

6) Pass object length to the hash callback in rhashtable as needed by
   the new set extension infrastructure.

7) Cleanup patch to restore struct nft_hash as wrapper for struct
   rhashtable

8) Another small source code readability cleanup for nft_hash.

9) Convert nft_hash to rhashtable callbacks.

And finally...

10) Add the new set extension infrastructure.

11) Convert the nft_hash and nft_rbtree sets to use it.

12) Batch set element release to avoid several RCU grace period in a row
    and add new function nft_set_elem_destroy() to consolidate set element
    release.

13) Return the set extension data area from nft_lookup.

14) Refactor existing transaction code to add some helper functions
    and document it.

15) Complete the set transaction support, using similar approach to what we
    already use, to activate/deactivate elements in an atomic fashion.

You can pull these changes from:

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

Thanks!

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

The following changes since commit 0144a81cccf7532bead90f0542f517bd028d3b3c:

  tcp: fix ipv4 mapped request socks (2015-03-25 00:57:48 -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 cc02e457bb86f7b6ffee3651bab22d104b60effb:

  netfilter: nf_tables: implement set transaction support (2015-03-26 11:09:35 +0100)

----------------------------------------------------------------
Joe Perches (1):
      netfilter: Use LOGLEVEL_<FOO> defines

Pablo Neira Ayuso (1):
      netfilter: nf_tables: restore nf_log_trace() in nf_tables_core.c

Patrick McHardy (13):
      netfilter: nf_tables: move struct net pointer to base chain
      netfilter: nf_tables: nft_queue does not depend on x_tables
      netfilter: nft_meta: use raw_smp_processor_id()
      rhashtable: provide len to obj_hashfn
      netfilter: nft_hash: restore struct nft_hash
      netfilter: nft_hash: indent rhashtable parameters
      netfilter: nft_hash: convert to use rhashtable callbacks
      netfilter: nf_tables: add set extensions
      netfilter: nf_tables: convert hash and rbtree to set extensions
      netfilter: nf_tables: consolide set element destruction
      netfilter: nf_tables: return set extensions from ->lookup()
      netfilter: nf_tables: add transaction helper functions
      netfilter: nf_tables: implement set transaction support

 include/linux/rhashtable.h        |    6 +-
 include/net/netfilter/nf_tables.h |  190 ++++++++++++++++++++++++++++++++---
 lib/rhashtable.c                  |    2 +-
 net/ipv4/netfilter/nf_log_arp.c   |    4 +-
 net/ipv4/netfilter/nf_log_ipv4.c  |    4 +-
 net/ipv6/netfilter/ip6_tables.c   |    5 +-
 net/ipv6/netfilter/nf_log_ipv6.c  |    4 +-
 net/netfilter/Kconfig             |    1 -
 net/netfilter/nf_tables_api.c     |  199 ++++++++++++++++++++++++++-----------
 net/netfilter/nf_tables_core.c    |   18 ++--
 net/netfilter/nft_hash.c          |  183 +++++++++++++++++++---------------
 net/netfilter/nft_log.c           |    2 +-
 net/netfilter/nft_lookup.c        |    6 +-
 net/netfilter/nft_meta.c          |    2 +-
 net/netfilter/nft_rbtree.c        |  123 +++++++++++------------
 net/netlink/af_netlink.c          |    2 +-
 16 files changed, 513 insertions(+), 238 deletions(-)

             reply	other threads:[~2015-03-26 12:03 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-26 12:06 Pablo Neira Ayuso [this message]
2015-03-26 12:06 ` [PATCH 01/15] netfilter: nf_tables: move struct net pointer to base chain Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 02/15] netfilter: Use LOGLEVEL_<FOO> defines Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 03/15] netfilter: nf_tables: restore nf_log_trace() in nf_tables_core.c Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 04/15] netfilter: nf_tables: nft_queue does not depend on x_tables Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 05/15] netfilter: nft_meta: use raw_smp_processor_id() Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 06/15] rhashtable: provide len to obj_hashfn Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 07/15] netfilter: nft_hash: restore struct nft_hash Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 08/15] netfilter: nft_hash: indent rhashtable parameters Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 09/15] netfilter: nft_hash: convert to use rhashtable callbacks Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 10/15] netfilter: nf_tables: add set extensions Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 11/15] netfilter: nf_tables: convert hash and rbtree to " Pablo Neira Ayuso
2015-03-26 12:06 ` [PATCH 12/15] netfilter: nf_tables: consolide set element destruction Pablo Neira Ayuso
2015-03-26 12:07 ` [PATCH 13/15] netfilter: nf_tables: return set extensions from ->lookup() Pablo Neira Ayuso
2015-03-26 12:07 ` [PATCH 14/15] netfilter: nf_tables: add transaction helper functions Pablo Neira Ayuso
2015-03-26 12:07 ` [PATCH 15/15] netfilter: nf_tables: implement set transaction support Pablo Neira Ayuso
2015-03-29 19:48 ` [PATCH 00/15] Netfilter updates for net-next David Miller
  -- strict thread matches above, loose matches on Subject: below --
2015-08-19 19:18 Pablo Neira Ayuso
2015-08-20 21:48 ` David Miller
2015-08-21  4:32 Pablo Neira Ayuso
2015-08-21  5:19 ` David Miller

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=1427371622-4466-1-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.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).