2013-01-04 06:05:31 +04:00
|
|
|
/* Copyright (C) 2008-2013 B.A.T.M.A.N. contributors:
|
2010-12-13 14:19:28 +03:00
|
|
|
*
|
|
|
|
* Simon Wunderlich
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
|
|
* License as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "main.h"
|
|
|
|
#include "send.h"
|
|
|
|
#include "translation-table.h"
|
|
|
|
#include "vis.h"
|
|
|
|
#include "soft-interface.h"
|
|
|
|
#include "hard-interface.h"
|
|
|
|
#include "hash.h"
|
|
|
|
#include "originator.h"
|
|
|
|
|
2012-06-04 00:19:07 +04:00
|
|
|
#define BATADV_MAX_VIS_PACKET_SIZE 1000
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-11-10 14:00:32 +04:00
|
|
|
/* hash class keys */
|
|
|
|
static struct lock_class_key batadv_vis_hash_lock_class_key;
|
|
|
|
|
2010-12-13 14:19:28 +03:00
|
|
|
/* free the info */
|
2012-05-16 22:23:18 +04:00
|
|
|
static void batadv_free_info(struct kref *ref)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
|
|
|
struct batadv_priv *bat_priv;
|
2012-12-25 13:03:23 +04:00
|
|
|
struct batadv_vis_recvlist_node *entry, *tmp;
|
2012-06-06 00:31:31 +04:00
|
|
|
|
|
|
|
info = container_of(ref, struct batadv_vis_info, refcount);
|
|
|
|
bat_priv = info->bat_priv;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
list_del_init(&info->send_list);
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
list_for_each_entry_safe(entry, tmp, &info->recv_list, list) {
|
|
|
|
list_del(&entry->list);
|
|
|
|
kfree(entry);
|
|
|
|
}
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
kfree_skb(info->skb_packet);
|
2011-01-28 20:34:06 +03:00
|
|
|
kfree(info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare two vis packets, used by the hashing algorithm */
|
2012-05-16 22:23:18 +04:00
|
|
|
static int batadv_vis_info_cmp(const struct hlist_node *node, const void *data2)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
const struct batadv_vis_info *d1, *d2;
|
2012-06-06 00:31:30 +04:00
|
|
|
const struct batadv_vis_packet *p1, *p2;
|
2011-02-18 15:28:09 +03:00
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
d1 = container_of(node, struct batadv_vis_info, hash_entry);
|
2010-12-13 14:19:28 +03:00
|
|
|
d2 = data2;
|
2012-06-06 00:31:30 +04:00
|
|
|
p1 = (struct batadv_vis_packet *)d1->skb_packet->data;
|
|
|
|
p2 = (struct batadv_vis_packet *)d2->skb_packet->data;
|
2012-05-12 15:48:58 +04:00
|
|
|
return batadv_compare_eth(p1->vis_orig, p2->vis_orig);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-05-12 04:09:43 +04:00
|
|
|
/* hash function to choose an entry in a hash table of given size
|
|
|
|
* hash algorithm from http://en.wikipedia.org/wiki/Hash_table
|
|
|
|
*/
|
2012-05-16 22:23:18 +04:00
|
|
|
static uint32_t batadv_vis_info_choose(const void *data, uint32_t size)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
const struct batadv_vis_info *vis_info = data;
|
2012-06-06 00:31:30 +04:00
|
|
|
const struct batadv_vis_packet *packet;
|
2011-05-15 01:14:50 +04:00
|
|
|
const unsigned char *key;
|
2010-12-13 14:19:28 +03:00
|
|
|
uint32_t hash = 0;
|
|
|
|
size_t i;
|
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)vis_info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
key = packet->vis_orig;
|
|
|
|
for (i = 0; i < ETH_ALEN; i++) {
|
|
|
|
hash += key[i];
|
|
|
|
hash += (hash << 10);
|
|
|
|
hash ^= (hash >> 6);
|
|
|
|
}
|
|
|
|
|
|
|
|
hash += (hash << 3);
|
|
|
|
hash ^= (hash >> 11);
|
|
|
|
hash += (hash << 15);
|
|
|
|
|
|
|
|
return hash % size;
|
|
|
|
}
|
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
static struct batadv_vis_info *
|
|
|
|
batadv_vis_hash_find(struct batadv_priv *bat_priv, const void *data)
|
2011-02-18 15:28:09 +03:00
|
|
|
{
|
2012-07-16 00:26:51 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->vis.hash;
|
2011-02-18 15:28:09 +03:00
|
|
|
struct hlist_head *head;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *vis_info, *vis_info_tmp = NULL;
|
2011-10-05 19:05:25 +04:00
|
|
|
uint32_t index;
|
2011-02-18 15:28:09 +03:00
|
|
|
|
|
|
|
if (!hash)
|
|
|
|
return NULL;
|
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
index = batadv_vis_info_choose(data, hash->size);
|
2011-02-18 15:28:09 +03:00
|
|
|
head = &hash->table[index];
|
|
|
|
|
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(vis_info, head, hash_entry) {
|
|
|
|
if (!batadv_vis_info_cmp(&vis_info->hash_entry, data))
|
2011-02-18 15:28:09 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
vis_info_tmp = vis_info;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return vis_info_tmp;
|
|
|
|
}
|
|
|
|
|
2010-12-13 14:19:28 +03:00
|
|
|
/* insert interface to the list of interfaces of one originator, if it
|
2012-05-12 04:09:43 +04:00
|
|
|
* does not already exist in the list
|
|
|
|
*/
|
2012-05-16 22:23:18 +04:00
|
|
|
static void batadv_vis_data_insert_interface(const uint8_t *interface,
|
|
|
|
struct hlist_head *if_list,
|
|
|
|
bool primary)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-12-25 13:03:22 +04:00
|
|
|
struct batadv_vis_if_list_entry *entry;
|
2010-12-13 14:19:28 +03: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(entry, if_list, list) {
|
2012-05-12 15:48:58 +04:00
|
|
|
if (batadv_compare_eth(entry->addr, interface))
|
2010-12-13 14:19:28 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-07-09 19:52:13 +04:00
|
|
|
/* it's a new address, add it to the list */
|
2010-12-13 14:19:28 +03:00
|
|
|
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
|
|
|
|
if (!entry)
|
|
|
|
return;
|
|
|
|
memcpy(entry->addr, interface, ETH_ALEN);
|
|
|
|
entry->primary = primary;
|
|
|
|
hlist_add_head(&entry->list, if_list);
|
|
|
|
}
|
|
|
|
|
2012-05-16 22:23:23 +04:00
|
|
|
static void batadv_vis_data_read_prim_sec(struct seq_file *seq,
|
|
|
|
const struct hlist_head *if_list)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-12-25 13:03:22 +04:00
|
|
|
struct batadv_vis_if_list_entry *entry;
|
2010-12-13 14:19:28 +03: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(entry, if_list, list) {
|
2010-12-13 14:19:28 +03:00
|
|
|
if (entry->primary)
|
2013-03-21 12:23:29 +04:00
|
|
|
seq_puts(seq, "PRIMARY, ");
|
2010-12-13 14:19:28 +03:00
|
|
|
else
|
2012-05-16 22:23:23 +04:00
|
|
|
seq_printf(seq, "SEC %pM, ", entry->addr);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2012-05-16 22:23:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* read an entry */
|
2012-06-06 00:31:31 +04:00
|
|
|
static ssize_t
|
|
|
|
batadv_vis_data_read_entry(struct seq_file *seq,
|
|
|
|
const struct batadv_vis_info_entry *entry,
|
|
|
|
const uint8_t *src, bool primary)
|
2012-05-16 22:23:23 +04:00
|
|
|
{
|
|
|
|
if (primary && entry->quality == 0)
|
|
|
|
return seq_printf(seq, "TT %pM, ", entry->dest);
|
|
|
|
else if (batadv_compare_eth(entry->src, src))
|
|
|
|
return seq_printf(seq, "TQ %pM %d, ", entry->dest,
|
|
|
|
entry->quality);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-16 22:23:23 +04:00
|
|
|
return 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
static void
|
|
|
|
batadv_vis_data_insert_interfaces(struct hlist_head *list,
|
|
|
|
struct batadv_vis_packet *packet,
|
|
|
|
struct batadv_vis_info_entry *entries)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-05-16 22:23:23 +04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < packet->entries; i++) {
|
|
|
|
if (entries[i].quality == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (batadv_compare_eth(entries[i].src, packet->vis_orig))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
batadv_vis_data_insert_interface(entries[i].src, list, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void batadv_vis_data_read_entries(struct seq_file *seq,
|
|
|
|
struct hlist_head *list,
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet,
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info_entry *entries)
|
2012-05-16 22:23:23 +04:00
|
|
|
{
|
|
|
|
int i;
|
2012-12-25 13:03:22 +04:00
|
|
|
struct batadv_vis_if_list_entry *entry;
|
2010-12-13 14:19:28 +03: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(entry, list, list) {
|
2012-05-16 22:23:23 +04:00
|
|
|
seq_printf(seq, "%pM,", entry->addr);
|
|
|
|
|
|
|
|
for (i = 0; i < packet->entries; i++)
|
|
|
|
batadv_vis_data_read_entry(seq, &entries[i],
|
|
|
|
entry->addr, entry->primary);
|
|
|
|
|
|
|
|
/* add primary/secondary records */
|
|
|
|
if (batadv_compare_eth(entry->addr, packet->vis_orig))
|
|
|
|
batadv_vis_data_read_prim_sec(seq, list);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2013-03-21 12:23:29 +04:00
|
|
|
seq_puts(seq, "\n");
|
2012-05-16 22:23:23 +04:00
|
|
|
}
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-05-16 22:23:23 +04:00
|
|
|
static void batadv_vis_seq_print_text_bucket(struct seq_file *seq,
|
|
|
|
const struct hlist_head *head)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2012-05-16 22:23:23 +04:00
|
|
|
uint8_t *entries_pos;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info_entry *entries;
|
2012-12-25 13:03:22 +04:00
|
|
|
struct batadv_vis_if_list_entry *entry;
|
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 *n;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-16 22:23:23 +04:00
|
|
|
HLIST_HEAD(vis_if_list);
|
|
|
|
|
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(info, head, hash_entry) {
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2012-05-16 22:23:23 +04:00
|
|
|
entries_pos = (uint8_t *)packet + sizeof(*packet);
|
2012-06-06 00:31:31 +04:00
|
|
|
entries = (struct batadv_vis_info_entry *)entries_pos;
|
2012-05-16 22:23:23 +04:00
|
|
|
|
|
|
|
batadv_vis_data_insert_interface(packet->vis_orig, &vis_if_list,
|
|
|
|
true);
|
|
|
|
batadv_vis_data_insert_interfaces(&vis_if_list, packet,
|
|
|
|
entries);
|
|
|
|
batadv_vis_data_read_entries(seq, &vis_if_list, packet,
|
|
|
|
entries);
|
|
|
|
|
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(entry, n, &vis_if_list, list) {
|
2012-05-16 22:23:23 +04:00
|
|
|
hlist_del(&entry->list);
|
|
|
|
kfree(entry);
|
|
|
|
}
|
|
|
|
}
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-05-12 04:09:41 +04:00
|
|
|
int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_hard_iface *primary_if;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct hlist_head *head;
|
|
|
|
struct net_device *net_dev = (struct net_device *)seq->private;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_priv *bat_priv = netdev_priv(net_dev);
|
2012-07-16 00:26:51 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->vis.hash;
|
2011-10-05 19:05:25 +04:00
|
|
|
uint32_t i;
|
2012-05-16 22:23:23 +04:00
|
|
|
int ret = 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
int vis_server = atomic_read(&bat_priv->vis_mode);
|
|
|
|
|
2012-05-12 15:48:54 +04:00
|
|
|
primary_if = batadv_primary_if_get_selected(bat_priv);
|
2011-04-20 17:40:58 +04:00
|
|
|
if (!primary_if)
|
|
|
|
goto out;
|
|
|
|
|
2012-06-04 00:19:21 +04:00
|
|
|
if (vis_server == BATADV_VIS_TYPE_CLIENT_UPDATE)
|
2011-04-20 17:40:58 +04:00
|
|
|
goto out;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
2012-05-16 22:23:23 +04:00
|
|
|
batadv_vis_seq_print_text_bucket(seq, head);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2011-04-20 17:40:58 +04:00
|
|
|
out:
|
|
|
|
if (primary_if)
|
2012-05-12 15:48:54 +04:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2011-04-20 17:40:58 +04:00
|
|
|
return ret;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* add the info packet to the send list, if it was not
|
2012-05-12 04:09:43 +04:00
|
|
|
* already linked in.
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_send_list_add(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
|
|
|
if (list_empty(&info->send_list)) {
|
|
|
|
kref_get(&info->refcount);
|
2012-07-16 00:26:51 +04:00
|
|
|
list_add_tail(&info->send_list, &bat_priv->vis.send_list);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* delete the info packet from the send list, if it was
|
2012-05-12 04:09:43 +04:00
|
|
|
* linked in.
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_send_list_del(struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
|
|
|
if (!list_empty(&info->send_list)) {
|
|
|
|
list_del_init(&info->send_list);
|
2012-05-16 22:23:18 +04:00
|
|
|
kref_put(&info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tries to add one entry to the receive list. */
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_recv_list_add(struct batadv_priv *bat_priv,
|
2012-05-16 22:23:18 +04:00
|
|
|
struct list_head *recv_list, const char *mac)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-12-25 13:03:23 +04:00
|
|
|
struct batadv_vis_recvlist_node *entry;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2011-05-15 01:14:54 +04:00
|
|
|
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
|
2010-12-13 14:19:28 +03:00
|
|
|
if (!entry)
|
|
|
|
return;
|
|
|
|
|
|
|
|
memcpy(entry->mac, mac, ETH_ALEN);
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
list_add_tail(&entry->list, recv_list);
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* returns 1 if this mac is in the recv_list */
|
2012-06-06 00:31:31 +04:00
|
|
|
static int batadv_recv_list_is_in(struct batadv_priv *bat_priv,
|
2012-05-16 22:23:18 +04:00
|
|
|
const struct list_head *recv_list,
|
|
|
|
const char *mac)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-12-25 13:03:23 +04:00
|
|
|
const struct batadv_vis_recvlist_node *entry;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
list_for_each_entry(entry, recv_list, list) {
|
2012-05-12 15:48:58 +04:00
|
|
|
if (batadv_compare_eth(entry->mac, mac)) {
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.list_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old,
|
|
|
|
* broken.. ). vis hash must be locked outside. is_new is set when the packet
|
2012-05-12 04:09:43 +04:00
|
|
|
* is newer than old entries in the hash.
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static struct batadv_vis_info *
|
|
|
|
batadv_add_packet(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_packet *vis_packet, int vis_info_len,
|
|
|
|
int *is_new, int make_broadcast)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info, *old_info;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *search_packet, *old_packet;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info search_elem;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
|
|
|
struct sk_buff *tmp_skb;
|
2010-12-13 14:19:28 +03:00
|
|
|
int hash_added;
|
2012-06-06 00:31:30 +04:00
|
|
|
size_t len;
|
2012-06-06 00:31:31 +04:00
|
|
|
size_t max_entries;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
*is_new = 0;
|
|
|
|
/* sanity check */
|
2012-07-16 00:26:51 +04:00
|
|
|
if (!bat_priv->vis.hash)
|
2010-12-13 14:19:28 +03:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* see if the packet is already in vis_hash */
|
2011-05-15 01:14:54 +04:00
|
|
|
search_elem.skb_packet = dev_alloc_skb(sizeof(*search_packet));
|
2010-12-13 14:19:28 +03:00
|
|
|
if (!search_elem.skb_packet)
|
|
|
|
return NULL;
|
2012-06-06 00:31:30 +04:00
|
|
|
len = sizeof(*search_packet);
|
|
|
|
tmp_skb = search_elem.skb_packet;
|
|
|
|
search_packet = (struct batadv_vis_packet *)skb_put(tmp_skb, len);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
memcpy(search_packet->vis_orig, vis_packet->vis_orig, ETH_ALEN);
|
2012-05-16 22:23:18 +04:00
|
|
|
old_info = batadv_vis_hash_find(bat_priv, &search_elem);
|
2010-12-13 14:19:28 +03:00
|
|
|
kfree_skb(search_elem.skb_packet);
|
|
|
|
|
|
|
|
if (old_info) {
|
2012-06-06 00:31:30 +04:00
|
|
|
tmp_skb = old_info->skb_packet;
|
|
|
|
old_packet = (struct batadv_vis_packet *)tmp_skb->data;
|
2012-05-16 22:23:22 +04:00
|
|
|
if (!batadv_seq_after(ntohl(vis_packet->seqno),
|
|
|
|
ntohl(old_packet->seqno))) {
|
2010-12-13 14:19:28 +03:00
|
|
|
if (old_packet->seqno == vis_packet->seqno) {
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_recv_list_add(bat_priv,
|
|
|
|
&old_info->recv_list,
|
|
|
|
vis_packet->sender_orig);
|
2010-12-13 14:19:28 +03:00
|
|
|
return old_info;
|
|
|
|
} else {
|
|
|
|
/* newer packet is already in hash. */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* remove old entry */
|
2012-07-16 00:26:51 +04:00
|
|
|
batadv_hash_remove(bat_priv->vis.hash, batadv_vis_info_cmp,
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_vis_info_choose, old_info);
|
|
|
|
batadv_send_list_del(old_info);
|
|
|
|
kref_put(&old_info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2011-05-15 01:14:54 +04:00
|
|
|
info = kmalloc(sizeof(*info), GFP_ATOMIC);
|
2010-12-13 14:19:28 +03:00
|
|
|
if (!info)
|
|
|
|
return NULL;
|
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
len = sizeof(*packet) + vis_info_len;
|
2013-04-03 00:28:44 +04:00
|
|
|
info->skb_packet = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
|
2010-12-13 14:19:28 +03:00
|
|
|
if (!info->skb_packet) {
|
|
|
|
kfree(info);
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-04-03 00:28:44 +04:00
|
|
|
skb_reserve(info->skb_packet, ETH_HLEN);
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
kref_init(&info->refcount);
|
|
|
|
INIT_LIST_HEAD(&info->send_list);
|
|
|
|
INIT_LIST_HEAD(&info->recv_list);
|
|
|
|
info->first_seen = jiffies;
|
|
|
|
info->bat_priv = bat_priv;
|
2012-06-06 00:31:30 +04:00
|
|
|
memcpy(packet, vis_packet, len);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* initialize and add new packet. */
|
|
|
|
*is_new = 1;
|
|
|
|
|
|
|
|
/* Make it a broadcast packet, if required */
|
|
|
|
if (make_broadcast)
|
2012-05-12 04:09:42 +04:00
|
|
|
memcpy(packet->target_orig, batadv_broadcast_addr, ETH_ALEN);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* repair if entries is longer than packet. */
|
2012-06-06 00:31:31 +04:00
|
|
|
max_entries = vis_info_len / sizeof(struct batadv_vis_info_entry);
|
|
|
|
if (packet->entries > max_entries)
|
|
|
|
packet->entries = max_entries;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* try to add it */
|
2012-07-16 00:26:51 +04:00
|
|
|
hash_added = batadv_hash_add(bat_priv->vis.hash, batadv_vis_info_cmp,
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_vis_info_choose, info,
|
|
|
|
&info->hash_entry);
|
2011-07-10 02:36:36 +04:00
|
|
|
if (hash_added != 0) {
|
2010-12-13 14:19:28 +03:00
|
|
|
/* did not work (for some reason) */
|
2012-05-16 22:23:18 +04:00
|
|
|
kref_put(&info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
info = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* handle the server sync packet, forward if needed. */
|
2012-06-06 00:31:31 +04:00
|
|
|
void batadv_receive_server_sync_packet(struct batadv_priv *bat_priv,
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *vis_packet,
|
2012-05-12 04:09:41 +04:00
|
|
|
int vis_info_len)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2010-12-13 14:19:28 +03:00
|
|
|
int is_new, make_broadcast;
|
|
|
|
int vis_server = atomic_read(&bat_priv->vis_mode);
|
|
|
|
|
2012-06-04 00:19:21 +04:00
|
|
|
make_broadcast = (vis_server == BATADV_VIS_TYPE_SERVER_SYNC);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2012-05-16 22:23:18 +04:00
|
|
|
info = batadv_add_packet(bat_priv, vis_packet, vis_info_len,
|
|
|
|
&is_new, make_broadcast);
|
2010-12-13 14:19:28 +03:00
|
|
|
if (!info)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
/* only if we are server ourselves and packet is newer than the one in
|
2012-05-12 04:09:43 +04:00
|
|
|
* hash.
|
|
|
|
*/
|
2012-06-04 00:19:21 +04:00
|
|
|
if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC && is_new)
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_add(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
end:
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* handle an incoming client update packet and schedule forward if needed. */
|
2012-06-06 00:31:31 +04:00
|
|
|
void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *vis_packet,
|
2012-05-12 04:09:41 +04:00
|
|
|
int vis_info_len)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2010-12-13 14:19:28 +03:00
|
|
|
int is_new;
|
|
|
|
int vis_server = atomic_read(&bat_priv->vis_mode);
|
|
|
|
int are_target = 0;
|
|
|
|
|
|
|
|
/* clients shall not broadcast. */
|
|
|
|
if (is_broadcast_ether_addr(vis_packet->target_orig))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Are we the target for this VIS packet? */
|
2012-06-04 00:19:21 +04:00
|
|
|
if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC &&
|
2013-04-03 21:10:26 +04:00
|
|
|
batadv_is_my_mac(bat_priv, vis_packet->target_orig))
|
2010-12-13 14:19:28 +03:00
|
|
|
are_target = 1;
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2012-05-16 22:23:18 +04:00
|
|
|
info = batadv_add_packet(bat_priv, vis_packet, vis_info_len,
|
|
|
|
&is_new, are_target);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
if (!info)
|
|
|
|
goto end;
|
|
|
|
/* note that outdated packets will be dropped at this point. */
|
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* send only if we're the target server or ... */
|
|
|
|
if (are_target && is_new) {
|
2012-06-04 00:19:21 +04:00
|
|
|
packet->vis_type = BATADV_VIS_TYPE_SERVER_SYNC; /* upgrade! */
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_add(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* ... we're not the recipient (and thus need to forward). */
|
2013-04-03 21:10:26 +04:00
|
|
|
} else if (!batadv_is_my_mac(bat_priv, packet->target_orig)) {
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_add(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
end:
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Walk the originators and find the VIS server with the best tq. Set the packet
|
|
|
|
* address to its address and return the best_tq.
|
|
|
|
*
|
2012-05-12 04:09:43 +04:00
|
|
|
* Must be called with the originator hash locked
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static int batadv_find_best_vis_server(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:28 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->orig_hash;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_neigh_node *router;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct hlist_head *head;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_orig_node *orig_node;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2011-10-05 19:05:25 +04:00
|
|
|
int best_tq = -1;
|
|
|
|
uint32_t i;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
|
2012-05-12 04:09:34 +04:00
|
|
|
router = batadv_orig_node_get_router(orig_node);
|
2011-03-15 01:43:37 +03:00
|
|
|
if (!router)
|
|
|
|
continue;
|
|
|
|
|
2012-06-04 00:19:21 +04:00
|
|
|
if ((orig_node->flags & BATADV_VIS_SERVER) &&
|
2011-03-15 01:43:37 +03:00
|
|
|
(router->tq_avg > best_tq)) {
|
|
|
|
best_tq = router->tq_avg;
|
2010-12-13 14:19:28 +03:00
|
|
|
memcpy(packet->target_orig, orig_node->orig,
|
|
|
|
ETH_ALEN);
|
|
|
|
}
|
2012-05-12 04:09:34 +04:00
|
|
|
batadv_neigh_node_free_ref(router);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_unlock();
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return best_tq;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return true if the vis packet is full. */
|
2012-06-06 00:31:31 +04:00
|
|
|
static bool batadv_vis_packet_full(const struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:30 +04:00
|
|
|
const struct batadv_vis_packet *packet;
|
2012-06-06 00:31:31 +04:00
|
|
|
size_t num;
|
2012-06-04 00:19:07 +04:00
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2012-06-06 00:31:31 +04:00
|
|
|
num = BATADV_MAX_VIS_PACKET_SIZE / sizeof(struct batadv_vis_info_entry);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
if (num < packet->entries + 1)
|
2010-12-13 14:19:28 +03:00
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* generates a packet of own vis data,
|
2012-05-12 04:09:43 +04:00
|
|
|
* returns 0 on success, -1 if no packet could be generated
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static int batadv_generate_vis_packet(struct batadv_priv *bat_priv)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:28 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->orig_hash;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct hlist_head *head;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_orig_node *orig_node;
|
|
|
|
struct batadv_neigh_node *router;
|
2012-07-16 00:26:51 +04:00
|
|
|
struct batadv_vis_info *info = bat_priv->vis.my_info;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info_entry *entry;
|
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2012-07-08 20:33:51 +04:00
|
|
|
uint8_t *packet_pos;
|
2011-10-05 19:05:25 +04:00
|
|
|
int best_tq = -1;
|
|
|
|
uint32_t i;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
info->first_seen = jiffies;
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->vis_type = atomic_read(&bat_priv->vis_mode);
|
|
|
|
|
2012-05-12 04:09:42 +04:00
|
|
|
memcpy(packet->target_orig, batadv_broadcast_addr, ETH_ALEN);
|
2012-06-04 00:19:17 +04:00
|
|
|
packet->header.ttl = BATADV_TTL;
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->seqno = htonl(ntohl(packet->seqno) + 1);
|
|
|
|
packet->entries = 0;
|
2012-06-28 13:56:52 +04:00
|
|
|
packet->reserved = 0;
|
2011-05-15 01:14:54 +04:00
|
|
|
skb_trim(info->skb_packet, sizeof(*packet));
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-04 00:19:21 +04:00
|
|
|
if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) {
|
2012-05-16 22:23:18 +04:00
|
|
|
best_tq = batadv_find_best_vis_server(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2011-01-19 23:01:44 +03:00
|
|
|
if (best_tq < 0)
|
2012-05-05 15:27:28 +04:00
|
|
|
return best_tq;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
|
2012-05-12 04:09:34 +04:00
|
|
|
router = batadv_orig_node_get_router(orig_node);
|
2011-03-15 01:43:37 +03:00
|
|
|
if (!router)
|
2010-12-13 14:19:28 +03:00
|
|
|
continue;
|
|
|
|
|
2012-05-12 15:48:58 +04:00
|
|
|
if (!batadv_compare_eth(router->addr, orig_node->orig))
|
2011-03-15 01:43:37 +03:00
|
|
|
goto next;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-04 00:19:19 +04:00
|
|
|
if (router->if_incoming->if_status != BATADV_IF_ACTIVE)
|
2011-03-15 01:43:37 +03:00
|
|
|
goto next;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2011-03-15 01:43:37 +03:00
|
|
|
if (router->tq_avg < 1)
|
|
|
|
goto next;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* fill one entry into buffer. */
|
2012-07-08 20:33:51 +04:00
|
|
|
packet_pos = skb_put(info->skb_packet, sizeof(*entry));
|
|
|
|
entry = (struct batadv_vis_info_entry *)packet_pos;
|
2010-12-13 14:19:28 +03:00
|
|
|
memcpy(entry->src,
|
2011-03-15 01:43:37 +03:00
|
|
|
router->if_incoming->net_dev->dev_addr,
|
2010-12-13 14:19:28 +03:00
|
|
|
ETH_ALEN);
|
|
|
|
memcpy(entry->dest, orig_node->orig, ETH_ALEN);
|
2011-03-15 01:43:37 +03:00
|
|
|
entry->quality = router->tq_avg;
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->entries++;
|
|
|
|
|
2011-03-15 01:43:37 +03:00
|
|
|
next:
|
2012-05-12 04:09:34 +04:00
|
|
|
batadv_neigh_node_free_ref(router);
|
2011-03-15 01:43:37 +03:00
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
if (batadv_vis_packet_full(info))
|
2011-01-19 23:01:44 +03:00
|
|
|
goto unlock;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_unlock();
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
hash = bat_priv->tt.local_hash;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-04-27 16:28:07 +04:00
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(tt_common_entry, head,
|
2011-04-27 16:28:07 +04:00
|
|
|
hash_entry) {
|
2012-07-08 20:33:51 +04:00
|
|
|
packet_pos = skb_put(info->skb_packet, sizeof(*entry));
|
|
|
|
entry = (struct batadv_vis_info_entry *)packet_pos;
|
2010-12-13 14:19:28 +03:00
|
|
|
memset(entry->src, 0, ETH_ALEN);
|
2011-10-30 15:17:33 +04:00
|
|
|
memcpy(entry->dest, tt_common_entry->addr, ETH_ALEN);
|
2011-05-05 10:42:45 +04:00
|
|
|
entry->quality = 0; /* 0 means TT */
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->entries++;
|
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
if (batadv_vis_packet_full(info))
|
2011-04-27 16:28:07 +04:00
|
|
|
goto unlock;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2011-04-27 16:28:07 +04:00
|
|
|
rcu_read_unlock();
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2011-01-19 23:01:44 +03:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* free old vis packets. Must be called with this vis_hash_lock
|
2012-05-12 04:09:43 +04:00
|
|
|
* held
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_purge_vis_packets(struct batadv_priv *bat_priv)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2011-10-05 19:05:25 +04:00
|
|
|
uint32_t i;
|
2012-07-16 00:26:51 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->vis.hash;
|
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 *node_tmp;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct hlist_head *head;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[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_safe(info, node_tmp,
|
2011-02-18 15:28:09 +03:00
|
|
|
head, hash_entry) {
|
2010-12-13 14:19:28 +03:00
|
|
|
/* never purge own data. */
|
2012-07-16 00:26:51 +04:00
|
|
|
if (info == bat_priv->vis.my_info)
|
2010-12-13 14:19:28 +03:00
|
|
|
continue;
|
|
|
|
|
2012-05-12 15:48:58 +04:00
|
|
|
if (batadv_has_timed_out(info->first_seen,
|
2012-06-04 00:19:16 +04:00
|
|
|
BATADV_VIS_TIMEOUT)) {
|
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_del(&info->hash_entry);
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_del(info);
|
|
|
|
kref_put(&info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:28 +04:00
|
|
|
struct batadv_hashtable *hash = bat_priv->orig_hash;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct hlist_head *head;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_orig_node *orig_node;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct sk_buff *skb;
|
2013-04-20 15:54:39 +04:00
|
|
|
uint32_t i, res;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* send to all routers in range. */
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 05:06:00 +04:00
|
|
|
hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
|
2010-12-13 14:19:28 +03:00
|
|
|
/* if it's a vis server and reachable, send it. */
|
2012-06-04 00:19:21 +04:00
|
|
|
if (!(orig_node->flags & BATADV_VIS_SERVER))
|
2010-12-13 14:19:28 +03:00
|
|
|
continue;
|
2011-03-15 01:43:37 +03:00
|
|
|
|
2010-12-13 14:19:28 +03:00
|
|
|
/* don't send it if we already received the packet from
|
2012-05-12 04:09:43 +04:00
|
|
|
* this node.
|
|
|
|
*/
|
2012-05-16 22:23:18 +04:00
|
|
|
if (batadv_recv_list_is_in(bat_priv, &info->recv_list,
|
2012-10-16 18:13:48 +04:00
|
|
|
orig_node->orig))
|
2010-12-13 14:19:28 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
|
|
|
|
skb = skb_clone(info->skb_packet, GFP_ATOMIC);
|
2012-10-16 18:13:48 +04:00
|
|
|
if (!skb)
|
|
|
|
continue;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2013-04-20 15:54:39 +04:00
|
|
|
res = batadv_send_skb_to_orig(skb, orig_node, NULL);
|
|
|
|
if (res == NET_XMIT_DROP)
|
2012-10-16 18:13:48 +04:00
|
|
|
kfree_skb(skb);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2011-01-19 23:01:40 +03:00
|
|
|
rcu_read_unlock();
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_orig_node *orig_node;
|
2010-12-13 14:19:28 +03:00
|
|
|
struct sk_buff *skb;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-12 15:48:56 +04:00
|
|
|
orig_node = batadv_orig_hash_find(bat_priv, packet->target_orig);
|
2011-02-10 17:33:53 +03:00
|
|
|
if (!orig_node)
|
2011-03-15 01:43:37 +03:00
|
|
|
goto out;
|
2011-02-10 17:33:53 +03:00
|
|
|
|
2012-10-16 18:13:48 +04:00
|
|
|
skb = skb_clone(info->skb_packet, GFP_ATOMIC);
|
|
|
|
if (!skb)
|
2011-03-15 01:43:37 +03:00
|
|
|
goto out;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2013-04-20 15:54:39 +04:00
|
|
|
if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP)
|
2012-10-16 18:13:48 +04:00
|
|
|
kfree_skb(skb);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
out:
|
2011-02-10 17:33:53 +03:00
|
|
|
if (orig_node)
|
2012-05-12 04:09:34 +04:00
|
|
|
batadv_orig_node_free_ref(orig_node);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
/* only send one vis packet. called from batadv_send_vis_packets() */
|
2012-06-06 00:31:31 +04:00
|
|
|
static void batadv_send_vis_packet(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_vis_info *info)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_hard_iface *primary_if;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-12 15:48:54 +04:00
|
|
|
primary_if = batadv_primary_if_get_selected(bat_priv);
|
2011-04-20 17:40:58 +04:00
|
|
|
if (!primary_if)
|
|
|
|
goto out;
|
|
|
|
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)info->skb_packet->data;
|
2011-11-20 18:47:38 +04:00
|
|
|
if (packet->header.ttl < 2) {
|
2010-12-13 14:19:28 +03:00
|
|
|
pr_debug("Error - can't send vis packet: ttl exceeded\n");
|
2011-04-20 17:40:58 +04:00
|
|
|
goto out;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2011-04-20 17:40:58 +04:00
|
|
|
memcpy(packet->sender_orig, primary_if->net_dev->dev_addr, ETH_ALEN);
|
2011-11-20 18:47:38 +04:00
|
|
|
packet->header.ttl--;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
if (is_broadcast_ether_addr(packet->target_orig))
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_broadcast_vis_packet(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
else
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_unicast_vis_packet(bat_priv, info);
|
2011-11-20 18:47:38 +04:00
|
|
|
packet->header.ttl++; /* restore TTL */
|
2011-04-20 17:40:58 +04:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (primary_if)
|
2012-05-12 15:48:54 +04:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* called from timer; send (and maybe generate) vis packet. */
|
2012-05-16 22:23:18 +04:00
|
|
|
static void batadv_send_vis_packets(struct work_struct *work)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-07-08 19:13:15 +04:00
|
|
|
struct delayed_work *delayed_work;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_priv *bat_priv;
|
2012-07-16 00:26:51 +04:00
|
|
|
struct batadv_priv_vis *priv_vis;
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-08 19:13:15 +04:00
|
|
|
delayed_work = container_of(work, struct delayed_work, work);
|
2012-07-16 00:26:51 +04:00
|
|
|
priv_vis = container_of(delayed_work, struct batadv_priv_vis, work);
|
|
|
|
bat_priv = container_of(priv_vis, struct batadv_priv, vis);
|
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_purge_vis_packets(bat_priv);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
if (batadv_generate_vis_packet(bat_priv) == 0) {
|
2010-12-13 14:19:28 +03:00
|
|
|
/* schedule if generation was successful */
|
2012-07-16 00:26:51 +04:00
|
|
|
batadv_send_list_add(bat_priv, bat_priv->vis.my_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
while (!list_empty(&bat_priv->vis.send_list)) {
|
|
|
|
info = list_first_entry(&bat_priv->vis.send_list,
|
2011-01-28 20:34:07 +03:00
|
|
|
typeof(*info), send_list);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
kref_get(&info->refcount);
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_vis_packet(bat_priv, info);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_del(info);
|
|
|
|
kref_put(&info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2012-12-25 16:14:37 +04:00
|
|
|
|
|
|
|
queue_delayed_work(batadv_event_workqueue, &bat_priv->vis.work,
|
|
|
|
msecs_to_jiffies(BATADV_VIS_INTERVAL));
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* init the vis server. this may only be called when if_list is already
|
2012-05-12 04:09:43 +04:00
|
|
|
* initialized (e.g. bat0 is initialized, interfaces have been added)
|
|
|
|
*/
|
2012-06-06 00:31:31 +04:00
|
|
|
int batadv_vis_init(struct batadv_priv *bat_priv)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:30 +04:00
|
|
|
struct batadv_vis_packet *packet;
|
2010-12-13 14:19:28 +03:00
|
|
|
int hash_added;
|
2012-06-04 00:19:07 +04:00
|
|
|
unsigned int len;
|
2012-06-04 00:19:17 +04:00
|
|
|
unsigned long first_seen;
|
2012-06-06 00:31:30 +04:00
|
|
|
struct sk_buff *tmp_skb;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
if (bat_priv->vis.hash)
|
2012-05-05 15:27:28 +04:00
|
|
|
return 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
bat_priv->vis.hash = batadv_hash_new(256);
|
|
|
|
if (!bat_priv->vis.hash) {
|
2010-12-13 14:19:28 +03:00
|
|
|
pr_err("Can't initialize vis_hash\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2012-11-10 14:00:32 +04:00
|
|
|
batadv_hash_set_lock_class(bat_priv->vis.hash,
|
|
|
|
&batadv_vis_hash_lock_class_key);
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
bat_priv->vis.my_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
|
|
|
|
if (!bat_priv->vis.my_info)
|
2010-12-13 14:19:28 +03:00
|
|
|
goto err;
|
|
|
|
|
2013-04-03 00:28:44 +04:00
|
|
|
len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN;
|
|
|
|
bat_priv->vis.my_info->skb_packet = netdev_alloc_skb_ip_align(NULL,
|
|
|
|
len);
|
2012-07-16 00:26:51 +04:00
|
|
|
if (!bat_priv->vis.my_info->skb_packet)
|
2010-12-13 14:19:28 +03:00
|
|
|
goto free_info;
|
|
|
|
|
2013-04-03 00:28:44 +04:00
|
|
|
skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN);
|
2012-07-16 00:26:51 +04:00
|
|
|
tmp_skb = bat_priv->vis.my_info->skb_packet;
|
2012-06-06 00:31:30 +04:00
|
|
|
packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
/* prefill the vis info */
|
2012-06-04 00:19:17 +04:00
|
|
|
first_seen = jiffies - msecs_to_jiffies(BATADV_VIS_INTERVAL);
|
2012-07-16 00:26:51 +04:00
|
|
|
bat_priv->vis.my_info->first_seen = first_seen;
|
|
|
|
INIT_LIST_HEAD(&bat_priv->vis.my_info->recv_list);
|
|
|
|
INIT_LIST_HEAD(&bat_priv->vis.my_info->send_list);
|
|
|
|
kref_init(&bat_priv->vis.my_info->refcount);
|
|
|
|
bat_priv->vis.my_info->bat_priv = bat_priv;
|
2012-06-04 00:19:13 +04:00
|
|
|
packet->header.version = BATADV_COMPAT_VERSION;
|
2012-06-04 00:19:21 +04:00
|
|
|
packet->header.packet_type = BATADV_VIS;
|
2012-06-04 00:19:17 +04:00
|
|
|
packet->header.ttl = BATADV_TTL;
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->seqno = 0;
|
2012-06-28 13:56:52 +04:00
|
|
|
packet->reserved = 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
packet->entries = 0;
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
INIT_LIST_HEAD(&bat_priv->vis.send_list);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
hash_added = batadv_hash_add(bat_priv->vis.hash, batadv_vis_info_cmp,
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_vis_info_choose,
|
2012-07-16 00:26:51 +04:00
|
|
|
bat_priv->vis.my_info,
|
|
|
|
&bat_priv->vis.my_info->hash_entry);
|
2011-07-10 02:36:36 +04:00
|
|
|
if (hash_added != 0) {
|
2010-12-13 14:19:28 +03:00
|
|
|
pr_err("Can't add own vis packet into hash\n");
|
|
|
|
/* not in hash, need to remove it manually. */
|
2012-07-16 00:26:51 +04:00
|
|
|
kref_put(&bat_priv->vis.my_info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2012-12-25 16:14:37 +04:00
|
|
|
|
|
|
|
INIT_DELAYED_WORK(&bat_priv->vis.work, batadv_send_vis_packets);
|
|
|
|
queue_delayed_work(batadv_event_workqueue, &bat_priv->vis.work,
|
|
|
|
msecs_to_jiffies(BATADV_VIS_INTERVAL));
|
|
|
|
|
2012-05-05 15:27:28 +04:00
|
|
|
return 0;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
|
|
|
free_info:
|
2012-07-16 00:26:51 +04:00
|
|
|
kfree(bat_priv->vis.my_info);
|
|
|
|
bat_priv->vis.my_info = NULL;
|
2010-12-13 14:19:28 +03:00
|
|
|
err:
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2012-05-12 04:09:41 +04:00
|
|
|
batadv_vis_quit(bat_priv);
|
2012-05-05 15:27:28 +04:00
|
|
|
return -ENOMEM;
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Decrease the reference count on a hash item info */
|
2012-05-16 22:23:18 +04:00
|
|
|
static void batadv_free_info_ref(struct hlist_node *node, void *arg)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-06-06 00:31:31 +04:00
|
|
|
struct batadv_vis_info *info;
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-06-06 00:31:31 +04:00
|
|
|
info = container_of(node, struct batadv_vis_info, hash_entry);
|
2012-05-16 22:23:18 +04:00
|
|
|
batadv_send_list_del(info);
|
|
|
|
kref_put(&info->refcount, batadv_free_info);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* shutdown vis-server */
|
2012-06-06 00:31:31 +04:00
|
|
|
void batadv_vis_quit(struct batadv_priv *bat_priv)
|
2010-12-13 14:19:28 +03:00
|
|
|
{
|
2012-07-16 00:26:51 +04:00
|
|
|
if (!bat_priv->vis.hash)
|
2010-12-13 14:19:28 +03:00
|
|
|
return;
|
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
cancel_delayed_work_sync(&bat_priv->vis.work);
|
2010-12-13 14:19:28 +03:00
|
|
|
|
2012-07-16 00:26:51 +04:00
|
|
|
spin_lock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
/* properly remove, kill timers ... */
|
2012-07-16 00:26:51 +04:00
|
|
|
batadv_hash_delete(bat_priv->vis.hash, batadv_free_info_ref, NULL);
|
|
|
|
bat_priv->vis.hash = NULL;
|
|
|
|
bat_priv->vis.my_info = NULL;
|
|
|
|
spin_unlock_bh(&bat_priv->vis.hash_lock);
|
2010-12-13 14:19:28 +03:00
|
|
|
}
|