2008-02-23 17:17:14 +03:00
|
|
|
/*
|
2009-11-10 02:46:58 +03:00
|
|
|
* Copyright (c) 2008, 2009 open80211s Ltd.
|
2008-02-23 17:17:14 +03:00
|
|
|
* Author: Luis Carlos Cobo <luisca@cozybit.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/random.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 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2008-02-23 17:17:14 +03:00
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <net/mac80211.h>
|
2011-09-08 04:49:52 +04:00
|
|
|
#include "wme.h"
|
2008-02-23 17:17:14 +03:00
|
|
|
#include "ieee80211_i.h"
|
|
|
|
#include "mesh.h"
|
|
|
|
|
|
|
|
/* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
|
|
|
|
#define INIT_PATHS_SIZE_ORDER 2
|
|
|
|
|
|
|
|
/* Keep the mean chain length below this constant */
|
|
|
|
#define MEAN_CHAIN_LEN 2
|
|
|
|
|
2013-02-15 17:40:31 +04:00
|
|
|
static inline bool mpath_expired(struct mesh_path *mpath)
|
|
|
|
{
|
|
|
|
return (mpath->flags & MESH_PATH_ACTIVE) &&
|
|
|
|
time_after(jiffies, mpath->exp_time) &&
|
|
|
|
!(mpath->flags & MESH_PATH_FIXED);
|
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
|
|
|
|
struct mpath_node {
|
|
|
|
struct hlist_node list;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
/* This indirection allows two different tables to point to the same
|
|
|
|
* mesh_path structure, useful when resizing
|
|
|
|
*/
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
};
|
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
static struct mesh_table __rcu *mesh_paths;
|
|
|
|
static struct mesh_table __rcu *mpp_paths; /* Store paths for MPP&MAP */
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2009-08-07 18:17:38 +04:00
|
|
|
int mesh_paths_generation;
|
2011-05-12 15:38:50 +04:00
|
|
|
|
|
|
|
/* This lock will have the grow table function as writer and add / delete nodes
|
2011-08-30 00:23:09 +04:00
|
|
|
* as readers. RCU provides sufficient protection only when reading the table
|
|
|
|
* (i.e. doing lookups). Adding or adding or removing nodes requires we take
|
|
|
|
* the read lock or we risk operating on an old table. The write lock is only
|
|
|
|
* needed when modifying the number of buckets a table.
|
2011-05-12 15:38:50 +04:00
|
|
|
*/
|
|
|
|
static DEFINE_RWLOCK(pathtbl_resize_lock);
|
|
|
|
|
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
static inline struct mesh_table *resize_dereference_mesh_paths(void)
|
|
|
|
{
|
|
|
|
return rcu_dereference_protected(mesh_paths,
|
|
|
|
lockdep_is_held(&pathtbl_resize_lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct mesh_table *resize_dereference_mpp_paths(void)
|
|
|
|
{
|
|
|
|
return rcu_dereference_protected(mpp_paths,
|
|
|
|
lockdep_is_held(&pathtbl_resize_lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* CAREFUL -- "tbl" must not be an expression,
|
|
|
|
* in particular not an rcu_dereference(), since
|
|
|
|
* it's used twice. So it is illegal to do
|
|
|
|
* for_each_mesh_entry(rcu_dereference(...), ...)
|
|
|
|
*/
|
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 05:06:00 +04:00
|
|
|
#define for_each_mesh_entry(tbl, node, i) \
|
2011-05-14 13:56:16 +04:00
|
|
|
for (i = 0; i <= tbl->hash_mask; i++) \
|
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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(node, &tbl->hash_buckets[i], list)
|
2011-05-14 13:56:16 +04:00
|
|
|
|
|
|
|
|
2011-05-12 15:38:50 +04:00
|
|
|
static struct mesh_table *mesh_table_alloc(int size_order)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct mesh_table *newtbl;
|
|
|
|
|
2011-05-18 03:13:34 +04:00
|
|
|
newtbl = kmalloc(sizeof(struct mesh_table), GFP_ATOMIC);
|
2011-05-12 15:38:50 +04:00
|
|
|
if (!newtbl)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
newtbl->hash_buckets = kzalloc(sizeof(struct hlist_head) *
|
2011-05-18 03:13:34 +04:00
|
|
|
(1 << size_order), GFP_ATOMIC);
|
2011-05-12 15:38:50 +04:00
|
|
|
|
|
|
|
if (!newtbl->hash_buckets) {
|
|
|
|
kfree(newtbl);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
newtbl->hashwlock = kmalloc(sizeof(spinlock_t) *
|
2011-05-18 03:13:34 +04:00
|
|
|
(1 << size_order), GFP_ATOMIC);
|
2011-05-12 15:38:50 +04:00
|
|
|
if (!newtbl->hashwlock) {
|
|
|
|
kfree(newtbl->hash_buckets);
|
|
|
|
kfree(newtbl);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
newtbl->size_order = size_order;
|
|
|
|
newtbl->hash_mask = (1 << size_order) - 1;
|
|
|
|
atomic_set(&newtbl->entries, 0);
|
|
|
|
get_random_bytes(&newtbl->hash_rnd,
|
|
|
|
sizeof(newtbl->hash_rnd));
|
|
|
|
for (i = 0; i <= newtbl->hash_mask; i++)
|
|
|
|
spin_lock_init(&newtbl->hashwlock[i]);
|
2011-08-10 03:45:08 +04:00
|
|
|
spin_lock_init(&newtbl->gates_lock);
|
2011-05-12 15:38:50 +04:00
|
|
|
|
|
|
|
return newtbl;
|
|
|
|
}
|
|
|
|
|
2009-08-10 23:15:52 +04:00
|
|
|
static void __mesh_table_free(struct mesh_table *tbl)
|
|
|
|
{
|
|
|
|
kfree(tbl->hash_buckets);
|
|
|
|
kfree(tbl->hashwlock);
|
|
|
|
kfree(tbl);
|
|
|
|
}
|
|
|
|
|
2011-05-12 15:38:50 +04:00
|
|
|
static void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
|
2009-08-10 23:15:52 +04:00
|
|
|
{
|
|
|
|
struct hlist_head *mesh_hash;
|
|
|
|
struct hlist_node *p, *q;
|
2011-08-10 03:45:08 +04:00
|
|
|
struct mpath_node *gate;
|
2009-08-10 23:15:52 +04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
mesh_hash = tbl->hash_buckets;
|
|
|
|
for (i = 0; i <= tbl->hash_mask; i++) {
|
2011-05-04 03:57:16 +04:00
|
|
|
spin_lock_bh(&tbl->hashwlock[i]);
|
2009-08-10 23:15:52 +04:00
|
|
|
hlist_for_each_safe(p, q, &mesh_hash[i]) {
|
|
|
|
tbl->free_node(p, free_leafs);
|
|
|
|
atomic_dec(&tbl->entries);
|
|
|
|
}
|
2011-05-04 03:57:16 +04:00
|
|
|
spin_unlock_bh(&tbl->hashwlock[i]);
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
2011-08-10 03:45:08 +04:00
|
|
|
if (free_leafs) {
|
|
|
|
spin_lock_bh(&tbl->gates_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-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_safe(gate, q,
|
2011-08-10 03:45:08 +04:00
|
|
|
tbl->known_gates, list) {
|
|
|
|
hlist_del(&gate->list);
|
|
|
|
kfree(gate);
|
|
|
|
}
|
|
|
|
kfree(tbl->known_gates);
|
|
|
|
spin_unlock_bh(&tbl->gates_lock);
|
|
|
|
}
|
|
|
|
|
2009-08-10 23:15:52 +04:00
|
|
|
__mesh_table_free(tbl);
|
|
|
|
}
|
|
|
|
|
2011-04-13 22:10:28 +04:00
|
|
|
static int mesh_table_grow(struct mesh_table *oldtbl,
|
2011-05-12 15:38:50 +04:00
|
|
|
struct mesh_table *newtbl)
|
2009-08-10 23:15:52 +04:00
|
|
|
{
|
|
|
|
struct hlist_head *oldhash;
|
|
|
|
struct hlist_node *p, *q;
|
|
|
|
int i;
|
|
|
|
|
2011-04-13 22:10:28 +04:00
|
|
|
if (atomic_read(&oldtbl->entries)
|
|
|
|
< oldtbl->mean_chain_len * (oldtbl->hash_mask + 1))
|
|
|
|
return -EAGAIN;
|
2009-08-10 23:15:52 +04:00
|
|
|
|
2011-04-13 22:10:28 +04:00
|
|
|
newtbl->free_node = oldtbl->free_node;
|
|
|
|
newtbl->mean_chain_len = oldtbl->mean_chain_len;
|
|
|
|
newtbl->copy_node = oldtbl->copy_node;
|
2011-08-10 03:45:08 +04:00
|
|
|
newtbl->known_gates = oldtbl->known_gates;
|
2011-04-13 22:10:28 +04:00
|
|
|
atomic_set(&newtbl->entries, atomic_read(&oldtbl->entries));
|
2009-08-10 23:15:52 +04:00
|
|
|
|
2011-04-13 22:10:28 +04:00
|
|
|
oldhash = oldtbl->hash_buckets;
|
|
|
|
for (i = 0; i <= oldtbl->hash_mask; i++)
|
2009-08-10 23:15:52 +04:00
|
|
|
hlist_for_each(p, &oldhash[i])
|
2011-04-13 22:10:28 +04:00
|
|
|
if (oldtbl->copy_node(p, newtbl) < 0)
|
2009-08-10 23:15:52 +04:00
|
|
|
goto errcopy;
|
|
|
|
|
2011-04-13 22:10:28 +04:00
|
|
|
return 0;
|
2009-08-10 23:15:52 +04:00
|
|
|
|
|
|
|
errcopy:
|
|
|
|
for (i = 0; i <= newtbl->hash_mask; i++) {
|
|
|
|
hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
|
2011-04-13 22:10:28 +04:00
|
|
|
oldtbl->free_node(p, 0);
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
2011-04-13 22:10:28 +04:00
|
|
|
return -ENOMEM;
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
|
|
|
|
2013-02-12 19:43:19 +04:00
|
|
|
static u32 mesh_table_hash(const u8 *addr, struct ieee80211_sub_if_data *sdata,
|
2011-05-12 15:38:50 +04:00
|
|
|
struct mesh_table *tbl)
|
|
|
|
{
|
|
|
|
/* Use last four bytes of hw addr and interface index as hash index */
|
2013-02-15 17:40:31 +04:00
|
|
|
return jhash_2words(*(u32 *)(addr+2), sdata->dev->ifindex,
|
|
|
|
tbl->hash_rnd) & tbl->hash_mask;
|
2011-05-12 15:38:50 +04:00
|
|
|
}
|
2009-08-07 18:17:38 +04:00
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* mesh_path_assign_nexthop - update mesh path next hop
|
|
|
|
*
|
|
|
|
* @mpath: mesh path to update
|
|
|
|
* @sta: next hop to assign
|
|
|
|
*
|
|
|
|
* Locking: mpath->state_lock must be held when calling this function
|
|
|
|
*/
|
|
|
|
void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta)
|
|
|
|
{
|
2009-07-10 01:42:16 +04:00
|
|
|
struct sk_buff *skb;
|
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2008-02-25 18:27:46 +03:00
|
|
|
rcu_assign_pointer(mpath->next_hop, sta);
|
2009-07-10 01:42:16 +04:00
|
|
|
|
|
|
|
spin_lock_irqsave(&mpath->frame_queue.lock, flags);
|
2012-08-10 05:15:39 +04:00
|
|
|
skb_queue_walk(&mpath->frame_queue, skb) {
|
2009-07-10 01:42:16 +04:00
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);
|
2011-11-25 05:15:21 +04:00
|
|
|
memcpy(hdr->addr2, mpath->sdata->vif.addr, ETH_ALEN);
|
2013-01-30 21:14:08 +04:00
|
|
|
ieee80211_mps_set_frame_flags(sta->sdata, sta, hdr);
|
2009-07-10 01:42:16 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&mpath->frame_queue.lock, flags);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
2011-08-10 03:45:08 +04:00
|
|
|
static void prepare_for_gate(struct sk_buff *skb, char *dst_addr,
|
|
|
|
struct mesh_path *gate_mpath)
|
|
|
|
{
|
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
|
struct ieee80211s_hdr *mshdr;
|
|
|
|
int mesh_hdrlen, hdrlen;
|
|
|
|
char *next_hop;
|
|
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
hdrlen = ieee80211_hdrlen(hdr->frame_control);
|
|
|
|
mshdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
|
|
|
|
|
|
|
|
if (!(mshdr->flags & MESH_FLAGS_AE)) {
|
|
|
|
/* size of the fixed part of the mesh header */
|
|
|
|
mesh_hdrlen = 6;
|
|
|
|
|
|
|
|
/* make room for the two extended addresses */
|
|
|
|
skb_push(skb, 2 * ETH_ALEN);
|
|
|
|
memmove(skb->data, hdr, hdrlen + mesh_hdrlen);
|
|
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
|
|
|
|
/* we preserve the previous mesh header and only add
|
|
|
|
* the new addreses */
|
|
|
|
mshdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
|
|
|
|
mshdr->flags = MESH_FLAGS_AE_A5_A6;
|
|
|
|
memcpy(mshdr->eaddr1, hdr->addr3, ETH_ALEN);
|
|
|
|
memcpy(mshdr->eaddr2, hdr->addr4, ETH_ALEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* update next hop */
|
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
rcu_read_lock();
|
|
|
|
next_hop = rcu_dereference(gate_mpath->next_hop)->sta.addr;
|
|
|
|
memcpy(hdr->addr1, next_hop, ETH_ALEN);
|
|
|
|
rcu_read_unlock();
|
2011-11-25 05:15:21 +04:00
|
|
|
memcpy(hdr->addr2, gate_mpath->sdata->vif.addr, ETH_ALEN);
|
2011-08-10 03:45:08 +04:00
|
|
|
memcpy(hdr->addr3, dst_addr, ETH_ALEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* mesh_path_move_to_queue - Move or copy frames from one mpath queue to another
|
|
|
|
*
|
|
|
|
* This function is used to transfer or copy frames from an unresolved mpath to
|
|
|
|
* a gate mpath. The function also adds the Address Extension field and
|
|
|
|
* updates the next hop.
|
|
|
|
*
|
|
|
|
* If a frame already has an Address Extension field, only the next hop and
|
|
|
|
* destination addresses are updated.
|
|
|
|
*
|
|
|
|
* The gate mpath must be an active mpath with a valid mpath->next_hop.
|
|
|
|
*
|
|
|
|
* @mpath: An active mpath the frames will be sent to (i.e. the gate)
|
|
|
|
* @from_mpath: The failed mpath
|
|
|
|
* @copy: When true, copy all the frames to the new mpath queue. When false,
|
|
|
|
* move them.
|
|
|
|
*/
|
|
|
|
static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
|
|
|
|
struct mesh_path *from_mpath,
|
|
|
|
bool copy)
|
|
|
|
{
|
2012-08-10 05:15:40 +04:00
|
|
|
struct sk_buff *skb, *fskb, *tmp;
|
|
|
|
struct sk_buff_head failq;
|
2011-08-10 03:45:08 +04:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
BUG_ON(gate_mpath == from_mpath);
|
|
|
|
BUG_ON(!gate_mpath->next_hop);
|
|
|
|
|
|
|
|
__skb_queue_head_init(&failq);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&from_mpath->frame_queue.lock, flags);
|
|
|
|
skb_queue_splice_init(&from_mpath->frame_queue, &failq);
|
|
|
|
spin_unlock_irqrestore(&from_mpath->frame_queue.lock, flags);
|
|
|
|
|
2012-08-10 05:15:40 +04:00
|
|
|
skb_queue_walk_safe(&failq, fskb, tmp) {
|
|
|
|
if (skb_queue_len(&gate_mpath->frame_queue) >=
|
|
|
|
MESH_FRAME_QUEUE_LEN) {
|
|
|
|
mpath_dbg(gate_mpath->sdata, "mpath queue full!\n");
|
|
|
|
break;
|
2011-08-24 23:12:41 +04:00
|
|
|
}
|
2011-08-10 03:45:08 +04:00
|
|
|
|
2012-08-10 05:15:40 +04:00
|
|
|
skb = skb_copy(fskb, GFP_ATOMIC);
|
|
|
|
if (WARN_ON(!skb))
|
|
|
|
break;
|
|
|
|
|
2011-08-10 03:45:08 +04:00
|
|
|
prepare_for_gate(skb, gate_mpath->dst, gate_mpath);
|
2012-08-10 05:15:40 +04:00
|
|
|
skb_queue_tail(&gate_mpath->frame_queue, skb);
|
|
|
|
|
|
|
|
if (copy)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
__skb_unlink(fskb, &failq);
|
|
|
|
kfree_skb(fskb);
|
2011-08-10 03:45:08 +04:00
|
|
|
}
|
|
|
|
|
2012-06-22 13:29:50 +04:00
|
|
|
mpath_dbg(gate_mpath->sdata, "Mpath queue for gate %pM has %d frames\n",
|
|
|
|
gate_mpath->dst, skb_queue_len(&gate_mpath->frame_queue));
|
2011-08-10 03:45:08 +04:00
|
|
|
|
|
|
|
if (!copy)
|
|
|
|
return;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&from_mpath->frame_queue.lock, flags);
|
|
|
|
skb_queue_splice(&failq, &from_mpath->frame_queue);
|
|
|
|
spin_unlock_irqrestore(&from_mpath->frame_queue.lock, flags);
|
|
|
|
}
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2013-02-12 19:43:19 +04:00
|
|
|
static struct mesh_path *mpath_lookup(struct mesh_table *tbl, const u8 *dst,
|
|
|
|
struct ieee80211_sub_if_data *sdata)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct hlist_head *bucket;
|
|
|
|
struct mpath_node *node;
|
|
|
|
|
2008-08-03 04:04:37 +04:00
|
|
|
bucket = &tbl->hash_buckets[mesh_table_hash(dst, sdata, tbl)];
|
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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(node, bucket, list) {
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath = node->mpath;
|
2008-08-03 04:04:37 +04:00
|
|
|
if (mpath->sdata == sdata &&
|
mac80211: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:52 +04:00
|
|
|
ether_addr_equal(dst, mpath->dst)) {
|
2013-02-15 17:40:31 +04:00
|
|
|
if (mpath_expired(mpath)) {
|
2008-02-23 17:17:14 +03:00
|
|
|
spin_lock_bh(&mpath->state_lock);
|
2011-08-30 00:23:06 +04:00
|
|
|
mpath->flags &= ~MESH_PATH_ACTIVE;
|
2008-02-23 17:17:14 +03:00
|
|
|
spin_unlock_bh(&mpath->state_lock);
|
|
|
|
}
|
|
|
|
return mpath;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-30 00:23:09 +04:00
|
|
|
/**
|
|
|
|
* mesh_path_lookup - look up a path in the mesh path table
|
|
|
|
* @sdata: local subif
|
2013-02-15 17:40:31 +04:00
|
|
|
* @dst: hardware address (ETH_ALEN length) of destination
|
2011-08-30 00:23:09 +04:00
|
|
|
*
|
|
|
|
* Returns: pointer to the mesh path structure, or NULL if not found
|
|
|
|
*
|
|
|
|
* Locking: must be called within a read rcu section.
|
|
|
|
*/
|
2013-02-15 17:40:31 +04:00
|
|
|
struct mesh_path *
|
|
|
|
mesh_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst)
|
2008-09-22 09:30:32 +04:00
|
|
|
{
|
2012-02-08 09:09:25 +04:00
|
|
|
return mpath_lookup(rcu_dereference(mesh_paths), dst, sdata);
|
2011-08-30 00:23:09 +04:00
|
|
|
}
|
2008-09-22 09:30:32 +04:00
|
|
|
|
2013-02-15 17:40:31 +04:00
|
|
|
struct mesh_path *
|
|
|
|
mpp_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst)
|
2011-08-30 00:23:09 +04:00
|
|
|
{
|
2012-02-08 09:09:25 +04:00
|
|
|
return mpath_lookup(rcu_dereference(mpp_paths), dst, sdata);
|
2008-09-22 09:30:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
/**
|
|
|
|
* mesh_path_lookup_by_idx - look up a path in the mesh path table by its index
|
|
|
|
* @idx: index
|
2008-08-03 04:04:37 +04:00
|
|
|
* @sdata: local subif, or NULL for all entries
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
|
|
|
* Returns: pointer to the mesh path structure, or NULL if not found.
|
|
|
|
*
|
|
|
|
* Locking: must be called within a read rcu section.
|
|
|
|
*/
|
2013-02-15 17:40:31 +04:00
|
|
|
struct mesh_path *
|
|
|
|
mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl = rcu_dereference(mesh_paths);
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mpath_node *node;
|
|
|
|
int i;
|
|
|
|
int j = 0;
|
|
|
|
|
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 05:06:00 +04:00
|
|
|
for_each_mesh_entry(tbl, node, i) {
|
2008-08-03 04:04:37 +04:00
|
|
|
if (sdata && node->mpath->sdata != sdata)
|
2008-03-01 04:51:25 +03:00
|
|
|
continue;
|
2008-02-23 17:17:14 +03:00
|
|
|
if (j++ == idx) {
|
2013-02-15 17:40:31 +04:00
|
|
|
if (mpath_expired(node->mpath)) {
|
2008-02-23 17:17:14 +03:00
|
|
|
spin_lock_bh(&node->mpath->state_lock);
|
2011-08-30 00:23:06 +04:00
|
|
|
node->mpath->flags &= ~MESH_PATH_ACTIVE;
|
2008-02-23 17:17:14 +03:00
|
|
|
spin_unlock_bh(&node->mpath->state_lock);
|
|
|
|
}
|
|
|
|
return node->mpath;
|
|
|
|
}
|
2008-03-01 04:51:25 +03:00
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-10 03:45:08 +04:00
|
|
|
/**
|
2011-11-21 14:23:50 +04:00
|
|
|
* mesh_path_add_gate - add the given mpath to a mesh gate to our path table
|
|
|
|
* @mpath: gate path to add to table
|
2011-08-10 03:45:08 +04:00
|
|
|
*/
|
2011-11-21 14:23:50 +04:00
|
|
|
int mesh_path_add_gate(struct mesh_path *mpath)
|
2011-08-10 03:45:08 +04:00
|
|
|
{
|
2011-11-21 14:23:50 +04:00
|
|
|
struct mesh_table *tbl;
|
2011-08-10 03:45:08 +04:00
|
|
|
struct mpath_node *gate, *new_gate;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2011-11-21 14:23:50 +04:00
|
|
|
tbl = rcu_dereference(mesh_paths);
|
2011-08-10 03:45:08 +04: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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(gate, tbl->known_gates, list)
|
2011-08-10 03:45:08 +04:00
|
|
|
if (gate->mpath == mpath) {
|
|
|
|
err = -EEXIST;
|
|
|
|
goto err_rcu;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_gate = kzalloc(sizeof(struct mpath_node), GFP_ATOMIC);
|
|
|
|
if (!new_gate) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_rcu;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpath->is_gate = true;
|
|
|
|
mpath->sdata->u.mesh.num_gates++;
|
|
|
|
new_gate->mpath = mpath;
|
|
|
|
spin_lock_bh(&tbl->gates_lock);
|
|
|
|
hlist_add_head_rcu(&new_gate->list, tbl->known_gates);
|
|
|
|
spin_unlock_bh(&tbl->gates_lock);
|
2012-06-22 13:29:50 +04:00
|
|
|
mpath_dbg(mpath->sdata,
|
|
|
|
"Mesh path: Recorded new gate: %pM. %d known gates\n",
|
|
|
|
mpath->dst, mpath->sdata->u.mesh.num_gates);
|
2013-02-15 17:40:31 +04:00
|
|
|
err = 0;
|
2011-08-10 03:45:08 +04:00
|
|
|
err_rcu:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_gate_del - remove a mesh gate from the list of known gates
|
|
|
|
* @tbl: table which holds our list of known gates
|
|
|
|
* @mpath: gate mpath
|
|
|
|
*
|
|
|
|
* Locking: must be called inside rcu_read_lock() section
|
|
|
|
*/
|
2013-02-15 17:40:31 +04:00
|
|
|
static void mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath)
|
2011-08-10 03:45:08 +04:00
|
|
|
{
|
|
|
|
struct mpath_node *gate;
|
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 05:06:00 +04:00
|
|
|
struct hlist_node *q;
|
2011-08-10 03:45:08 +04: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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_safe(gate, q, tbl->known_gates, list) {
|
2013-02-15 17:40:31 +04:00
|
|
|
if (gate->mpath != mpath)
|
|
|
|
continue;
|
|
|
|
spin_lock_bh(&tbl->gates_lock);
|
|
|
|
hlist_del_rcu(&gate->list);
|
|
|
|
kfree_rcu(gate, rcu);
|
|
|
|
spin_unlock_bh(&tbl->gates_lock);
|
|
|
|
mpath->sdata->u.mesh.num_gates--;
|
|
|
|
mpath->is_gate = false;
|
|
|
|
mpath_dbg(mpath->sdata,
|
|
|
|
"Mesh path: Deleted gate: %pM. %d known gates\n",
|
|
|
|
mpath->dst, mpath->sdata->u.mesh.num_gates);
|
|
|
|
break;
|
|
|
|
}
|
2011-08-10 03:45:08 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_gate_num - number of gates known to this interface
|
|
|
|
* @sdata: subif data
|
|
|
|
*/
|
|
|
|
int mesh_gate_num(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
return sdata->u.mesh.num_gates;
|
|
|
|
}
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
/**
|
|
|
|
* mesh_path_add - allocate and add a new path to the mesh path table
|
2013-02-15 17:40:31 +04:00
|
|
|
* @dst: destination address of the path (ETH_ALEN length)
|
2008-08-03 04:04:37 +04:00
|
|
|
* @sdata: local subif
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 18:09:05 +03:00
|
|
|
* Returns: 0 on success
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
|
|
|
* State: the initial state of the new path is set to 0
|
|
|
|
*/
|
2013-03-29 17:38:39 +04:00
|
|
|
struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const u8 *dst)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
2009-08-10 23:15:52 +04:00
|
|
|
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mesh_path *mpath, *new_mpath;
|
|
|
|
struct mpath_node *node, *new_node;
|
|
|
|
struct hlist_head *bucket;
|
|
|
|
int grow = 0;
|
2013-03-29 17:38:39 +04:00
|
|
|
int err;
|
2008-02-23 17:17:14 +03:00
|
|
|
u32 hash_idx;
|
|
|
|
|
mac80211: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:52 +04:00
|
|
|
if (ether_addr_equal(dst, sdata->vif.addr))
|
2008-02-23 17:17:14 +03:00
|
|
|
/* never add ourselves as neighbours */
|
2013-03-29 17:38:39 +04:00
|
|
|
return ERR_PTR(-ENOTSUPP);
|
2008-02-23 17:17:14 +03:00
|
|
|
|
|
|
|
if (is_multicast_ether_addr(dst))
|
2013-03-29 17:38:39 +04:00
|
|
|
return ERR_PTR(-ENOTSUPP);
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2008-09-11 02:01:49 +04:00
|
|
|
if (atomic_add_unless(&sdata->u.mesh.mpaths, 1, MESH_MAX_MPATHS) == 0)
|
2013-03-29 17:38:39 +04:00
|
|
|
return ERR_PTR(-ENOSPC);
|
|
|
|
|
|
|
|
read_lock_bh(&pathtbl_resize_lock);
|
|
|
|
tbl = resize_dereference_mesh_paths();
|
|
|
|
|
|
|
|
hash_idx = mesh_table_hash(dst, sdata, tbl);
|
|
|
|
bucket = &tbl->hash_buckets[hash_idx];
|
|
|
|
|
|
|
|
spin_lock(&tbl->hashwlock[hash_idx]);
|
|
|
|
|
|
|
|
hlist_for_each_entry(node, bucket, list) {
|
|
|
|
mpath = node->mpath;
|
|
|
|
if (mpath->sdata == sdata &&
|
|
|
|
ether_addr_equal(dst, mpath->dst))
|
|
|
|
goto found;
|
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2008-05-06 18:53:43 +04:00
|
|
|
err = -ENOMEM;
|
2009-08-10 23:15:52 +04:00
|
|
|
new_mpath = kzalloc(sizeof(struct mesh_path), GFP_ATOMIC);
|
2008-05-06 18:53:43 +04:00
|
|
|
if (!new_mpath)
|
|
|
|
goto err_path_alloc;
|
|
|
|
|
2009-08-10 23:15:52 +04:00
|
|
|
new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
|
2008-05-06 18:53:43 +04:00
|
|
|
if (!new_node)
|
|
|
|
goto err_node_alloc;
|
2008-05-06 18:46:36 +04:00
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
memcpy(new_mpath->dst, dst, ETH_ALEN);
|
2012-07-13 18:23:07 +04:00
|
|
|
eth_broadcast_addr(new_mpath->rann_snd_addr);
|
2012-04-10 08:31:56 +04:00
|
|
|
new_mpath->is_root = false;
|
2008-08-03 04:04:37 +04:00
|
|
|
new_mpath->sdata = sdata;
|
2008-02-23 17:17:14 +03:00
|
|
|
new_mpath->flags = 0;
|
|
|
|
skb_queue_head_init(&new_mpath->frame_queue);
|
|
|
|
new_node->mpath = new_mpath;
|
|
|
|
new_mpath->timer.data = (unsigned long) new_mpath;
|
|
|
|
new_mpath->timer.function = mesh_path_timer;
|
|
|
|
new_mpath->exp_time = jiffies;
|
|
|
|
spin_lock_init(&new_mpath->state_lock);
|
|
|
|
init_timer(&new_mpath->timer);
|
|
|
|
|
|
|
|
hlist_add_head_rcu(&new_node->list, bucket);
|
2011-05-14 13:56:16 +04:00
|
|
|
if (atomic_inc_return(&tbl->entries) >=
|
|
|
|
tbl->mean_chain_len * (tbl->hash_mask + 1))
|
2008-02-23 17:17:14 +03:00
|
|
|
grow = 1;
|
|
|
|
|
2009-08-07 18:17:38 +04:00
|
|
|
mesh_paths_generation++;
|
|
|
|
|
2008-05-06 18:53:43 +04:00
|
|
|
if (grow) {
|
2009-08-10 23:15:52 +04:00
|
|
|
set_bit(MESH_WORK_GROW_MPATH_TABLE, &ifmsh->wrkq_flags);
|
2010-06-10 12:21:31 +04:00
|
|
|
ieee80211_queue_work(&local->hw, &sdata->work);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
2013-03-29 17:38:39 +04:00
|
|
|
mpath = new_mpath;
|
|
|
|
found:
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[hash_idx]);
|
2011-05-04 03:57:16 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2013-03-29 17:38:39 +04:00
|
|
|
return mpath;
|
|
|
|
|
2008-05-06 18:53:43 +04:00
|
|
|
err_node_alloc:
|
|
|
|
kfree(new_mpath);
|
|
|
|
err_path_alloc:
|
2008-09-11 02:01:49 +04:00
|
|
|
atomic_dec(&sdata->u.mesh.mpaths);
|
2013-03-29 17:38:39 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[hash_idx]);
|
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
|
|
|
return ERR_PTR(err);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
2011-05-14 13:00:52 +04:00
|
|
|
static void mesh_table_free_rcu(struct rcu_head *rcu)
|
|
|
|
{
|
|
|
|
struct mesh_table *tbl = container_of(rcu, struct mesh_table, rcu_head);
|
|
|
|
|
|
|
|
mesh_table_free(tbl, false);
|
|
|
|
}
|
|
|
|
|
2009-08-10 23:15:52 +04:00
|
|
|
void mesh_mpath_table_grow(void)
|
|
|
|
{
|
|
|
|
struct mesh_table *oldtbl, *newtbl;
|
|
|
|
|
2011-05-04 03:57:16 +04:00
|
|
|
write_lock_bh(&pathtbl_resize_lock);
|
2011-05-14 13:56:16 +04:00
|
|
|
oldtbl = resize_dereference_mesh_paths();
|
|
|
|
newtbl = mesh_table_alloc(oldtbl->size_order + 1);
|
2011-05-14 13:00:52 +04:00
|
|
|
if (!newtbl)
|
|
|
|
goto out;
|
2011-05-14 13:56:16 +04:00
|
|
|
if (mesh_table_grow(oldtbl, newtbl) < 0) {
|
2011-04-13 22:10:28 +04:00
|
|
|
__mesh_table_free(newtbl);
|
2011-05-14 13:00:52 +04:00
|
|
|
goto out;
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
|
|
|
rcu_assign_pointer(mesh_paths, newtbl);
|
|
|
|
|
2011-05-14 13:00:52 +04:00
|
|
|
call_rcu(&oldtbl->rcu_head, mesh_table_free_rcu);
|
|
|
|
|
|
|
|
out:
|
|
|
|
write_unlock_bh(&pathtbl_resize_lock);
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void mesh_mpp_table_grow(void)
|
|
|
|
{
|
|
|
|
struct mesh_table *oldtbl, *newtbl;
|
|
|
|
|
2011-05-04 03:57:16 +04:00
|
|
|
write_lock_bh(&pathtbl_resize_lock);
|
2011-05-14 13:56:16 +04:00
|
|
|
oldtbl = resize_dereference_mpp_paths();
|
|
|
|
newtbl = mesh_table_alloc(oldtbl->size_order + 1);
|
2011-05-14 13:00:52 +04:00
|
|
|
if (!newtbl)
|
|
|
|
goto out;
|
2011-05-14 13:56:16 +04:00
|
|
|
if (mesh_table_grow(oldtbl, newtbl) < 0) {
|
2011-04-13 22:10:28 +04:00
|
|
|
__mesh_table_free(newtbl);
|
2011-05-14 13:00:52 +04:00
|
|
|
goto out;
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
|
|
|
rcu_assign_pointer(mpp_paths, newtbl);
|
2011-05-14 13:00:52 +04:00
|
|
|
call_rcu(&oldtbl->rcu_head, mesh_table_free_rcu);
|
2009-08-10 23:15:52 +04:00
|
|
|
|
2011-05-14 13:00:52 +04:00
|
|
|
out:
|
|
|
|
write_unlock_bh(&pathtbl_resize_lock);
|
2009-08-10 23:15:52 +04:00
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2013-02-15 17:40:31 +04:00
|
|
|
int mpp_path_add(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const u8 *dst, const u8 *mpp)
|
2008-09-22 09:30:32 +04:00
|
|
|
{
|
2009-08-10 23:15:52 +04:00
|
|
|
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-09-22 09:30:32 +04:00
|
|
|
struct mesh_path *mpath, *new_mpath;
|
|
|
|
struct mpath_node *node, *new_node;
|
|
|
|
struct hlist_head *bucket;
|
|
|
|
int grow = 0;
|
|
|
|
int err = 0;
|
|
|
|
u32 hash_idx;
|
|
|
|
|
mac80211: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:52 +04:00
|
|
|
if (ether_addr_equal(dst, sdata->vif.addr))
|
2008-09-22 09:30:32 +04:00
|
|
|
/* never add ourselves as neighbours */
|
|
|
|
return -ENOTSUPP;
|
|
|
|
|
|
|
|
if (is_multicast_ether_addr(dst))
|
|
|
|
return -ENOTSUPP;
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
2009-08-10 23:15:52 +04:00
|
|
|
new_mpath = kzalloc(sizeof(struct mesh_path), GFP_ATOMIC);
|
2008-09-22 09:30:32 +04:00
|
|
|
if (!new_mpath)
|
|
|
|
goto err_path_alloc;
|
|
|
|
|
2009-08-10 23:15:52 +04:00
|
|
|
new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
|
2008-09-22 09:30:32 +04:00
|
|
|
if (!new_node)
|
|
|
|
goto err_node_alloc;
|
|
|
|
|
2011-05-04 03:57:16 +04:00
|
|
|
read_lock_bh(&pathtbl_resize_lock);
|
2008-09-22 09:30:32 +04:00
|
|
|
memcpy(new_mpath->dst, dst, ETH_ALEN);
|
|
|
|
memcpy(new_mpath->mpp, mpp, ETH_ALEN);
|
|
|
|
new_mpath->sdata = sdata;
|
|
|
|
new_mpath->flags = 0;
|
|
|
|
skb_queue_head_init(&new_mpath->frame_queue);
|
|
|
|
new_node->mpath = new_mpath;
|
2011-08-25 21:36:14 +04:00
|
|
|
init_timer(&new_mpath->timer);
|
2008-09-22 09:30:32 +04:00
|
|
|
new_mpath->exp_time = jiffies;
|
|
|
|
spin_lock_init(&new_mpath->state_lock);
|
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl = resize_dereference_mpp_paths();
|
2008-09-22 09:30:32 +04:00
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
hash_idx = mesh_table_hash(dst, sdata, tbl);
|
|
|
|
bucket = &tbl->hash_buckets[hash_idx];
|
|
|
|
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_lock(&tbl->hashwlock[hash_idx]);
|
2008-09-22 09:30:32 +04:00
|
|
|
|
|
|
|
err = -EEXIST;
|
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 05:06:00 +04:00
|
|
|
hlist_for_each_entry(node, bucket, list) {
|
2008-09-22 09:30:32 +04:00
|
|
|
mpath = node->mpath;
|
2012-03-01 18:22:09 +04:00
|
|
|
if (mpath->sdata == sdata &&
|
mac80211: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:52 +04:00
|
|
|
ether_addr_equal(dst, mpath->dst))
|
2008-09-22 09:30:32 +04:00
|
|
|
goto err_exists;
|
|
|
|
}
|
|
|
|
|
|
|
|
hlist_add_head_rcu(&new_node->list, bucket);
|
2011-05-14 13:56:16 +04:00
|
|
|
if (atomic_inc_return(&tbl->entries) >=
|
|
|
|
tbl->mean_chain_len * (tbl->hash_mask + 1))
|
2008-09-22 09:30:32 +04:00
|
|
|
grow = 1;
|
|
|
|
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[hash_idx]);
|
2011-05-04 03:57:16 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2008-09-22 09:30:32 +04:00
|
|
|
if (grow) {
|
2009-08-10 23:15:52 +04:00
|
|
|
set_bit(MESH_WORK_GROW_MPP_TABLE, &ifmsh->wrkq_flags);
|
2010-06-10 12:21:31 +04:00
|
|
|
ieee80211_queue_work(&local->hw, &sdata->work);
|
2008-09-22 09:30:32 +04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_exists:
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[hash_idx]);
|
2011-05-04 03:57:16 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2008-09-22 09:30:32 +04:00
|
|
|
kfree(new_node);
|
|
|
|
err_node_alloc:
|
|
|
|
kfree(new_mpath);
|
|
|
|
err_path_alloc:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
/**
|
|
|
|
* mesh_plink_broken - deactivates paths and sends perr when a link breaks
|
|
|
|
*
|
|
|
|
* @sta: broken peer link
|
|
|
|
*
|
|
|
|
* This function must be called from the rate control algorithm if enough
|
|
|
|
* delivery errors suggest that a peer link is no longer usable.
|
|
|
|
*/
|
|
|
|
void mesh_plink_broken(struct sta_info *sta)
|
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2009-11-17 15:34:04 +03:00
|
|
|
static const u8 bcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node;
|
2008-08-03 04:04:37 +04:00
|
|
|
struct ieee80211_sub_if_data *sdata = sta->sdata;
|
2008-02-23 17:17:14 +03:00
|
|
|
int i;
|
2011-08-12 06:35:15 +04:00
|
|
|
__le16 reason = cpu_to_le16(WLAN_REASON_MESH_PATH_DEST_UNREACHABLE);
|
2008-02-23 17:17:14 +03:00
|
|
|
|
|
|
|
rcu_read_lock();
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl = rcu_dereference(mesh_paths);
|
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 05:06:00 +04:00
|
|
|
for_each_mesh_entry(tbl, node, i) {
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath = node->mpath;
|
2011-05-14 13:56:16 +04:00
|
|
|
if (rcu_dereference(mpath->next_hop) == sta &&
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath->flags & MESH_PATH_ACTIVE &&
|
|
|
|
!(mpath->flags & MESH_PATH_FIXED)) {
|
2011-08-30 00:23:05 +04:00
|
|
|
spin_lock_bh(&mpath->state_lock);
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath->flags &= ~MESH_PATH_ACTIVE;
|
2009-11-10 02:46:55 +03:00
|
|
|
++mpath->sn;
|
2008-02-23 17:17:14 +03:00
|
|
|
spin_unlock_bh(&mpath->state_lock);
|
2013-02-15 17:40:31 +04:00
|
|
|
mesh_path_error_tx(sdata,
|
|
|
|
sdata->u.mesh.mshcfg.element_ttl,
|
|
|
|
mpath->dst, cpu_to_le32(mpath->sn),
|
|
|
|
reason, bcast);
|
2011-08-30 00:23:05 +04:00
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2011-08-30 00:23:07 +04:00
|
|
|
static void mesh_path_node_reclaim(struct rcu_head *rp)
|
|
|
|
{
|
|
|
|
struct mpath_node *node = container_of(rp, struct mpath_node, rcu);
|
|
|
|
struct ieee80211_sub_if_data *sdata = node->mpath->sdata;
|
|
|
|
|
|
|
|
del_timer_sync(&node->mpath->timer);
|
|
|
|
atomic_dec(&sdata->u.mesh.mpaths);
|
|
|
|
kfree(node->mpath);
|
|
|
|
kfree(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* needs to be called with the corresponding hashwlock taken */
|
|
|
|
static void __mesh_path_del(struct mesh_table *tbl, struct mpath_node *node)
|
|
|
|
{
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
mpath = node->mpath;
|
|
|
|
spin_lock(&mpath->state_lock);
|
|
|
|
mpath->flags |= MESH_PATH_RESOLVING;
|
|
|
|
if (mpath->is_gate)
|
|
|
|
mesh_gate_del(tbl, mpath);
|
|
|
|
hlist_del_rcu(&node->list);
|
|
|
|
call_rcu(&node->rcu, mesh_path_node_reclaim);
|
|
|
|
spin_unlock(&mpath->state_lock);
|
|
|
|
atomic_dec(&tbl->entries);
|
|
|
|
}
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
/**
|
|
|
|
* mesh_path_flush_by_nexthop - Deletes mesh paths if their next hop matches
|
|
|
|
*
|
2012-07-10 14:55:09 +04:00
|
|
|
* @sta: mesh peer to match
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
2008-03-01 02:46:08 +03:00
|
|
|
* RCU notes: this function is called when a mesh plink transitions from
|
|
|
|
* PLINK_ESTAB to any other state, since PLINK_ESTAB state is the only one that
|
|
|
|
* allows path creation. This will happen before the sta can be freed (because
|
2008-02-25 18:27:46 +03:00
|
|
|
* sta_info_destroy() calls this) so any reader in a rcu read block will be
|
|
|
|
* protected against the plink disappearing.
|
2008-02-23 17:17:14 +03:00
|
|
|
*/
|
|
|
|
void mesh_path_flush_by_nexthop(struct sta_info *sta)
|
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node;
|
|
|
|
int i;
|
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
rcu_read_lock();
|
2011-08-30 00:23:09 +04:00
|
|
|
read_lock_bh(&pathtbl_resize_lock);
|
|
|
|
tbl = resize_dereference_mesh_paths();
|
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 05:06:00 +04:00
|
|
|
for_each_mesh_entry(tbl, node, i) {
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath = node->mpath;
|
2011-08-30 00:23:08 +04:00
|
|
|
if (rcu_dereference(mpath->next_hop) == sta) {
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_lock(&tbl->hashwlock[i]);
|
2011-08-30 00:23:07 +04:00
|
|
|
__mesh_path_del(tbl, node);
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[i]);
|
2011-08-30 00:23:07 +04:00
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
2011-08-30 00:23:09 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2011-05-14 13:56:16 +04:00
|
|
|
rcu_read_unlock();
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
2011-08-30 00:23:08 +04:00
|
|
|
static void table_flush_by_iface(struct mesh_table *tbl,
|
|
|
|
struct ieee80211_sub_if_data *sdata)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node;
|
|
|
|
int i;
|
|
|
|
|
2011-08-30 00:23:08 +04:00
|
|
|
WARN_ON(!rcu_read_lock_held());
|
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 05:06:00 +04:00
|
|
|
for_each_mesh_entry(tbl, node, i) {
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath = node->mpath;
|
2011-08-30 00:23:08 +04:00
|
|
|
if (mpath->sdata != sdata)
|
|
|
|
continue;
|
2011-08-30 00:23:04 +04:00
|
|
|
spin_lock_bh(&tbl->hashwlock[i]);
|
2011-08-30 00:23:07 +04:00
|
|
|
__mesh_path_del(tbl, node);
|
2011-08-30 00:23:04 +04:00
|
|
|
spin_unlock_bh(&tbl->hashwlock[i]);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-30 00:23:04 +04:00
|
|
|
/**
|
|
|
|
* mesh_path_flush_by_iface - Deletes all mesh paths associated with a given iface
|
|
|
|
*
|
|
|
|
* This function deletes both mesh paths as well as mesh portal paths.
|
|
|
|
*
|
2012-07-10 14:55:09 +04:00
|
|
|
* @sdata: interface data to match
|
2011-08-30 00:23:04 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
2011-08-30 00:23:08 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-02-25 18:27:46 +03:00
|
|
|
|
2011-08-30 00:23:08 +04:00
|
|
|
rcu_read_lock();
|
2011-08-30 00:23:09 +04:00
|
|
|
read_lock_bh(&pathtbl_resize_lock);
|
|
|
|
tbl = resize_dereference_mesh_paths();
|
2011-08-30 00:23:08 +04:00
|
|
|
table_flush_by_iface(tbl, sdata);
|
2011-08-30 00:23:09 +04:00
|
|
|
tbl = resize_dereference_mpp_paths();
|
2011-08-30 00:23:08 +04:00
|
|
|
table_flush_by_iface(tbl, sdata);
|
2011-08-30 00:23:09 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2011-08-30 00:23:08 +04:00
|
|
|
rcu_read_unlock();
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_path_del - delete a mesh path from the table
|
|
|
|
*
|
|
|
|
* @addr: dst address (ETH_ALEN length)
|
2008-08-03 04:04:37 +04:00
|
|
|
* @sdata: local subif
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 18:09:05 +03:00
|
|
|
* Returns: 0 if successful
|
2008-02-23 17:17:14 +03:00
|
|
|
*/
|
2013-02-15 17:40:31 +04:00
|
|
|
int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node;
|
|
|
|
struct hlist_head *bucket;
|
|
|
|
int hash_idx;
|
|
|
|
int err = 0;
|
|
|
|
|
2011-05-04 03:57:16 +04:00
|
|
|
read_lock_bh(&pathtbl_resize_lock);
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl = resize_dereference_mesh_paths();
|
|
|
|
hash_idx = mesh_table_hash(addr, sdata, tbl);
|
|
|
|
bucket = &tbl->hash_buckets[hash_idx];
|
2008-02-23 17:17:14 +03:00
|
|
|
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_lock(&tbl->hashwlock[hash_idx]);
|
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 05:06:00 +04:00
|
|
|
hlist_for_each_entry(node, bucket, list) {
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath = node->mpath;
|
2008-08-03 04:04:37 +04:00
|
|
|
if (mpath->sdata == sdata &&
|
mac80211: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:52 +04:00
|
|
|
ether_addr_equal(addr, mpath->dst)) {
|
2011-08-30 00:23:07 +04:00
|
|
|
__mesh_path_del(tbl, node);
|
2008-02-23 17:17:14 +03:00
|
|
|
goto enddel;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err = -ENXIO;
|
|
|
|
enddel:
|
2009-08-07 18:17:38 +04:00
|
|
|
mesh_paths_generation++;
|
2012-03-07 04:42:09 +04:00
|
|
|
spin_unlock(&tbl->hashwlock[hash_idx]);
|
2011-05-04 03:57:16 +04:00
|
|
|
read_unlock_bh(&pathtbl_resize_lock);
|
2008-02-23 17:17:14 +03:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_path_tx_pending - sends pending frames in a mesh path queue
|
|
|
|
*
|
|
|
|
* @mpath: mesh path to activate
|
|
|
|
*
|
|
|
|
* Locking: the state_lock of the mpath structure must NOT be held when calling
|
|
|
|
* this function.
|
|
|
|
*/
|
|
|
|
void mesh_path_tx_pending(struct mesh_path *mpath)
|
|
|
|
{
|
2009-07-07 21:55:03 +04:00
|
|
|
if (mpath->flags & MESH_PATH_ACTIVE)
|
|
|
|
ieee80211_add_pending_skbs(mpath->sdata->local,
|
|
|
|
&mpath->frame_queue);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
2011-08-10 03:45:08 +04:00
|
|
|
/**
|
|
|
|
* mesh_path_send_to_gates - sends pending frames to all known mesh gates
|
|
|
|
*
|
|
|
|
* @mpath: mesh path whose queue will be emptied
|
|
|
|
*
|
|
|
|
* If there is only one gate, the frames are transferred from the failed mpath
|
|
|
|
* queue to that gate's queue. If there are more than one gates, the frames
|
|
|
|
* are copied from each gate to the next. After frames are copied, the
|
|
|
|
* mpath queues are emptied onto the transmission queue.
|
|
|
|
*/
|
|
|
|
int mesh_path_send_to_gates(struct mesh_path *mpath)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = mpath->sdata;
|
|
|
|
struct mesh_table *tbl;
|
|
|
|
struct mesh_path *from_mpath = mpath;
|
|
|
|
struct mpath_node *gate = NULL;
|
|
|
|
bool copy = false;
|
|
|
|
struct hlist_head *known_gates;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
tbl = rcu_dereference(mesh_paths);
|
|
|
|
known_gates = tbl->known_gates;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (!known_gates)
|
|
|
|
return -EHOSTUNREACH;
|
|
|
|
|
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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(gate, known_gates, list) {
|
2011-08-10 03:45:08 +04:00
|
|
|
if (gate->mpath->sdata != sdata)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (gate->mpath->flags & MESH_PATH_ACTIVE) {
|
2012-06-22 13:29:50 +04:00
|
|
|
mpath_dbg(sdata, "Forwarding to %pM\n", gate->mpath->dst);
|
2011-08-10 03:45:08 +04:00
|
|
|
mesh_path_move_to_queue(gate->mpath, from_mpath, copy);
|
|
|
|
from_mpath = gate->mpath;
|
|
|
|
copy = true;
|
|
|
|
} else {
|
2012-06-22 13:29:50 +04:00
|
|
|
mpath_dbg(sdata,
|
|
|
|
"Not forwarding %p (flags %#x)\n",
|
|
|
|
gate->mpath, gate->mpath->flags);
|
2011-08-10 03:45:08 +04: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 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(gate, known_gates, list)
|
2011-08-10 03:45:08 +04:00
|
|
|
if (gate->mpath->sdata == sdata) {
|
2012-06-22 13:29:50 +04:00
|
|
|
mpath_dbg(sdata, "Sending to %pM\n", gate->mpath->dst);
|
2011-08-10 03:45:08 +04:00
|
|
|
mesh_path_tx_pending(gate->mpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (from_mpath == mpath) ? -EHOSTUNREACH : 0;
|
|
|
|
}
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
/**
|
|
|
|
* mesh_path_discard_frame - discard a frame whose path could not be resolved
|
|
|
|
*
|
|
|
|
* @skb: frame to discard
|
2008-08-03 04:04:37 +04:00
|
|
|
* @sdata: network subif the frame was to be sent through
|
2008-02-23 17:17:14 +03:00
|
|
|
*
|
|
|
|
* Locking: the function must me called within a rcu_read_lock region
|
|
|
|
*/
|
2013-02-15 17:40:31 +04:00
|
|
|
void mesh_path_discard_frame(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
|
|
|
kfree_skb(skb);
|
2008-09-11 02:01:49 +04:00
|
|
|
sdata->u.mesh.mshstats.dropped_frames_no_route++;
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_path_flush_pending - free the pending queue of a mesh path
|
|
|
|
*
|
|
|
|
* @mpath: mesh path whose queue has to be freed
|
|
|
|
*
|
2011-03-31 05:57:33 +04:00
|
|
|
* Locking: the function must me called within a rcu_read_lock region
|
2008-02-23 17:17:14 +03:00
|
|
|
*/
|
|
|
|
void mesh_path_flush_pending(struct mesh_path *mpath)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2011-08-10 03:45:07 +04:00
|
|
|
while ((skb = skb_dequeue(&mpath->frame_queue)) != NULL)
|
2013-02-15 17:40:31 +04:00
|
|
|
mesh_path_discard_frame(mpath->sdata, skb);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* mesh_path_fix_nexthop - force a specific next hop for a mesh path
|
|
|
|
*
|
|
|
|
* @mpath: the mesh path to modify
|
|
|
|
* @next_hop: the next hop to force
|
|
|
|
*
|
|
|
|
* Locking: this function must be called holding mpath->state_lock
|
|
|
|
*/
|
|
|
|
void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&mpath->state_lock);
|
|
|
|
mesh_path_assign_nexthop(mpath, next_hop);
|
2009-11-10 02:46:55 +03:00
|
|
|
mpath->sn = 0xffff;
|
2008-02-23 17:17:14 +03:00
|
|
|
mpath->metric = 0;
|
|
|
|
mpath->hop_count = 0;
|
|
|
|
mpath->exp_time = 0;
|
|
|
|
mpath->flags |= MESH_PATH_FIXED;
|
|
|
|
mesh_path_activate(mpath);
|
|
|
|
spin_unlock_bh(&mpath->state_lock);
|
|
|
|
mesh_path_tx_pending(mpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mesh_path_node_free(struct hlist_node *p, bool free_leafs)
|
|
|
|
{
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node = hlist_entry(p, struct mpath_node, list);
|
|
|
|
mpath = node->mpath;
|
|
|
|
hlist_del_rcu(p);
|
2011-05-14 01:16:07 +04:00
|
|
|
if (free_leafs) {
|
|
|
|
del_timer_sync(&mpath->timer);
|
2008-02-23 17:17:14 +03:00
|
|
|
kfree(mpath);
|
2011-05-14 01:16:07 +04:00
|
|
|
}
|
2008-02-23 17:17:14 +03:00
|
|
|
kfree(node);
|
|
|
|
}
|
|
|
|
|
2008-05-07 19:47:01 +04:00
|
|
|
static int mesh_path_node_copy(struct hlist_node *p, struct mesh_table *newtbl)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node, *new_node;
|
|
|
|
u32 hash_idx;
|
|
|
|
|
2008-05-07 19:51:51 +04:00
|
|
|
new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
|
2008-05-07 19:48:14 +04:00
|
|
|
if (new_node == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
node = hlist_entry(p, struct mpath_node, list);
|
|
|
|
mpath = node->mpath;
|
|
|
|
new_node->mpath = mpath;
|
2008-08-03 04:04:37 +04:00
|
|
|
hash_idx = mesh_table_hash(mpath->dst, mpath->sdata, newtbl);
|
2008-02-23 17:17:14 +03:00
|
|
|
hlist_add_head(&new_node->list,
|
|
|
|
&newtbl->hash_buckets[hash_idx]);
|
2008-05-07 19:47:01 +04:00
|
|
|
return 0;
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
int mesh_pathtbl_init(void)
|
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl_path, *tbl_mpp;
|
2011-08-30 23:16:15 +04:00
|
|
|
int ret;
|
2011-05-14 13:56:16 +04:00
|
|
|
|
|
|
|
tbl_path = mesh_table_alloc(INIT_PATHS_SIZE_ORDER);
|
|
|
|
if (!tbl_path)
|
2008-09-22 09:30:32 +04:00
|
|
|
return -ENOMEM;
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl_path->free_node = &mesh_path_node_free;
|
|
|
|
tbl_path->copy_node = &mesh_path_node_copy;
|
|
|
|
tbl_path->mean_chain_len = MEAN_CHAIN_LEN;
|
2011-08-10 03:45:08 +04:00
|
|
|
tbl_path->known_gates = kzalloc(sizeof(struct hlist_head), GFP_ATOMIC);
|
2011-08-30 23:16:15 +04:00
|
|
|
if (!tbl_path->known_gates) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto free_path;
|
|
|
|
}
|
2011-08-10 03:45:08 +04:00
|
|
|
INIT_HLIST_HEAD(tbl_path->known_gates);
|
|
|
|
|
2008-09-22 09:30:32 +04:00
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl_mpp = mesh_table_alloc(INIT_PATHS_SIZE_ORDER);
|
|
|
|
if (!tbl_mpp) {
|
2011-08-30 23:16:15 +04:00
|
|
|
ret = -ENOMEM;
|
|
|
|
goto free_path;
|
2008-09-22 09:30:32 +04:00
|
|
|
}
|
2011-05-14 13:56:16 +04:00
|
|
|
tbl_mpp->free_node = &mesh_path_node_free;
|
|
|
|
tbl_mpp->copy_node = &mesh_path_node_copy;
|
|
|
|
tbl_mpp->mean_chain_len = MEAN_CHAIN_LEN;
|
2011-08-10 03:45:08 +04:00
|
|
|
tbl_mpp->known_gates = kzalloc(sizeof(struct hlist_head), GFP_ATOMIC);
|
2011-08-30 23:16:15 +04:00
|
|
|
if (!tbl_mpp->known_gates) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto free_mpp;
|
|
|
|
}
|
2011-08-10 03:45:08 +04:00
|
|
|
INIT_HLIST_HEAD(tbl_mpp->known_gates);
|
2011-05-14 13:56:16 +04:00
|
|
|
|
|
|
|
/* Need no locking since this is during init */
|
|
|
|
RCU_INIT_POINTER(mesh_paths, tbl_path);
|
|
|
|
RCU_INIT_POINTER(mpp_paths, tbl_mpp);
|
2008-09-22 09:30:32 +04:00
|
|
|
|
2008-02-23 17:17:14 +03:00
|
|
|
return 0;
|
2011-08-30 23:16:15 +04:00
|
|
|
|
|
|
|
free_mpp:
|
|
|
|
mesh_table_free(tbl_mpp, true);
|
|
|
|
free_path:
|
|
|
|
mesh_table_free(tbl_path, true);
|
|
|
|
return ret;
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
2008-08-03 04:04:37 +04:00
|
|
|
void mesh_path_expire(struct ieee80211_sub_if_data *sdata)
|
2008-02-23 17:17:14 +03:00
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
struct mesh_table *tbl;
|
2008-02-23 17:17:14 +03:00
|
|
|
struct mesh_path *mpath;
|
|
|
|
struct mpath_node *node;
|
|
|
|
int i;
|
|
|
|
|
2011-05-14 13:56:16 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
tbl = rcu_dereference(mesh_paths);
|
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 05:06:00 +04:00
|
|
|
for_each_mesh_entry(tbl, node, i) {
|
2008-08-03 04:04:37 +04:00
|
|
|
if (node->mpath->sdata != sdata)
|
2008-02-23 17:17:14 +03:00
|
|
|
continue;
|
|
|
|
mpath = node->mpath;
|
|
|
|
if ((!(mpath->flags & MESH_PATH_RESOLVING)) &&
|
|
|
|
(!(mpath->flags & MESH_PATH_FIXED)) &&
|
2011-08-30 00:23:05 +04:00
|
|
|
time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
|
2013-02-15 17:40:31 +04:00
|
|
|
mesh_path_del(mpath->sdata, mpath->dst);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
2011-05-14 13:56:16 +04:00
|
|
|
rcu_read_unlock();
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void mesh_pathtbl_unregister(void)
|
|
|
|
{
|
2011-05-14 13:56:16 +04:00
|
|
|
/* no need for locking during exit path */
|
2011-08-11 23:30:52 +04:00
|
|
|
mesh_table_free(rcu_dereference_protected(mesh_paths, 1), true);
|
|
|
|
mesh_table_free(rcu_dereference_protected(mpp_paths, 1), true);
|
2008-02-23 17:17:14 +03:00
|
|
|
}
|