2014-01-04 17:04:25 +00:00
|
|
|
/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors:
|
2010-12-13 11:19:28 +00:00
|
|
|
*
|
2012-03-14 12:03:01 +00:00
|
|
|
* Marek Lindner, Simon Wunderlich, Antonio Quartulli
|
2010-12-13 11:19:28 +00:00
|
|
|
*
|
|
|
|
* 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
|
2013-11-03 19:40:48 +00:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2010-12-13 11:19:28 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "main.h"
|
|
|
|
#include "translation-table.h"
|
|
|
|
#include "soft-interface.h"
|
2011-04-20 13:40:58 +00:00
|
|
|
#include "hard-interface.h"
|
2011-04-27 12:27:44 +00:00
|
|
|
#include "send.h"
|
2010-12-13 11:19:28 +00:00
|
|
|
#include "hash.h"
|
|
|
|
#include "originator.h"
|
2011-04-27 12:27:44 +00:00
|
|
|
#include "routing.h"
|
2012-01-22 19:00:23 +00:00
|
|
|
#include "bridge_loop_avoidance.h"
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
#include <linux/crc32c.h>
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-11-10 10:00:32 +00:00
|
|
|
/* hash class keys */
|
|
|
|
static struct lock_class_key batadv_tt_local_hash_lock_class_key;
|
|
|
|
static struct lock_class_key batadv_tt_global_hash_lock_class_key;
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client,
|
2013-06-04 10:11:39 +00:00
|
|
|
unsigned short vid,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_orig_node *orig_node);
|
2012-05-16 18:23:16 +00:00
|
|
|
static void batadv_tt_purge(struct work_struct *work);
|
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry);
|
2012-07-05 21:38:29 +00:00
|
|
|
static void batadv_tt_global_del(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
|
|
|
const unsigned char *addr,
|
2013-06-04 10:11:39 +00:00
|
|
|
unsigned short vid, const char *message,
|
|
|
|
bool roaming);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-02-18 12:28:09 +00:00
|
|
|
/* returns 1 if they are the same mac addr */
|
2012-05-16 18:23:16 +00:00
|
|
|
static int batadv_compare_tt(const struct hlist_node *node, const void *data2)
|
2011-02-18 12:28:09 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
const void *data1 = container_of(node, struct batadv_tt_common_entry,
|
2011-05-14 21:14:50 +00:00
|
|
|
hash_entry);
|
2011-02-18 12:28:09 +00:00
|
|
|
|
2013-12-26 11:40:39 +00:00
|
|
|
return batadv_compare_eth(data1, data2);
|
2011-02-18 12:28:09 +00:00
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_choose_tt - return the index of the tt entry in the hash table
|
|
|
|
* @data: pointer to the tt_common_entry object to map
|
|
|
|
* @size: the size of the hash table
|
|
|
|
*
|
|
|
|
* Returns the hash index where the object represented by 'data' should be
|
|
|
|
* stored at.
|
|
|
|
*/
|
|
|
|
static inline uint32_t batadv_choose_tt(const void *data, uint32_t size)
|
|
|
|
{
|
|
|
|
struct batadv_tt_common_entry *tt;
|
|
|
|
uint32_t hash = 0;
|
|
|
|
|
|
|
|
tt = (struct batadv_tt_common_entry *)data;
|
|
|
|
hash = batadv_hash_bytes(hash, &tt->addr, ETH_ALEN);
|
|
|
|
hash = batadv_hash_bytes(hash, &tt->vid, sizeof(tt->vid));
|
|
|
|
|
|
|
|
hash += (hash << 3);
|
|
|
|
hash ^= (hash >> 11);
|
|
|
|
hash += (hash << 15);
|
|
|
|
|
|
|
|
return hash % size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_hash_find - look for a client in the given hash table
|
|
|
|
* @hash: the hash table to search
|
|
|
|
* @addr: the mac address of the client to look for
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns a pointer to the tt_common struct belonging to the searched client if
|
|
|
|
* found, NULL otherwise.
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static struct batadv_tt_common_entry *
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_tt_hash_find(struct batadv_hashtable *hash, const uint8_t *addr,
|
|
|
|
unsigned short vid)
|
2011-02-18 12:28:09 +00:00
|
|
|
{
|
|
|
|
struct hlist_head *head;
|
2013-06-04 10:11:39 +00:00
|
|
|
struct batadv_tt_common_entry to_search, *tt, *tt_tmp = NULL;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t index;
|
2011-02-18 12:28:09 +00:00
|
|
|
|
|
|
|
if (!hash)
|
|
|
|
return NULL;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
memcpy(to_search.addr, addr, ETH_ALEN);
|
|
|
|
to_search.vid = vid;
|
|
|
|
|
|
|
|
index = batadv_choose_tt(&to_search, hash->size);
|
2011-02-18 12:28:09 +00:00
|
|
|
head = &hash->table[index];
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2013-06-04 10:11:39 +00:00
|
|
|
hlist_for_each_entry_rcu(tt, head, hash_entry) {
|
|
|
|
if (!batadv_compare_eth(tt, addr))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (tt->vid != vid)
|
2011-02-18 12:28:09 +00:00
|
|
|
continue;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
if (!atomic_inc_not_zero(&tt->refcount))
|
2011-04-27 12:28:07 +00:00
|
|
|
continue;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_tmp = tt;
|
2011-02-18 12:28:09 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
return tt_tmp;
|
2011-02-18 12:28:09 +00:00
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_hash_find - search the local table for a given client
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the mac address of the client to look for
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns a pointer to the corresponding tt_local_entry struct if the client is
|
|
|
|
* found, NULL otherwise.
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static struct batadv_tt_local_entry *
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const uint8_t *addr,
|
|
|
|
unsigned short vid)
|
2011-02-18 12:28:09 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
|
|
|
struct batadv_tt_local_entry *tt_local_entry = NULL;
|
2011-02-18 12:28:09 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_common_entry = batadv_tt_hash_find(bat_priv->tt.local_hash, addr,
|
|
|
|
vid);
|
2011-10-30 11:17:33 +00:00
|
|
|
if (tt_common_entry)
|
|
|
|
tt_local_entry = container_of(tt_common_entry,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry,
|
|
|
|
common);
|
2011-10-30 11:17:33 +00:00
|
|
|
return tt_local_entry;
|
|
|
|
}
|
2011-02-18 12:28:09 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_hash_find - search the global table for a given client
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the mac address of the client to look for
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns a pointer to the corresponding tt_global_entry struct if the client
|
|
|
|
* is found, NULL otherwise.
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static struct batadv_tt_global_entry *
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const uint8_t *addr,
|
|
|
|
unsigned short vid)
|
2011-10-30 11:17:33 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry = NULL;
|
2011-04-27 12:28:07 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_common_entry = batadv_tt_hash_find(bat_priv->tt.global_hash, addr,
|
|
|
|
vid);
|
2011-10-30 11:17:33 +00:00
|
|
|
if (tt_common_entry)
|
|
|
|
tt_global_entry = container_of(tt_common_entry,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
2011-10-30 11:17:33 +00:00
|
|
|
return tt_global_entry;
|
2011-02-18 12:28:09 +00:00
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry)
|
2011-04-27 12:28:07 +00:00
|
|
|
{
|
2011-10-30 11:17:33 +00:00
|
|
|
if (atomic_dec_and_test(&tt_local_entry->common.refcount))
|
|
|
|
kfree_rcu(tt_local_entry, common.rcu);
|
2011-04-27 12:28:07 +00:00
|
|
|
}
|
|
|
|
|
2013-05-06 22:29:22 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_entry_free_ref - decrement the refcounter for a
|
|
|
|
* tt_global_entry and possibly free it
|
|
|
|
* @tt_global_entry: the object to free
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry)
|
2011-04-27 12:28:07 +00:00
|
|
|
{
|
2011-10-22 18:12:51 +00:00
|
|
|
if (atomic_dec_and_test(&tt_global_entry->common.refcount)) {
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_orig_list(tt_global_entry);
|
2013-05-06 22:29:22 +00:00
|
|
|
kfree_rcu(tt_global_entry, common.rcu);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu);
|
2013-04-15 13:43:29 +00:00
|
|
|
|
|
|
|
/* We are in an rcu callback here, therefore we cannot use
|
|
|
|
* batadv_orig_node_free_ref() and its call_rcu():
|
|
|
|
* An rcu_barrier() wouldn't wait for that to finish
|
|
|
|
*/
|
|
|
|
batadv_orig_node_free_ref_now(orig_entry->orig_node);
|
2011-10-22 18:12:51 +00:00
|
|
|
kfree(orig_entry);
|
|
|
|
}
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_size_mod - change the size by v of the local table identified
|
|
|
|
* by vid
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @vid: the VLAN identifier of the sub-table to change
|
|
|
|
* @v: the amount to sum to the local table size
|
|
|
|
*/
|
|
|
|
static void batadv_tt_local_size_mod(struct batadv_priv *bat_priv,
|
|
|
|
unsigned short vid, int v)
|
|
|
|
{
|
|
|
|
struct batadv_softif_vlan *vlan;
|
|
|
|
|
|
|
|
vlan = batadv_softif_vlan_get(bat_priv, vid);
|
|
|
|
if (!vlan)
|
|
|
|
return;
|
|
|
|
|
|
|
|
atomic_add(v, &vlan->tt.num_entries);
|
|
|
|
|
|
|
|
batadv_softif_vlan_free_ref(vlan);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_local_size_inc - increase by one the local table size for the given
|
|
|
|
* vid
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @vid: the VLAN identifier
|
|
|
|
*/
|
|
|
|
static void batadv_tt_local_size_inc(struct batadv_priv *bat_priv,
|
|
|
|
unsigned short vid)
|
|
|
|
{
|
|
|
|
batadv_tt_local_size_mod(bat_priv, vid, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_local_size_dec - decrease by one the local table size for the given
|
|
|
|
* vid
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @vid: the VLAN identifier
|
|
|
|
*/
|
|
|
|
static void batadv_tt_local_size_dec(struct batadv_priv *bat_priv,
|
|
|
|
unsigned short vid)
|
|
|
|
{
|
|
|
|
batadv_tt_local_size_mod(bat_priv, vid, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_global_size_mod - change the size by v of the local table
|
|
|
|
* identified by vid
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @vid: the VLAN identifier
|
|
|
|
* @v: the amount to sum to the global table size
|
|
|
|
*/
|
|
|
|
static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node,
|
|
|
|
unsigned short vid, int v)
|
|
|
|
{
|
|
|
|
struct batadv_orig_node_vlan *vlan;
|
|
|
|
|
|
|
|
vlan = batadv_orig_node_vlan_new(orig_node, vid);
|
|
|
|
if (!vlan)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (atomic_add_return(v, &vlan->tt.num_entries) == 0) {
|
|
|
|
spin_lock_bh(&orig_node->vlan_list_lock);
|
|
|
|
list_del_rcu(&vlan->list);
|
|
|
|
spin_unlock_bh(&orig_node->vlan_list_lock);
|
|
|
|
batadv_orig_node_vlan_free_ref(vlan);
|
|
|
|
}
|
|
|
|
|
|
|
|
batadv_orig_node_vlan_free_ref(vlan);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_global_size_inc - increase by one the global table size for the
|
|
|
|
* given vid
|
|
|
|
* @orig_node: the originator which global table size has to be decreased
|
|
|
|
* @vid: the vlan identifier
|
|
|
|
*/
|
|
|
|
static void batadv_tt_global_size_inc(struct batadv_orig_node *orig_node,
|
|
|
|
unsigned short vid)
|
|
|
|
{
|
|
|
|
batadv_tt_global_size_mod(orig_node, vid, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_global_size_dec - decrease by one the global table size for the
|
|
|
|
* given vid
|
|
|
|
* @orig_node: the originator which global table size has to be decreased
|
|
|
|
* @vid: the vlan identifier
|
|
|
|
*/
|
|
|
|
static void batadv_tt_global_size_dec(struct batadv_orig_node *orig_node,
|
|
|
|
unsigned short vid)
|
|
|
|
{
|
|
|
|
batadv_tt_global_size_mod(orig_node, vid, -1);
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_orig_list_entry_free_ref(struct batadv_tt_orig_list_entry *orig_entry)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
2012-07-01 12:09:12 +00:00
|
|
|
if (!atomic_dec_and_test(&orig_entry->refcount))
|
|
|
|
return;
|
2013-07-30 20:16:25 +00:00
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);
|
2011-04-27 12:28:07 +00:00
|
|
|
}
|
|
|
|
|
2013-04-03 09:15:33 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_event - store a local TT event (ADD/DEL)
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_local_entry: the TT entry involved in the event
|
|
|
|
* @event_flags: flags to store in the event structure
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_local_event(struct batadv_priv *bat_priv,
|
2013-04-03 09:15:33 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry,
|
|
|
|
uint8_t event_flags)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_change_node *tt_change_node, *entry, *safe;
|
2013-04-03 09:15:33 +00:00
|
|
|
struct batadv_tt_common_entry *common = &tt_local_entry->common;
|
|
|
|
uint8_t flags = common->flags | event_flags;
|
2012-05-24 22:00:42 +00:00
|
|
|
bool event_removed = false;
|
|
|
|
bool del_op_requested, del_op_entry;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC);
|
|
|
|
if (!tt_change_node)
|
|
|
|
return;
|
|
|
|
|
2011-06-29 23:14:00 +00:00
|
|
|
tt_change_node->change.flags = flags;
|
2013-12-15 12:26:55 +00:00
|
|
|
memset(tt_change_node->change.reserved, 0,
|
|
|
|
sizeof(tt_change_node->change.reserved));
|
2013-04-03 09:15:33 +00:00
|
|
|
memcpy(tt_change_node->change.addr, common->addr, ETH_ALEN);
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_change_node->change.vid = htons(common->vid);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
del_op_requested = flags & BATADV_TT_CLIENT_DEL;
|
2012-05-24 22:00:42 +00:00
|
|
|
|
|
|
|
/* check for ADD+DEL or DEL+ADD events */
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.changes_list_lock);
|
|
|
|
list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list,
|
2012-05-24 22:00:42 +00:00
|
|
|
list) {
|
2013-04-03 09:15:33 +00:00
|
|
|
if (!batadv_compare_eth(entry->change.addr, common->addr))
|
2012-05-24 22:00:42 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* DEL+ADD in the same orig interval have no effect and can be
|
|
|
|
* removed to avoid silly behaviour on the receiver side. The
|
|
|
|
* other way around (ADD+DEL) can happen in case of roaming of
|
|
|
|
* a client still in the NEW state. Roaming of NEW clients is
|
|
|
|
* now possible due to automatically recognition of "temporary"
|
|
|
|
* clients
|
|
|
|
*/
|
2012-06-03 20:19:21 +00:00
|
|
|
del_op_entry = entry->change.flags & BATADV_TT_CLIENT_DEL;
|
2012-05-24 22:00:42 +00:00
|
|
|
if (!del_op_requested && del_op_entry)
|
|
|
|
goto del;
|
|
|
|
if (del_op_requested && !del_op_entry)
|
|
|
|
goto del;
|
2013-10-13 00:50:19 +00:00
|
|
|
|
|
|
|
/* this is a second add in the same originator interval. It
|
|
|
|
* means that flags have been changed: update them!
|
|
|
|
*/
|
|
|
|
if (!del_op_requested && !del_op_entry)
|
|
|
|
entry->change.flags = flags;
|
|
|
|
|
2012-05-24 22:00:42 +00:00
|
|
|
continue;
|
|
|
|
del:
|
|
|
|
list_del(&entry->list);
|
|
|
|
kfree(entry);
|
2012-08-07 08:32:34 +00:00
|
|
|
kfree(tt_change_node);
|
2012-05-24 22:00:42 +00:00
|
|
|
event_removed = true;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2011-04-27 12:27:44 +00:00
|
|
|
/* track the change in the OGMinterval list */
|
2012-07-15 20:26:51 +00:00
|
|
|
list_add_tail(&tt_change_node->list, &bat_priv->tt.changes_list);
|
2012-05-24 22:00:42 +00:00
|
|
|
|
|
|
|
unlock:
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.changes_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-05-24 22:00:42 +00:00
|
|
|
if (event_removed)
|
2012-07-15 20:26:51 +00:00
|
|
|
atomic_dec(&bat_priv->tt.local_changes);
|
2012-05-24 22:00:42 +00:00
|
|
|
else
|
2012-07-15 20:26:51 +00:00
|
|
|
atomic_inc(&bat_priv->tt.local_changes);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_len - compute length in bytes of given number of tt changes
|
|
|
|
* @changes_num: number of tt changes
|
|
|
|
*
|
|
|
|
* Returns computed length in bytes.
|
|
|
|
*/
|
|
|
|
static int batadv_tt_len(int changes_num)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2013-04-23 13:40:02 +00:00
|
|
|
return changes_num * sizeof(struct batadv_tvlv_tt_change);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-05-28 11:14:27 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_entries - compute the number of entries fitting in tt_len bytes
|
|
|
|
* @tt_len: available space
|
|
|
|
*
|
|
|
|
* Returns the number of entries.
|
|
|
|
*/
|
|
|
|
static uint16_t batadv_tt_entries(uint16_t tt_len)
|
|
|
|
{
|
|
|
|
return tt_len / batadv_tt_len(1);
|
|
|
|
}
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_table_transmit_size - calculates the local translation table
|
|
|
|
* size when transmitted over the air
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
*
|
|
|
|
* Returns local translation table size in bytes.
|
|
|
|
*/
|
|
|
|
static int batadv_tt_local_table_transmit_size(struct batadv_priv *bat_priv)
|
|
|
|
{
|
|
|
|
uint16_t num_vlan = 0, tt_local_entries = 0;
|
|
|
|
struct batadv_softif_vlan *vlan;
|
|
|
|
int hdr_size;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
|
|
|
|
num_vlan++;
|
|
|
|
tt_local_entries += atomic_read(&vlan->tt.num_entries);
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
/* header size of tvlv encapsulated tt response payload */
|
|
|
|
hdr_size = sizeof(struct batadv_unicast_tvlv_packet);
|
|
|
|
hdr_size += sizeof(struct batadv_tvlv_hdr);
|
|
|
|
hdr_size += sizeof(struct batadv_tvlv_tt_data);
|
|
|
|
hdr_size += num_vlan * sizeof(struct batadv_tvlv_tt_vlan_data);
|
|
|
|
|
|
|
|
return hdr_size + batadv_tt_len(tt_local_entries);
|
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static int batadv_tt_local_init(struct batadv_priv *bat_priv)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
if (bat_priv->tt.local_hash)
|
2012-05-05 11:27:28 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
bat_priv->tt.local_hash = batadv_hash_new(1024);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
if (!bat_priv->tt.local_hash)
|
2012-05-05 11:27:28 +00:00
|
|
|
return -ENOMEM;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-11-10 10:00:32 +00:00
|
|
|
batadv_hash_set_lock_class(bat_priv->tt.local_hash,
|
|
|
|
&batadv_tt_local_hash_lock_class_key);
|
|
|
|
|
2012-05-05 11:27:28 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-09-23 20:38:37 +00:00
|
|
|
static void batadv_tt_global_free(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_global_entry *tt_global,
|
|
|
|
const char *message)
|
|
|
|
{
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Deleting global tt entry %pM (vid: %d): %s\n",
|
|
|
|
tt_global->common.addr,
|
|
|
|
BATADV_PRINT_VID(tt_global->common.vid), message);
|
2012-09-23 20:38:37 +00:00
|
|
|
|
|
|
|
batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt,
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_choose_tt, &tt_global->common);
|
2012-09-23 20:38:37 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global);
|
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_add - add a new client to the local table or update an
|
|
|
|
* existing client
|
|
|
|
* @soft_iface: netdev struct of the mesh interface
|
|
|
|
* @addr: the mac address of the client to add
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
* @ifindex: index of the interface where the client is connected to (useful to
|
|
|
|
* identify wireless clients)
|
2013-11-16 11:03:48 +00:00
|
|
|
* @mark: the value contained in the skb->mark field of the received packet (if
|
|
|
|
* any)
|
2013-05-27 07:33:25 +00:00
|
|
|
*
|
|
|
|
* Returns true if the client was successfully added, false otherwise.
|
2013-06-04 10:11:39 +00:00
|
|
|
*/
|
2013-05-27 07:33:25 +00:00
|
|
|
bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
|
2013-11-16 11:03:48 +00:00
|
|
|
unsigned short vid, int ifindex, uint32_t mark)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local;
|
|
|
|
struct batadv_tt_global_entry *tt_global;
|
2013-10-13 00:50:18 +00:00
|
|
|
struct net_device *in_dev = NULL;
|
2011-10-22 18:12:51 +00:00
|
|
|
struct hlist_head *head;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2013-05-27 07:33:25 +00:00
|
|
|
int hash_added, table_size, packet_size_max;
|
|
|
|
bool ret = false, roamed_back = false;
|
2013-10-13 00:50:19 +00:00
|
|
|
uint8_t remote_flags;
|
2013-11-16 11:03:48 +00:00
|
|
|
uint32_t match_mark;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-10-13 00:50:18 +00:00
|
|
|
if (ifindex != BATADV_NULL_IFINDEX)
|
|
|
|
in_dev = dev_get_by_index(&init_net, ifindex);
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid);
|
|
|
|
tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-09-23 20:38:35 +00:00
|
|
|
if (tt_local) {
|
|
|
|
tt_local->last_seen = jiffies;
|
2012-09-23 20:38:37 +00:00
|
|
|
if (tt_local->common.flags & BATADV_TT_CLIENT_PENDING) {
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Re-adding pending client %pM (vid: %d)\n",
|
|
|
|
addr, BATADV_PRINT_VID(vid));
|
2012-09-23 20:38:37 +00:00
|
|
|
/* whatever the reason why the PENDING flag was set,
|
|
|
|
* this is a client which was enqueued to be removed in
|
|
|
|
* this orig_interval. Since it popped up again, the
|
|
|
|
* flag can be reset like it was never enqueued
|
|
|
|
*/
|
|
|
|
tt_local->common.flags &= ~BATADV_TT_CLIENT_PENDING;
|
|
|
|
goto add_event;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tt_local->common.flags & BATADV_TT_CLIENT_ROAM) {
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Roaming client %pM (vid: %d) came back to its original location\n",
|
|
|
|
addr, BATADV_PRINT_VID(vid));
|
2012-09-23 20:38:37 +00:00
|
|
|
/* the ROAM flag is set because this client roamed away
|
|
|
|
* and the node got a roaming_advertisement message. Now
|
|
|
|
* that the client popped up again at its original
|
|
|
|
* location such flag can be unset
|
|
|
|
*/
|
|
|
|
tt_local->common.flags &= ~BATADV_TT_CLIENT_ROAM;
|
|
|
|
roamed_back = true;
|
|
|
|
}
|
|
|
|
goto check_roaming;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/* Ignore the client if we cannot send it in a full table response. */
|
|
|
|
table_size = batadv_tt_local_table_transmit_size(bat_priv);
|
|
|
|
table_size += batadv_tt_len(1);
|
|
|
|
packet_size_max = atomic_read(&bat_priv->packet_size_max);
|
|
|
|
if (table_size > packet_size_max) {
|
|
|
|
net_ratelimited_function(batadv_info, soft_iface,
|
|
|
|
"Local translation table size (%i) exceeds maximum packet size (%i); Ignoring new local tt entry: %pM\n",
|
|
|
|
table_size, packet_size_max, addr);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-09-23 20:38:35 +00:00
|
|
|
tt_local = kmalloc(sizeof(*tt_local), GFP_ATOMIC);
|
|
|
|
if (!tt_local)
|
2011-04-27 12:28:07 +00:00
|
|
|
goto out;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n",
|
|
|
|
addr, BATADV_PRINT_VID(vid),
|
2012-07-15 20:26:51 +00:00
|
|
|
(uint8_t)atomic_read(&bat_priv->tt.vn));
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-09-23 20:38:35 +00:00
|
|
|
memcpy(tt_local->common.addr, addr, ETH_ALEN);
|
2012-11-19 08:01:44 +00:00
|
|
|
/* The local entry has to be marked as NEW to avoid to send it in
|
|
|
|
* a full table response going out before the next ttvn increment
|
|
|
|
* (consistency check)
|
|
|
|
*/
|
|
|
|
tt_local->common.flags = BATADV_TT_CLIENT_NEW;
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local->common.vid = vid;
|
2013-10-13 00:50:18 +00:00
|
|
|
if (batadv_is_wifi_netdev(in_dev))
|
2012-09-23 20:38:35 +00:00
|
|
|
tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;
|
|
|
|
atomic_set(&tt_local->common.refcount, 2);
|
|
|
|
tt_local->last_seen = jiffies;
|
|
|
|
tt_local->common.added_at = tt_local->last_seen;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
|
|
|
/* the batman interface mac address should never be purged */
|
2012-05-12 11:48:58 +00:00
|
|
|
if (batadv_compare_eth(addr, soft_iface->dev_addr))
|
2012-09-23 20:38:35 +00:00
|
|
|
tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt,
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_choose_tt, &tt_local->common,
|
2012-09-23 20:38:35 +00:00
|
|
|
&tt_local->common.hash_entry);
|
2011-11-02 19:26:45 +00:00
|
|
|
|
|
|
|
if (unlikely(hash_added != 0)) {
|
|
|
|
/* remove the reference for the hash */
|
2012-09-23 20:38:35 +00:00
|
|
|
batadv_tt_local_entry_free_ref(tt_local);
|
2011-11-02 19:26:45 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-09-23 20:38:37 +00:00
|
|
|
add_event:
|
2013-04-03 09:15:33 +00:00
|
|
|
batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS);
|
2011-06-29 23:14:00 +00:00
|
|
|
|
2012-09-23 20:38:37 +00:00
|
|
|
check_roaming:
|
|
|
|
/* Check whether it is a roaming, but don't do anything if the roaming
|
|
|
|
* process has already been handled
|
|
|
|
*/
|
|
|
|
if (tt_global && !(tt_global->common.flags & BATADV_TT_CLIENT_ROAM)) {
|
2011-10-22 18:12:51 +00:00
|
|
|
/* These node are probably going to update their tt table */
|
2012-09-23 20:38:35 +00:00
|
|
|
head = &tt_global->orig_list;
|
2011-10-22 18:12:51 +00: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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(orig_entry, head, list) {
|
2012-09-23 20:38:35 +00:00
|
|
|
batadv_send_roam_adv(bat_priv, tt_global->common.addr,
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global->common.vid,
|
2012-05-16 18:23:16 +00:00
|
|
|
orig_entry->orig_node);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2012-09-23 20:38:37 +00:00
|
|
|
if (roamed_back) {
|
|
|
|
batadv_tt_global_free(bat_priv, tt_global,
|
|
|
|
"Roaming canceled");
|
|
|
|
tt_global = NULL;
|
|
|
|
} else {
|
|
|
|
/* The global entry has to be marked as ROAMING and
|
|
|
|
* has to be kept for consistency purpose
|
|
|
|
*/
|
|
|
|
tt_global->common.flags |= BATADV_TT_CLIENT_ROAM;
|
|
|
|
tt_global->roam_at = jiffies;
|
|
|
|
}
|
2011-04-27 12:28:07 +00:00
|
|
|
}
|
2012-09-23 20:38:37 +00:00
|
|
|
|
2013-10-13 00:50:19 +00:00
|
|
|
/* store the current remote flags before altering them. This helps
|
|
|
|
* understanding is flags are changing or not
|
|
|
|
*/
|
|
|
|
remote_flags = tt_local->common.flags & BATADV_TT_REMOTE_MASK;
|
|
|
|
|
|
|
|
if (batadv_is_wifi_netdev(in_dev))
|
|
|
|
tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;
|
|
|
|
else
|
|
|
|
tt_local->common.flags &= ~BATADV_TT_CLIENT_WIFI;
|
2013-05-27 07:33:25 +00:00
|
|
|
|
2013-11-16 11:03:48 +00:00
|
|
|
/* check the mark in the skb: if it's equal to the configured
|
|
|
|
* isolation_mark, it means the packet is coming from an isolated
|
|
|
|
* non-mesh client
|
|
|
|
*/
|
|
|
|
match_mark = (mark & bat_priv->isolation_mark_mask);
|
|
|
|
if (bat_priv->isolation_mark_mask &&
|
|
|
|
match_mark == bat_priv->isolation_mark)
|
|
|
|
tt_local->common.flags |= BATADV_TT_CLIENT_ISOLA;
|
|
|
|
else
|
|
|
|
tt_local->common.flags &= ~BATADV_TT_CLIENT_ISOLA;
|
|
|
|
|
2013-10-13 00:50:19 +00:00
|
|
|
/* if any "dynamic" flag has been modified, resend an ADD event for this
|
|
|
|
* entry so that all the nodes can get the new flags
|
|
|
|
*/
|
|
|
|
if (remote_flags ^ (tt_local->common.flags & BATADV_TT_REMOTE_MASK))
|
|
|
|
batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS);
|
|
|
|
|
|
|
|
ret = true;
|
2011-04-27 12:28:07 +00:00
|
|
|
out:
|
2013-10-13 00:50:18 +00:00
|
|
|
if (in_dev)
|
|
|
|
dev_put(in_dev);
|
2012-09-23 20:38:35 +00:00
|
|
|
if (tt_local)
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local);
|
|
|
|
if (tt_global)
|
|
|
|
batadv_tt_global_entry_free_ref(tt_global);
|
2013-05-27 07:33:25 +00:00
|
|
|
return ret;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_prepare_tvlv_global_data - prepare the TVLV TT header to send
|
|
|
|
* within a TT Response directed to another node
|
|
|
|
* @orig_node: originator for which the TT data has to be prepared
|
|
|
|
* @tt_data: uninitialised pointer to the address of the TVLV buffer
|
|
|
|
* @tt_change: uninitialised pointer to the address of the area where the TT
|
|
|
|
* changed can be stored
|
|
|
|
* @tt_len: pointer to the length to reserve to the tt_change. if -1 this
|
|
|
|
* function reserves the amount of space needed to send the entire global TT
|
|
|
|
* table. In case of success the value is updated with the real amount of
|
|
|
|
* reserved bytes
|
|
|
|
|
|
|
|
* Allocate the needed amount of memory for the entire TT TVLV and write its
|
|
|
|
* header made up by one tvlv_tt_data object and a series of tvlv_tt_vlan_data
|
|
|
|
* objects, one per active VLAN served by the originator node.
|
|
|
|
*
|
|
|
|
* Return the size of the allocated buffer or 0 in case of failure.
|
|
|
|
*/
|
|
|
|
static uint16_t
|
|
|
|
batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,
|
|
|
|
struct batadv_tvlv_tt_data **tt_data,
|
|
|
|
struct batadv_tvlv_tt_change **tt_change,
|
|
|
|
int32_t *tt_len)
|
|
|
|
{
|
|
|
|
uint16_t num_vlan = 0, num_entries = 0, change_offset, tvlv_len;
|
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan;
|
|
|
|
struct batadv_orig_node_vlan *vlan;
|
|
|
|
uint8_t *tt_change_ptr;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
|
|
|
|
num_vlan++;
|
|
|
|
num_entries += atomic_read(&vlan->tt.num_entries);
|
|
|
|
}
|
|
|
|
|
|
|
|
change_offset = sizeof(**tt_data);
|
|
|
|
change_offset += num_vlan * sizeof(*tt_vlan);
|
|
|
|
|
|
|
|
/* if tt_len is negative, allocate the space needed by the full table */
|
|
|
|
if (*tt_len < 0)
|
|
|
|
*tt_len = batadv_tt_len(num_entries);
|
|
|
|
|
|
|
|
tvlv_len = *tt_len;
|
|
|
|
tvlv_len += change_offset;
|
|
|
|
|
|
|
|
*tt_data = kmalloc(tvlv_len, GFP_ATOMIC);
|
|
|
|
if (!*tt_data) {
|
|
|
|
*tt_len = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
(*tt_data)->flags = BATADV_NO_FLAGS;
|
|
|
|
(*tt_data)->ttvn = atomic_read(&orig_node->last_ttvn);
|
|
|
|
(*tt_data)->num_vlan = htons(num_vlan);
|
|
|
|
|
|
|
|
tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);
|
|
|
|
list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
|
|
|
|
tt_vlan->vid = htons(vlan->vid);
|
|
|
|
tt_vlan->crc = htonl(vlan->tt.crc);
|
|
|
|
|
|
|
|
tt_vlan++;
|
|
|
|
}
|
|
|
|
|
|
|
|
tt_change_ptr = (uint8_t *)*tt_data + change_offset;
|
|
|
|
*tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr;
|
|
|
|
|
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return tvlv_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_prepare_tvlv_local_data - allocate and prepare the TT TVLV for this
|
|
|
|
* node
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_data: uninitialised pointer to the address of the TVLV buffer
|
|
|
|
* @tt_change: uninitialised pointer to the address of the area where the TT
|
|
|
|
* changes can be stored
|
|
|
|
* @tt_len: pointer to the length to reserve to the tt_change. if -1 this
|
|
|
|
* function reserves the amount of space needed to send the entire local TT
|
|
|
|
* table. In case of success the value is updated with the real amount of
|
|
|
|
* reserved bytes
|
|
|
|
*
|
|
|
|
* Allocate the needed amount of memory for the entire TT TVLV and write its
|
|
|
|
* header made up by one tvlv_tt_data object and a series of tvlv_tt_vlan_data
|
|
|
|
* objects, one per active VLAN.
|
|
|
|
*
|
|
|
|
* Return the size of the allocated buffer or 0 in case of failure.
|
|
|
|
*/
|
|
|
|
static uint16_t
|
|
|
|
batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tvlv_tt_data **tt_data,
|
|
|
|
struct batadv_tvlv_tt_change **tt_change,
|
|
|
|
int32_t *tt_len)
|
|
|
|
{
|
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan;
|
|
|
|
struct batadv_softif_vlan *vlan;
|
|
|
|
uint16_t num_vlan = 0, num_entries = 0, tvlv_len;
|
|
|
|
uint8_t *tt_change_ptr;
|
|
|
|
int change_offset;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
|
|
|
|
num_vlan++;
|
|
|
|
num_entries += atomic_read(&vlan->tt.num_entries);
|
|
|
|
}
|
|
|
|
|
|
|
|
change_offset = sizeof(**tt_data);
|
|
|
|
change_offset += num_vlan * sizeof(*tt_vlan);
|
|
|
|
|
|
|
|
/* if tt_len is negative, allocate the space needed by the full table */
|
|
|
|
if (*tt_len < 0)
|
|
|
|
*tt_len = batadv_tt_len(num_entries);
|
|
|
|
|
|
|
|
tvlv_len = *tt_len;
|
|
|
|
tvlv_len += change_offset;
|
|
|
|
|
|
|
|
*tt_data = kmalloc(tvlv_len, GFP_ATOMIC);
|
|
|
|
if (!*tt_data) {
|
|
|
|
tvlv_len = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
(*tt_data)->flags = BATADV_NO_FLAGS;
|
|
|
|
(*tt_data)->ttvn = atomic_read(&bat_priv->tt.vn);
|
|
|
|
(*tt_data)->num_vlan = htons(num_vlan);
|
|
|
|
|
|
|
|
tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);
|
|
|
|
hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
|
|
|
|
tt_vlan->vid = htons(vlan->vid);
|
|
|
|
tt_vlan->crc = htonl(vlan->tt.crc);
|
|
|
|
|
|
|
|
tt_vlan++;
|
|
|
|
}
|
|
|
|
|
|
|
|
tt_change_ptr = (uint8_t *)*tt_data + change_offset;
|
|
|
|
*tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr;
|
|
|
|
|
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return tvlv_len;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_tvlv_container_update - update the translation table tvlv container
|
|
|
|
* after local tt changes have been committed
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
*/
|
|
|
|
static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv)
|
2012-05-06 20:22:05 +00:00
|
|
|
{
|
2013-04-23 13:40:01 +00:00
|
|
|
struct batadv_tt_change_node *entry, *safe;
|
|
|
|
struct batadv_tvlv_tt_data *tt_data;
|
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
2013-07-30 20:16:25 +00:00
|
|
|
int tt_diff_len, tt_change_len = 0;
|
2013-04-23 13:40:01 +00:00
|
|
|
int tt_diff_entries_num = 0, tt_diff_entries_count = 0;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint16_t tvlv_len;
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes);
|
|
|
|
tt_diff_len = batadv_tt_len(tt_diff_entries_num);
|
2012-05-06 20:22:05 +00:00
|
|
|
|
|
|
|
/* if we have too many changes for one packet don't send any
|
|
|
|
* and wait for the tt table request which will be fragmented
|
|
|
|
*/
|
2013-04-23 13:40:01 +00:00
|
|
|
if (tt_diff_len > bat_priv->soft_iface->mtu)
|
|
|
|
tt_diff_len = 0;
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data,
|
|
|
|
&tt_change, &tt_diff_len);
|
|
|
|
if (!tvlv_len)
|
2013-04-23 13:40:01 +00:00
|
|
|
return;
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
tt_data->flags = BATADV_TT_OGM_DIFF;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
if (tt_diff_len == 0)
|
|
|
|
goto container_register;
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.changes_list_lock);
|
|
|
|
atomic_set(&bat_priv->tt.local_changes, 0);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list,
|
2012-02-28 09:55:36 +00:00
|
|
|
list) {
|
2013-04-23 13:40:01 +00:00
|
|
|
if (tt_diff_entries_count < tt_diff_entries_num) {
|
|
|
|
memcpy(tt_change + tt_diff_entries_count,
|
|
|
|
&entry->change,
|
|
|
|
sizeof(struct batadv_tvlv_tt_change));
|
|
|
|
tt_diff_entries_count++;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
list_del(&entry->list);
|
|
|
|
kfree(entry);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.changes_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
/* Keep the buffer for possible tt_request */
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.last_changeset_lock);
|
|
|
|
kfree(bat_priv->tt.last_changeset);
|
|
|
|
bat_priv->tt.last_changeset_len = 0;
|
|
|
|
bat_priv->tt.last_changeset = NULL;
|
2013-04-23 13:40:01 +00:00
|
|
|
tt_change_len = batadv_tt_len(tt_diff_entries_count);
|
2012-05-06 20:22:05 +00:00
|
|
|
/* check whether this new OGM has no changes due to size problems */
|
2013-04-23 13:40:01 +00:00
|
|
|
if (tt_diff_entries_count > 0) {
|
2012-05-06 20:22:05 +00:00
|
|
|
/* if kmalloc() fails we will reply with the full table
|
2011-04-27 12:27:44 +00:00
|
|
|
* instead of providing the diff
|
|
|
|
*/
|
2013-04-23 13:40:01 +00:00
|
|
|
bat_priv->tt.last_changeset = kzalloc(tt_diff_len, GFP_ATOMIC);
|
2012-07-15 20:26:51 +00:00
|
|
|
if (bat_priv->tt.last_changeset) {
|
2013-04-23 13:40:01 +00:00
|
|
|
memcpy(bat_priv->tt.last_changeset,
|
|
|
|
tt_change, tt_change_len);
|
|
|
|
bat_priv->tt.last_changeset_len = tt_diff_len;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
}
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.last_changeset_lock);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
container_register:
|
|
|
|
batadv_tvlv_container_register(bat_priv, BATADV_TVLV_TT, 1, tt_data,
|
2013-07-30 20:16:25 +00:00
|
|
|
tvlv_len);
|
2013-04-23 13:40:01 +00:00
|
|
|
kfree(tt_data);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-05-12 00:09:39 +00:00
|
|
|
int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
|
|
|
struct net_device *net_dev = (struct net_device *)seq->private;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_priv *bat_priv = netdev_priv(net_dev);
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2012-11-08 21:16:16 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_hard_iface *primary_if;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_softif_vlan *vlan;
|
2010-12-13 11:19:28 +00:00
|
|
|
struct hlist_head *head;
|
2013-07-30 20:16:25 +00:00
|
|
|
unsigned short vid;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2012-11-08 21:16:16 +00:00
|
|
|
int last_seen_secs;
|
|
|
|
int last_seen_msecs;
|
|
|
|
unsigned long last_seen_jiffies;
|
|
|
|
bool no_purge;
|
|
|
|
uint16_t np_flag = BATADV_TT_CLIENT_NOPURGE;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-08-03 15:15:46 +00:00
|
|
|
primary_if = batadv_seq_print_text_primary_if_get(seq);
|
|
|
|
if (!primary_if)
|
2011-04-20 13:40:58 +00:00
|
|
|
goto out;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-03-07 08:07:45 +00:00
|
|
|
seq_printf(seq,
|
2013-07-30 20:16:25 +00:00
|
|
|
"Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n",
|
|
|
|
net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn));
|
2013-11-16 11:03:49 +00:00
|
|
|
seq_printf(seq, " %-13s %s %-8s %-9s (%-10s)\n", "Client", "VID",
|
2013-07-30 20:16:25 +00:00
|
|
|
"Flags", "Last seen", "CRC");
|
2010-12-13 11:19:28 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-02-18 12:28:09 +00: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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common_entry,
|
2011-02-18 12:28:09 +00:00
|
|
|
head, hash_entry) {
|
2012-11-08 21:16:16 +00:00
|
|
|
tt_local = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_local_entry,
|
|
|
|
common);
|
2013-07-30 20:16:25 +00:00
|
|
|
vid = tt_common_entry->vid;
|
2012-11-08 21:16:16 +00:00
|
|
|
last_seen_jiffies = jiffies - tt_local->last_seen;
|
|
|
|
last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);
|
|
|
|
last_seen_secs = last_seen_msecs / 1000;
|
|
|
|
last_seen_msecs = last_seen_msecs % 1000;
|
|
|
|
|
|
|
|
no_purge = tt_common_entry->flags & np_flag;
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
vlan = batadv_softif_vlan_get(bat_priv, vid);
|
|
|
|
if (!vlan) {
|
|
|
|
seq_printf(seq, "Cannot retrieve VLAN %d\n",
|
|
|
|
BATADV_PRINT_VID(vid));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
seq_printf(seq,
|
2013-11-16 11:03:49 +00:00
|
|
|
" * %pM %4i [%c%c%c%c%c%c] %3u.%03u (%#.8x)\n",
|
2012-02-28 09:55:36 +00:00
|
|
|
tt_common_entry->addr,
|
2013-06-04 10:11:41 +00:00
|
|
|
BATADV_PRINT_VID(tt_common_entry->vid),
|
2012-02-28 09:55:36 +00:00
|
|
|
(tt_common_entry->flags &
|
2012-06-03 20:19:21 +00:00
|
|
|
BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
|
2012-11-08 21:16:16 +00:00
|
|
|
no_purge ? 'P' : '.',
|
2012-02-28 09:55:36 +00:00
|
|
|
(tt_common_entry->flags &
|
2012-06-03 20:19:21 +00:00
|
|
|
BATADV_TT_CLIENT_NEW ? 'N' : '.'),
|
2012-02-28 09:55:36 +00:00
|
|
|
(tt_common_entry->flags &
|
2012-06-03 20:19:21 +00:00
|
|
|
BATADV_TT_CLIENT_PENDING ? 'X' : '.'),
|
2012-02-28 09:55:36 +00:00
|
|
|
(tt_common_entry->flags &
|
2012-11-08 21:16:16 +00:00
|
|
|
BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
|
2013-11-16 11:03:49 +00:00
|
|
|
(tt_common_entry->flags &
|
|
|
|
BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
|
2013-01-24 10:41:39 +00:00
|
|
|
no_purge ? 0 : last_seen_secs,
|
2013-07-30 20:16:25 +00:00
|
|
|
no_purge ? 0 : last_seen_msecs,
|
|
|
|
vlan->tt.crc);
|
|
|
|
|
|
|
|
batadv_softif_vlan_free_ref(vlan);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-02-18 12:28:09 +00:00
|
|
|
rcu_read_unlock();
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-04-20 13:40:58 +00:00
|
|
|
out:
|
|
|
|
if (primary_if)
|
2012-05-12 11:48:54 +00:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2012-08-03 15:15:46 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void
|
|
|
|
batadv_tt_local_set_pending(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_local_entry *tt_local_entry,
|
|
|
|
uint16_t flags, const char *message)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2013-04-03 09:15:33 +00:00
|
|
|
batadv_tt_local_event(bat_priv, tt_local_entry, flags);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2011-07-09 15:52:13 +00:00
|
|
|
/* The local client has to be marked as "pending to be removed" but has
|
|
|
|
* to be kept in the table in order to send it in a full table
|
2012-05-12 00:09:43 +00:00
|
|
|
* response issued before the net ttvn increment (consistency check)
|
|
|
|
*/
|
2012-06-03 20:19:21 +00:00
|
|
|
tt_local_entry->common.flags |= BATADV_TT_CLIENT_PENDING;
|
2012-01-06 20:31:34 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Local tt entry (%pM, vid: %d) pending to be removed: %s\n",
|
|
|
|
tt_local_entry->common.addr,
|
|
|
|
BATADV_PRINT_VID(tt_local_entry->common.vid), message);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-08-27 09:44:43 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_remove - logically remove an entry from the local table
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the MAC address of the client to remove
|
2013-06-04 10:11:39 +00:00
|
|
|
* @vid: VLAN identifier
|
2012-08-27 09:44:43 +00:00
|
|
|
* @message: message to append to the log on deletion
|
|
|
|
* @roaming: true if the deletion is due to a roaming event
|
|
|
|
*
|
|
|
|
* Returns the flags assigned to the local entry before being deleted
|
|
|
|
*/
|
|
|
|
uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
|
2013-06-04 10:11:39 +00:00
|
|
|
const uint8_t *addr, unsigned short vid,
|
|
|
|
const char *message, bool roaming)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry;
|
2012-08-27 09:44:43 +00:00
|
|
|
uint16_t flags, curr_flags = BATADV_NO_FLAGS;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
|
2011-04-27 12:28:07 +00:00
|
|
|
if (!tt_local_entry)
|
|
|
|
goto out;
|
|
|
|
|
2012-08-27 09:44:43 +00:00
|
|
|
curr_flags = tt_local_entry->common.flags;
|
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
flags = BATADV_TT_CLIENT_DEL;
|
2012-09-23 20:38:37 +00:00
|
|
|
/* if this global entry addition is due to a roaming, the node has to
|
|
|
|
* mark the local entry as "roamed" in order to correctly reroute
|
|
|
|
* packets later
|
|
|
|
*/
|
2012-09-23 20:38:34 +00:00
|
|
|
if (roaming) {
|
2012-06-03 20:19:21 +00:00
|
|
|
flags |= BATADV_TT_CLIENT_ROAM;
|
2012-09-23 20:38:34 +00:00
|
|
|
/* mark the local client as ROAMed */
|
|
|
|
tt_local_entry->common.flags |= BATADV_TT_CLIENT_ROAM;
|
|
|
|
}
|
2012-06-03 20:19:17 +00:00
|
|
|
|
2012-09-23 20:38:37 +00:00
|
|
|
if (!(tt_local_entry->common.flags & BATADV_TT_CLIENT_NEW)) {
|
|
|
|
batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags,
|
|
|
|
message);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* if this client has been added right now, it is possible to
|
|
|
|
* immediately purge it
|
|
|
|
*/
|
2013-04-03 09:15:33 +00:00
|
|
|
batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);
|
2012-09-23 20:38:37 +00:00
|
|
|
hlist_del_rcu(&tt_local_entry->common.hash_entry);
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2012-08-27 09:44:43 +00:00
|
|
|
|
2011-04-27 12:28:07 +00:00
|
|
|
out:
|
|
|
|
if (tt_local_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2012-08-27 09:44:43 +00:00
|
|
|
|
|
|
|
return curr_flags;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_purge_list - purge inactive tt local entries
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @head: pointer to the list containing the local tt entries
|
|
|
|
* @timeout: parameter deciding whether a given tt local entry is considered
|
|
|
|
* inactive or not
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv,
|
2013-05-27 07:33:25 +00:00
|
|
|
struct hlist_head *head,
|
|
|
|
int timeout)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry;
|
|
|
|
struct batadv_tt_common_entry *tt_common_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 01:06:00 +00:00
|
|
|
struct hlist_node *node_tmp;
|
2012-06-03 20:19:21 +00: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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common_entry, node_tmp, head,
|
2012-06-03 20:19:21 +00:00
|
|
|
hash_entry) {
|
|
|
|
tt_local_entry = container_of(tt_common_entry,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry,
|
|
|
|
common);
|
2012-06-03 20:19:21 +00:00
|
|
|
if (tt_local_entry->common.flags & BATADV_TT_CLIENT_NOPURGE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* entry already marked for deletion */
|
|
|
|
if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING)
|
|
|
|
continue;
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
if (!batadv_has_timed_out(tt_local_entry->last_seen, timeout))
|
2012-06-03 20:19:21 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
batadv_tt_local_set_pending(bat_priv, tt_local_entry,
|
|
|
|
BATADV_TT_CLIENT_DEL, "timed out");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_purge - purge inactive tt local entries
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @timeout: parameter deciding whether a given tt local entry is considered
|
|
|
|
* inactive or not
|
|
|
|
*/
|
|
|
|
static void batadv_tt_local_purge(struct batadv_priv *bat_priv,
|
|
|
|
int timeout)
|
2012-06-03 20:19:21 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
2010-12-13 11:19:28 +00:00
|
|
|
struct hlist_head *head;
|
2011-04-27 12:28:07 +00:00
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
2011-04-27 12:28:07 +00:00
|
|
|
list_lock = &hash->list_locks[i];
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_lock_bh(list_lock);
|
2013-05-27 07:33:25 +00:00
|
|
|
batadv_tt_local_purge_list(bat_priv, head, timeout);
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_unlock_bh(list_lock);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_local_table_free(struct batadv_priv *bat_priv)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:28 +00:00
|
|
|
struct batadv_hashtable *hash;
|
2011-04-27 12:27:44 +00:00
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
|
|
|
struct batadv_tt_local_entry *tt_local;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *node_tmp;
|
2011-04-27 12:28:07 +00:00
|
|
|
struct hlist_head *head;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
if (!bat_priv->tt.local_hash)
|
2010-12-13 11:19:28 +00:00
|
|
|
return;
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
hash = bat_priv->tt.local_hash;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
list_lock = &hash->list_locks[i];
|
|
|
|
|
|
|
|
spin_lock_bh(list_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common_entry, node_tmp,
|
2011-04-27 12:27:44 +00:00
|
|
|
head, hash_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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&tt_common_entry->hash_entry);
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_local = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_local_entry,
|
|
|
|
common);
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
spin_unlock_bh(list_lock);
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:09:32 +00:00
|
|
|
batadv_hash_destroy(hash);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
bat_priv->tt.local_hash = NULL;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static int batadv_tt_global_init(struct batadv_priv *bat_priv)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
if (bat_priv->tt.global_hash)
|
2012-05-05 11:27:28 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
bat_priv->tt.global_hash = batadv_hash_new(1024);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
if (!bat_priv->tt.global_hash)
|
2012-05-05 11:27:28 +00:00
|
|
|
return -ENOMEM;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-11-10 10:00:32 +00:00
|
|
|
batadv_hash_set_lock_class(bat_priv->tt.global_hash,
|
|
|
|
&batadv_tt_global_hash_lock_class_key);
|
|
|
|
|
2012-05-05 11:27:28 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_change_node *entry, *safe;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.changes_list_lock);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list,
|
2011-04-27 12:27:44 +00:00
|
|
|
list) {
|
|
|
|
list_del(&entry->list);
|
|
|
|
kfree(entry);
|
|
|
|
}
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
atomic_set(&bat_priv->tt.local_changes, 0);
|
|
|
|
spin_unlock_bh(&bat_priv->tt.changes_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-07-01 12:09:12 +00:00
|
|
|
/* retrieves the orig_tt_list_entry belonging to orig_node from the
|
|
|
|
* batadv_tt_global_entry list
|
|
|
|
*
|
|
|
|
* returns it with an increased refcounter, NULL if not found
|
2011-10-22 18:12:51 +00:00
|
|
|
*/
|
2012-07-01 12:09:12 +00:00
|
|
|
static struct batadv_tt_orig_list_entry *
|
|
|
|
batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry,
|
|
|
|
const struct batadv_orig_node *orig_node)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
2012-07-01 12:09:12 +00:00
|
|
|
struct batadv_tt_orig_list_entry *tmp_orig_entry, *orig_entry = NULL;
|
2011-10-22 18:12:51 +00:00
|
|
|
const struct hlist_head *head;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
head = &entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tmp_orig_entry, head, list) {
|
2012-07-01 12:09:12 +00:00
|
|
|
if (tmp_orig_entry->orig_node != orig_node)
|
|
|
|
continue;
|
|
|
|
if (!atomic_inc_not_zero(&tmp_orig_entry->refcount))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
orig_entry = tmp_orig_entry;
|
|
|
|
break;
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2012-07-01 12:09:12 +00:00
|
|
|
|
|
|
|
return orig_entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find out if an orig_node is already in the list of a tt_global_entry.
|
|
|
|
* returns true if found, false otherwise
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry,
|
|
|
|
const struct batadv_orig_node *orig_node)
|
|
|
|
{
|
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
orig_entry = batadv_tt_global_orig_entry_find(entry, orig_node);
|
|
|
|
if (orig_entry) {
|
|
|
|
found = true;
|
|
|
|
batadv_tt_orig_list_entry_free_ref(orig_entry);
|
|
|
|
}
|
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-07-01 12:09:12 +00:00
|
|
|
batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_orig_node *orig_node, int ttvn)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-07-01 12:09:12 +00:00
|
|
|
orig_entry = batadv_tt_global_orig_entry_find(tt_global, orig_node);
|
2012-07-05 21:38:29 +00:00
|
|
|
if (orig_entry) {
|
|
|
|
/* refresh the ttvn: the current value could be a bogus one that
|
|
|
|
* was added during a "temporary client detection"
|
|
|
|
*/
|
|
|
|
orig_entry->ttvn = ttvn;
|
2012-07-01 12:09:12 +00:00
|
|
|
goto out;
|
2012-07-05 21:38:29 +00:00
|
|
|
}
|
2012-07-01 12:09:12 +00:00
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
orig_entry = kzalloc(sizeof(*orig_entry), GFP_ATOMIC);
|
|
|
|
if (!orig_entry)
|
2012-07-01 12:09:12 +00:00
|
|
|
goto out;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
INIT_HLIST_NODE(&orig_entry->list);
|
|
|
|
atomic_inc(&orig_node->refcount);
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_global_size_inc(orig_node, tt_global->common.vid);
|
2011-10-22 18:12:51 +00:00
|
|
|
orig_entry->orig_node = orig_node;
|
|
|
|
orig_entry->ttvn = ttvn;
|
2012-07-01 12:09:12 +00:00
|
|
|
atomic_set(&orig_entry->refcount, 2);
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-07-01 12:09:12 +00:00
|
|
|
spin_lock_bh(&tt_global->list_lock);
|
2011-10-22 18:12:51 +00:00
|
|
|
hlist_add_head_rcu(&orig_entry->list,
|
2012-07-01 12:09:12 +00:00
|
|
|
&tt_global->orig_list);
|
|
|
|
spin_unlock_bh(&tt_global->list_lock);
|
|
|
|
out:
|
|
|
|
if (orig_entry)
|
|
|
|
batadv_tt_orig_list_entry_free_ref(orig_entry);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
|
2013-04-18 13:13:01 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_add - add a new TT global entry or update an existing one
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig_node: the originator announcing the client
|
|
|
|
* @tt_addr: the mac address of the non-mesh client
|
2013-06-04 10:11:39 +00:00
|
|
|
* @vid: VLAN identifier
|
2013-04-18 13:13:01 +00:00
|
|
|
* @flags: TT flags that have to be set for this non-mesh client
|
|
|
|
* @ttvn: the tt version number ever announcing this non-mesh client
|
|
|
|
*
|
|
|
|
* Add a new TT global entry for the given originator. If the entry already
|
|
|
|
* exists add a new reference to the given originator (a global entry can have
|
|
|
|
* references to multiple originators) and adjust the flags attribute to reflect
|
|
|
|
* the function argument.
|
|
|
|
* If a TT local entry exists for this non-mesh client remove it.
|
|
|
|
*
|
|
|
|
* The caller must hold orig_node refcount.
|
2013-05-05 17:32:38 +00:00
|
|
|
*
|
|
|
|
* Return true if the new entry has been added, false otherwise
|
2013-04-18 13:13:01 +00:00
|
|
|
*/
|
2013-05-05 17:32:38 +00:00
|
|
|
static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-06-04 10:11:39 +00:00
|
|
|
const unsigned char *tt_addr,
|
|
|
|
unsigned short vid, uint16_t flags,
|
2013-05-05 17:32:38 +00:00
|
|
|
uint8_t ttvn)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_tt_global_entry *tt_global_entry;
|
|
|
|
struct batadv_tt_local_entry *tt_local_entry;
|
2013-05-05 17:32:38 +00:00
|
|
|
bool ret = false;
|
2011-11-02 19:26:45 +00:00
|
|
|
int hash_added;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *common;
|
2012-08-27 09:44:43 +00:00
|
|
|
uint16_t local_flags;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2013-08-07 16:28:56 +00:00
|
|
|
/* ignore global entries from backbone nodes */
|
|
|
|
if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig, vid))
|
|
|
|
return true;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr, vid);
|
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, tt_addr, vid);
|
2012-09-23 20:38:37 +00:00
|
|
|
|
|
|
|
/* if the node already has a local client for this entry, it has to wait
|
|
|
|
* for a roaming advertisement instead of manually messing up the global
|
|
|
|
* table
|
|
|
|
*/
|
|
|
|
if ((flags & BATADV_TT_CLIENT_TEMP) && tt_local_entry &&
|
|
|
|
!(tt_local_entry->common.flags & BATADV_TT_CLIENT_NEW))
|
|
|
|
goto out;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
if (!tt_global_entry) {
|
2012-05-24 22:00:54 +00:00
|
|
|
tt_global_entry = kzalloc(sizeof(*tt_global_entry), GFP_ATOMIC);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!tt_global_entry)
|
2011-04-27 12:28:07 +00:00
|
|
|
goto out;
|
|
|
|
|
2012-05-12 11:48:55 +00:00
|
|
|
common = &tt_global_entry->common;
|
|
|
|
memcpy(common->addr, tt_addr, ETH_ALEN);
|
2013-06-04 10:11:39 +00:00
|
|
|
common->vid = vid;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-05-24 22:00:54 +00:00
|
|
|
common->flags = flags;
|
2011-04-27 12:27:57 +00:00
|
|
|
tt_global_entry->roam_at = 0;
|
2012-08-24 15:54:07 +00:00
|
|
|
/* node must store current time in case of roaming. This is
|
|
|
|
* needed to purge this entry out on timeout (if nobody claims
|
|
|
|
* it)
|
|
|
|
*/
|
|
|
|
if (flags & BATADV_TT_CLIENT_ROAM)
|
|
|
|
tt_global_entry->roam_at = jiffies;
|
2012-05-12 11:48:55 +00:00
|
|
|
atomic_set(&common->refcount, 2);
|
2012-07-05 21:38:29 +00:00
|
|
|
common->added_at = jiffies;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
INIT_HLIST_HEAD(&tt_global_entry->orig_list);
|
|
|
|
spin_lock_init(&tt_global_entry->list_lock);
|
2011-04-27 12:28:07 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
hash_added = batadv_hash_add(bat_priv->tt.global_hash,
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_compare_tt,
|
2013-06-04 10:11:39 +00:00
|
|
|
batadv_choose_tt, common,
|
2012-05-16 18:23:16 +00:00
|
|
|
&common->hash_entry);
|
2011-11-02 19:26:45 +00:00
|
|
|
|
|
|
|
if (unlikely(hash_added != 0)) {
|
|
|
|
/* remove the reference for the hash */
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
2011-11-02 19:26:45 +00:00
|
|
|
goto out_remove;
|
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
} else {
|
2012-09-23 20:38:37 +00:00
|
|
|
common = &tt_global_entry->common;
|
2012-07-05 21:38:29 +00:00
|
|
|
/* If there is already a global entry, we can use this one for
|
|
|
|
* our processing.
|
2012-09-23 20:38:37 +00:00
|
|
|
* But if we are trying to add a temporary client then here are
|
|
|
|
* two options at this point:
|
|
|
|
* 1) the global client is not a temporary client: the global
|
|
|
|
* client has to be left as it is, temporary information
|
|
|
|
* should never override any already known client state
|
|
|
|
* 2) the global client is a temporary client: purge the
|
|
|
|
* originator list and add the new one orig_entry
|
2012-07-05 21:38:29 +00:00
|
|
|
*/
|
2012-09-23 20:38:37 +00:00
|
|
|
if (flags & BATADV_TT_CLIENT_TEMP) {
|
|
|
|
if (!(common->flags & BATADV_TT_CLIENT_TEMP))
|
|
|
|
goto out;
|
|
|
|
if (batadv_tt_global_entry_has_orig(tt_global_entry,
|
|
|
|
orig_node))
|
|
|
|
goto out_remove;
|
|
|
|
batadv_tt_global_del_orig_list(tt_global_entry);
|
|
|
|
goto add_orig_entry;
|
|
|
|
}
|
2012-07-05 21:38:29 +00:00
|
|
|
|
|
|
|
/* if the client was temporary added before receiving the first
|
|
|
|
* OGM announcing it, we have to clear the TEMP flag
|
|
|
|
*/
|
2012-09-23 20:38:37 +00:00
|
|
|
common->flags &= ~BATADV_TT_CLIENT_TEMP;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-11-07 14:05:33 +00:00
|
|
|
/* the change can carry possible "attribute" flags like the
|
|
|
|
* TT_CLIENT_WIFI, therefore they have to be copied in the
|
|
|
|
* client entry
|
|
|
|
*/
|
|
|
|
tt_global_entry->common.flags |= flags;
|
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
/* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
|
|
|
|
* one originator left in the list and we previously received a
|
2011-10-22 18:12:51 +00:00
|
|
|
* delete + roaming change for this originator.
|
|
|
|
*
|
|
|
|
* We should first delete the old originator before adding the
|
|
|
|
* new one.
|
|
|
|
*/
|
2012-09-23 20:38:37 +00:00
|
|
|
if (common->flags & BATADV_TT_CLIENT_ROAM) {
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_orig_list(tt_global_entry);
|
2012-09-23 20:38:37 +00:00
|
|
|
common->flags &= ~BATADV_TT_CLIENT_ROAM;
|
2011-10-22 18:12:51 +00:00
|
|
|
tt_global_entry->roam_at = 0;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
}
|
2012-09-23 20:38:37 +00:00
|
|
|
add_orig_entry:
|
2012-07-05 21:38:29 +00:00
|
|
|
/* add the new orig_entry (if needed) or update it */
|
2012-07-01 12:09:12 +00:00
|
|
|
batadv_tt_global_orig_entry_add(tt_global_entry, orig_node, ttvn);
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Creating new global tt entry: %pM (vid: %d, via %pM)\n",
|
|
|
|
common->addr, BATADV_PRINT_VID(common->vid),
|
|
|
|
orig_node->orig);
|
2013-05-05 17:32:38 +00:00
|
|
|
ret = true;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-11-02 19:26:45 +00:00
|
|
|
out_remove:
|
2012-08-27 09:44:43 +00:00
|
|
|
|
2011-04-27 12:27:44 +00:00
|
|
|
/* remove address from local hash if present */
|
2013-06-04 10:11:39 +00:00
|
|
|
local_flags = batadv_tt_local_remove(bat_priv, tt_addr, vid,
|
2012-08-27 09:44:43 +00:00
|
|
|
"global tt received",
|
2013-01-15 12:17:19 +00:00
|
|
|
flags & BATADV_TT_CLIENT_ROAM);
|
2012-08-27 09:44:43 +00:00
|
|
|
tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI;
|
|
|
|
|
2012-09-23 20:38:37 +00:00
|
|
|
if (!(flags & BATADV_TT_CLIENT_ROAM))
|
|
|
|
/* this is a normal global add. Therefore the client is not in a
|
|
|
|
* roaming state anymore.
|
|
|
|
*/
|
|
|
|
tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_ROAM;
|
|
|
|
|
2011-04-27 12:28:07 +00:00
|
|
|
out:
|
|
|
|
if (tt_global_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
2012-09-23 20:38:37 +00:00
|
|
|
if (tt_local_entry)
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2011-04-27 12:28:07 +00:00
|
|
|
return ret;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2014-01-15 20:17:54 +00:00
|
|
|
/**
|
|
|
|
* batadv_transtable_best_orig - Get best originator list entry from tt entry
|
2013-09-03 09:10:24 +00:00
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2012-10-07 11:34:15 +00:00
|
|
|
* @tt_global_entry: global translation table entry to be analyzed
|
|
|
|
*
|
|
|
|
* This functon assumes the caller holds rcu_read_lock().
|
|
|
|
* Returns best originator list entry or NULL on errors.
|
|
|
|
*/
|
|
|
|
static struct batadv_tt_orig_list_entry *
|
2013-09-03 09:10:24 +00:00
|
|
|
batadv_transtable_best_orig(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry)
|
2012-10-07 11:34:15 +00:00
|
|
|
{
|
2013-09-03 09:10:24 +00:00
|
|
|
struct batadv_neigh_node *router, *best_router = NULL;
|
|
|
|
struct batadv_algo_ops *bao = bat_priv->bat_algo_ops;
|
2012-10-07 11:34:15 +00:00
|
|
|
struct hlist_head *head;
|
|
|
|
struct batadv_tt_orig_list_entry *orig_entry, *best_entry = NULL;
|
|
|
|
|
|
|
|
head = &tt_global_entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(orig_entry, head, list) {
|
2013-11-13 18:14:47 +00:00
|
|
|
router = batadv_orig_router_get(orig_entry->orig_node,
|
|
|
|
BATADV_IF_DEFAULT);
|
2012-10-07 11:34:15 +00:00
|
|
|
if (!router)
|
|
|
|
continue;
|
|
|
|
|
2013-09-03 09:10:24 +00:00
|
|
|
if (best_router &&
|
2013-11-13 18:14:46 +00:00
|
|
|
bao->bat_neigh_cmp(router, BATADV_IF_DEFAULT,
|
|
|
|
best_router, BATADV_IF_DEFAULT) <= 0) {
|
2013-09-03 09:10:24 +00:00
|
|
|
batadv_neigh_node_free_ref(router);
|
|
|
|
continue;
|
2012-10-07 11:34:15 +00:00
|
|
|
}
|
|
|
|
|
2013-09-03 09:10:24 +00:00
|
|
|
/* release the refcount for the "old" best */
|
|
|
|
if (best_router)
|
|
|
|
batadv_neigh_node_free_ref(best_router);
|
|
|
|
|
|
|
|
best_entry = orig_entry;
|
|
|
|
best_router = router;
|
2012-10-07 11:34:15 +00:00
|
|
|
}
|
|
|
|
|
2013-09-03 09:10:24 +00:00
|
|
|
if (best_router)
|
|
|
|
batadv_neigh_node_free_ref(best_router);
|
|
|
|
|
2012-10-07 11:34:15 +00:00
|
|
|
return best_entry;
|
|
|
|
}
|
|
|
|
|
2014-01-15 20:17:54 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_print_entry - print all orig nodes who announce the address
|
|
|
|
* for this global entry
|
2013-09-03 09:10:24 +00:00
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2012-10-07 11:34:15 +00:00
|
|
|
* @tt_global_entry: global translation table entry to be printed
|
|
|
|
* @seq: debugfs table seq_file struct
|
|
|
|
*
|
|
|
|
* This functon assumes the caller holds rcu_read_lock().
|
2011-10-22 18:12:51 +00:00
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2013-09-03 09:10:24 +00:00
|
|
|
batadv_tt_global_print_entry(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry,
|
2012-05-16 18:23:16 +00:00
|
|
|
struct seq_file *seq)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
2012-10-07 11:34:15 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry, *best_entry;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_orig_node_vlan *vlan;
|
|
|
|
struct hlist_head *head;
|
2011-10-22 18:12:51 +00:00
|
|
|
uint8_t last_ttvn;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint16_t flags;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
tt_common_entry = &tt_global_entry->common;
|
2012-10-07 11:34:15 +00:00
|
|
|
flags = tt_common_entry->flags;
|
|
|
|
|
2013-09-03 09:10:24 +00:00
|
|
|
best_entry = batadv_transtable_best_orig(bat_priv, tt_global_entry);
|
2012-10-07 11:34:15 +00:00
|
|
|
if (best_entry) {
|
2013-07-30 20:16:25 +00:00
|
|
|
vlan = batadv_orig_node_vlan_get(best_entry->orig_node,
|
|
|
|
tt_common_entry->vid);
|
|
|
|
if (!vlan) {
|
|
|
|
seq_printf(seq,
|
|
|
|
" * Cannot retrieve VLAN %d for originator %pM\n",
|
|
|
|
BATADV_PRINT_VID(tt_common_entry->vid),
|
|
|
|
best_entry->orig_node->orig);
|
|
|
|
goto print_list;
|
|
|
|
}
|
|
|
|
|
2012-10-07 11:34:15 +00:00
|
|
|
last_ttvn = atomic_read(&best_entry->orig_node->last_ttvn);
|
2012-11-19 08:01:42 +00:00
|
|
|
seq_printf(seq,
|
2013-11-16 11:03:49 +00:00
|
|
|
" %c %pM %4i (%3u) via %pM (%3u) (%#.8x) [%c%c%c%c]\n",
|
2012-10-07 11:34:15 +00:00
|
|
|
'*', tt_global_entry->common.addr,
|
2013-06-04 10:11:41 +00:00
|
|
|
BATADV_PRINT_VID(tt_global_entry->common.vid),
|
2012-10-07 11:34:15 +00:00
|
|
|
best_entry->ttvn, best_entry->orig_node->orig,
|
2013-07-30 20:16:25 +00:00
|
|
|
last_ttvn, vlan->tt.crc,
|
2012-10-07 11:34:15 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
|
|
|
|
(flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
|
2013-11-16 11:03:49 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
|
2012-10-07 11:34:15 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.'));
|
2013-07-30 20:16:25 +00:00
|
|
|
|
|
|
|
batadv_orig_node_vlan_free_ref(vlan);
|
2012-10-07 11:34:15 +00:00
|
|
|
}
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
print_list:
|
2011-10-22 18:12:51 +00:00
|
|
|
head = &tt_global_entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(orig_entry, head, list) {
|
2012-10-07 11:34:15 +00:00
|
|
|
if (best_entry == orig_entry)
|
|
|
|
continue;
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
vlan = batadv_orig_node_vlan_get(orig_entry->orig_node,
|
|
|
|
tt_common_entry->vid);
|
|
|
|
if (!vlan) {
|
|
|
|
seq_printf(seq,
|
|
|
|
" + Cannot retrieve VLAN %d for originator %pM\n",
|
|
|
|
BATADV_PRINT_VID(tt_common_entry->vid),
|
|
|
|
orig_entry->orig_node->orig);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
last_ttvn = atomic_read(&orig_entry->orig_node->last_ttvn);
|
2013-06-04 10:11:41 +00:00
|
|
|
seq_printf(seq,
|
2013-11-16 11:03:49 +00:00
|
|
|
" %c %pM %4d (%3u) via %pM (%3u) (%#.8x) [%c%c%c%c]\n",
|
2012-10-07 11:34:15 +00:00
|
|
|
'+', tt_global_entry->common.addr,
|
2013-06-04 10:11:41 +00:00
|
|
|
BATADV_PRINT_VID(tt_global_entry->common.vid),
|
2012-10-07 11:34:15 +00:00
|
|
|
orig_entry->ttvn, orig_entry->orig_node->orig,
|
2013-07-30 20:16:25 +00:00
|
|
|
last_ttvn, vlan->tt.crc,
|
2012-06-03 20:19:21 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
|
2012-07-05 21:38:29 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
|
2013-11-16 11:03:49 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
|
2012-07-05 21:38:29 +00:00
|
|
|
(flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.'));
|
2013-07-30 20:16:25 +00:00
|
|
|
|
|
|
|
batadv_orig_node_vlan_free_ref(vlan);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:09:39 +00:00
|
|
|
int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
|
|
|
struct net_device *net_dev = (struct net_device *)seq->private;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_priv *bat_priv = netdev_priv(net_dev);
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.global_hash;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
|
|
|
struct batadv_tt_global_entry *tt_global;
|
|
|
|
struct batadv_hard_iface *primary_if;
|
2010-12-13 11:19:28 +00:00
|
|
|
struct hlist_head *head;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2012-08-03 15:15:46 +00:00
|
|
|
primary_if = batadv_seq_print_text_primary_if_get(seq);
|
|
|
|
if (!primary_if)
|
2011-04-20 13:40:58 +00:00
|
|
|
goto out;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-05-05 06:42:45 +00:00
|
|
|
seq_printf(seq,
|
|
|
|
"Globally announced TT entries received via the mesh %s\n",
|
2010-12-13 11:19:28 +00:00
|
|
|
net_dev->name);
|
2013-06-04 10:11:41 +00:00
|
|
|
seq_printf(seq, " %-13s %s %s %-15s %s (%-10s) %s\n",
|
|
|
|
"Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)",
|
|
|
|
"CRC", "Flags");
|
2010-12-13 11:19:28 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
2011-02-18 12:28:09 +00: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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common_entry,
|
2011-02-18 12:28:09 +00:00
|
|
|
head, hash_entry) {
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_global = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
2013-09-03 09:10:24 +00:00
|
|
|
batadv_tt_global_print_entry(bat_priv, tt_global, seq);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-02-18 12:28:09 +00:00
|
|
|
rcu_read_unlock();
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-04-20 13:40:58 +00:00
|
|
|
out:
|
|
|
|
if (primary_if)
|
2012-05-12 11:48:54 +00:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2012-08-03 15:15:46 +00:00
|
|
|
return 0;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
/* deletes the orig list of a tt_global_entry */
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2011-10-22 18:12:51 +00:00
|
|
|
struct hlist_head *head;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *safe;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
spin_lock_bh(&tt_global_entry->list_lock);
|
|
|
|
head = &tt_global_entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(orig_entry, safe, head, list) {
|
|
|
|
hlist_del_rcu(&orig_entry->list);
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_global_size_dec(orig_entry->orig_node,
|
|
|
|
tt_global_entry->common.vid);
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_orig_list_entry_free_ref(orig_entry);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
spin_unlock_bh(&tt_global_entry->list_lock);
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_del_orig_entry(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2012-05-16 18:23:16 +00:00
|
|
|
const char *message)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
|
|
|
struct hlist_head *head;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *safe;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2013-06-04 10:11:41 +00:00
|
|
|
unsigned short vid;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
spin_lock_bh(&tt_global_entry->list_lock);
|
|
|
|
head = &tt_global_entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(orig_entry, safe, head, list) {
|
2011-10-22 18:12:51 +00:00
|
|
|
if (orig_entry->orig_node == orig_node) {
|
2013-06-04 10:11:41 +00:00
|
|
|
vid = tt_global_entry->common.vid;
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Deleting %pM from global tt entry %pM (vid: %d): %s\n",
|
2012-05-12 11:48:58 +00:00
|
|
|
orig_node->orig,
|
2013-06-04 10:11:41 +00:00
|
|
|
tt_global_entry->common.addr,
|
|
|
|
BATADV_PRINT_VID(vid), message);
|
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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&orig_entry->list);
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_global_size_dec(orig_node,
|
|
|
|
tt_global_entry->common.vid);
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_orig_list_entry_free_ref(orig_entry);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&tt_global_entry->list_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the client is to be deleted, we check if it is the last origantor entry
|
2012-06-03 20:19:21 +00:00
|
|
|
* within tt_global entry. If yes, we set the BATADV_TT_CLIENT_ROAM flag and the
|
|
|
|
* timer, otherwise we simply remove the originator scheduled for deletion.
|
2011-10-22 18:12:51 +00:00
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
static void
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_del_roaming(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry,
|
|
|
|
struct batadv_orig_node *orig_node,
|
|
|
|
const char *message)
|
2011-10-22 18:12:51 +00:00
|
|
|
{
|
|
|
|
bool last_entry = true;
|
|
|
|
struct hlist_head *head;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_orig_list_entry *orig_entry;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
/* no local entry exists, case 1:
|
|
|
|
* Check if this is the last one or if other entries exist.
|
|
|
|
*/
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
head = &tt_global_entry->orig_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(orig_entry, head, list) {
|
2011-10-22 18:12:51 +00:00
|
|
|
if (orig_entry->orig_node != orig_node) {
|
|
|
|
last_entry = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (last_entry) {
|
|
|
|
/* its the last one, mark for roaming. */
|
2012-06-03 20:19:21 +00:00
|
|
|
tt_global_entry->common.flags |= BATADV_TT_CLIENT_ROAM;
|
2011-10-22 18:12:51 +00:00
|
|
|
tt_global_entry->roam_at = jiffies;
|
|
|
|
} else
|
|
|
|
/* there is another entry, we can simply delete this
|
|
|
|
* one and can still use the other one.
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_orig_entry(bat_priv, tt_global_entry,
|
|
|
|
orig_node, message);
|
2011-10-22 18:12:51 +00:00
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_del - remove a client from the global table
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig_node: an originator serving this client
|
|
|
|
* @addr: the mac address of the client
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
* @message: a message explaining the reason for deleting the client to print
|
|
|
|
* for debugging purpose
|
|
|
|
* @roaming: true if the deletion has been triggered by a roaming event
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_global_del(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-06-04 10:11:39 +00:00
|
|
|
const unsigned char *addr, unsigned short vid,
|
2012-05-16 18:23:16 +00:00
|
|
|
const char *message, bool roaming)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_tt_global_entry *tt_global_entry;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry *local_entry = NULL;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid);
|
2011-10-22 18:12:51 +00:00
|
|
|
if (!tt_global_entry)
|
2011-04-27 12:28:07 +00:00
|
|
|
goto out;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
if (!roaming) {
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_orig_entry(bat_priv, tt_global_entry,
|
|
|
|
orig_node, message);
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
if (hlist_empty(&tt_global_entry->orig_list))
|
2012-09-23 20:38:36 +00:00
|
|
|
batadv_tt_global_free(bat_priv, tt_global_entry,
|
|
|
|
message);
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
goto out;
|
|
|
|
}
|
2011-12-22 12:31:12 +00:00
|
|
|
|
|
|
|
/* if we are deleting a global entry due to a roam
|
|
|
|
* event, there are two possibilities:
|
2011-10-22 18:12:51 +00:00
|
|
|
* 1) the client roamed from node A to node B => if there
|
|
|
|
* is only one originator left for this client, we mark
|
2012-06-03 20:19:21 +00:00
|
|
|
* it with BATADV_TT_CLIENT_ROAM, we start a timer and we
|
2011-12-22 12:31:12 +00:00
|
|
|
* wait for node B to claim it. In case of timeout
|
|
|
|
* the entry is purged.
|
2011-10-22 18:12:51 +00:00
|
|
|
*
|
|
|
|
* If there are other originators left, we directly delete
|
|
|
|
* the originator.
|
2011-12-22 12:31:12 +00:00
|
|
|
* 2) the client roamed to us => we can directly delete
|
2012-05-12 00:09:43 +00:00
|
|
|
* the global entry, since it is useless now.
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
local_entry = batadv_tt_local_hash_find(bat_priv,
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global_entry->common.addr,
|
|
|
|
vid);
|
2012-05-16 18:23:16 +00:00
|
|
|
if (local_entry) {
|
2011-10-22 18:12:51 +00:00
|
|
|
/* local entry exists, case 2: client roamed to us. */
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_orig_list(tt_global_entry);
|
2012-09-23 20:38:36 +00:00
|
|
|
batadv_tt_global_free(bat_priv, tt_global_entry, message);
|
2011-10-22 18:12:51 +00:00
|
|
|
} else
|
|
|
|
/* no local entry exists, case 1: check for roaming */
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del_roaming(bat_priv, tt_global_entry,
|
|
|
|
orig_node, message);
|
2011-12-22 12:31:12 +00:00
|
|
|
|
|
|
|
|
2011-04-27 12:27:57 +00:00
|
|
|
out:
|
2011-04-27 12:28:07 +00:00
|
|
|
if (tt_global_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
|
|
|
if (local_entry)
|
|
|
|
batadv_tt_local_entry_free_ref(local_entry);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-08-07 16:28:55 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_del_orig - remove all the TT global entries belonging to the
|
|
|
|
* given originator matching the provided vid
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig_node: the originator owning the entries to remove
|
|
|
|
* @match_vid: the VLAN identifier to match. If negative all the entries will be
|
|
|
|
* removed
|
|
|
|
* @message: debug message to print as "reason"
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-08-07 16:28:55 +00:00
|
|
|
int32_t match_vid,
|
2012-06-05 20:31:31 +00:00
|
|
|
const char *message)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_global_entry *tt_global;
|
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.global_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 01:06:00 +00:00
|
|
|
struct hlist_node *safe;
|
2011-04-27 12:27:44 +00:00
|
|
|
struct hlist_head *head;
|
2011-04-27 12:28:07 +00:00
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2013-06-04 10:11:41 +00:00
|
|
|
unsigned short vid;
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-10-19 08:28:26 +00:00
|
|
|
if (!hash)
|
|
|
|
return;
|
|
|
|
|
2011-04-27 12:27:44 +00:00
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
2011-04-27 12:28:07 +00:00
|
|
|
list_lock = &hash->list_locks[i];
|
2010-12-13 11:19:28 +00:00
|
|
|
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_lock_bh(list_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common_entry, safe,
|
2012-02-28 09:55:36 +00:00
|
|
|
head, hash_entry) {
|
2013-08-07 16:28:55 +00:00
|
|
|
/* remove only matching entries */
|
|
|
|
if (match_vid >= 0 && tt_common_entry->vid != match_vid)
|
|
|
|
continue;
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_global = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_del_orig_entry(bat_priv, tt_global,
|
2012-05-16 18:23:16 +00:00
|
|
|
orig_node, message);
|
2011-10-22 18:12:51 +00:00
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
if (hlist_empty(&tt_global->orig_list)) {
|
2013-06-04 10:11:41 +00:00
|
|
|
vid = tt_global->common.vid;
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Deleting global tt entry %pM (vid: %d): %s\n",
|
|
|
|
tt_global->common.addr,
|
|
|
|
BATADV_PRINT_VID(vid), message);
|
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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&tt_common_entry->hash_entry);
|
2012-06-05 20:31:31 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global);
|
2011-04-27 12:28:07 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_unlock_bh(list_lock);
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-11-07 15:36:40 +00:00
|
|
|
orig_node->tt_initialised = false;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global,
|
|
|
|
char **msg)
|
2011-04-27 12:27:57 +00:00
|
|
|
{
|
2012-07-05 21:38:29 +00:00
|
|
|
bool purge = false;
|
|
|
|
unsigned long roam_timeout = BATADV_TT_CLIENT_ROAM_TIMEOUT;
|
|
|
|
unsigned long temp_timeout = BATADV_TT_CLIENT_TEMP_TIMEOUT;
|
2012-06-03 20:19:17 +00:00
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
if ((tt_global->common.flags & BATADV_TT_CLIENT_ROAM) &&
|
|
|
|
batadv_has_timed_out(tt_global->roam_at, roam_timeout)) {
|
|
|
|
purge = true;
|
|
|
|
*msg = "Roaming timeout\n";
|
|
|
|
}
|
2012-06-03 20:19:17 +00:00
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
if ((tt_global->common.flags & BATADV_TT_CLIENT_TEMP) &&
|
|
|
|
batadv_has_timed_out(tt_global->common.added_at, temp_timeout)) {
|
|
|
|
purge = true;
|
|
|
|
*msg = "Temporary client timeout\n";
|
2012-06-03 20:19:17 +00:00
|
|
|
}
|
2012-07-05 21:38:29 +00:00
|
|
|
|
|
|
|
return purge;
|
2012-06-03 20:19:17 +00:00
|
|
|
}
|
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
static void batadv_tt_global_purge(struct batadv_priv *bat_priv)
|
2012-06-03 20:19:17 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.global_hash;
|
2011-04-27 12:27:57 +00:00
|
|
|
struct hlist_head *head;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *node_tmp;
|
2011-04-27 12:28:07 +00:00
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2012-07-05 21:38:29 +00:00
|
|
|
char *msg = NULL;
|
|
|
|
struct batadv_tt_common_entry *tt_common;
|
|
|
|
struct batadv_tt_global_entry *tt_global;
|
2011-04-27 12:27:57 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
2011-04-27 12:28:07 +00:00
|
|
|
list_lock = &hash->list_locks[i];
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_lock_bh(list_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common, node_tmp, head,
|
2012-07-05 21:38:29 +00:00
|
|
|
hash_entry) {
|
|
|
|
tt_global = container_of(tt_common,
|
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
|
|
|
|
|
|
|
if (!batadv_tt_global_to_purge(tt_global, &msg))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Deleting global tt entry %pM (vid: %d): %s\n",
|
|
|
|
tt_global->common.addr,
|
|
|
|
BATADV_PRINT_VID(tt_global->common.vid),
|
|
|
|
msg);
|
2012-07-05 21:38:29 +00: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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&tt_common->hash_entry);
|
2012-07-05 21:38:29 +00:00
|
|
|
|
|
|
|
batadv_tt_global_entry_free_ref(tt_global);
|
|
|
|
}
|
2011-04-27 12:28:07 +00:00
|
|
|
spin_unlock_bh(list_lock);
|
2011-04-27 12:27:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_global_table_free(struct batadv_priv *bat_priv)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:28 +00:00
|
|
|
struct batadv_hashtable *hash;
|
2011-04-27 12:28:07 +00:00
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
|
|
|
struct batadv_tt_global_entry *tt_global;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *node_tmp;
|
2011-04-27 12:28:07 +00:00
|
|
|
struct hlist_head *head;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2011-04-27 12:28:07 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
if (!bat_priv->tt.global_hash)
|
2010-12-13 11:19:28 +00:00
|
|
|
return;
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
hash = bat_priv->tt.global_hash;
|
2011-04-27 12:28:07 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
list_lock = &hash->list_locks[i];
|
|
|
|
|
|
|
|
spin_lock_bh(list_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common_entry, node_tmp,
|
2011-04-27 12:28:07 +00:00
|
|
|
head, hash_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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&tt_common_entry->hash_entry);
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_global = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
|
|
|
batadv_tt_global_entry_free_ref(tt_global);
|
2011-04-27 12:28:07 +00:00
|
|
|
}
|
|
|
|
spin_unlock_bh(list_lock);
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:09:32 +00:00
|
|
|
batadv_hash_destroy(hash);
|
2011-04-27 12:28:07 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
bat_priv->tt.global_hash = NULL;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static bool
|
|
|
|
_batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry)
|
2011-07-07 13:35:36 +00:00
|
|
|
{
|
|
|
|
bool ret = false;
|
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
if (tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI &&
|
|
|
|
tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI)
|
2011-07-07 13:35:36 +00:00
|
|
|
ret = true;
|
|
|
|
|
2013-11-16 11:03:50 +00:00
|
|
|
/* check if the two clients are marked as isolated */
|
|
|
|
if (tt_local_entry->common.flags & BATADV_TT_CLIENT_ISOLA &&
|
|
|
|
tt_global_entry->common.flags & BATADV_TT_CLIENT_ISOLA)
|
|
|
|
ret = true;
|
|
|
|
|
2011-07-07 13:35:36 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_transtable_search - get the mesh destination for a given client
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @src: mac address of the source client
|
|
|
|
* @addr: mac address of the destination client
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns a pointer to the originator that was selected as destination in the
|
|
|
|
* mesh for contacting the client 'addr', NULL otherwise.
|
|
|
|
* In case of multiple originators serving the same client, the function returns
|
|
|
|
* the best one (best in terms of metric towards the destination node).
|
|
|
|
*
|
|
|
|
* If the two clients are AP isolated the function returns NULL.
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,
|
|
|
|
const uint8_t *src,
|
2013-06-04 10:11:39 +00:00
|
|
|
const uint8_t *addr,
|
|
|
|
unsigned short vid)
|
2010-12-13 11:19:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry = NULL;
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry = NULL;
|
|
|
|
struct batadv_orig_node *orig_node = NULL;
|
2012-10-07 11:34:15 +00:00
|
|
|
struct batadv_tt_orig_list_entry *best_entry;
|
2013-07-02 09:04:36 +00:00
|
|
|
|
2013-11-16 11:03:51 +00:00
|
|
|
if (src && batadv_vlan_ap_isola_get(bat_priv, vid)) {
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, src, vid);
|
2012-09-23 20:38:37 +00:00
|
|
|
if (!tt_local_entry ||
|
|
|
|
(tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING))
|
2011-07-07 13:35:37 +00:00
|
|
|
goto out;
|
|
|
|
}
|
2011-02-18 12:28:09 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid);
|
2011-05-05 06:42:45 +00:00
|
|
|
if (!tt_global_entry)
|
2011-02-18 12:28:10 +00:00
|
|
|
goto out;
|
2011-02-18 12:28:09 +00:00
|
|
|
|
2011-07-07 13:35:37 +00:00
|
|
|
/* check whether the clients should not communicate due to AP
|
2012-05-12 00:09:43 +00:00
|
|
|
* isolation
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
if (tt_local_entry &&
|
|
|
|
_batadv_is_ap_isolated(tt_local_entry, tt_global_entry))
|
2011-07-07 13:35:37 +00:00
|
|
|
goto out;
|
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
rcu_read_lock();
|
2013-09-03 09:10:24 +00:00
|
|
|
best_entry = batadv_transtable_best_orig(bat_priv, tt_global_entry);
|
2011-10-22 18:12:51 +00:00
|
|
|
/* found anything? */
|
2012-10-07 11:34:15 +00:00
|
|
|
if (best_entry)
|
|
|
|
orig_node = best_entry->orig_node;
|
2011-10-22 18:12:51 +00:00
|
|
|
if (orig_node && !atomic_inc_not_zero(&orig_node->refcount))
|
|
|
|
orig_node = NULL;
|
|
|
|
rcu_read_unlock();
|
2012-10-07 11:34:15 +00:00
|
|
|
|
2011-02-18 12:28:10 +00:00
|
|
|
out:
|
2011-07-07 13:35:37 +00:00
|
|
|
if (tt_global_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
2011-07-07 13:35:37 +00:00
|
|
|
if (tt_local_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2011-07-07 13:35:37 +00:00
|
|
|
|
2011-02-18 12:28:10 +00:00
|
|
|
return orig_node;
|
2010-12-13 11:19:28 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_crc - calculates the checksum of the local table belonging
|
|
|
|
* to the given orig_node
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2013-06-04 10:11:40 +00:00
|
|
|
* @orig_node: originator for which the CRC should be computed
|
2013-07-30 20:16:25 +00:00
|
|
|
* @vid: VLAN identifier for which the CRC32 has to be computed
|
2013-06-04 10:11:40 +00:00
|
|
|
*
|
|
|
|
* This function computes the checksum for the global table corresponding to a
|
|
|
|
* specific originator. In particular, the checksum is computed as follows: For
|
|
|
|
* each client connected to the originator the CRC32C of the MAC address and the
|
|
|
|
* VID is computed and then all the CRC32Cs of the various clients are xor'ed
|
|
|
|
* together.
|
|
|
|
*
|
|
|
|
* The idea behind is that CRC32C should be used as much as possible in order to
|
|
|
|
* produce a unique hash of the table, but since the order which is used to feed
|
|
|
|
* the CRC32C function affects the result and since every node in the network
|
|
|
|
* probably sorts the clients differently, the hash function cannot be directly
|
|
|
|
* computed over the entire table. Hence the CRC32C is used only on
|
|
|
|
* the single client entry, while all the results are then xor'ed together
|
|
|
|
* because the XOR operation can combine them all while trying to reduce the
|
|
|
|
* noise as much as possible.
|
|
|
|
*
|
|
|
|
* Returns the checksum of the global table of a given originator.
|
2013-04-24 14:37:51 +00:00
|
|
|
*/
|
|
|
|
static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv,
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_orig_node *orig_node,
|
|
|
|
unsigned short vid)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.global_hash;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common;
|
|
|
|
struct batadv_tt_global_entry *tt_global;
|
2011-04-27 12:27:44 +00:00
|
|
|
struct hlist_head *head;
|
2013-06-04 10:11:40 +00:00
|
|
|
uint32_t i, crc_tmp, crc = 0;
|
2013-10-13 00:50:20 +00:00
|
|
|
uint8_t flags;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
|
|
|
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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common, head, hash_entry) {
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_global = container_of(tt_common,
|
|
|
|
struct batadv_tt_global_entry,
|
|
|
|
common);
|
2013-07-30 20:16:25 +00:00
|
|
|
/* compute the CRC only for entries belonging to the
|
|
|
|
* VLAN identified by the vid passed as parameter
|
|
|
|
*/
|
|
|
|
if (tt_common->vid != vid)
|
|
|
|
continue;
|
|
|
|
|
2011-10-22 18:12:51 +00:00
|
|
|
/* Roaming clients are in the global table for
|
|
|
|
* consistency only. They don't have to be
|
|
|
|
* taken into account while computing the
|
|
|
|
* global crc
|
|
|
|
*/
|
2012-06-03 20:19:21 +00:00
|
|
|
if (tt_common->flags & BATADV_TT_CLIENT_ROAM)
|
2011-10-22 18:12:51 +00:00
|
|
|
continue;
|
2012-07-05 21:38:29 +00:00
|
|
|
/* Temporary clients have not been announced yet, so
|
|
|
|
* they have to be skipped while computing the global
|
|
|
|
* crc
|
|
|
|
*/
|
|
|
|
if (tt_common->flags & BATADV_TT_CLIENT_TEMP)
|
|
|
|
continue;
|
2011-10-22 18:12:51 +00:00
|
|
|
|
|
|
|
/* find out if this global entry is announced by this
|
|
|
|
* originator
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
if (!batadv_tt_global_entry_has_orig(tt_global,
|
2012-05-16 18:23:16 +00:00
|
|
|
orig_node))
|
2011-10-22 18:12:51 +00:00
|
|
|
continue;
|
|
|
|
|
2013-06-04 10:11:40 +00:00
|
|
|
crc_tmp = crc32c(0, &tt_common->vid,
|
|
|
|
sizeof(tt_common->vid));
|
2013-10-13 00:50:20 +00:00
|
|
|
|
|
|
|
/* compute the CRC on flags that have to be kept in sync
|
|
|
|
* among nodes
|
|
|
|
*/
|
|
|
|
flags = tt_common->flags & BATADV_TT_SYNC_MASK;
|
|
|
|
crc_tmp = crc32c(crc_tmp, &flags, sizeof(flags));
|
|
|
|
|
2013-06-04 10:11:40 +00:00
|
|
|
crc ^= crc32c(crc_tmp, tt_common->addr, ETH_ALEN);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
return crc;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_crc - calculates the checksum of the local table
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2013-07-30 20:16:25 +00:00
|
|
|
* @vid: VLAN identifier for which the CRC32 has to be computed
|
2013-06-04 10:11:40 +00:00
|
|
|
*
|
|
|
|
* For details about the computation, please refer to the documentation for
|
|
|
|
* batadv_tt_global_crc().
|
|
|
|
*
|
|
|
|
* Returns the checksum of the local table
|
2013-04-24 14:37:51 +00:00
|
|
|
*/
|
2013-07-30 20:16:25 +00:00
|
|
|
static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv,
|
|
|
|
unsigned short vid)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common;
|
2011-04-27 12:27:44 +00:00
|
|
|
struct hlist_head *head;
|
2013-06-04 10:11:40 +00:00
|
|
|
uint32_t i, crc_tmp, crc = 0;
|
2013-10-13 00:50:20 +00:00
|
|
|
uint8_t flags;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
|
|
|
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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common, head, hash_entry) {
|
2013-07-30 20:16:25 +00:00
|
|
|
/* compute the CRC only for entries belonging to the
|
|
|
|
* VLAN identified by vid
|
|
|
|
*/
|
|
|
|
if (tt_common->vid != vid)
|
|
|
|
continue;
|
|
|
|
|
2011-07-06 23:40:58 +00:00
|
|
|
/* not yet committed clients have not to be taken into
|
2012-05-12 00:09:43 +00:00
|
|
|
* account while computing the CRC
|
|
|
|
*/
|
2012-06-03 20:19:21 +00:00
|
|
|
if (tt_common->flags & BATADV_TT_CLIENT_NEW)
|
2011-07-06 23:40:58 +00:00
|
|
|
continue;
|
2013-04-24 14:37:51 +00:00
|
|
|
|
2013-06-04 10:11:40 +00:00
|
|
|
crc_tmp = crc32c(0, &tt_common->vid,
|
|
|
|
sizeof(tt_common->vid));
|
2013-10-13 00:50:20 +00:00
|
|
|
|
|
|
|
/* compute the CRC on flags that have to be kept in sync
|
|
|
|
* among nodes
|
|
|
|
*/
|
|
|
|
flags = tt_common->flags & BATADV_TT_SYNC_MASK;
|
|
|
|
crc_tmp = crc32c(crc_tmp, &flags, sizeof(flags));
|
|
|
|
|
2013-06-04 10:11:40 +00:00
|
|
|
crc ^= crc32c(crc_tmp, tt_common->addr, ETH_ALEN);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
return crc;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_req_list_free(struct batadv_priv *bat_priv)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_req_node *node, *safe;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
|
2011-04-27 12:27:44 +00:00
|
|
|
list_del(&node->list);
|
|
|
|
kfree(node);
|
|
|
|
}
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-05-28 11:14:28 +00:00
|
|
|
const void *tt_buff,
|
|
|
|
uint16_t tt_buff_len)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
|
|
|
/* Replace the old buffer only if I received something in the
|
2012-05-12 00:09:43 +00:00
|
|
|
* last OGM (the OGM could carry no changes)
|
|
|
|
*/
|
2011-04-27 12:27:44 +00:00
|
|
|
spin_lock_bh(&orig_node->tt_buff_lock);
|
|
|
|
if (tt_buff_len > 0) {
|
|
|
|
kfree(orig_node->tt_buff);
|
|
|
|
orig_node->tt_buff_len = 0;
|
|
|
|
orig_node->tt_buff = kmalloc(tt_buff_len, GFP_ATOMIC);
|
|
|
|
if (orig_node->tt_buff) {
|
|
|
|
memcpy(orig_node->tt_buff, tt_buff, tt_buff_len);
|
|
|
|
orig_node->tt_buff_len = tt_buff_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&orig_node->tt_buff_lock);
|
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_req_purge(struct batadv_priv *bat_priv)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_req_node *node, *safe;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
|
|
|
list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
|
2012-06-03 20:19:17 +00:00
|
|
|
if (batadv_has_timed_out(node->issued_at,
|
|
|
|
BATADV_TT_REQUEST_TIMEOUT)) {
|
2011-04-27 12:27:44 +00:00
|
|
|
list_del(&node->list);
|
|
|
|
kfree(node);
|
|
|
|
}
|
|
|
|
}
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* returns the pointer to the new tt_req_node struct if no request
|
2012-05-12 00:09:43 +00:00
|
|
|
* has already been issued for this orig_node, NULL otherwise
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static struct batadv_tt_req_node *
|
|
|
|
batadv_new_tt_req_node(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node = NULL;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
|
|
|
list_for_each_entry(tt_req_node_tmp, &bat_priv->tt.req_list, list) {
|
2012-05-12 11:48:58 +00:00
|
|
|
if (batadv_compare_eth(tt_req_node_tmp, orig_node) &&
|
|
|
|
!batadv_has_timed_out(tt_req_node_tmp->issued_at,
|
2012-06-03 20:19:17 +00:00
|
|
|
BATADV_TT_REQUEST_TIMEOUT))
|
2011-04-27 12:27:44 +00:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
tt_req_node = kmalloc(sizeof(*tt_req_node), GFP_ATOMIC);
|
|
|
|
if (!tt_req_node)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
memcpy(tt_req_node->addr, orig_node->orig, ETH_ALEN);
|
|
|
|
tt_req_node->issued_at = jiffies;
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_add(&tt_req_node->list, &bat_priv->tt.req_list);
|
2011-04-27 12:27:44 +00:00
|
|
|
unlock:
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
return tt_req_node;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_valid - verify that given tt entry is a valid one
|
|
|
|
* @entry_ptr: to be checked local tt entry
|
|
|
|
* @data_ptr: not used but definition required to satisfy the callback prototype
|
|
|
|
*
|
|
|
|
* Returns 1 if the entry is a valid, 0 otherwise.
|
|
|
|
*/
|
|
|
|
static int batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr)
|
2011-07-06 23:40:58 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
|
2011-07-06 23:40:58 +00:00
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW)
|
2011-07-06 23:40:58 +00:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static int batadv_tt_global_valid(const void *entry_ptr,
|
|
|
|
const void *data_ptr)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
|
|
|
|
const struct batadv_tt_global_entry *tt_global_entry;
|
|
|
|
const struct batadv_orig_node *orig_node = data_ptr;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
if (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ||
|
|
|
|
tt_common_entry->flags & BATADV_TT_CLIENT_TEMP)
|
2011-04-27 12:27:57 +00:00
|
|
|
return 0;
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_global_entry = container_of(tt_common_entry,
|
|
|
|
struct batadv_tt_global_entry,
|
2011-10-30 11:17:33 +00:00
|
|
|
common);
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
2013-07-30 20:16:25 +00:00
|
|
|
* batadv_tt_tvlv_generate - fill the tvlv buff with the tt entries from the
|
|
|
|
* specified tt hash
|
2013-04-23 13:40:02 +00:00
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @hash: hash table containing the tt entries
|
|
|
|
* @tt_len: expected tvlv tt data buffer length in number of bytes
|
2013-07-30 20:16:25 +00:00
|
|
|
* @tvlv_buff: pointer to the buffer to fill with the TT data
|
2013-04-23 13:40:02 +00:00
|
|
|
* @valid_cb: function to filter tt change entries
|
|
|
|
* @cb_data: data passed to the filter function as argument
|
|
|
|
*/
|
2013-07-30 20:16:25 +00:00
|
|
|
static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_hashtable *hash,
|
|
|
|
void *tvlv_buff, uint16_t tt_len,
|
|
|
|
int (*valid_cb)(const void *, const void *),
|
|
|
|
void *cb_data)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
2011-04-27 12:27:44 +00:00
|
|
|
struct hlist_head *head;
|
2013-04-23 13:40:02 +00:00
|
|
|
uint16_t tt_tot, tt_num_entries = 0;
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-05-28 11:14:27 +00:00
|
|
|
tt_tot = batadv_tt_entries(tt_len);
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common_entry,
|
2011-04-27 12:27:44 +00:00
|
|
|
head, hash_entry) {
|
2013-04-23 13:40:02 +00:00
|
|
|
if (tt_tot == tt_num_entries)
|
2011-04-27 12:27:44 +00:00
|
|
|
break;
|
|
|
|
|
2011-10-30 11:17:33 +00:00
|
|
|
if ((valid_cb) && (!valid_cb(tt_common_entry, cb_data)))
|
2011-04-27 12:27:44 +00:00
|
|
|
continue;
|
|
|
|
|
2011-10-30 11:17:33 +00:00
|
|
|
memcpy(tt_change->addr, tt_common_entry->addr,
|
|
|
|
ETH_ALEN);
|
2012-11-08 13:21:11 +00:00
|
|
|
tt_change->flags = tt_common_entry->flags;
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_change->vid = htons(tt_common_entry->vid);
|
2013-12-15 12:26:55 +00:00
|
|
|
memset(tt_change->reserved, 0,
|
|
|
|
sizeof(tt_change->reserved));
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
tt_num_entries++;
|
2011-04-27 12:27:44 +00:00
|
|
|
tt_change++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2013-07-30 20:16:25 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_check_crc - check if all the CRCs are correct
|
|
|
|
* @orig_node: originator for which the CRCs have to be checked
|
|
|
|
* @tt_vlan: pointer to the first tvlv VLAN entry
|
|
|
|
* @num_vlan: number of tvlv VLAN entries
|
|
|
|
* @create: if true, create VLAN objects if not found
|
|
|
|
*
|
|
|
|
* Return true if all the received CRCs match the locally stored ones, false
|
|
|
|
* otherwise
|
|
|
|
*/
|
|
|
|
static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
|
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan,
|
|
|
|
uint16_t num_vlan)
|
|
|
|
{
|
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp;
|
|
|
|
struct batadv_orig_node_vlan *vlan;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* check if each received CRC matches the locally stored one */
|
|
|
|
for (i = 0; i < num_vlan; i++) {
|
|
|
|
tt_vlan_tmp = tt_vlan + i;
|
|
|
|
|
|
|
|
/* if orig_node is a backbone node for this VLAN, don't check
|
|
|
|
* the CRC as we ignore all the global entries over it
|
|
|
|
*/
|
|
|
|
if (batadv_bla_is_backbone_gw_orig(orig_node->bat_priv,
|
2013-08-07 16:28:56 +00:00
|
|
|
orig_node->orig,
|
|
|
|
ntohs(tt_vlan_tmp->vid)))
|
2013-07-30 20:16:25 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
vlan = batadv_orig_node_vlan_get(orig_node,
|
|
|
|
ntohs(tt_vlan_tmp->vid));
|
|
|
|
if (!vlan)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (vlan->tt.crc != ntohl(tt_vlan_tmp->crc))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_local_update_crc - update all the local CRCs
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
*/
|
|
|
|
static void batadv_tt_local_update_crc(struct batadv_priv *bat_priv)
|
|
|
|
{
|
|
|
|
struct batadv_softif_vlan *vlan;
|
|
|
|
|
|
|
|
/* recompute the global CRC for each VLAN */
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
|
|
|
|
vlan->tt.crc = batadv_tt_local_crc(bat_priv, vlan->vid);
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_global_update_crc - update all the global CRCs for this orig_node
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig_node: the orig_node for which the CRCs have to be updated
|
|
|
|
*/
|
|
|
|
static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node)
|
|
|
|
{
|
|
|
|
struct batadv_orig_node_vlan *vlan;
|
|
|
|
uint32_t crc;
|
|
|
|
|
|
|
|
/* recompute the global CRC for each VLAN */
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
|
|
|
|
/* if orig_node is a backbone node for this VLAN, don't compute
|
|
|
|
* the CRC as we ignore all the global entries over it
|
|
|
|
*/
|
2013-08-07 16:28:56 +00:00
|
|
|
if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig,
|
|
|
|
vlan->vid))
|
2013-07-30 20:16:25 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
crc = batadv_tt_global_crc(bat_priv, orig_node, vlan->vid);
|
|
|
|
vlan->tt.crc = crc;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-24 14:37:51 +00:00
|
|
|
/**
|
|
|
|
* batadv_send_tt_request - send a TT Request message to a given node
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @dst_orig_node: the destination of the message
|
|
|
|
* @ttvn: the version number that the source of the message is looking for
|
2013-07-30 20:16:25 +00:00
|
|
|
* @tt_vlan: pointer to the first tvlv VLAN object to request
|
|
|
|
* @num_vlan: number of tvlv VLAN entries
|
2013-04-24 14:37:51 +00:00
|
|
|
* @full_table: ask for the entire translation table if true, while only for the
|
|
|
|
* last TT diff otherwise
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static int batadv_send_tt_request(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *dst_orig_node,
|
2013-07-30 20:16:25 +00:00
|
|
|
uint8_t ttvn,
|
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan,
|
|
|
|
uint16_t num_vlan, bool full_table)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_req_node *tt_req_node = NULL;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan_req;
|
|
|
|
struct batadv_hard_iface *primary_if;
|
2013-04-23 13:40:02 +00:00
|
|
|
bool ret = false;
|
2013-07-30 20:16:25 +00:00
|
|
|
int i, size;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-05-12 11:48:54 +00:00
|
|
|
primary_if = batadv_primary_if_get_selected(bat_priv);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!primary_if)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* The new tt_req will be issued only if I'm not waiting for a
|
2012-05-12 00:09:43 +00:00
|
|
|
* reply from the same orig_node yet
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
tt_req_node = batadv_new_tt_req_node(bat_priv, dst_orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!tt_req_node)
|
|
|
|
goto out;
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
size = sizeof(*tvlv_tt_data) + sizeof(*tt_vlan_req) * num_vlan;
|
|
|
|
tvlv_tt_data = kzalloc(size, GFP_ATOMIC);
|
2013-04-23 13:40:02 +00:00
|
|
|
if (!tvlv_tt_data)
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags = BATADV_TT_REQUEST;
|
|
|
|
tvlv_tt_data->ttvn = ttvn;
|
2013-07-30 20:16:25 +00:00
|
|
|
tvlv_tt_data->num_vlan = htons(num_vlan);
|
|
|
|
|
|
|
|
/* send all the CRCs within the request. This is needed by intermediate
|
|
|
|
* nodes to ensure they have the correct table before replying
|
|
|
|
*/
|
|
|
|
tt_vlan_req = (struct batadv_tvlv_tt_vlan_data *)(tvlv_tt_data + 1);
|
|
|
|
for (i = 0; i < num_vlan; i++) {
|
|
|
|
tt_vlan_req->vid = tt_vlan->vid;
|
|
|
|
tt_vlan_req->crc = tt_vlan->crc;
|
|
|
|
|
|
|
|
tt_vlan_req++;
|
|
|
|
tt_vlan++;
|
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
if (full_table)
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags |= BATADV_TT_FULL_TABLE;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-10-16 14:13:48 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv, "Sending TT_REQUEST to %pM [%c]\n",
|
2013-04-23 13:40:02 +00:00
|
|
|
dst_orig_node->orig, full_table ? 'F' : '.');
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:20 +00:00
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_TX);
|
2013-04-23 13:40:02 +00:00
|
|
|
batadv_tvlv_unicast_send(bat_priv, primary_if->net_dev->dev_addr,
|
|
|
|
dst_orig_node->orig, BATADV_TVLV_TT, 1,
|
2013-07-30 20:16:25 +00:00
|
|
|
tvlv_tt_data, size);
|
2013-04-23 13:40:02 +00:00
|
|
|
ret = true;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (primary_if)
|
2012-05-12 11:48:54 +00:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (ret && tt_req_node) {
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
list_del(&tt_req_node->list);
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
kfree(tt_req_node);
|
|
|
|
}
|
2013-04-23 13:40:02 +00:00
|
|
|
kfree(tvlv_tt_data);
|
2011-04-27 12:27:44 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_send_other_tt_response - send reply to tt request concerning another
|
|
|
|
* node's translation table
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_data: tt data containing the tt request information
|
|
|
|
* @req_src: mac address of tt request sender
|
|
|
|
* @req_dst: mac address of tt request recipient
|
|
|
|
*
|
|
|
|
* Returns true if tt request reply was sent, false otherwise.
|
|
|
|
*/
|
|
|
|
static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tvlv_tt_data *tt_data,
|
|
|
|
uint8_t *req_src, uint8_t *req_dst)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_orig_node *req_dst_orig_node;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_orig_node *res_dst_orig_node = NULL;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan;
|
2013-04-23 13:40:02 +00:00
|
|
|
bool ret = false, full_table;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint8_t orig_ttvn, req_ttvn;
|
|
|
|
uint16_t tvlv_len;
|
|
|
|
int32_t tt_len;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2012-05-12 11:48:58 +00:00
|
|
|
"Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n",
|
2013-04-23 13:40:02 +00:00
|
|
|
req_src, tt_data->ttvn, req_dst,
|
|
|
|
(tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
/* Let's get the orig node of the REAL destination */
|
2013-04-23 13:40:02 +00:00
|
|
|
req_dst_orig_node = batadv_orig_hash_find(bat_priv, req_dst);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!req_dst_orig_node)
|
|
|
|
goto out;
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
res_dst_orig_node = batadv_orig_hash_find(bat_priv, req_src);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!res_dst_orig_node)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
orig_ttvn = (uint8_t)atomic_read(&req_dst_orig_node->last_ttvn);
|
2013-04-23 13:40:02 +00:00
|
|
|
req_ttvn = tt_data->ttvn;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(tt_data + 1);
|
2013-04-23 13:40:02 +00:00
|
|
|
/* this node doesn't have the requested data */
|
2011-04-27 12:27:44 +00:00
|
|
|
if (orig_ttvn != req_ttvn ||
|
2013-07-30 20:16:25 +00:00
|
|
|
!batadv_tt_global_check_crc(req_dst_orig_node, tt_vlan,
|
|
|
|
ntohs(tt_data->num_vlan)))
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
|
|
|
|
2011-07-09 15:52:13 +00:00
|
|
|
/* If the full table has been explicitly requested */
|
2013-04-23 13:40:02 +00:00
|
|
|
if (tt_data->flags & BATADV_TT_FULL_TABLE ||
|
2011-04-27 12:27:44 +00:00
|
|
|
!req_dst_orig_node->tt_buff)
|
|
|
|
full_table = true;
|
|
|
|
else
|
|
|
|
full_table = false;
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/* TT fragmentation hasn't been implemented yet, so send as many
|
|
|
|
* TT entries fit a single packet as possible only
|
2012-05-12 00:09:43 +00:00
|
|
|
*/
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!full_table) {
|
|
|
|
spin_lock_bh(&req_dst_orig_node->tt_buff_lock);
|
|
|
|
tt_len = req_dst_orig_node->tt_buff_len;
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tvlv_len = batadv_tt_prepare_tvlv_global_data(req_dst_orig_node,
|
|
|
|
&tvlv_tt_data,
|
|
|
|
&tt_change,
|
|
|
|
&tt_len);
|
|
|
|
if (!tt_len)
|
2011-04-27 12:27:44 +00:00
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
/* Copy the last orig_node's OGM buffer */
|
2013-07-30 20:16:25 +00:00
|
|
|
memcpy(tt_change, req_dst_orig_node->tt_buff,
|
2011-04-27 12:27:44 +00:00
|
|
|
req_dst_orig_node->tt_buff_len);
|
|
|
|
spin_unlock_bh(&req_dst_orig_node->tt_buff_lock);
|
|
|
|
} else {
|
2013-07-30 20:16:25 +00:00
|
|
|
/* allocate the tvlv, put the tt_data and all the tt_vlan_data
|
|
|
|
* in the initial part
|
|
|
|
*/
|
|
|
|
tt_len = -1;
|
|
|
|
tvlv_len = batadv_tt_prepare_tvlv_global_data(req_dst_orig_node,
|
|
|
|
&tvlv_tt_data,
|
|
|
|
&tt_change,
|
|
|
|
&tt_len);
|
|
|
|
if (!tt_len)
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
2013-07-30 20:16:25 +00:00
|
|
|
|
|
|
|
/* fill the rest of the tvlv with the real TT entries */
|
|
|
|
batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash,
|
|
|
|
tt_change, tt_len,
|
|
|
|
batadv_tt_global_valid,
|
|
|
|
req_dst_orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/* Don't send the response, if larger than fragmented packet. */
|
|
|
|
tt_len = sizeof(struct batadv_unicast_tvlv_packet) + tvlv_len;
|
|
|
|
if (tt_len > atomic_read(&bat_priv->packet_size_max)) {
|
|
|
|
net_ratelimited_function(batadv_info, bat_priv->soft_iface,
|
|
|
|
"Ignoring TT_REQUEST from %pM; Response size exceeds max packet size.\n",
|
|
|
|
res_dst_orig_node->orig);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags = BATADV_TT_RESPONSE;
|
|
|
|
tvlv_tt_data->ttvn = req_ttvn;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
if (full_table)
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags |= BATADV_TT_FULL_TABLE;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-04-23 13:40:02 +00:00
|
|
|
"Sending TT_RESPONSE %pM for %pM [%c] (ttvn: %u)\n",
|
|
|
|
res_dst_orig_node->orig, req_dst_orig_node->orig,
|
|
|
|
full_table ? 'F' : '.', req_ttvn);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:20 +00:00
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
|
2012-04-20 15:02:45 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
batadv_tvlv_unicast_send(bat_priv, req_dst_orig_node->orig,
|
2013-07-30 20:16:25 +00:00
|
|
|
req_src, BATADV_TVLV_TT, 1, tvlv_tt_data,
|
|
|
|
tvlv_len);
|
2013-04-20 11:54:39 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
ret = true;
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
unlock:
|
|
|
|
spin_unlock_bh(&req_dst_orig_node->tt_buff_lock);
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (res_dst_orig_node)
|
2012-05-12 00:09:34 +00:00
|
|
|
batadv_orig_node_free_ref(res_dst_orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (req_dst_orig_node)
|
2012-05-12 00:09:34 +00:00
|
|
|
batadv_orig_node_free_ref(req_dst_orig_node);
|
2013-04-23 13:40:02 +00:00
|
|
|
kfree(tvlv_tt_data);
|
2011-04-27 12:27:44 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2012-06-05 20:31:30 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_send_my_tt_response - send reply to tt request concerning this node's
|
|
|
|
* translation table
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_data: tt data containing the tt request information
|
|
|
|
* @req_src: mac address of tt request sender
|
|
|
|
*
|
|
|
|
* Returns true if tt request reply was sent, false otherwise.
|
|
|
|
*/
|
|
|
|
static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tvlv_tt_data *tt_data,
|
|
|
|
uint8_t *req_src)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_data *tvlv_tt_data = NULL;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_hard_iface *primary_if = NULL;
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
|
|
|
struct batadv_orig_node *orig_node;
|
2013-04-23 13:40:02 +00:00
|
|
|
uint8_t my_ttvn, req_ttvn;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint16_t tvlv_len;
|
2011-04-27 12:27:44 +00:00
|
|
|
bool full_table;
|
2013-07-30 20:16:25 +00:00
|
|
|
int32_t tt_len;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2012-05-12 11:48:58 +00:00
|
|
|
"Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n",
|
2013-04-23 13:40:02 +00:00
|
|
|
req_src, tt_data->ttvn,
|
|
|
|
(tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.commit_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
my_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn);
|
2013-04-23 13:40:02 +00:00
|
|
|
req_ttvn = tt_data->ttvn;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
orig_node = batadv_orig_hash_find(bat_priv, req_src);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!orig_node)
|
|
|
|
goto out;
|
|
|
|
|
2012-05-12 11:48:54 +00:00
|
|
|
primary_if = batadv_primary_if_get_selected(bat_priv);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!primary_if)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* If the full table has been explicitly requested or the gap
|
2012-05-12 00:09:43 +00:00
|
|
|
* is too big send the whole local translation table
|
|
|
|
*/
|
2013-04-23 13:40:02 +00:00
|
|
|
if (tt_data->flags & BATADV_TT_FULL_TABLE || my_ttvn != req_ttvn ||
|
2012-07-15 20:26:51 +00:00
|
|
|
!bat_priv->tt.last_changeset)
|
2011-04-27 12:27:44 +00:00
|
|
|
full_table = true;
|
|
|
|
else
|
|
|
|
full_table = false;
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/* TT fragmentation hasn't been implemented yet, so send as many
|
|
|
|
* TT entries fit a single packet as possible only
|
2012-05-12 00:09:43 +00:00
|
|
|
*/
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!full_table) {
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.last_changeset_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_len = bat_priv->tt.last_changeset_len;
|
|
|
|
tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv,
|
|
|
|
&tvlv_tt_data,
|
|
|
|
&tt_change,
|
|
|
|
&tt_len);
|
|
|
|
if (!tt_len)
|
2011-04-27 12:27:44 +00:00
|
|
|
goto unlock;
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/* Copy the last orig_node's OGM buffer */
|
2013-07-30 20:16:25 +00:00
|
|
|
memcpy(tt_change, bat_priv->tt.last_changeset,
|
2012-07-15 20:26:51 +00:00
|
|
|
bat_priv->tt.last_changeset_len);
|
|
|
|
spin_unlock_bh(&bat_priv->tt.last_changeset_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
} else {
|
2013-04-23 13:40:02 +00:00
|
|
|
req_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn);
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
/* allocate the tvlv, put the tt_data and all the tt_vlan_data
|
|
|
|
* in the initial part
|
|
|
|
*/
|
|
|
|
tt_len = -1;
|
|
|
|
tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv,
|
|
|
|
&tvlv_tt_data,
|
|
|
|
&tt_change,
|
|
|
|
&tt_len);
|
|
|
|
if (!tt_len)
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
2013-07-30 20:16:25 +00:00
|
|
|
|
|
|
|
/* fill the rest of the tvlv with the real TT entries */
|
|
|
|
batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash,
|
|
|
|
tt_change, tt_len,
|
|
|
|
batadv_tt_local_valid, NULL);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags = BATADV_TT_RESPONSE;
|
|
|
|
tvlv_tt_data->ttvn = req_ttvn;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
if (full_table)
|
2013-04-23 13:40:02 +00:00
|
|
|
tvlv_tt_data->flags |= BATADV_TT_FULL_TABLE;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-04-23 13:40:02 +00:00
|
|
|
"Sending TT_RESPONSE to %pM [%c] (ttvn: %u)\n",
|
|
|
|
orig_node->orig, full_table ? 'F' : '.', req_ttvn);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:20 +00:00
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
|
2012-04-20 15:02:45 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
batadv_tvlv_unicast_send(bat_priv, primary_if->net_dev->dev_addr,
|
2013-07-30 20:16:25 +00:00
|
|
|
req_src, BATADV_TVLV_TT, 1, tvlv_tt_data,
|
|
|
|
tvlv_len);
|
2013-04-23 13:40:02 +00:00
|
|
|
|
2011-04-27 12:27:44 +00:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
unlock:
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.last_changeset_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
out:
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.commit_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (orig_node)
|
2012-05-12 00:09:34 +00:00
|
|
|
batadv_orig_node_free_ref(orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (primary_if)
|
2012-05-12 11:48:54 +00:00
|
|
|
batadv_hardif_free_ref(primary_if);
|
2013-04-23 13:40:02 +00:00
|
|
|
kfree(tvlv_tt_data);
|
|
|
|
/* The packet was for this host, so it doesn't need to be re-routed */
|
2011-04-27 12:27:44 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_send_tt_response - send reply to tt request
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_data: tt data containing the tt request information
|
|
|
|
* @req_src: mac address of tt request sender
|
|
|
|
* @req_dst: mac address of tt request recipient
|
|
|
|
*
|
|
|
|
* Returns true if tt request reply was sent, false otherwise.
|
|
|
|
*/
|
|
|
|
static bool batadv_send_tt_response(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tvlv_tt_data *tt_data,
|
|
|
|
uint8_t *req_src, uint8_t *req_dst)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2013-08-07 16:28:56 +00:00
|
|
|
if (batadv_is_my_mac(bat_priv, req_dst))
|
2013-04-23 13:40:02 +00:00
|
|
|
return batadv_send_my_tt_response(bat_priv, tt_data, req_src);
|
2013-08-07 16:28:56 +00:00
|
|
|
else
|
2013-04-23 13:40:02 +00:00
|
|
|
return batadv_send_other_tt_response(bat_priv, tt_data,
|
|
|
|
req_src, req_dst);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change,
|
2012-05-16 18:23:16 +00:00
|
|
|
uint16_t tt_num_changes, uint8_t ttvn)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
|
|
|
int i;
|
2012-05-16 18:23:16 +00:00
|
|
|
int roams;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
for (i = 0; i < tt_num_changes; i++) {
|
2012-06-03 20:19:21 +00:00
|
|
|
if ((tt_change + i)->flags & BATADV_TT_CLIENT_DEL) {
|
|
|
|
roams = (tt_change + i)->flags & BATADV_TT_CLIENT_ROAM;
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_del(bat_priv, orig_node,
|
|
|
|
(tt_change + i)->addr,
|
2013-06-04 10:11:39 +00:00
|
|
|
ntohs((tt_change + i)->vid),
|
2012-05-24 22:00:54 +00:00
|
|
|
"tt removed by changes",
|
|
|
|
roams);
|
2012-05-12 00:09:39 +00:00
|
|
|
} else {
|
|
|
|
if (!batadv_tt_global_add(bat_priv, orig_node,
|
2012-05-24 22:00:54 +00:00
|
|
|
(tt_change + i)->addr,
|
2013-06-04 10:11:39 +00:00
|
|
|
ntohs((tt_change + i)->vid),
|
2012-05-24 22:00:54 +00:00
|
|
|
(tt_change + i)->flags, ttvn))
|
2011-04-27 12:27:44 +00:00
|
|
|
/* In case of problem while storing a
|
|
|
|
* global_entry, we stop the updating
|
|
|
|
* procedure without committing the
|
|
|
|
* ttvn change. This will avoid to send
|
|
|
|
* corrupted data on tt_request
|
|
|
|
*/
|
|
|
|
return;
|
2012-05-12 00:09:39 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
2011-11-07 15:36:40 +00:00
|
|
|
orig_node->tt_initialised = true;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change,
|
|
|
|
uint8_t ttvn, uint8_t *resp_src,
|
|
|
|
uint16_t num_entries)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_orig_node *orig_node;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
orig_node = batadv_orig_hash_find(bat_priv, resp_src);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!orig_node)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Purge the old table first.. */
|
2013-08-07 16:28:55 +00:00
|
|
|
batadv_tt_global_del_orig(bat_priv, orig_node, -1,
|
|
|
|
"Received full table");
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
_batadv_tt_update_changes(bat_priv, orig_node, tt_change, num_entries,
|
|
|
|
ttvn);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
spin_lock_bh(&orig_node->tt_buff_lock);
|
|
|
|
kfree(orig_node->tt_buff);
|
|
|
|
orig_node->tt_buff_len = 0;
|
|
|
|
orig_node->tt_buff = NULL;
|
|
|
|
spin_unlock_bh(&orig_node->tt_buff_lock);
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
atomic_set(&orig_node->last_ttvn, ttvn);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (orig_node)
|
2012-05-12 00:09:34 +00:00
|
|
|
batadv_orig_node_free_ref(orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_update_changes(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2012-05-16 18:23:16 +00:00
|
|
|
uint16_t tt_num_changes, uint8_t ttvn,
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-05-16 18:23:16 +00:00
|
|
|
_batadv_tt_update_changes(bat_priv, orig_node, tt_change,
|
|
|
|
tt_num_changes, ttvn);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-05-28 11:14:28 +00:00
|
|
|
batadv_tt_save_orig_buffer(bat_priv, orig_node, tt_change,
|
|
|
|
batadv_tt_len(tt_num_changes));
|
2011-04-27 12:27:44 +00:00
|
|
|
atomic_set(&orig_node->last_ttvn, ttvn);
|
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_is_my_client - check if a client is served by the local node
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the mac adress of the client to check
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns true if the client is served by this node, false otherwise.
|
|
|
|
*/
|
|
|
|
bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr,
|
|
|
|
unsigned short vid)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-10-07 10:02:22 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry;
|
2011-04-27 12:28:07 +00:00
|
|
|
bool ret = false;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
|
2011-04-27 12:28:07 +00:00
|
|
|
if (!tt_local_entry)
|
|
|
|
goto out;
|
2011-07-06 23:40:58 +00:00
|
|
|
/* Check if the client has been logically deleted (but is kept for
|
2012-05-12 00:09:43 +00:00
|
|
|
* consistency purpose)
|
|
|
|
*/
|
2012-09-23 20:38:34 +00:00
|
|
|
if ((tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) ||
|
|
|
|
(tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM))
|
2011-07-06 23:40:58 +00:00
|
|
|
goto out;
|
2011-04-27 12:28:07 +00:00
|
|
|
ret = true;
|
|
|
|
out:
|
2011-04-27 12:27:44 +00:00
|
|
|
if (tt_local_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2011-04-27 12:28:07 +00:00
|
|
|
return ret;
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_handle_tt_response - process incoming tt reply
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @tt_data: tt data containing the tt request information
|
|
|
|
* @resp_src: mac address of tt reply sender
|
|
|
|
* @num_entries: number of tt change entries appended to the tt data
|
|
|
|
*/
|
|
|
|
static void batadv_handle_tt_response(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_tvlv_tt_data *tt_data,
|
|
|
|
uint8_t *resp_src, uint16_t num_entries)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_req_node *node, *safe;
|
|
|
|
struct batadv_orig_node *orig_node = NULL;
|
2013-04-23 13:40:02 +00:00
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint8_t *tvlv_ptr = (uint8_t *)tt_data;
|
|
|
|
uint16_t change_offset;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2012-05-12 11:48:58 +00:00
|
|
|
"Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n",
|
2013-04-23 13:40:02 +00:00
|
|
|
resp_src, tt_data->ttvn, num_entries,
|
|
|
|
(tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
orig_node = batadv_orig_hash_find(bat_priv, resp_src);
|
2011-04-27 12:27:44 +00:00
|
|
|
if (!orig_node)
|
|
|
|
goto out;
|
|
|
|
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_lock_bh(&orig_node->tt_lock);
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
change_offset = sizeof(struct batadv_tvlv_tt_vlan_data);
|
|
|
|
change_offset *= ntohs(tt_data->num_vlan);
|
|
|
|
change_offset += sizeof(*tt_data);
|
|
|
|
tvlv_ptr += change_offset;
|
|
|
|
|
|
|
|
tt_change = (struct batadv_tvlv_tt_change *)tvlv_ptr;
|
2013-04-23 13:40:02 +00:00
|
|
|
if (tt_data->flags & BATADV_TT_FULL_TABLE) {
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_fill_gtable(bat_priv, tt_change, tt_data->ttvn,
|
|
|
|
resp_src, num_entries);
|
2012-06-05 20:31:30 +00:00
|
|
|
} else {
|
2013-04-23 13:40:02 +00:00
|
|
|
batadv_tt_update_changes(bat_priv, orig_node, num_entries,
|
|
|
|
tt_data->ttvn, tt_change);
|
2012-06-05 20:31:30 +00:00
|
|
|
}
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-07-30 20:16:24 +00:00
|
|
|
/* Recalculate the CRC for this orig_node and store it */
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_global_update_crc(bat_priv, orig_node);
|
2013-07-30 20:16:24 +00:00
|
|
|
|
|
|
|
spin_unlock_bh(&orig_node->tt_lock);
|
|
|
|
|
2011-04-27 12:27:44 +00:00
|
|
|
/* Delete the tt_req_node from pending tt_requests list */
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
|
|
|
list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) {
|
2013-04-23 13:40:02 +00:00
|
|
|
if (!batadv_compare_eth(node->addr, resp_src))
|
2011-04-27 12:27:44 +00:00
|
|
|
continue;
|
|
|
|
list_del(&node->list);
|
|
|
|
kfree(node);
|
|
|
|
}
|
2013-07-30 20:16:25 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
out:
|
|
|
|
if (orig_node)
|
2012-05-12 00:09:34 +00:00
|
|
|
batadv_orig_node_free_ref(orig_node);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_roam_node *node, *safe;
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.roam_list_lock);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_for_each_entry_safe(node, safe, &bat_priv->tt.roam_list, list) {
|
2011-04-27 12:27:57 +00:00
|
|
|
list_del(&node->list);
|
|
|
|
kfree(node);
|
|
|
|
}
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.roam_list_lock);
|
2011-04-27 12:27:57 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_roam_purge(struct batadv_priv *bat_priv)
|
2011-04-27 12:27:57 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_roam_node *node, *safe;
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.roam_list_lock);
|
|
|
|
list_for_each_entry_safe(node, safe, &bat_priv->tt.roam_list, list) {
|
2012-06-03 20:19:17 +00:00
|
|
|
if (!batadv_has_timed_out(node->first_time,
|
|
|
|
BATADV_ROAMING_MAX_TIME))
|
2011-04-27 12:27:57 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
list_del(&node->list);
|
|
|
|
kfree(node);
|
|
|
|
}
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.roam_list_lock);
|
2011-04-27 12:27:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This function checks whether the client already reached the
|
|
|
|
* maximum number of possible roaming phases. In this case the ROAMING_ADV
|
|
|
|
* will not be sent.
|
|
|
|
*
|
2012-05-12 00:09:43 +00:00
|
|
|
* returns true if the ROAMING_ADV can be sent, false otherwise
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static bool batadv_tt_check_roam_count(struct batadv_priv *bat_priv,
|
2012-05-16 18:23:16 +00:00
|
|
|
uint8_t *client)
|
2011-04-27 12:27:57 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_roam_node *tt_roam_node;
|
2011-04-27 12:27:57 +00:00
|
|
|
bool ret = false;
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_lock_bh(&bat_priv->tt.roam_list_lock);
|
2011-04-27 12:27:57 +00:00
|
|
|
/* The new tt_req will be issued only if I'm not waiting for a
|
2012-05-12 00:09:43 +00:00
|
|
|
* reply from the same orig_node yet
|
|
|
|
*/
|
2012-07-15 20:26:51 +00:00
|
|
|
list_for_each_entry(tt_roam_node, &bat_priv->tt.roam_list, list) {
|
2012-05-12 11:48:58 +00:00
|
|
|
if (!batadv_compare_eth(tt_roam_node->addr, client))
|
2011-04-27 12:27:57 +00:00
|
|
|
continue;
|
|
|
|
|
2012-05-12 11:48:58 +00:00
|
|
|
if (batadv_has_timed_out(tt_roam_node->first_time,
|
2012-06-03 20:19:17 +00:00
|
|
|
BATADV_ROAMING_MAX_TIME))
|
2011-04-27 12:27:57 +00:00
|
|
|
continue;
|
|
|
|
|
2012-05-16 18:23:22 +00:00
|
|
|
if (!batadv_atomic_dec_not_zero(&tt_roam_node->counter))
|
2011-04-27 12:27:57 +00:00
|
|
|
/* Sorry, you roamed too many times! */
|
|
|
|
goto unlock;
|
|
|
|
ret = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
tt_roam_node = kmalloc(sizeof(*tt_roam_node), GFP_ATOMIC);
|
|
|
|
if (!tt_roam_node)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
tt_roam_node->first_time = jiffies;
|
2012-06-03 20:19:17 +00:00
|
|
|
atomic_set(&tt_roam_node->counter,
|
|
|
|
BATADV_ROAMING_MAX_COUNT - 1);
|
2011-04-27 12:27:57 +00:00
|
|
|
memcpy(tt_roam_node->addr, client, ETH_ALEN);
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
list_add(&tt_roam_node->list, &bat_priv->tt.roam_list);
|
2011-04-27 12:27:57 +00:00
|
|
|
ret = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
unlock:
|
2012-07-15 20:26:51 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.roam_list_lock);
|
2011-04-27 12:27:57 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_send_roam_adv - send a roaming advertisement message
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @client: mac address of the roaming client
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
* @orig_node: message destination
|
|
|
|
*
|
|
|
|
* Send a ROAMING_ADV message to the node which was previously serving this
|
|
|
|
* client. This is done to inform the node that from now on all traffic destined
|
|
|
|
* for this particular roamed client has to be forwarded to the sender of the
|
|
|
|
* roaming message.
|
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client,
|
2013-06-04 10:11:39 +00:00
|
|
|
unsigned short vid,
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_orig_node *orig_node)
|
2011-04-27 12:27:57 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_hard_iface *primary_if;
|
2013-04-23 13:40:03 +00:00
|
|
|
struct batadv_tvlv_roam_adv tvlv_roam;
|
|
|
|
|
|
|
|
primary_if = batadv_primary_if_get_selected(bat_priv);
|
|
|
|
if (!primary_if)
|
|
|
|
goto out;
|
2011-04-27 12:27:57 +00:00
|
|
|
|
|
|
|
/* before going on we have to check whether the client has
|
2012-05-12 00:09:43 +00:00
|
|
|
* already roamed to us too many times
|
|
|
|
*/
|
2012-05-16 18:23:16 +00:00
|
|
|
if (!batadv_tt_check_roam_count(bat_priv, client))
|
2011-04-27 12:27:57 +00:00
|
|
|
goto out;
|
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Sending ROAMING_ADV to %pM (client %pM, vid: %d)\n",
|
|
|
|
orig_node->orig, client, BATADV_PRINT_VID(vid));
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2012-06-03 20:19:20 +00:00
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_TX);
|
2012-04-20 15:02:45 +00:00
|
|
|
|
2013-04-23 13:40:03 +00:00
|
|
|
memcpy(tvlv_roam.client, client, sizeof(tvlv_roam.client));
|
2013-06-04 10:11:39 +00:00
|
|
|
tvlv_roam.vid = htons(vid);
|
2013-04-23 13:40:03 +00:00
|
|
|
|
|
|
|
batadv_tvlv_unicast_send(bat_priv, primary_if->net_dev->dev_addr,
|
|
|
|
orig_node->orig, BATADV_TVLV_ROAM, 1,
|
|
|
|
&tvlv_roam, sizeof(tvlv_roam));
|
2011-04-27 12:27:57 +00:00
|
|
|
|
|
|
|
out:
|
2013-04-23 13:40:03 +00:00
|
|
|
if (primary_if)
|
|
|
|
batadv_hardif_free_ref(primary_if);
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
static void batadv_tt_purge(struct work_struct *work)
|
2011-04-27 12:27:44 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct delayed_work *delayed_work;
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_priv_tt *priv_tt;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_priv *bat_priv;
|
|
|
|
|
|
|
|
delayed_work = container_of(work, struct delayed_work, work);
|
2012-07-15 20:26:51 +00:00
|
|
|
priv_tt = container_of(delayed_work, struct batadv_priv_tt, work);
|
|
|
|
bat_priv = container_of(priv_tt, struct batadv_priv, tt);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
batadv_tt_local_purge(bat_priv, BATADV_TT_LOCAL_TIMEOUT);
|
2012-07-05 21:38:29 +00:00
|
|
|
batadv_tt_global_purge(bat_priv);
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_req_purge(bat_priv);
|
|
|
|
batadv_tt_roam_purge(bat_priv);
|
2011-04-27 12:27:44 +00:00
|
|
|
|
2012-12-25 12:14:37 +00:00
|
|
|
queue_delayed_work(batadv_event_workqueue, &bat_priv->tt.work,
|
|
|
|
msecs_to_jiffies(BATADV_TT_WORK_PERIOD));
|
2011-04-27 12:27:44 +00:00
|
|
|
}
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
void batadv_tt_free(struct batadv_priv *bat_priv)
|
2011-04-27 12:27:57 +00:00
|
|
|
{
|
2013-04-23 13:40:01 +00:00
|
|
|
batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_TT, 1);
|
|
|
|
batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_TT, 1);
|
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
cancel_delayed_work_sync(&bat_priv->tt.work);
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_table_free(bat_priv);
|
|
|
|
batadv_tt_global_table_free(bat_priv);
|
|
|
|
batadv_tt_req_list_free(bat_priv);
|
|
|
|
batadv_tt_changes_list_free(bat_priv);
|
|
|
|
batadv_tt_roam_list_free(bat_priv);
|
2011-04-27 12:27:57 +00:00
|
|
|
|
2012-07-15 20:26:51 +00:00
|
|
|
kfree(bat_priv->tt.last_changeset);
|
2011-04-27 12:27:57 +00:00
|
|
|
}
|
2011-07-06 23:40:58 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_set_flags - set or unset the specified flags on the local
|
|
|
|
* table and possibly count them in the TT size
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @flags: the flag to switch
|
|
|
|
* @enable: whether to set or unset the flag
|
|
|
|
* @count: whether to increase the TT size by the number of changed entries
|
2012-05-12 00:09:43 +00:00
|
|
|
*/
|
2013-07-30 20:16:25 +00:00
|
|
|
static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv,
|
|
|
|
uint16_t flags, bool enable, bool count)
|
2011-07-06 23:40:58 +00:00
|
|
|
{
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
|
|
|
struct batadv_tt_common_entry *tt_common_entry;
|
2011-11-07 15:47:01 +00:00
|
|
|
uint16_t changed_num = 0;
|
2011-07-06 23:40:58 +00:00
|
|
|
struct hlist_head *head;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint32_t i;
|
2011-07-06 23:40:58 +00:00
|
|
|
|
|
|
|
if (!hash)
|
2013-07-30 20:16:25 +00:00
|
|
|
return;
|
2011-07-06 23:40:58 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
|
|
|
|
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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_rcu(tt_common_entry,
|
2011-07-06 23:40:58 +00:00
|
|
|
head, hash_entry) {
|
2011-11-07 15:47:01 +00:00
|
|
|
if (enable) {
|
|
|
|
if ((tt_common_entry->flags & flags) == flags)
|
|
|
|
continue;
|
|
|
|
tt_common_entry->flags |= flags;
|
|
|
|
} else {
|
|
|
|
if (!(tt_common_entry->flags & flags))
|
|
|
|
continue;
|
|
|
|
tt_common_entry->flags &= ~flags;
|
|
|
|
}
|
|
|
|
changed_num++;
|
2013-07-30 20:16:25 +00:00
|
|
|
|
|
|
|
if (!count)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
batadv_tt_local_size_inc(bat_priv,
|
|
|
|
tt_common_entry->vid);
|
2011-07-06 23:40:58 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-03 20:19:21 +00:00
|
|
|
/* Purge out all the tt local entries marked with BATADV_TT_CLIENT_PENDING */
|
2012-06-05 20:31:31 +00:00
|
|
|
static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)
|
2011-07-06 23:40:58 +00:00
|
|
|
{
|
2012-07-15 20:26:51 +00:00
|
|
|
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_common_entry *tt_common;
|
|
|
|
struct batadv_tt_local_entry *tt_local;
|
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 01:06:00 +00:00
|
|
|
struct hlist_node *node_tmp;
|
2011-07-06 23:40:58 +00:00
|
|
|
struct hlist_head *head;
|
|
|
|
spinlock_t *list_lock; /* protects write access to the hash lists */
|
2011-10-05 15:05:25 +00:00
|
|
|
uint32_t i;
|
2011-07-06 23:40:58 +00:00
|
|
|
|
|
|
|
if (!hash)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < hash->size; i++) {
|
|
|
|
head = &hash->table[i];
|
|
|
|
list_lock = &hash->list_locks[i];
|
|
|
|
|
|
|
|
spin_lock_bh(list_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 01:06:00 +00:00
|
|
|
hlist_for_each_entry_safe(tt_common, node_tmp, head,
|
2012-06-03 20:19:21 +00:00
|
|
|
hash_entry) {
|
|
|
|
if (!(tt_common->flags & BATADV_TT_CLIENT_PENDING))
|
2011-07-06 23:40:58 +00:00
|
|
|
continue;
|
|
|
|
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Deleting local tt entry (%pM, vid: %d): pending\n",
|
|
|
|
tt_common->addr,
|
|
|
|
BATADV_PRINT_VID(tt_common->vid));
|
2011-07-06 23:40:58 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_local_size_dec(bat_priv, tt_common->vid);
|
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 01:06:00 +00:00
|
|
|
hlist_del_rcu(&tt_common->hash_entry);
|
2012-06-05 20:31:31 +00:00
|
|
|
tt_local = container_of(tt_common,
|
|
|
|
struct batadv_tt_local_entry,
|
|
|
|
common);
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local);
|
2011-07-06 23:40:58 +00:00
|
|
|
}
|
|
|
|
spin_unlock_bh(list_lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
/**
|
2013-05-27 07:33:25 +00:00
|
|
|
* batadv_tt_local_commit_changes_nolock - commit all pending local tt changes
|
|
|
|
* which have been queued in the time since the last commit
|
2013-04-23 13:40:01 +00:00
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2013-05-27 07:33:25 +00:00
|
|
|
*
|
|
|
|
* Caller must hold tt->commit_lock.
|
2013-04-23 13:40:01 +00:00
|
|
|
*/
|
2013-05-27 07:33:25 +00:00
|
|
|
static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv)
|
2011-07-06 23:40:58 +00:00
|
|
|
{
|
2013-04-23 13:40:01 +00:00
|
|
|
if (atomic_read(&bat_priv->tt.local_changes) < 1) {
|
|
|
|
if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt))
|
|
|
|
batadv_tt_tvlv_container_update(bat_priv);
|
2013-05-27 07:33:25 +00:00
|
|
|
return;
|
2013-04-23 13:40:01 +00:00
|
|
|
}
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_local_set_flags(bat_priv, BATADV_TT_CLIENT_NEW, false, true);
|
2012-05-06 20:22:05 +00:00
|
|
|
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_purge_pending_clients(bat_priv);
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_local_update_crc(bat_priv);
|
2011-07-06 23:40:58 +00:00
|
|
|
|
|
|
|
/* Increment the TTVN only once per OGM interval */
|
2012-07-15 20:26:51 +00:00
|
|
|
atomic_inc(&bat_priv->tt.vn);
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2012-05-12 11:48:58 +00:00
|
|
|
"Local changes committed, updating to ttvn %u\n",
|
2012-07-15 20:26:51 +00:00
|
|
|
(uint8_t)atomic_read(&bat_priv->tt.vn));
|
2012-05-06 20:22:05 +00:00
|
|
|
|
|
|
|
/* reset the sending counter */
|
2012-07-15 20:26:51 +00:00
|
|
|
atomic_set(&bat_priv->tt.ogm_append_cnt, BATADV_TT_OGM_APPEND_MAX);
|
2013-04-23 13:40:01 +00:00
|
|
|
batadv_tt_tvlv_container_update(bat_priv);
|
2013-05-27 07:33:25 +00:00
|
|
|
}
|
2013-07-30 20:16:24 +00:00
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_commit_changes - commit all pending local tt changes which
|
|
|
|
* have been queued in the time since the last commit
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
*/
|
|
|
|
void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&bat_priv->tt.commit_lock);
|
|
|
|
batadv_tt_local_commit_changes_nolock(bat_priv);
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_unlock_bh(&bat_priv->tt.commit_lock);
|
2011-07-06 23:40:58 +00:00
|
|
|
}
|
2011-07-07 13:35:36 +00:00
|
|
|
|
2012-06-05 20:31:31 +00:00
|
|
|
bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,
|
2013-07-02 09:04:36 +00:00
|
|
|
uint8_t *dst, unsigned short vid)
|
2011-07-07 13:35:36 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_local_entry *tt_local_entry = NULL;
|
|
|
|
struct batadv_tt_global_entry *tt_global_entry = NULL;
|
2013-07-02 09:04:36 +00:00
|
|
|
struct batadv_softif_vlan *vlan;
|
2012-06-20 15:16:05 +00:00
|
|
|
bool ret = false;
|
2011-07-07 13:35:36 +00:00
|
|
|
|
2013-07-02 09:04:36 +00:00
|
|
|
vlan = batadv_softif_vlan_get(bat_priv, vid);
|
|
|
|
if (!vlan || !atomic_read(&vlan->ap_isolation))
|
2012-06-20 15:16:05 +00:00
|
|
|
goto out;
|
2011-07-07 13:35:36 +00:00
|
|
|
|
2013-07-02 09:04:36 +00:00
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst, vid);
|
2011-07-07 13:35:36 +00:00
|
|
|
if (!tt_local_entry)
|
|
|
|
goto out;
|
|
|
|
|
2013-07-02 09:04:36 +00:00
|
|
|
tt_global_entry = batadv_tt_global_hash_find(bat_priv, src, vid);
|
2011-07-07 13:35:36 +00:00
|
|
|
if (!tt_global_entry)
|
|
|
|
goto out;
|
|
|
|
|
2012-06-25 20:49:50 +00:00
|
|
|
if (!_batadv_is_ap_isolated(tt_local_entry, tt_global_entry))
|
2011-07-07 13:35:36 +00:00
|
|
|
goto out;
|
|
|
|
|
2012-06-20 15:16:05 +00:00
|
|
|
ret = true;
|
2011-07-07 13:35:36 +00:00
|
|
|
|
|
|
|
out:
|
2013-07-02 09:04:36 +00:00
|
|
|
if (vlan)
|
|
|
|
batadv_softif_vlan_free_ref(vlan);
|
2011-07-07 13:35:36 +00:00
|
|
|
if (tt_global_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
2011-07-07 13:35:36 +00:00
|
|
|
if (tt_local_entry)
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
2011-07-07 13:35:36 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2011-07-30 11:10:18 +00:00
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_update_orig - update global translation table with new tt
|
|
|
|
* information received via ogms
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig: the orig_node of the ogm
|
2013-07-30 20:16:25 +00:00
|
|
|
* @tt_vlan: pointer to the first tvlv VLAN entry
|
|
|
|
* @tt_num_vlan: number of tvlv VLAN entries
|
|
|
|
* @tt_change: pointer to the first entry in the TT buffer
|
2013-04-23 13:40:01 +00:00
|
|
|
* @tt_num_changes: number of tt changes inside the tt buffer
|
|
|
|
* @ttvn: translation table version number of this changeset
|
2013-04-24 14:37:51 +00:00
|
|
|
* @tt_crc: crc32 checksum of orig node's translation table
|
2013-04-23 13:40:01 +00:00
|
|
|
*/
|
|
|
|
static void batadv_tt_update_orig(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-07-30 20:16:25 +00:00
|
|
|
const void *tt_buff, uint16_t tt_num_vlan,
|
|
|
|
struct batadv_tvlv_tt_change *tt_change,
|
|
|
|
uint16_t tt_num_changes, uint8_t ttvn)
|
2011-07-30 11:10:18 +00:00
|
|
|
{
|
|
|
|
uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn);
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan;
|
2011-07-30 11:10:18 +00:00
|
|
|
bool full_table = true;
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_vlan = (struct batadv_tvlv_tt_vlan_data *)tt_buff;
|
2011-11-07 15:36:40 +00:00
|
|
|
/* orig table not initialised AND first diff is in the OGM OR the ttvn
|
2012-05-12 00:09:43 +00:00
|
|
|
* increased by one -> we can apply the attached changes
|
|
|
|
*/
|
2011-11-07 15:36:40 +00:00
|
|
|
if ((!orig_node->tt_initialised && ttvn == 1) ||
|
|
|
|
ttvn - orig_ttvn == 1) {
|
2011-07-30 11:10:18 +00:00
|
|
|
/* the OGM could not contain the changes due to their size or
|
2012-06-03 20:19:17 +00:00
|
|
|
* because they have already been sent BATADV_TT_OGM_APPEND_MAX
|
|
|
|
* times.
|
2012-05-12 00:09:43 +00:00
|
|
|
* In this case send a tt request
|
|
|
|
*/
|
2011-07-30 11:10:18 +00:00
|
|
|
if (!tt_num_changes) {
|
|
|
|
full_table = false;
|
|
|
|
goto request_table;
|
|
|
|
}
|
|
|
|
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_lock_bh(&orig_node->tt_lock);
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
tt_change = (struct batadv_tvlv_tt_change *)tt_buff;
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_update_changes(bat_priv, orig_node, tt_num_changes,
|
2012-06-05 20:31:30 +00:00
|
|
|
ttvn, tt_change);
|
2011-07-30 11:10:18 +00:00
|
|
|
|
|
|
|
/* Even if we received the precomputed crc with the OGM, we
|
|
|
|
* prefer to recompute it to spot any possible inconsistency
|
2012-05-12 00:09:43 +00:00
|
|
|
* in the global table
|
|
|
|
*/
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_global_update_crc(bat_priv, orig_node);
|
2011-07-30 11:10:18 +00:00
|
|
|
|
2013-07-30 20:16:24 +00:00
|
|
|
spin_unlock_bh(&orig_node->tt_lock);
|
|
|
|
|
2011-07-30 11:10:18 +00:00
|
|
|
/* The ttvn alone is not enough to guarantee consistency
|
|
|
|
* because a single value could represent different states
|
|
|
|
* (due to the wrap around). Thus a node has to check whether
|
|
|
|
* the resulting table (after applying the changes) is still
|
|
|
|
* consistent or not. E.g. a node could disconnect while its
|
|
|
|
* ttvn is X and reconnect on ttvn = X + TTVN_MAX: in this case
|
|
|
|
* checking the CRC value is mandatory to detect the
|
2012-05-12 00:09:43 +00:00
|
|
|
* inconsistency
|
|
|
|
*/
|
2013-07-30 20:16:25 +00:00
|
|
|
if (!batadv_tt_global_check_crc(orig_node, tt_vlan,
|
|
|
|
tt_num_vlan))
|
2011-07-30 11:10:18 +00:00
|
|
|
goto request_table;
|
|
|
|
} else {
|
|
|
|
/* if we missed more than one change or our tables are not
|
2012-05-12 00:09:43 +00:00
|
|
|
* in sync anymore -> request fresh tt data
|
|
|
|
*/
|
2011-11-07 15:36:40 +00:00
|
|
|
if (!orig_node->tt_initialised || ttvn != orig_ttvn ||
|
2013-07-30 20:16:25 +00:00
|
|
|
!batadv_tt_global_check_crc(orig_node, tt_vlan,
|
|
|
|
tt_num_vlan)) {
|
2011-07-30 11:10:18 +00:00
|
|
|
request_table:
|
2012-06-03 20:19:22 +00:00
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-07-30 20:16:25 +00:00
|
|
|
"TT inconsistency for %pM. Need to retrieve the correct information (ttvn: %u last_ttvn: %u num_changes: %u)\n",
|
|
|
|
orig_node->orig, ttvn, orig_ttvn,
|
|
|
|
tt_num_changes);
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_send_tt_request(bat_priv, orig_node, ttvn,
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_vlan, tt_num_vlan,
|
|
|
|
full_table);
|
2011-07-30 11:10:18 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-16 17:03:28 +00:00
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_global_client_is_roaming - check if a client is marked as roaming
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the mac address of the client to check
|
|
|
|
* @vid: VLAN identifier
|
|
|
|
*
|
|
|
|
* Returns true if we know that the client has moved from its old originator
|
|
|
|
* to another one. This entry is still kept for consistency purposes and will be
|
|
|
|
* deleted later by a DEL or because of timeout
|
2012-03-16 17:03:28 +00:00
|
|
|
*/
|
2012-06-05 20:31:31 +00:00
|
|
|
bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv,
|
2013-06-04 10:11:39 +00:00
|
|
|
uint8_t *addr, unsigned short vid)
|
2012-03-16 17:03:28 +00:00
|
|
|
{
|
2012-06-05 20:31:31 +00:00
|
|
|
struct batadv_tt_global_entry *tt_global_entry;
|
2012-03-16 17:03:28 +00:00
|
|
|
bool ret = false;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid);
|
2012-03-16 17:03:28 +00:00
|
|
|
if (!tt_global_entry)
|
|
|
|
goto out;
|
|
|
|
|
2013-01-15 12:17:19 +00:00
|
|
|
ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM;
|
2012-05-16 18:23:16 +00:00
|
|
|
batadv_tt_global_entry_free_ref(tt_global_entry);
|
2012-03-16 17:03:28 +00:00
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
2012-07-05 21:38:29 +00:00
|
|
|
|
2012-09-23 20:38:34 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_client_is_roaming - tells whether the client is roaming
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
2013-06-04 10:11:39 +00:00
|
|
|
* @addr: the mac address of the local client to query
|
|
|
|
* @vid: VLAN identifier
|
2012-09-23 20:38:34 +00:00
|
|
|
*
|
|
|
|
* Returns true if the local client is known to be roaming (it is not served by
|
|
|
|
* this node anymore) or not. If yes, the client is still present in the table
|
|
|
|
* to keep the latter consistent with the node TTVN
|
|
|
|
*/
|
|
|
|
bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv,
|
2013-06-04 10:11:39 +00:00
|
|
|
uint8_t *addr, unsigned short vid)
|
2012-09-23 20:38:34 +00:00
|
|
|
{
|
|
|
|
struct batadv_tt_local_entry *tt_local_entry;
|
|
|
|
bool ret = false;
|
|
|
|
|
2013-06-04 10:11:39 +00:00
|
|
|
tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
|
2012-09-23 20:38:34 +00:00
|
|
|
if (!tt_local_entry)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM;
|
|
|
|
batadv_tt_local_entry_free_ref(tt_local_entry);
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-07-05 21:38:29 +00:00
|
|
|
bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig_node,
|
2013-06-04 10:11:39 +00:00
|
|
|
const unsigned char *addr,
|
2013-06-04 10:11:41 +00:00
|
|
|
unsigned short vid)
|
2012-07-05 21:38:29 +00:00
|
|
|
{
|
|
|
|
bool ret = false;
|
|
|
|
|
2013-06-04 10:11:41 +00:00
|
|
|
if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
|
2012-07-05 21:38:29 +00:00
|
|
|
BATADV_TT_CLIENT_TEMP,
|
|
|
|
atomic_read(&orig_node->last_ttvn)))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
2013-06-04 10:11:41 +00:00
|
|
|
"Added temporary global client (addr: %pM, vid: %d, orig: %pM)\n",
|
|
|
|
addr, BATADV_PRINT_VID(vid), orig_node->orig);
|
2012-07-05 21:38:29 +00:00
|
|
|
ret = true;
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
2013-04-23 13:40:01 +00:00
|
|
|
|
2013-05-27 07:33:25 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_local_resize_to_mtu - resize the local translation table fit the
|
|
|
|
* maximum packet size that can be transported through the mesh
|
|
|
|
* @soft_iface: netdev struct of the mesh interface
|
|
|
|
*
|
|
|
|
* Remove entries older than 'timeout' and half timeout if more entries need
|
|
|
|
* to be removed.
|
|
|
|
*/
|
|
|
|
void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface)
|
|
|
|
{
|
|
|
|
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
|
|
|
|
int packet_size_max = atomic_read(&bat_priv->packet_size_max);
|
|
|
|
int table_size, timeout = BATADV_TT_LOCAL_TIMEOUT / 2;
|
|
|
|
bool reduced = false;
|
|
|
|
|
|
|
|
spin_lock_bh(&bat_priv->tt.commit_lock);
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
table_size = batadv_tt_local_table_transmit_size(bat_priv);
|
|
|
|
if (packet_size_max >= table_size)
|
|
|
|
break;
|
|
|
|
|
|
|
|
batadv_tt_local_purge(bat_priv, timeout);
|
|
|
|
batadv_tt_local_purge_pending_clients(bat_priv);
|
|
|
|
|
|
|
|
timeout /= 2;
|
|
|
|
reduced = true;
|
|
|
|
net_ratelimited_function(batadv_info, soft_iface,
|
|
|
|
"Forced to purge local tt entries to fit new maximum fragment MTU (%i)\n",
|
|
|
|
packet_size_max);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* commit these changes immediately, to avoid synchronization problem
|
|
|
|
* with the TTVN
|
|
|
|
*/
|
|
|
|
if (reduced)
|
|
|
|
batadv_tt_local_commit_changes_nolock(bat_priv);
|
|
|
|
|
|
|
|
spin_unlock_bh(&bat_priv->tt.commit_lock);
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_tvlv_ogm_handler_v1 - process incoming tt tvlv container
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @orig: the orig_node of the ogm
|
|
|
|
* @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags)
|
|
|
|
* @tvlv_value: tvlv buffer containing the gateway data
|
|
|
|
* @tvlv_value_len: tvlv buffer length
|
|
|
|
*/
|
|
|
|
static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
|
|
|
|
struct batadv_orig_node *orig,
|
2013-07-30 20:16:25 +00:00
|
|
|
uint8_t flags, void *tvlv_value,
|
2013-04-23 13:40:01 +00:00
|
|
|
uint16_t tvlv_value_len)
|
|
|
|
{
|
2013-07-30 20:16:25 +00:00
|
|
|
struct batadv_tvlv_tt_vlan_data *tt_vlan;
|
|
|
|
struct batadv_tvlv_tt_change *tt_change;
|
2013-04-23 13:40:01 +00:00
|
|
|
struct batadv_tvlv_tt_data *tt_data;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint16_t num_entries, num_vlan;
|
2013-04-23 13:40:01 +00:00
|
|
|
|
|
|
|
if (tvlv_value_len < sizeof(*tt_data))
|
|
|
|
return;
|
|
|
|
|
|
|
|
tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;
|
|
|
|
tvlv_value_len -= sizeof(*tt_data);
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
num_vlan = ntohs(tt_data->num_vlan);
|
|
|
|
|
|
|
|
if (tvlv_value_len < sizeof(*tt_vlan) * num_vlan)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(tt_data + 1);
|
|
|
|
tt_change = (struct batadv_tvlv_tt_change *)(tt_vlan + num_vlan);
|
|
|
|
tvlv_value_len -= sizeof(*tt_vlan) * num_vlan;
|
|
|
|
|
2013-05-28 11:14:27 +00:00
|
|
|
num_entries = batadv_tt_entries(tvlv_value_len);
|
2013-04-23 13:40:01 +00:00
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
batadv_tt_update_orig(bat_priv, orig, tt_vlan, num_vlan, tt_change,
|
|
|
|
num_entries, tt_data->ttvn);
|
2013-04-23 13:40:01 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:02 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_tvlv_unicast_handler_v1 - process incoming (unicast) tt tvlv
|
|
|
|
* container
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @src: mac address of tt tvlv sender
|
|
|
|
* @dst: mac address of tt tvlv recipient
|
|
|
|
* @tvlv_value: tvlv buffer containing the tt data
|
|
|
|
* @tvlv_value_len: tvlv buffer length
|
|
|
|
*
|
|
|
|
* Returns NET_RX_DROP if the tt tvlv is to be re-routed, NET_RX_SUCCESS
|
|
|
|
* otherwise.
|
|
|
|
*/
|
|
|
|
static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,
|
|
|
|
uint8_t *src, uint8_t *dst,
|
|
|
|
void *tvlv_value,
|
|
|
|
uint16_t tvlv_value_len)
|
|
|
|
{
|
|
|
|
struct batadv_tvlv_tt_data *tt_data;
|
2013-07-30 20:16:25 +00:00
|
|
|
uint16_t tt_vlan_len, tt_num_entries;
|
2013-04-23 13:40:02 +00:00
|
|
|
char tt_flag;
|
|
|
|
bool ret;
|
|
|
|
|
|
|
|
if (tvlv_value_len < sizeof(*tt_data))
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
|
|
|
|
tt_data = (struct batadv_tvlv_tt_data *)tvlv_value;
|
|
|
|
tvlv_value_len -= sizeof(*tt_data);
|
|
|
|
|
2013-07-30 20:16:25 +00:00
|
|
|
tt_vlan_len = sizeof(struct batadv_tvlv_tt_vlan_data);
|
|
|
|
tt_vlan_len *= ntohs(tt_data->num_vlan);
|
|
|
|
|
|
|
|
if (tvlv_value_len < tt_vlan_len)
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
|
|
|
|
tvlv_value_len -= tt_vlan_len;
|
|
|
|
tt_num_entries = batadv_tt_entries(tvlv_value_len);
|
2013-04-23 13:40:02 +00:00
|
|
|
|
|
|
|
switch (tt_data->flags & BATADV_TT_DATA_TYPE_MASK) {
|
|
|
|
case BATADV_TT_REQUEST:
|
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_RX);
|
|
|
|
|
|
|
|
/* If this node cannot provide a TT response the tt_request is
|
|
|
|
* forwarded
|
|
|
|
*/
|
|
|
|
ret = batadv_send_tt_response(bat_priv, tt_data, src, dst);
|
|
|
|
if (!ret) {
|
|
|
|
if (tt_data->flags & BATADV_TT_FULL_TABLE)
|
|
|
|
tt_flag = 'F';
|
|
|
|
else
|
|
|
|
tt_flag = '.';
|
|
|
|
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
|
|
|
"Routing TT_REQUEST to %pM [%c]\n",
|
|
|
|
dst, tt_flag);
|
|
|
|
/* tvlv API will re-route the packet */
|
|
|
|
return NET_RX_DROP;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case BATADV_TT_RESPONSE:
|
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX);
|
|
|
|
|
|
|
|
if (batadv_is_my_mac(bat_priv, dst)) {
|
|
|
|
batadv_handle_tt_response(bat_priv, tt_data,
|
2013-07-30 20:16:25 +00:00
|
|
|
src, tt_num_entries);
|
2013-04-23 13:40:02 +00:00
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tt_data->flags & BATADV_TT_FULL_TABLE)
|
|
|
|
tt_flag = 'F';
|
|
|
|
else
|
|
|
|
tt_flag = '.';
|
|
|
|
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
|
|
|
"Routing TT_RESPONSE to %pM [%c]\n", dst, tt_flag);
|
|
|
|
|
|
|
|
/* tvlv API will re-route the packet */
|
|
|
|
return NET_RX_DROP;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:03 +00:00
|
|
|
/**
|
|
|
|
* batadv_roam_tvlv_unicast_handler_v1 - process incoming tt roam tvlv container
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @src: mac address of tt tvlv sender
|
|
|
|
* @dst: mac address of tt tvlv recipient
|
|
|
|
* @tvlv_value: tvlv buffer containing the tt data
|
|
|
|
* @tvlv_value_len: tvlv buffer length
|
|
|
|
*
|
|
|
|
* Returns NET_RX_DROP if the tt roam tvlv is to be re-routed, NET_RX_SUCCESS
|
|
|
|
* otherwise.
|
|
|
|
*/
|
|
|
|
static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,
|
|
|
|
uint8_t *src, uint8_t *dst,
|
|
|
|
void *tvlv_value,
|
|
|
|
uint16_t tvlv_value_len)
|
|
|
|
{
|
|
|
|
struct batadv_tvlv_roam_adv *roaming_adv;
|
|
|
|
struct batadv_orig_node *orig_node = NULL;
|
|
|
|
|
|
|
|
/* If this node is not the intended recipient of the
|
|
|
|
* roaming advertisement the packet is forwarded
|
|
|
|
* (the tvlv API will re-route the packet).
|
|
|
|
*/
|
|
|
|
if (!batadv_is_my_mac(bat_priv, dst))
|
|
|
|
return NET_RX_DROP;
|
|
|
|
|
|
|
|
if (tvlv_value_len < sizeof(*roaming_adv))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
orig_node = batadv_orig_hash_find(bat_priv, src);
|
|
|
|
if (!orig_node)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
|
|
|
|
roaming_adv = (struct batadv_tvlv_roam_adv *)tvlv_value;
|
|
|
|
|
|
|
|
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
|
|
|
"Received ROAMING_ADV from %pM (client %pM)\n",
|
|
|
|
src, roaming_adv->client);
|
|
|
|
|
|
|
|
batadv_tt_global_add(bat_priv, orig_node, roaming_adv->client,
|
2013-06-04 10:11:39 +00:00
|
|
|
ntohs(roaming_adv->vid), BATADV_TT_CLIENT_ROAM,
|
2013-04-23 13:40:03 +00:00
|
|
|
atomic_read(&orig_node->last_ttvn) + 1);
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (orig_node)
|
|
|
|
batadv_orig_node_free_ref(orig_node);
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
/**
|
|
|
|
* batadv_tt_init - initialise the translation table internals
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
*
|
|
|
|
* Return 0 on success or negative error number in case of failure.
|
|
|
|
*/
|
|
|
|
int batadv_tt_init(struct batadv_priv *bat_priv)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2013-10-13 00:50:20 +00:00
|
|
|
/* synchronized flags must be remote */
|
|
|
|
BUILD_BUG_ON(!(BATADV_TT_SYNC_MASK & BATADV_TT_REMOTE_MASK));
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
ret = batadv_tt_local_init(bat_priv);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = batadv_tt_global_init(bat_priv);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
batadv_tvlv_handler_register(bat_priv, batadv_tt_tvlv_ogm_handler_v1,
|
2013-04-23 13:40:02 +00:00
|
|
|
batadv_tt_tvlv_unicast_handler_v1,
|
|
|
|
BATADV_TVLV_TT, 1, BATADV_NO_FLAGS);
|
2013-04-23 13:40:01 +00:00
|
|
|
|
2013-04-23 13:40:03 +00:00
|
|
|
batadv_tvlv_handler_register(bat_priv, NULL,
|
|
|
|
batadv_roam_tvlv_unicast_handler_v1,
|
|
|
|
BATADV_TVLV_ROAM, 1, BATADV_NO_FLAGS);
|
|
|
|
|
2013-04-23 13:40:01 +00:00
|
|
|
INIT_DELAYED_WORK(&bat_priv->tt.work, batadv_tt_purge);
|
|
|
|
queue_delayed_work(batadv_event_workqueue, &bat_priv->tt.work,
|
|
|
|
msecs_to_jiffies(BATADV_TT_WORK_PERIOD));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2013-11-16 11:03:52 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* batadv_tt_global_is_isolated - check if a client is marked as isolated
|
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
|
* @addr: the mac address of the client
|
|
|
|
* @vid: the identifier of the VLAN where this client is connected
|
|
|
|
*
|
|
|
|
* Returns true if the client is marked with the TT_CLIENT_ISOLA flag, false
|
|
|
|
* otherwise
|
|
|
|
*/
|
|
|
|
bool batadv_tt_global_is_isolated(struct batadv_priv *bat_priv,
|
|
|
|
const uint8_t *addr, unsigned short vid)
|
|
|
|
{
|
|
|
|
struct batadv_tt_global_entry *tt;
|
|
|
|
bool ret;
|
|
|
|
|
|
|
|
tt = batadv_tt_global_hash_find(bat_priv, addr, vid);
|
|
|
|
if (!tt)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
ret = tt->common.flags & BATADV_TT_CLIENT_ISOLA;
|
|
|
|
|
|
|
|
batadv_tt_global_entry_free_ref(tt);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|