2007-11-13 23:56:23 -07:00
|
|
|
/*
|
|
|
|
* IPv6 Address Label subsystem
|
|
|
|
* for the IPv6 "Default" Source Address Selection
|
|
|
|
*
|
|
|
|
* Copyright (C)2007 USAGI/WIDE Project
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* Author:
|
|
|
|
* YOSHIFUJI Hideaki @ USAGI/WIDE Project <yoshfuji@linux-ipv6.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/rcupdate.h>
|
|
|
|
#include <linux/in6.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 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2007-11-13 23:56:23 -07:00
|
|
|
#include <net/addrconf.h>
|
|
|
|
#include <linux/if_addrlabel.h>
|
|
|
|
#include <linux/netlink.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
#define ADDRLABEL(x...) printk(x)
|
|
|
|
#else
|
|
|
|
#define ADDRLABEL(x...) do { ; } while(0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Policy Table
|
|
|
|
*/
|
|
|
|
struct ip6addrlbl_entry
|
|
|
|
{
|
2008-05-28 06:51:24 -06:00
|
|
|
#ifdef CONFIG_NET_NS
|
|
|
|
struct net *lbl_net;
|
|
|
|
#endif
|
2007-11-13 23:56:23 -07:00
|
|
|
struct in6_addr prefix;
|
|
|
|
int prefixlen;
|
|
|
|
int ifindex;
|
|
|
|
int addrtype;
|
|
|
|
u32 label;
|
|
|
|
struct hlist_node list;
|
|
|
|
atomic_t refcnt;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct ip6addrlbl_table
|
|
|
|
{
|
|
|
|
struct hlist_head head;
|
|
|
|
spinlock_t lock;
|
|
|
|
u32 seq;
|
|
|
|
} ip6addrlbl_table;
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
static inline
|
|
|
|
struct net *ip6addrlbl_net(const struct ip6addrlbl_entry *lbl)
|
|
|
|
{
|
2010-06-01 00:51:19 -06:00
|
|
|
return read_pnet(&lbl->lbl_net);
|
2008-05-28 06:51:24 -06:00
|
|
|
}
|
|
|
|
|
2007-11-13 23:56:23 -07:00
|
|
|
/*
|
2012-09-10 12:16:49 -06:00
|
|
|
* Default policy table (RFC6724 + extensions)
|
2007-11-13 23:56:23 -07:00
|
|
|
*
|
|
|
|
* prefix addr_type label
|
|
|
|
* -------------------------------------------------------------------------
|
|
|
|
* ::1/128 LOOPBACK 0
|
|
|
|
* ::/0 N/A 1
|
|
|
|
* 2002::/16 N/A 2
|
|
|
|
* ::/96 COMPATv4 3
|
|
|
|
* ::ffff:0:0/96 V4MAPPED 4
|
|
|
|
* fc00::/7 N/A 5 ULA (RFC 4193)
|
|
|
|
* 2001::/32 N/A 6 Teredo (RFC 4380)
|
2008-02-28 21:55:02 -07:00
|
|
|
* 2001:10::/28 N/A 7 ORCHID (RFC 4843)
|
2012-09-10 12:16:49 -06:00
|
|
|
* fec0::/10 N/A 11 Site-local
|
|
|
|
* (deprecated by RFC3879)
|
|
|
|
* 3ffe::/16 N/A 12 6bone
|
2007-11-13 23:56:23 -07:00
|
|
|
*
|
|
|
|
* Note: 0xffffffff is used if we do not have any policies.
|
2012-09-10 12:16:49 -06:00
|
|
|
* Note: Labels for ULA and 6to4 are different from labels listed in RFC6724.
|
2007-11-13 23:56:23 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
#define IPV6_ADDR_LABEL_DEFAULT 0xffffffffUL
|
|
|
|
|
2012-10-04 18:12:11 -06:00
|
|
|
static const __net_initconst struct ip6addrlbl_init_table
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
const struct in6_addr *prefix;
|
|
|
|
int prefixlen;
|
|
|
|
u32 label;
|
|
|
|
} ip6addrlbl_init_table[] = {
|
|
|
|
{ /* ::/0 */
|
|
|
|
.prefix = &in6addr_any,
|
|
|
|
.label = 1,
|
|
|
|
},{ /* fc00::/7 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0xfc }}},
|
|
|
|
.prefixlen = 7,
|
|
|
|
.label = 5,
|
2012-09-10 12:16:49 -06:00
|
|
|
},{ /* fec0::/10 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0xfe, 0xc0 }}},
|
|
|
|
.prefixlen = 10,
|
|
|
|
.label = 11,
|
2007-11-13 23:56:23 -07:00
|
|
|
},{ /* 2002::/16 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0x20, 0x02 }}},
|
|
|
|
.prefixlen = 16,
|
|
|
|
.label = 2,
|
2012-09-10 12:16:49 -06:00
|
|
|
},{ /* 3ffe::/16 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0x3f, 0xfe }}},
|
|
|
|
.prefixlen = 16,
|
|
|
|
.label = 12,
|
2007-11-13 23:56:23 -07:00
|
|
|
},{ /* 2001::/32 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0x20, 0x01 }}},
|
|
|
|
.prefixlen = 32,
|
|
|
|
.label = 6,
|
2008-02-28 21:55:02 -07:00
|
|
|
},{ /* 2001:10::/28 */
|
|
|
|
.prefix = &(struct in6_addr){{{ 0x20, 0x01, 0x00, 0x10 }}},
|
|
|
|
.prefixlen = 28,
|
|
|
|
.label = 7,
|
2007-11-13 23:56:23 -07:00
|
|
|
},{ /* ::ffff:0:0 */
|
|
|
|
.prefix = &(struct in6_addr){{{ [10] = 0xff, [11] = 0xff }}},
|
|
|
|
.prefixlen = 96,
|
|
|
|
.label = 4,
|
|
|
|
},{ /* ::/96 */
|
|
|
|
.prefix = &in6addr_any,
|
|
|
|
.prefixlen = 96,
|
|
|
|
.label = 3,
|
|
|
|
},{ /* ::1/128 */
|
|
|
|
.prefix = &in6addr_loopback,
|
|
|
|
.prefixlen = 128,
|
|
|
|
.label = 0,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Object management */
|
|
|
|
static inline void ip6addrlbl_free(struct ip6addrlbl_entry *p)
|
|
|
|
{
|
2008-05-28 06:51:24 -06:00
|
|
|
#ifdef CONFIG_NET_NS
|
|
|
|
release_net(p->lbl_net);
|
|
|
|
#endif
|
2007-11-13 23:56:23 -07:00
|
|
|
kfree(p);
|
|
|
|
}
|
|
|
|
|
2008-01-28 16:46:02 -07:00
|
|
|
static void ip6addrlbl_free_rcu(struct rcu_head *h)
|
|
|
|
{
|
|
|
|
ip6addrlbl_free(container_of(h, struct ip6addrlbl_entry, rcu));
|
|
|
|
}
|
|
|
|
|
2012-05-18 12:57:34 -06:00
|
|
|
static bool ip6addrlbl_hold(struct ip6addrlbl_entry *p)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
return atomic_inc_not_zero(&p->refcnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void ip6addrlbl_put(struct ip6addrlbl_entry *p)
|
|
|
|
{
|
|
|
|
if (atomic_dec_and_test(&p->refcnt))
|
2008-01-28 16:46:02 -07:00
|
|
|
call_rcu(&p->rcu, ip6addrlbl_free_rcu);
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find label */
|
2012-05-18 12:57:34 -06:00
|
|
|
static bool __ip6addrlbl_match(struct net *net,
|
|
|
|
const struct ip6addrlbl_entry *p,
|
|
|
|
const struct in6_addr *addr,
|
|
|
|
int addrtype, int ifindex)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
2008-05-28 06:51:24 -06:00
|
|
|
if (!net_eq(ip6addrlbl_net(p), net))
|
2012-05-18 12:57:34 -06:00
|
|
|
return false;
|
2007-11-13 23:56:23 -07:00
|
|
|
if (p->ifindex && p->ifindex != ifindex)
|
2012-05-18 12:57:34 -06:00
|
|
|
return false;
|
2007-11-13 23:56:23 -07:00
|
|
|
if (p->addrtype && p->addrtype != addrtype)
|
2012-05-18 12:57:34 -06:00
|
|
|
return false;
|
2007-11-13 23:56:23 -07:00
|
|
|
if (!ipv6_prefix_equal(addr, &p->prefix, p->prefixlen))
|
2012-05-18 12:57:34 -06:00
|
|
|
return false;
|
|
|
|
return true;
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
static struct ip6addrlbl_entry *__ipv6_addr_label(struct net *net,
|
|
|
|
const struct in6_addr *addr,
|
2007-11-13 23:56:23 -07:00
|
|
|
int type, int ifindex)
|
|
|
|
{
|
|
|
|
struct ip6addrlbl_entry *p;
|
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-27 18:06:00 -07:00
|
|
|
hlist_for_each_entry_rcu(p, &ip6addrlbl_table.head, list) {
|
2008-05-28 06:51:24 -06:00
|
|
|
if (__ip6addrlbl_match(net, p, addr, type, ifindex))
|
2007-11-13 23:56:23 -07:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
u32 ipv6_addr_label(struct net *net,
|
|
|
|
const struct in6_addr *addr, int type, int ifindex)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
u32 label;
|
|
|
|
struct ip6addrlbl_entry *p;
|
|
|
|
|
|
|
|
type &= IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2008-05-28 06:51:24 -06:00
|
|
|
p = __ipv6_addr_label(net, addr, type, ifindex);
|
2007-11-13 23:56:23 -07:00
|
|
|
label = p ? p->label : IPV6_ADDR_LABEL_DEFAULT;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2008-10-29 13:52:50 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(addr=%pI6, type=%d, ifindex=%d) => %08x\n",
|
2008-10-28 17:09:23 -06:00
|
|
|
__func__, addr, type, ifindex, label);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
|
|
|
return label;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate one entry */
|
2008-05-28 06:51:24 -06:00
|
|
|
static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
|
|
|
|
const struct in6_addr *prefix,
|
2008-01-22 01:12:50 -07:00
|
|
|
int prefixlen, int ifindex,
|
|
|
|
u32 label)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
struct ip6addrlbl_entry *newp;
|
|
|
|
int addrtype;
|
|
|
|
|
2008-10-29 13:52:50 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u)\n",
|
2008-10-28 17:09:23 -06:00
|
|
|
__func__, prefix, prefixlen, ifindex, (unsigned int)label);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
|
|
|
addrtype = ipv6_addr_type(prefix) & (IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK);
|
|
|
|
|
|
|
|
switch (addrtype) {
|
|
|
|
case IPV6_ADDR_MAPPED:
|
|
|
|
if (prefixlen > 96)
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
if (prefixlen < 96)
|
|
|
|
addrtype = 0;
|
|
|
|
break;
|
|
|
|
case IPV6_ADDR_COMPATv4:
|
|
|
|
if (prefixlen != 96)
|
|
|
|
addrtype = 0;
|
|
|
|
break;
|
|
|
|
case IPV6_ADDR_LOOPBACK:
|
|
|
|
if (prefixlen != 128)
|
|
|
|
addrtype = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
newp = kmalloc(sizeof(*newp), GFP_KERNEL);
|
|
|
|
if (!newp)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
|
|
ipv6_addr_prefix(&newp->prefix, prefix, prefixlen);
|
|
|
|
newp->prefixlen = prefixlen;
|
|
|
|
newp->ifindex = ifindex;
|
|
|
|
newp->addrtype = addrtype;
|
|
|
|
newp->label = label;
|
|
|
|
INIT_HLIST_NODE(&newp->list);
|
2008-05-28 06:51:24 -06:00
|
|
|
#ifdef CONFIG_NET_NS
|
|
|
|
newp->lbl_net = hold_net(net);
|
|
|
|
#endif
|
2007-11-13 23:56:23 -07:00
|
|
|
atomic_set(&newp->refcnt, 1);
|
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add a label */
|
2008-01-22 01:12:50 -07:00
|
|
|
static int __ip6addrlbl_add(struct ip6addrlbl_entry *newp, int replace)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
2013-09-02 18:13:31 -06:00
|
|
|
struct hlist_node *n;
|
|
|
|
struct ip6addrlbl_entry *last = NULL, *p = NULL;
|
2007-11-13 23:56:23 -07:00
|
|
|
int ret = 0;
|
|
|
|
|
2013-09-02 18:13:31 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(newp=%p, replace=%d)\n", __func__, newp,
|
|
|
|
replace);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
2013-09-02 18:13:31 -06:00
|
|
|
hlist_for_each_entry_safe(p, n, &ip6addrlbl_table.head, list) {
|
|
|
|
if (p->prefixlen == newp->prefixlen &&
|
|
|
|
net_eq(ip6addrlbl_net(p), ip6addrlbl_net(newp)) &&
|
|
|
|
p->ifindex == newp->ifindex &&
|
|
|
|
ipv6_addr_equal(&p->prefix, &newp->prefix)) {
|
|
|
|
if (!replace) {
|
|
|
|
ret = -EEXIST;
|
2007-11-13 23:56:23 -07:00
|
|
|
goto out;
|
|
|
|
}
|
2013-09-02 18:13:31 -06:00
|
|
|
hlist_replace_rcu(&p->list, &newp->list);
|
|
|
|
ip6addrlbl_put(p);
|
|
|
|
goto out;
|
|
|
|
} else if ((p->prefixlen == newp->prefixlen && !p->ifindex) ||
|
|
|
|
(p->prefixlen < newp->prefixlen)) {
|
|
|
|
hlist_add_before_rcu(&newp->list, &p->list);
|
|
|
|
goto out;
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
2013-09-02 18:13:31 -06:00
|
|
|
last = p;
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
2013-09-02 18:13:31 -06:00
|
|
|
if (last)
|
|
|
|
hlist_add_after_rcu(&last->list, &newp->list);
|
|
|
|
else
|
|
|
|
hlist_add_head_rcu(&newp->list, &ip6addrlbl_table.head);
|
2007-11-13 23:56:23 -07:00
|
|
|
out:
|
|
|
|
if (!ret)
|
|
|
|
ip6addrlbl_table.seq++;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add a label */
|
2008-05-28 06:51:24 -06:00
|
|
|
static int ip6addrlbl_add(struct net *net,
|
|
|
|
const struct in6_addr *prefix, int prefixlen,
|
2008-01-22 01:12:50 -07:00
|
|
|
int ifindex, u32 label, int replace)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
struct ip6addrlbl_entry *newp;
|
|
|
|
int ret = 0;
|
|
|
|
|
2008-10-29 13:52:50 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",
|
2008-10-28 17:09:23 -06:00
|
|
|
__func__, prefix, prefixlen, ifindex, (unsigned int)label,
|
|
|
|
replace);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
newp = ip6addrlbl_alloc(net, prefix, prefixlen, ifindex, label);
|
2007-11-13 23:56:23 -07:00
|
|
|
if (IS_ERR(newp))
|
|
|
|
return PTR_ERR(newp);
|
|
|
|
spin_lock(&ip6addrlbl_table.lock);
|
|
|
|
ret = __ip6addrlbl_add(newp, replace);
|
|
|
|
spin_unlock(&ip6addrlbl_table.lock);
|
|
|
|
if (ret)
|
|
|
|
ip6addrlbl_free(newp);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove a label */
|
2008-05-28 06:51:24 -06:00
|
|
|
static int __ip6addrlbl_del(struct net *net,
|
|
|
|
const struct in6_addr *prefix, int prefixlen,
|
2008-01-22 01:12:50 -07:00
|
|
|
int ifindex)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
struct ip6addrlbl_entry *p = NULL;
|
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-27 18:06:00 -07:00
|
|
|
struct hlist_node *n;
|
2007-11-13 23:56:23 -07:00
|
|
|
int ret = -ESRCH;
|
|
|
|
|
2008-10-29 13:52:50 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",
|
2008-10-28 17:09:23 -06:00
|
|
|
__func__, prefix, prefixlen, ifindex);
|
2007-11-13 23:56:23 -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-27 18:06:00 -07:00
|
|
|
hlist_for_each_entry_safe(p, n, &ip6addrlbl_table.head, list) {
|
2007-11-13 23:56:23 -07:00
|
|
|
if (p->prefixlen == prefixlen &&
|
2008-05-28 06:51:24 -06:00
|
|
|
net_eq(ip6addrlbl_net(p), net) &&
|
2007-11-13 23:56:23 -07:00
|
|
|
p->ifindex == ifindex &&
|
|
|
|
ipv6_addr_equal(&p->prefix, prefix)) {
|
|
|
|
hlist_del_rcu(&p->list);
|
|
|
|
ip6addrlbl_put(p);
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
static int ip6addrlbl_del(struct net *net,
|
|
|
|
const struct in6_addr *prefix, int prefixlen,
|
2008-01-22 01:12:50 -07:00
|
|
|
int ifindex)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
struct in6_addr prefix_buf;
|
|
|
|
int ret;
|
|
|
|
|
2008-10-29 13:52:50 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",
|
2008-10-28 17:09:23 -06:00
|
|
|
__func__, prefix, prefixlen, ifindex);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
|
|
|
ipv6_addr_prefix(&prefix_buf, prefix, prefixlen);
|
|
|
|
spin_lock(&ip6addrlbl_table.lock);
|
2008-05-28 06:51:24 -06:00
|
|
|
ret = __ip6addrlbl_del(net, &prefix_buf, prefixlen, ifindex);
|
2007-11-13 23:56:23 -07:00
|
|
|
spin_unlock(&ip6addrlbl_table.lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add default label */
|
2008-05-28 06:51:24 -06:00
|
|
|
static int __net_init ip6addrlbl_net_init(struct net *net)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
int i;
|
|
|
|
|
2012-05-15 08:11:53 -06:00
|
|
|
ADDRLABEL(KERN_DEBUG "%s\n", __func__);
|
2007-11-13 23:56:23 -07:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ip6addrlbl_init_table); i++) {
|
2008-05-28 06:51:24 -06:00
|
|
|
int ret = ip6addrlbl_add(net,
|
|
|
|
ip6addrlbl_init_table[i].prefix,
|
2007-11-13 23:56:23 -07:00
|
|
|
ip6addrlbl_init_table[i].prefixlen,
|
|
|
|
0,
|
|
|
|
ip6addrlbl_init_table[i].label, 0);
|
|
|
|
/* XXX: should we free all rules when we catch an error? */
|
|
|
|
if (ret && (!err || err != -ENOMEM))
|
|
|
|
err = ret;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
static void __net_exit ip6addrlbl_net_exit(struct net *net)
|
|
|
|
{
|
|
|
|
struct ip6addrlbl_entry *p = NULL;
|
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-27 18:06:00 -07:00
|
|
|
struct hlist_node *n;
|
2008-05-28 06:51:24 -06:00
|
|
|
|
|
|
|
/* Remove all labels belonging to the exiting net */
|
|
|
|
spin_lock(&ip6addrlbl_table.lock);
|
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-27 18:06:00 -07:00
|
|
|
hlist_for_each_entry_safe(p, n, &ip6addrlbl_table.head, list) {
|
2008-05-28 06:51:24 -06:00
|
|
|
if (net_eq(ip6addrlbl_net(p), net)) {
|
|
|
|
hlist_del_rcu(&p->list);
|
|
|
|
ip6addrlbl_put(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&ip6addrlbl_table.lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations ipv6_addr_label_ops = {
|
|
|
|
.init = ip6addrlbl_net_init,
|
|
|
|
.exit = ip6addrlbl_net_exit,
|
|
|
|
};
|
|
|
|
|
2007-11-13 23:56:23 -07:00
|
|
|
int __init ipv6_addr_label_init(void)
|
|
|
|
{
|
|
|
|
spin_lock_init(&ip6addrlbl_table.lock);
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
return register_pernet_subsys(&ipv6_addr_label_ops);
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
|
|
|
|
2010-09-24 03:55:52 -06:00
|
|
|
void ipv6_addr_label_cleanup(void)
|
|
|
|
{
|
|
|
|
unregister_pernet_subsys(&ipv6_addr_label_ops);
|
|
|
|
}
|
|
|
|
|
2007-11-13 23:56:23 -07:00
|
|
|
static const struct nla_policy ifal_policy[IFAL_MAX+1] = {
|
|
|
|
[IFAL_ADDRESS] = { .len = sizeof(struct in6_addr), },
|
|
|
|
[IFAL_LABEL] = { .len = sizeof(u32), },
|
|
|
|
};
|
|
|
|
|
2013-03-21 01:45:29 -06:00
|
|
|
static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
2008-03-25 11:26:21 -06:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2007-11-13 23:56:23 -07:00
|
|
|
struct ifaddrlblmsg *ifal;
|
|
|
|
struct nlattr *tb[IFAL_MAX+1];
|
|
|
|
struct in6_addr *pfx;
|
|
|
|
u32 label;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
ifal = nlmsg_data(nlh);
|
|
|
|
|
|
|
|
if (ifal->ifal_family != AF_INET6 ||
|
|
|
|
ifal->ifal_prefixlen > 128)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!tb[IFAL_ADDRESS])
|
|
|
|
return -EINVAL;
|
|
|
|
pfx = nla_data(tb[IFAL_ADDRESS]);
|
|
|
|
|
|
|
|
if (!tb[IFAL_LABEL])
|
|
|
|
return -EINVAL;
|
|
|
|
label = nla_get_u32(tb[IFAL_LABEL]);
|
|
|
|
if (label == IPV6_ADDR_LABEL_DEFAULT)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch(nlh->nlmsg_type) {
|
|
|
|
case RTM_NEWADDRLABEL:
|
2010-05-07 05:31:33 -06:00
|
|
|
if (ifal->ifal_index &&
|
|
|
|
!__dev_get_by_index(net, ifal->ifal_index))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-05-28 06:51:24 -06:00
|
|
|
err = ip6addrlbl_add(net, pfx, ifal->ifal_prefixlen,
|
2007-11-13 23:56:23 -07:00
|
|
|
ifal->ifal_index, label,
|
|
|
|
nlh->nlmsg_flags & NLM_F_REPLACE);
|
|
|
|
break;
|
|
|
|
case RTM_DELADDRLABEL:
|
2008-05-28 06:51:24 -06:00
|
|
|
err = ip6addrlbl_del(net, pfx, ifal->ifal_prefixlen,
|
2007-11-13 23:56:23 -07:00
|
|
|
ifal->ifal_index);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
err = -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-05-18 12:57:34 -06:00
|
|
|
static void ip6addrlbl_putmsg(struct nlmsghdr *nlh,
|
|
|
|
int prefixlen, int ifindex, u32 lseq)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
|
|
|
struct ifaddrlblmsg *ifal = nlmsg_data(nlh);
|
|
|
|
ifal->ifal_family = AF_INET6;
|
|
|
|
ifal->ifal_prefixlen = prefixlen;
|
|
|
|
ifal->ifal_flags = 0;
|
|
|
|
ifal->ifal_index = ifindex;
|
|
|
|
ifal->ifal_seq = lseq;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int ip6addrlbl_fill(struct sk_buff *skb,
|
|
|
|
struct ip6addrlbl_entry *p,
|
|
|
|
u32 lseq,
|
2012-09-07 14:12:54 -06:00
|
|
|
u32 portid, u32 seq, int event,
|
2007-11-13 23:56:23 -07:00
|
|
|
unsigned int flags)
|
|
|
|
{
|
2012-09-07 14:12:54 -06:00
|
|
|
struct nlmsghdr *nlh = nlmsg_put(skb, portid, seq, event,
|
2007-11-13 23:56:23 -07:00
|
|
|
sizeof(struct ifaddrlblmsg), flags);
|
|
|
|
if (!nlh)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
ip6addrlbl_putmsg(nlh, p->prefixlen, p->ifindex, lseq);
|
|
|
|
|
|
|
|
if (nla_put(skb, IFAL_ADDRESS, 16, &p->prefix) < 0 ||
|
|
|
|
nla_put_u32(skb, IFAL_LABEL, p->label) < 0) {
|
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nlmsg_end(skb, nlh);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ip6addrlbl_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
|
|
|
{
|
2008-03-25 11:26:21 -06:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2007-11-13 23:56:23 -07:00
|
|
|
struct ip6addrlbl_entry *p;
|
|
|
|
int idx = 0, s_idx = cb->args[0];
|
|
|
|
int err;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
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-27 18:06:00 -07:00
|
|
|
hlist_for_each_entry_rcu(p, &ip6addrlbl_table.head, list) {
|
2008-05-28 06:51:24 -06:00
|
|
|
if (idx >= s_idx &&
|
|
|
|
net_eq(ip6addrlbl_net(p), net)) {
|
2007-11-13 23:56:23 -07:00
|
|
|
if ((err = ip6addrlbl_fill(skb, p,
|
|
|
|
ip6addrlbl_table.seq,
|
2012-09-07 14:12:54 -06:00
|
|
|
NETLINK_CB(cb->skb).portid,
|
2007-11-13 23:56:23 -07:00
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
RTM_NEWADDRLABEL,
|
|
|
|
NLM_F_MULTI)) <= 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
idx++;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
cb->args[0] = idx;
|
|
|
|
return skb->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ip6addrlbl_msgsize(void)
|
|
|
|
{
|
2010-09-22 14:43:57 -06:00
|
|
|
return NLMSG_ALIGN(sizeof(struct ifaddrlblmsg))
|
2007-11-13 23:56:23 -07:00
|
|
|
+ nla_total_size(16) /* IFAL_ADDRESS */
|
2010-09-22 14:43:57 -06:00
|
|
|
+ nla_total_size(4); /* IFAL_LABEL */
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
|
|
|
|
2013-03-21 01:45:29 -06:00
|
|
|
static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr* nlh)
|
2007-11-13 23:56:23 -07:00
|
|
|
{
|
2008-03-25 11:26:21 -06:00
|
|
|
struct net *net = sock_net(in_skb->sk);
|
2007-11-13 23:56:23 -07:00
|
|
|
struct ifaddrlblmsg *ifal;
|
|
|
|
struct nlattr *tb[IFAL_MAX+1];
|
|
|
|
struct in6_addr *addr;
|
|
|
|
u32 lseq;
|
|
|
|
int err = 0;
|
|
|
|
struct ip6addrlbl_entry *p;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
ifal = nlmsg_data(nlh);
|
|
|
|
|
|
|
|
if (ifal->ifal_family != AF_INET6 ||
|
|
|
|
ifal->ifal_prefixlen != 128)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (ifal->ifal_index &&
|
2008-05-28 06:51:24 -06:00
|
|
|
!__dev_get_by_index(net, ifal->ifal_index))
|
2007-11-13 23:56:23 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!tb[IFAL_ADDRESS])
|
|
|
|
return -EINVAL;
|
|
|
|
addr = nla_data(tb[IFAL_ADDRESS]);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2008-05-28 06:51:24 -06:00
|
|
|
p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal->ifal_index);
|
2007-11-13 23:56:23 -07:00
|
|
|
if (p && ip6addrlbl_hold(p))
|
|
|
|
p = NULL;
|
|
|
|
lseq = ip6addrlbl_table.seq;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (!p) {
|
|
|
|
err = -ESRCH;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(skb = nlmsg_new(ip6addrlbl_msgsize(), GFP_KERNEL))) {
|
|
|
|
ip6addrlbl_put(p);
|
|
|
|
return -ENOBUFS;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = ip6addrlbl_fill(skb, p, lseq,
|
2012-09-07 14:12:54 -06:00
|
|
|
NETLINK_CB(in_skb).portid, nlh->nlmsg_seq,
|
2007-11-13 23:56:23 -07:00
|
|
|
RTM_NEWADDRLABEL, 0);
|
|
|
|
|
|
|
|
ip6addrlbl_put(p);
|
|
|
|
|
|
|
|
if (err < 0) {
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-09-07 14:12:54 -06:00
|
|
|
err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);
|
2007-11-13 23:56:23 -07:00
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init ipv6_addr_label_rtnl_register(void)
|
|
|
|
{
|
2011-06-09 19:27:09 -06:00
|
|
|
__rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel,
|
|
|
|
NULL, NULL);
|
|
|
|
__rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel,
|
|
|
|
NULL, NULL);
|
|
|
|
__rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get,
|
|
|
|
ip6addrlbl_dump, NULL);
|
2007-11-13 23:56:23 -07:00
|
|
|
}
|
|
|
|
|