2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Copyright (C)2003,2004 USAGI/WIDE Project
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
2007-02-09 21:24:49 +07:00
|
|
|
*
|
2005-04-17 05:20:36 +07:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2007-02-09 21:24:49 +07:00
|
|
|
*
|
2005-04-17 05:20:36 +07:00
|
|
|
* You should have received a copy of the GNU General Public License
|
2013-12-07 00:13:39 +07:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2005-04-17 05:20:36 +07:00
|
|
|
*
|
|
|
|
* Authors Mitsuru KANDA <mk@linux-ipv6.org>
|
2014-08-25 03:53:10 +07:00
|
|
|
* YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
|
2005-04-17 05:20:36 +07:00
|
|
|
*
|
|
|
|
* Based on net/ipv4/xfrm4_tunnel.c
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/xfrm.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2009-10-24 01:19:19 +07:00
|
|
|
#include <linux/rculist.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <net/ip.h>
|
|
|
|
#include <net/xfrm.h>
|
|
|
|
#include <net/ipv6.h>
|
|
|
|
#include <linux/ipv6.h>
|
|
|
|
#include <linux/icmpv6.h>
|
2006-03-21 13:33:17 +07:00
|
|
|
#include <linux/mutex.h>
|
2010-01-25 17:37:54 +07:00
|
|
|
#include <net/netns/generic.h>
|
|
|
|
|
|
|
|
#define XFRM6_TUNNEL_SPI_BYADDR_HSIZE 256
|
|
|
|
#define XFRM6_TUNNEL_SPI_BYSPI_HSIZE 256
|
|
|
|
|
|
|
|
#define XFRM6_TUNNEL_SPI_MIN 1
|
|
|
|
#define XFRM6_TUNNEL_SPI_MAX 0xffffffff
|
|
|
|
|
|
|
|
struct xfrm6_tunnel_net {
|
|
|
|
struct hlist_head spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE];
|
|
|
|
struct hlist_head spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE];
|
|
|
|
u32 spi;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int xfrm6_tunnel_net_id __read_mostly;
|
|
|
|
static inline struct xfrm6_tunnel_net *xfrm6_tunnel_pernet(struct net *net)
|
|
|
|
{
|
|
|
|
return net_generic(net, xfrm6_tunnel_net_id);
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
2007-02-09 21:24:49 +07:00
|
|
|
* xfrm_tunnel_spi things are for allocating unique id ("spi")
|
2005-04-17 05:20:36 +07:00
|
|
|
* per xfrm_address_t.
|
|
|
|
*/
|
|
|
|
struct xfrm6_tunnel_spi {
|
2009-10-24 01:19:19 +07:00
|
|
|
struct hlist_node list_byaddr;
|
|
|
|
struct hlist_node list_byspi;
|
|
|
|
xfrm_address_t addr;
|
|
|
|
u32 spi;
|
|
|
|
atomic_t refcnt;
|
|
|
|
struct rcu_head rcu_head;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2009-10-24 01:19:19 +07:00
|
|
|
static DEFINE_SPINLOCK(xfrm6_tunnel_spi_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-12-07 11:33:20 +07:00
|
|
|
static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-04-15 12:58:06 +07:00
|
|
|
static inline unsigned int xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-04-15 12:58:06 +07:00
|
|
|
unsigned int h;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-01-13 12:02:38 +07:00
|
|
|
h = ipv6_addr_hash((const struct in6_addr *)addr);
|
2005-04-17 05:20:36 +07:00
|
|
|
h ^= h >> 16;
|
|
|
|
h ^= h >> 8;
|
|
|
|
h &= XFRM6_TUNNEL_SPI_BYADDR_HSIZE - 1;
|
|
|
|
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2012-04-15 12:58:06 +07:00
|
|
|
static inline unsigned int xfrm6_tunnel_spi_hash_byspi(u32 spi)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
|
|
|
|
}
|
|
|
|
|
2011-04-22 11:53:02 +07:00
|
|
|
static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry_rcu(x6spi,
|
2010-01-25 17:37:54 +07:00
|
|
|
&xfrm6_tn->spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
|
2005-04-17 05:20:36 +07:00
|
|
|
list_byaddr) {
|
2013-01-29 19:48:31 +07:00
|
|
|
if (xfrm6_addr_equal(&x6spi->addr, saddr))
|
2005-04-17 05:20:36 +07:00
|
|
|
return x6spi;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-04-22 11:53:02 +07:00
|
|
|
__be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
|
|
|
u32 spi;
|
|
|
|
|
2009-10-24 01:19:19 +07:00
|
|
|
rcu_read_lock_bh();
|
2010-01-25 17:37:54 +07:00
|
|
|
x6spi = __xfrm6_tunnel_spi_lookup(net, saddr);
|
2005-04-17 05:20:36 +07:00
|
|
|
spi = x6spi ? x6spi->spi : 0;
|
2009-10-24 01:19:19 +07:00
|
|
|
rcu_read_unlock_bh();
|
2006-11-02 06:28:58 +07:00
|
|
|
return htonl(spi);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
|
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
static int __xfrm6_tunnel_spi_check(struct net *net, u32 spi)
|
2008-02-19 20:54:00 +07:00
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
|
2008-02-19 20:54:00 +07:00
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
|
|
|
int index = xfrm6_tunnel_spi_hash_byspi(spi);
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry(x6spi,
|
2010-01-25 17:37:54 +07:00
|
|
|
&xfrm6_tn->spi_byspi[index],
|
2008-02-19 20:54:00 +07:00
|
|
|
list_byspi) {
|
|
|
|
if (x6spi->spi == spi)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
|
2005-04-17 05:20:36 +07:00
|
|
|
u32 spi;
|
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
2008-02-19 20:54:00 +07:00
|
|
|
int index;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
if (xfrm6_tn->spi < XFRM6_TUNNEL_SPI_MIN ||
|
|
|
|
xfrm6_tn->spi >= XFRM6_TUNNEL_SPI_MAX)
|
|
|
|
xfrm6_tn->spi = XFRM6_TUNNEL_SPI_MIN;
|
2005-04-17 05:20:36 +07:00
|
|
|
else
|
2010-01-25 17:37:54 +07:00
|
|
|
xfrm6_tn->spi++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
for (spi = xfrm6_tn->spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) {
|
|
|
|
index = __xfrm6_tunnel_spi_check(net, spi);
|
2008-02-19 20:54:00 +07:00
|
|
|
if (index >= 0)
|
|
|
|
goto alloc_spi;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-01-25 17:37:54 +07:00
|
|
|
for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tn->spi; spi++) {
|
|
|
|
index = __xfrm6_tunnel_spi_check(net, spi);
|
2008-02-19 20:54:00 +07:00
|
|
|
if (index >= 0)
|
|
|
|
goto alloc_spi;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
spi = 0;
|
|
|
|
goto out;
|
|
|
|
alloc_spi:
|
2010-01-25 17:37:54 +07:00
|
|
|
xfrm6_tn->spi = spi;
|
2006-12-07 11:33:16 +07:00
|
|
|
x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, GFP_ATOMIC);
|
2006-07-25 03:49:06 +07:00
|
|
|
if (!x6spi)
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out;
|
2006-07-25 03:49:06 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr));
|
|
|
|
x6spi->spi = spi;
|
|
|
|
atomic_set(&x6spi->refcnt, 1);
|
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
hlist_add_head_rcu(&x6spi->list_byspi, &xfrm6_tn->spi_byspi[index]);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
index = xfrm6_tunnel_spi_hash_byaddr(saddr);
|
2010-01-25 17:37:54 +07:00
|
|
|
hlist_add_head_rcu(&x6spi->list_byaddr, &xfrm6_tn->spi_byaddr[index]);
|
2005-04-17 05:20:36 +07:00
|
|
|
out:
|
|
|
|
return spi;
|
|
|
|
}
|
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
__be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
|
|
|
u32 spi;
|
|
|
|
|
2009-10-24 01:19:19 +07:00
|
|
|
spin_lock_bh(&xfrm6_tunnel_spi_lock);
|
2010-01-25 17:37:54 +07:00
|
|
|
x6spi = __xfrm6_tunnel_spi_lookup(net, saddr);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (x6spi) {
|
|
|
|
atomic_inc(&x6spi->refcnt);
|
|
|
|
spi = x6spi->spi;
|
|
|
|
} else
|
2010-01-25 17:37:54 +07:00
|
|
|
spi = __xfrm6_tunnel_alloc_spi(net, saddr);
|
2009-10-24 01:19:19 +07:00
|
|
|
spin_unlock_bh(&xfrm6_tunnel_spi_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-11-02 06:28:58 +07:00
|
|
|
return htonl(spi);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(xfrm6_tunnel_alloc_spi);
|
|
|
|
|
2009-10-24 01:19:19 +07:00
|
|
|
static void x6spi_destroy_rcu(struct rcu_head *head)
|
|
|
|
{
|
|
|
|
kmem_cache_free(xfrm6_tunnel_spi_kmem,
|
|
|
|
container_of(head, struct xfrm6_tunnel_spi, rcu_head));
|
|
|
|
}
|
|
|
|
|
2010-10-15 12:15:59 +07:00
|
|
|
static void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct xfrm6_tunnel_spi *x6spi;
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
struct hlist_node *n;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2009-10-24 01:19:19 +07:00
|
|
|
spin_lock_bh(&xfrm6_tunnel_spi_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry_safe(x6spi, n,
|
2010-01-25 17:37:54 +07:00
|
|
|
&xfrm6_tn->spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
|
2005-04-17 05:20:36 +07:00
|
|
|
list_byaddr)
|
|
|
|
{
|
2013-01-29 19:48:31 +07:00
|
|
|
if (xfrm6_addr_equal(&x6spi->addr, saddr)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (atomic_dec_and_test(&x6spi->refcnt)) {
|
2009-10-24 01:19:19 +07:00
|
|
|
hlist_del_rcu(&x6spi->list_byaddr);
|
|
|
|
hlist_del_rcu(&x6spi->list_byspi);
|
|
|
|
call_rcu(&x6spi->rcu_head, x6spi_destroy_rcu);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-10-24 01:19:19 +07:00
|
|
|
spin_unlock_bh(&xfrm6_tunnel_spi_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
|
|
|
|
{
|
2007-10-11 05:44:06 +07:00
|
|
|
skb_push(skb, -skb_network_offset(skb));
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-01 15:52:46 +07:00
|
|
|
static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-10-18 11:28:06 +07:00
|
|
|
return skb_network_header(skb)[IP6CB(skb)->nhoff];
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2006-03-28 16:12:13 +07:00
|
|
|
static int xfrm6_tunnel_rcv(struct sk_buff *skb)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct net *net = dev_net(skb->dev);
|
2011-04-22 11:53:02 +07:00
|
|
|
const struct ipv6hdr *iph = ipv6_hdr(skb);
|
2006-09-28 08:48:18 +07:00
|
|
|
__be32 spi;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-04-22 11:53:02 +07:00
|
|
|
spi = xfrm6_tunnel_spi_lookup(net, (const xfrm_address_t *)&iph->saddr);
|
2011-05-24 12:11:51 +07:00
|
|
|
return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2006-03-28 16:12:13 +07:00
|
|
|
static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
2009-06-23 18:31:07 +07:00
|
|
|
u8 type, u8 code, int offset, __be32 info)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/* xfrm6_tunnel native err handling */
|
|
|
|
switch (type) {
|
2007-02-09 21:24:49 +07:00
|
|
|
case ICMPV6_DEST_UNREACH:
|
2005-04-17 05:20:36 +07:00
|
|
|
switch (code) {
|
2007-02-09 21:24:49 +07:00
|
|
|
case ICMPV6_NOROUTE:
|
2005-04-17 05:20:36 +07:00
|
|
|
case ICMPV6_ADM_PROHIBITED:
|
|
|
|
case ICMPV6_NOT_NEIGHBOUR:
|
|
|
|
case ICMPV6_ADDR_UNREACH:
|
|
|
|
case ICMPV6_PORT_UNREACH:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMPV6_PKT_TOOBIG:
|
|
|
|
break;
|
|
|
|
case ICMPV6_TIME_EXCEED:
|
|
|
|
switch (code) {
|
|
|
|
case ICMPV6_EXC_HOPLIMIT:
|
|
|
|
break;
|
|
|
|
case ICMPV6_EXC_FRAGTIME:
|
2007-02-09 21:24:49 +07:00
|
|
|
default:
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMPV6_PARAMPROB:
|
|
|
|
switch (code) {
|
|
|
|
case ICMPV6_HDR_FIELD: break;
|
|
|
|
case ICMPV6_UNK_NEXTHDR: break;
|
|
|
|
case ICMPV6_UNK_OPTION: break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2006-03-28 16:12:13 +07:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2005-06-21 03:18:08 +07:00
|
|
|
static int xfrm6_tunnel_init_state(struct xfrm_state *x)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2006-09-23 05:05:15 +07:00
|
|
|
if (x->props.mode != XFRM_MODE_TUNNEL)
|
2005-04-17 05:20:36 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (x->encap)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
x->props.header_len = sizeof(struct ipv6hdr);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void xfrm6_tunnel_destroy(struct xfrm_state *x)
|
|
|
|
{
|
2010-01-25 17:37:54 +07:00
|
|
|
struct net *net = xs_net(x);
|
|
|
|
|
|
|
|
xfrm6_tunnel_free_spi(net, (xfrm_address_t *)&x->props.saddr);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-01-31 10:11:50 +07:00
|
|
|
static const struct xfrm_type xfrm6_tunnel_type = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.description = "IP6IP6",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.proto = IPPROTO_IPV6,
|
|
|
|
.init_state = xfrm6_tunnel_init_state,
|
|
|
|
.destructor = xfrm6_tunnel_destroy,
|
|
|
|
.input = xfrm6_tunnel_input,
|
|
|
|
.output = xfrm6_tunnel_output,
|
|
|
|
};
|
|
|
|
|
2010-08-30 17:27:10 +07:00
|
|
|
static struct xfrm6_tunnel xfrm6_tunnel_handler __read_mostly = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.handler = xfrm6_tunnel_rcv,
|
2006-03-28 16:12:13 +07:00
|
|
|
.err_handler = xfrm6_tunnel_err,
|
|
|
|
.priority = 2,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2010-08-30 17:27:10 +07:00
|
|
|
static struct xfrm6_tunnel xfrm46_tunnel_handler __read_mostly = {
|
2007-02-14 03:55:55 +07:00
|
|
|
.handler = xfrm6_tunnel_rcv,
|
|
|
|
.err_handler = xfrm6_tunnel_err,
|
|
|
|
.priority = 2,
|
|
|
|
};
|
|
|
|
|
2010-01-25 17:37:54 +07:00
|
|
|
static int __net_init xfrm6_tunnel_net_init(struct net *net)
|
|
|
|
{
|
|
|
|
struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < XFRM6_TUNNEL_SPI_BYADDR_HSIZE; i++)
|
|
|
|
INIT_HLIST_HEAD(&xfrm6_tn->spi_byaddr[i]);
|
|
|
|
for (i = 0; i < XFRM6_TUNNEL_SPI_BYSPI_HSIZE; i++)
|
|
|
|
INIT_HLIST_HEAD(&xfrm6_tn->spi_byspi[i]);
|
|
|
|
xfrm6_tn->spi = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __net_exit xfrm6_tunnel_net_exit(struct net *net)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations xfrm6_tunnel_net_ops = {
|
|
|
|
.init = xfrm6_tunnel_net_init,
|
|
|
|
.exit = xfrm6_tunnel_net_exit,
|
|
|
|
.id = &xfrm6_tunnel_net_id,
|
|
|
|
.size = sizeof(struct xfrm6_tunnel_net),
|
|
|
|
};
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int __init xfrm6_tunnel_init(void)
|
|
|
|
{
|
2010-01-25 17:28:21 +07:00
|
|
|
int rv;
|
|
|
|
|
2010-02-16 16:05:04 +07:00
|
|
|
xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",
|
|
|
|
sizeof(struct xfrm6_tunnel_spi),
|
|
|
|
0, SLAB_HWCACHE_ALIGN,
|
|
|
|
NULL);
|
|
|
|
if (!xfrm6_tunnel_spi_kmem)
|
|
|
|
return -ENOMEM;
|
|
|
|
rv = register_pernet_subsys(&xfrm6_tunnel_net_ops);
|
|
|
|
if (rv < 0)
|
|
|
|
goto out_pernet;
|
2010-01-25 17:28:21 +07:00
|
|
|
rv = xfrm_register_type(&xfrm6_tunnel_type, AF_INET6);
|
|
|
|
if (rv < 0)
|
2010-02-16 16:05:04 +07:00
|
|
|
goto out_type;
|
2010-01-25 17:28:21 +07:00
|
|
|
rv = xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6);
|
|
|
|
if (rv < 0)
|
2010-02-16 16:05:04 +07:00
|
|
|
goto out_xfrm6;
|
2010-01-25 17:28:21 +07:00
|
|
|
rv = xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET);
|
|
|
|
if (rv < 0)
|
2010-02-16 16:05:04 +07:00
|
|
|
goto out_xfrm46;
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
2008-12-15 14:13:48 +07:00
|
|
|
|
2010-02-16 16:05:04 +07:00
|
|
|
out_xfrm46:
|
2008-12-15 14:13:48 +07:00
|
|
|
xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
|
2010-02-16 16:05:04 +07:00
|
|
|
out_xfrm6:
|
2008-12-15 14:13:48 +07:00
|
|
|
xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
|
2010-02-16 16:05:04 +07:00
|
|
|
out_type:
|
|
|
|
unregister_pernet_subsys(&xfrm6_tunnel_net_ops);
|
|
|
|
out_pernet:
|
|
|
|
kmem_cache_destroy(xfrm6_tunnel_spi_kmem);
|
2010-01-25 17:28:21 +07:00
|
|
|
return rv;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit xfrm6_tunnel_fini(void)
|
|
|
|
{
|
2007-02-14 03:55:55 +07:00
|
|
|
xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
|
|
|
|
xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
|
2006-07-25 03:49:06 +07:00
|
|
|
xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
|
2010-02-16 16:05:04 +07:00
|
|
|
unregister_pernet_subsys(&xfrm6_tunnel_net_ops);
|
|
|
|
kmem_cache_destroy(xfrm6_tunnel_spi_kmem);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(xfrm6_tunnel_init);
|
|
|
|
module_exit(xfrm6_tunnel_fini);
|
|
|
|
MODULE_LICENSE("GPL");
|
2007-06-27 13:57:49 +07:00
|
|
|
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_IPV6);
|