Commit 9c6bc165 authored by David S. Miller's avatar David S. Miller

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

parents 03746b0a af20b710
This diff is collapsed.
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
void gw_deselect(struct bat_priv *bat_priv); void gw_deselect(struct bat_priv *bat_priv);
void gw_election(struct bat_priv *bat_priv); void gw_election(struct bat_priv *bat_priv);
void *gw_get_selected(struct bat_priv *bat_priv); struct orig_node *gw_get_selected_orig(struct bat_priv *bat_priv);
void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node); void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node);
void gw_node_update(struct bat_priv *bat_priv, void gw_node_update(struct bat_priv *bat_priv,
struct orig_node *orig_node, uint8_t new_gwflags); struct orig_node *orig_node, uint8_t new_gwflags);
......
...@@ -218,23 +218,13 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, ...@@ -218,23 +218,13 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff,
if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
goto dst_unreach; goto dst_unreach;
rcu_read_lock();
orig_node = orig_hash_find(bat_priv, icmp_packet->dst); orig_node = orig_hash_find(bat_priv, icmp_packet->dst);
if (!orig_node) if (!orig_node)
goto unlock; goto dst_unreach;
neigh_node = orig_node->router;
neigh_node = orig_node_get_router(orig_node);
if (!neigh_node) if (!neigh_node)
goto unlock; goto dst_unreach;
if (!atomic_inc_not_zero(&neigh_node->refcount)) {
neigh_node = NULL;
goto unlock;
}
rcu_read_unlock();
if (!neigh_node->if_incoming) if (!neigh_node->if_incoming)
goto dst_unreach; goto dst_unreach;
...@@ -252,8 +242,6 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, ...@@ -252,8 +242,6 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff,
send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
goto out; goto out;
unlock:
rcu_read_unlock();
dst_unreach: dst_unreach:
icmp_packet->msg_type = DESTINATION_UNREACHABLE; icmp_packet->msg_type = DESTINATION_UNREACHABLE;
bat_socket_add_packet(socket_client, icmp_packet, packet_len); bat_socket_add_packet(socket_client, icmp_packet, packet_len);
......
...@@ -70,6 +70,21 @@ void neigh_node_free_ref(struct neigh_node *neigh_node) ...@@ -70,6 +70,21 @@ void neigh_node_free_ref(struct neigh_node *neigh_node)
call_rcu(&neigh_node->rcu, neigh_node_free_rcu); call_rcu(&neigh_node->rcu, neigh_node_free_rcu);
} }
/* increases the refcounter of a found router */
struct neigh_node *orig_node_get_router(struct orig_node *orig_node)
{
struct neigh_node *router;
rcu_read_lock();
router = rcu_dereference(orig_node->router);
if (router && !atomic_inc_not_zero(&router->refcount))
router = NULL;
rcu_read_unlock();
return router;
}
struct neigh_node *create_neighbor(struct orig_node *orig_node, struct neigh_node *create_neighbor(struct orig_node *orig_node,
struct orig_node *orig_neigh_node, struct orig_node *orig_neigh_node,
uint8_t *neigh, uint8_t *neigh,
...@@ -87,6 +102,7 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node, ...@@ -87,6 +102,7 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node,
INIT_HLIST_NODE(&neigh_node->list); INIT_HLIST_NODE(&neigh_node->list);
INIT_LIST_HEAD(&neigh_node->bonding_list); INIT_LIST_HEAD(&neigh_node->bonding_list);
spin_lock_init(&neigh_node->tq_lock);
memcpy(neigh_node->addr, neigh, ETH_ALEN); memcpy(neigh_node->addr, neigh, ETH_ALEN);
neigh_node->orig_node = orig_neigh_node; neigh_node->orig_node = orig_neigh_node;
...@@ -390,7 +406,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) ...@@ -390,7 +406,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
struct hlist_node *node, *node_tmp; struct hlist_node *node, *node_tmp;
struct hlist_head *head; struct hlist_head *head;
struct orig_node *orig_node; struct orig_node *orig_node;
struct neigh_node *neigh_node; struct neigh_node *neigh_node, *neigh_node_tmp;
int batman_count = 0; int batman_count = 0;
int last_seen_secs; int last_seen_secs;
int last_seen_msecs; int last_seen_msecs;
...@@ -421,37 +437,41 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) ...@@ -421,37 +437,41 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) { hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
if (!orig_node->router) neigh_node = orig_node_get_router(orig_node);
if (!neigh_node)
continue; continue;
if (orig_node->router->tq_avg == 0) if (neigh_node->tq_avg == 0)
continue; goto next;
last_seen_secs = jiffies_to_msecs(jiffies - last_seen_secs = jiffies_to_msecs(jiffies -
orig_node->last_valid) / 1000; orig_node->last_valid) / 1000;
last_seen_msecs = jiffies_to_msecs(jiffies - last_seen_msecs = jiffies_to_msecs(jiffies -
orig_node->last_valid) % 1000; orig_node->last_valid) % 1000;
neigh_node = orig_node->router;
seq_printf(seq, "%pM %4i.%03is (%3i) %pM [%10s]:", seq_printf(seq, "%pM %4i.%03is (%3i) %pM [%10s]:",
orig_node->orig, last_seen_secs, orig_node->orig, last_seen_secs,
last_seen_msecs, neigh_node->tq_avg, last_seen_msecs, neigh_node->tq_avg,
neigh_node->addr, neigh_node->addr,
neigh_node->if_incoming->net_dev->name); neigh_node->if_incoming->net_dev->name);
hlist_for_each_entry_rcu(neigh_node, node_tmp, hlist_for_each_entry_rcu(neigh_node_tmp, node_tmp,
&orig_node->neigh_list, list) { &orig_node->neigh_list, list) {
seq_printf(seq, " %pM (%3i)", neigh_node->addr, seq_printf(seq, " %pM (%3i)",
neigh_node->tq_avg); neigh_node_tmp->addr,
neigh_node_tmp->tq_avg);
} }
seq_printf(seq, "\n"); seq_printf(seq, "\n");
batman_count++; batman_count++;
next:
neigh_node_free_ref(neigh_node);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
if ((batman_count == 0)) if (batman_count == 0)
seq_printf(seq, "No batman nodes in range ...\n"); seq_printf(seq, "No batman nodes in range ...\n");
return 0; return 0;
......
...@@ -34,6 +34,7 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node, ...@@ -34,6 +34,7 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node,
uint8_t *neigh, uint8_t *neigh,
struct hard_iface *if_incoming); struct hard_iface *if_incoming);
void neigh_node_free_ref(struct neigh_node *neigh_node); void neigh_node_free_ref(struct neigh_node *neigh_node);
struct neigh_node *orig_node_get_router(struct orig_node *orig_node);
int orig_seq_print_text(struct seq_file *seq, void *offset); int orig_seq_print_text(struct seq_file *seq, void *offset);
int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num); int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num);
int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num);
......
This diff is collapsed.
...@@ -308,6 +308,7 @@ void schedule_forward_packet(struct orig_node *orig_node, ...@@ -308,6 +308,7 @@ void schedule_forward_packet(struct orig_node *orig_node,
struct hard_iface *if_incoming) struct hard_iface *if_incoming)
{ {
struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
struct neigh_node *router;
unsigned char in_tq, in_ttl, tq_avg = 0; unsigned char in_tq, in_ttl, tq_avg = 0;
unsigned long send_time; unsigned long send_time;
...@@ -316,6 +317,8 @@ void schedule_forward_packet(struct orig_node *orig_node, ...@@ -316,6 +317,8 @@ void schedule_forward_packet(struct orig_node *orig_node,
return; return;
} }
router = orig_node_get_router(orig_node);
in_tq = batman_packet->tq; in_tq = batman_packet->tq;
in_ttl = batman_packet->ttl; in_ttl = batman_packet->ttl;
...@@ -324,20 +327,22 @@ void schedule_forward_packet(struct orig_node *orig_node, ...@@ -324,20 +327,22 @@ void schedule_forward_packet(struct orig_node *orig_node,
/* rebroadcast tq of our best ranking neighbor to ensure the rebroadcast /* rebroadcast tq of our best ranking neighbor to ensure the rebroadcast
* of our best tq value */ * of our best tq value */
if ((orig_node->router) && (orig_node->router->tq_avg != 0)) { if (router && router->tq_avg != 0) {
/* rebroadcast ogm of best ranking neighbor as is */ /* rebroadcast ogm of best ranking neighbor as is */
if (!compare_eth(orig_node->router->addr, ethhdr->h_source)) { if (!compare_eth(router->addr, ethhdr->h_source)) {
batman_packet->tq = orig_node->router->tq_avg; batman_packet->tq = router->tq_avg;
if (orig_node->router->last_ttl) if (router->last_ttl)
batman_packet->ttl = orig_node->router->last_ttl batman_packet->ttl = router->last_ttl - 1;
- 1;
} }
tq_avg = orig_node->router->tq_avg; tq_avg = router->tq_avg;
} }
if (router)
neigh_node_free_ref(router);
/* apply hop penalty */ /* apply hop penalty */
batman_packet->tq = hop_penalty(batman_packet->tq, bat_priv); batman_packet->tq = hop_penalty(batman_packet->tq, bat_priv);
......
...@@ -90,10 +90,51 @@ static void softif_neigh_free_ref(struct softif_neigh *softif_neigh) ...@@ -90,10 +90,51 @@ static void softif_neigh_free_ref(struct softif_neigh *softif_neigh)
call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu); call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu);
} }
static struct softif_neigh *softif_neigh_get_selected(struct bat_priv *bat_priv)
{
struct softif_neigh *neigh;
rcu_read_lock();
neigh = rcu_dereference(bat_priv->softif_neigh);
if (neigh && !atomic_inc_not_zero(&neigh->refcount))
neigh = NULL;
rcu_read_unlock();
return neigh;
}
static void softif_neigh_select(struct bat_priv *bat_priv,
struct softif_neigh *new_neigh)
{
struct softif_neigh *curr_neigh;
spin_lock_bh(&bat_priv->softif_neigh_lock);
if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount))
new_neigh = NULL;
curr_neigh = bat_priv->softif_neigh;
rcu_assign_pointer(bat_priv->softif_neigh, new_neigh);
if (curr_neigh)
softif_neigh_free_ref(curr_neigh);
spin_unlock_bh(&bat_priv->softif_neigh_lock);
}
static void softif_neigh_deselect(struct bat_priv *bat_priv)
{
softif_neigh_select(bat_priv, NULL);
}
void softif_neigh_purge(struct bat_priv *bat_priv) void softif_neigh_purge(struct bat_priv *bat_priv)
{ {
struct softif_neigh *softif_neigh, *softif_neigh_tmp; struct softif_neigh *softif_neigh, *curr_softif_neigh;
struct hlist_node *node, *node_tmp; struct hlist_node *node, *node_tmp;
char do_deselect = 0;
curr_softif_neigh = softif_neigh_get_selected(bat_priv);
spin_lock_bh(&bat_priv->softif_neigh_lock); spin_lock_bh(&bat_priv->softif_neigh_lock);
...@@ -105,22 +146,26 @@ void softif_neigh_purge(struct bat_priv *bat_priv) ...@@ -105,22 +146,26 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
(atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
continue; continue;
hlist_del_rcu(&softif_neigh->list); if (curr_softif_neigh == softif_neigh) {
if (bat_priv->softif_neigh == softif_neigh) {
bat_dbg(DBG_ROUTES, bat_priv, bat_dbg(DBG_ROUTES, bat_priv,
"Current mesh exit point '%pM' vanished " "Current mesh exit point '%pM' vanished "
"(vid: %d).\n", "(vid: %d).\n",
softif_neigh->addr, softif_neigh->vid); softif_neigh->addr, softif_neigh->vid);
softif_neigh_tmp = bat_priv->softif_neigh; do_deselect = 1;
bat_priv->softif_neigh = NULL;
softif_neigh_free_ref(softif_neigh_tmp);
} }
hlist_del_rcu(&softif_neigh->list);
softif_neigh_free_ref(softif_neigh); softif_neigh_free_ref(softif_neigh);
} }
spin_unlock_bh(&bat_priv->softif_neigh_lock); spin_unlock_bh(&bat_priv->softif_neigh_lock);
/* soft_neigh_deselect() needs to acquire the softif_neigh_lock */
if (do_deselect)
softif_neigh_deselect(bat_priv);
if (curr_softif_neigh)
softif_neigh_free_ref(curr_softif_neigh);
} }
static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv, static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv,
...@@ -171,6 +216,7 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset) ...@@ -171,6 +216,7 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset)
struct bat_priv *bat_priv = netdev_priv(net_dev); struct bat_priv *bat_priv = netdev_priv(net_dev);
struct softif_neigh *softif_neigh; struct softif_neigh *softif_neigh;
struct hlist_node *node; struct hlist_node *node;
struct softif_neigh *curr_softif_neigh;
if (!bat_priv->primary_if) { if (!bat_priv->primary_if) {
return seq_printf(seq, "BATMAN mesh %s disabled - " return seq_printf(seq, "BATMAN mesh %s disabled - "
...@@ -180,14 +226,17 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset) ...@@ -180,14 +226,17 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset)
seq_printf(seq, "Softif neighbor list (%s)\n", net_dev->name); seq_printf(seq, "Softif neighbor list (%s)\n", net_dev->name);
curr_softif_neigh = softif_neigh_get_selected(bat_priv);
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(softif_neigh, node, hlist_for_each_entry_rcu(softif_neigh, node,
&bat_priv->softif_neigh_list, list) &bat_priv->softif_neigh_list, list)
seq_printf(seq, "%s %pM (vid: %d)\n", seq_printf(seq, "%s %pM (vid: %d)\n",
bat_priv->softif_neigh == softif_neigh curr_softif_neigh == softif_neigh
? "=>" : " ", softif_neigh->addr, ? "=>" : " ", softif_neigh->addr,
softif_neigh->vid); softif_neigh->vid);
rcu_read_unlock(); rcu_read_unlock();
if (curr_softif_neigh)
softif_neigh_free_ref(curr_softif_neigh);
return 0; return 0;
} }
...@@ -198,7 +247,8 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -198,7 +247,8 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev,
struct bat_priv *bat_priv = netdev_priv(dev); struct bat_priv *bat_priv = netdev_priv(dev);
struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
struct batman_packet *batman_packet; struct batman_packet *batman_packet;
struct softif_neigh *softif_neigh, *softif_neigh_tmp; struct softif_neigh *softif_neigh;
struct softif_neigh *curr_softif_neigh = NULL;
if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) if (ntohs(ethhdr->h_proto) == ETH_P_8021Q)
batman_packet = (struct batman_packet *) batman_packet = (struct batman_packet *)
...@@ -223,7 +273,8 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -223,7 +273,8 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev,
if (!softif_neigh) if (!softif_neigh)
goto err; goto err;
if (bat_priv->softif_neigh == softif_neigh) curr_softif_neigh = softif_neigh_get_selected(bat_priv);
if (curr_softif_neigh == softif_neigh)
goto out; goto out;
/* we got a neighbor but its mac is 'bigger' than ours */ /* we got a neighbor but its mac is 'bigger' than ours */
...@@ -232,38 +283,39 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -232,38 +283,39 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev,
goto out; goto out;
/* switch to new 'smallest neighbor' */ /* switch to new 'smallest neighbor' */
if ((bat_priv->softif_neigh) && if ((curr_softif_neigh) &&
(memcmp(softif_neigh->addr, bat_priv->softif_neigh->addr, (memcmp(softif_neigh->addr, curr_softif_neigh->addr,
ETH_ALEN) < 0)) { ETH_ALEN) < 0)) {
bat_dbg(DBG_ROUTES, bat_priv, bat_dbg(DBG_ROUTES, bat_priv,
"Changing mesh exit point from %pM (vid: %d) " "Changing mesh exit point from %pM (vid: %d) "
"to %pM (vid: %d).\n", "to %pM (vid: %d).\n",
bat_priv->softif_neigh->addr, curr_softif_neigh->addr,
bat_priv->softif_neigh->vid, curr_softif_neigh->vid,
softif_neigh->addr, softif_neigh->vid); softif_neigh->addr, softif_neigh->vid);
softif_neigh_tmp = bat_priv->softif_neigh;
bat_priv->softif_neigh = softif_neigh; softif_neigh_select(bat_priv, softif_neigh);
softif_neigh_free_ref(softif_neigh_tmp); goto out;
/* we need to hold the additional reference */
goto err;
} }
/* close own batX device and use softif_neigh as exit node */ /* close own batX device and use softif_neigh as exit node */
if ((!bat_priv->softif_neigh) && if ((!curr_softif_neigh) &&
(memcmp(softif_neigh->addr, (memcmp(softif_neigh->addr,
bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN) < 0)) { bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN) < 0)) {
bat_dbg(DBG_ROUTES, bat_priv, bat_dbg(DBG_ROUTES, bat_priv,
"Setting mesh exit point to %pM (vid: %d).\n", "Setting mesh exit point to %pM (vid: %d).\n",
softif_neigh->addr, softif_neigh->vid); softif_neigh->addr, softif_neigh->vid);
bat_priv->softif_neigh = softif_neigh;
/* we need to hold the additional reference */ softif_neigh_select(bat_priv, softif_neigh);
goto err; goto out;
} }
out: out:
softif_neigh_free_ref(softif_neigh); softif_neigh_free_ref(softif_neigh);
err: err:
kfree_skb(skb); kfree_skb(skb);
if (curr_softif_neigh)
softif_neigh_free_ref(curr_softif_neigh);
return; return;
} }
...@@ -321,6 +373,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) ...@@ -321,6 +373,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
struct bat_priv *bat_priv = netdev_priv(soft_iface); struct bat_priv *bat_priv = netdev_priv(soft_iface);
struct bcast_packet *bcast_packet; struct bcast_packet *bcast_packet;
struct vlan_ethhdr *vhdr; struct vlan_ethhdr *vhdr;
struct softif_neigh *curr_softif_neigh = NULL;
int data_len = skb->len, ret; int data_len = skb->len, ret;
short vid = -1; short vid = -1;
bool do_bcast = false; bool do_bcast = false;
...@@ -348,7 +401,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) ...@@ -348,7 +401,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
* if we have a another chosen mesh exit node in range * if we have a another chosen mesh exit node in range
* it will transport the packets to the mesh * it will transport the packets to the mesh
*/ */
if ((bat_priv->softif_neigh) && (bat_priv->softif_neigh->vid == vid)) curr_softif_neigh = softif_neigh_get_selected(bat_priv);
if ((curr_softif_neigh) && (curr_softif_neigh->vid == vid))
goto dropped; goto dropped;
/* TODO: check this for locks */ /* TODO: check this for locks */
...@@ -410,6 +464,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) ...@@ -410,6 +464,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
dropped_freed: dropped_freed:
bat_priv->stats.tx_dropped++; bat_priv->stats.tx_dropped++;
end: end:
if (curr_softif_neigh)
softif_neigh_free_ref(curr_softif_neigh);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
...@@ -421,6 +477,7 @@ void interface_rx(struct net_device *soft_iface, ...@@ -421,6 +477,7 @@ void interface_rx(struct net_device *soft_iface,
struct unicast_packet *unicast_packet; struct unicast_packet *unicast_packet;
struct ethhdr *ethhdr; struct ethhdr *ethhdr;
struct vlan_ethhdr *vhdr; struct vlan_ethhdr *vhdr;
struct softif_neigh *curr_softif_neigh = NULL;
short vid = -1; short vid = -1;
int ret; int ret;
...@@ -450,7 +507,8 @@ void interface_rx(struct net_device *soft_iface, ...@@ -450,7 +507,8 @@ void interface_rx(struct net_device *soft_iface,
* if we have a another chosen mesh exit node in range * if we have a another chosen mesh exit node in range
* it will transport the packets to the non-mesh network * it will transport the packets to the non-mesh network
*/ */
if ((bat_priv->softif_neigh) && (bat_priv->softif_neigh->vid == vid)) { curr_softif_neigh = softif_neigh_get_selected(bat_priv);
if (curr_softif_neigh && (curr_softif_neigh->vid == vid)) {
skb_push(skb, hdr_size); skb_push(skb, hdr_size);
unicast_packet = (struct unicast_packet *)skb->data; unicast_packet = (struct unicast_packet *)skb->data;
...@@ -461,7 +519,7 @@ void interface_rx(struct net_device *soft_iface, ...@@ -461,7 +519,7 @@ void interface_rx(struct net_device *soft_iface,
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
memcpy(unicast_packet->dest, memcpy(unicast_packet->dest,
bat_priv->softif_neigh->addr, ETH_ALEN); curr_softif_neigh->addr, ETH_ALEN);
ret = route_unicast_packet(skb, recv_if); ret = route_unicast_packet(skb, recv_if);
if (ret == NET_RX_DROP) if (ret == NET_RX_DROP)
goto dropped; goto dropped;
...@@ -486,11 +544,13 @@ void interface_rx(struct net_device *soft_iface, ...@@ -486,11 +544,13 @@ void interface_rx(struct net_device *soft_iface,
soft_iface->last_rx = jiffies; soft_iface->last_rx = jiffies;
netif_rx(skb); netif_rx(skb);
return; goto out;
dropped: dropped:
kfree_skb(skb); kfree_skb(skb);
out: out:
if (curr_softif_neigh)
softif_neigh_free_ref(curr_softif_neigh);
return; return;
} }
...@@ -524,6 +584,7 @@ static void interface_setup(struct net_device *dev) ...@@ -524,6 +584,7 @@ static void interface_setup(struct net_device *dev)
dev->hard_start_xmit = interface_tx; dev->hard_start_xmit = interface_tx;
#endif #endif
dev->destructor = free_netdev; dev->destructor = free_netdev;
dev->tx_queue_len = 0;
/** /**
* can't call min_mtu, because the needed variables * can't call min_mtu, because the needed variables
......
...@@ -67,7 +67,7 @@ struct hard_iface { ...@@ -67,7 +67,7 @@ struct hard_iface {
struct orig_node { struct orig_node {
uint8_t orig[ETH_ALEN]; uint8_t orig[ETH_ALEN];
uint8_t primary_addr[ETH_ALEN]; uint8_t primary_addr[ETH_ALEN];
struct neigh_node *router; struct neigh_node __rcu *router; /* rcu protected pointer */
unsigned long *bcast_own; unsigned long *bcast_own;
uint8_t *bcast_own_sum; uint8_t *bcast_own_sum;
unsigned long last_valid; unsigned long last_valid;
...@@ -83,7 +83,7 @@ struct orig_node { ...@@ -83,7 +83,7 @@ struct orig_node {
uint32_t last_bcast_seqno; uint32_t last_bcast_seqno;
struct hlist_head neigh_list; struct hlist_head neigh_list;
struct list_head frag_list; struct list_head frag_list;
spinlock_t neigh_list_lock; /* protects neighbor list */ spinlock_t neigh_list_lock; /* protects neigh_list and router */
atomic_t refcount; atomic_t refcount;
struct rcu_head rcu; struct rcu_head rcu;
struct hlist_node hash_entry; struct hlist_node hash_entry;
...@@ -125,6 +125,7 @@ struct neigh_node { ...@@ -125,6 +125,7 @@ struct neigh_node {
struct rcu_head rcu; struct rcu_head rcu;
struct orig_node *orig_node; struct orig_node *orig_node;
struct hard_iface *if_incoming; struct hard_iface *if_incoming;
spinlock_t tq_lock; /* protects: tq_recv, tq_index */
}; };
...@@ -146,7 +147,7 @@ struct bat_priv { ...@@ -146,7 +147,7 @@ struct bat_priv {
atomic_t batman_queue_left; atomic_t batman_queue_left;
char num_ifaces; char num_ifaces;
struct hlist_head softif_neigh_list; struct hlist_head softif_neigh_list;
struct softif_neigh *softif_neigh; struct softif_neigh __rcu *softif_neigh;
struct debug_log *debug_log; struct debug_log *debug_log;
struct hard_iface *primary_if; struct hard_iface *primary_if;
struct kobject *mesh_obj; struct kobject *mesh_obj;
......
...@@ -289,7 +289,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) ...@@ -289,7 +289,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
/* get routing information */ /* get routing information */
if (is_multicast_ether_addr(ethhdr->h_dest)) { if (is_multicast_ether_addr(ethhdr->h_dest)) {
orig_node = (struct orig_node *)gw_get_selected(bat_priv); orig_node = (struct orig_node *)gw_get_selected_orig(bat_priv);
if (orig_node) if (orig_node)
goto find_router; goto find_router;
} }
......
...@@ -558,6 +558,7 @@ static int find_best_vis_server(struct bat_priv *bat_priv, ...@@ -558,6 +558,7 @@ static int find_best_vis_server(struct bat_priv *bat_priv,
struct vis_info *info) struct vis_info *info)
{ {
struct hashtable_t *hash = bat_priv->orig_hash; struct hashtable_t *hash = bat_priv->orig_hash;
struct neigh_node *router;
struct hlist_node *node; struct hlist_node *node;
struct hlist_head *head; struct hlist_head *head;
struct orig_node *orig_node; struct orig_node *orig_node;
...@@ -571,13 +572,17 @@ static int find_best_vis_server(struct bat_priv *bat_priv, ...@@ -571,13 +572,17 @@ static int find_best_vis_server(struct bat_priv *bat_priv,
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) { hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
if ((orig_node) && (orig_node->router) && router = orig_node_get_router(orig_node);
(orig_node->flags & VIS_SERVER) && if (!router)
(orig_node->router->tq_avg > best_tq)) { continue;
best_tq = orig_node->router->tq_avg;
if ((orig_node->flags & VIS_SERVER) &&
(router->tq_avg > best_tq)) {
best_tq = router->tq_avg;
memcpy(packet->target_orig, orig_node->orig, memcpy(packet->target_orig, orig_node->orig,
ETH_ALEN); ETH_ALEN);
} }
neigh_node_free_ref(router);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
...@@ -605,7 +610,7 @@ static int generate_vis_packet(struct bat_priv *bat_priv) ...@@ -605,7 +610,7 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
struct hlist_node *node; struct hlist_node *node;
struct hlist_head *head; struct hlist_head *head;
struct orig_node *orig_node; struct orig_node *orig_node;
struct neigh_node *neigh_node; struct neigh_node *router;
struct vis_info *info = (struct vis_info *)bat_priv->my_vis_info; struct vis_info *info = (struct vis_info *)bat_priv->my_vis_info;
struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data; struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data;
struct vis_info_entry *entry; struct vis_info_entry *entry;
...@@ -633,30 +638,32 @@ static int generate_vis_packet(struct bat_priv *bat_priv) ...@@ -633,30 +638,32 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) { hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
neigh_node = orig_node->router; router = orig_node_get_router(orig_node);
if (!router)
if (!neigh_node)
continue; continue;
if (!compare_eth(neigh_node->addr, orig_node->orig)) if (!compare_eth(router->addr, orig_node->orig))
continue; goto next;
if (neigh_node->if_incoming->if_status != IF_ACTIVE) if (router->if_incoming->if_status != IF_ACTIVE)
continue; goto next;
if (neigh_node->tq_avg < 1) if (router->tq_avg < 1)
continue; goto next;
/* fill one entry into buffer. */ /* fill one entry into buffer. */
entry = (struct vis_info_entry *) entry = (struct vis_info_entry *)
skb_put(info->skb_packet, sizeof(*entry)); skb_put(info->skb_packet, sizeof(*entry));
memcpy(entry->src, memcpy(entry->src,
neigh_node->if_incoming->net_dev->dev_addr, router->if_incoming->net_dev->dev_addr,
ETH_ALEN); ETH_ALEN);
memcpy(entry->dest, orig_node->orig, ETH_ALEN); memcpy(entry->dest, orig_node->orig, ETH_ALEN);
entry->quality = neigh_node->tq_avg; entry->quality = router->tq_avg;
packet->entries++; packet->entries++;
next:
neigh_node_free_ref(router);
if (vis_packet_full(info)) if (vis_packet_full(info))
goto unlock; goto unlock;
} }
...@@ -725,6 +732,7 @@ static void purge_vis_packets(struct bat_priv *bat_priv) ...@@ -725,6 +732,7 @@ static void purge_vis_packets(struct bat_priv *bat_priv)
static void broadcast_vis_packet(struct bat_priv *bat_priv, static void broadcast_vis_packet(struct bat_priv *bat_priv,
struct vis_info *info) struct vis_info *info)
{ {
struct neigh_node *router;
struct hashtable_t *hash = bat_priv->orig_hash; struct hashtable_t *hash = bat_priv->orig_hash;
struct hlist_node *node; struct hlist_node *node;
struct hlist_head *head; struct hlist_head *head;
...@@ -745,19 +753,26 @@ static void broadcast_vis_packet(struct bat_priv *bat_priv, ...@@ -745,19 +753,26 @@ static void broadcast_vis_packet(struct bat_priv *bat_priv,
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) { hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
/* if it's a vis server and reachable, send it. */ /* if it's a vis server and reachable, send it. */
if ((!orig_node) || (!orig_node->router))
continue;
if (!(orig_node->flags & VIS_SERVER)) if (!(orig_node->flags & VIS_SERVER))
continue; continue;
router = orig_node_get_router(orig_node);
if (!router)
continue;
/* don't send it if we already received the packet from /* don't send it if we already received the packet from
* this node. */ * this node. */
if (recv_list_is_in(bat_priv, &info->recv_list, if (recv_list_is_in(bat_priv, &info->recv_list,
orig_node->orig)) orig_node->orig)) {
neigh_node_free_ref(router);
continue; continue;
}
memcpy(packet->target_orig, orig_node->orig, ETH_ALEN); memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
hard_iface = orig_node->router->if_incoming; hard_iface = router->if_incoming;
memcpy(dstaddr, orig_node->router->addr, ETH_ALEN); memcpy(dstaddr, router->addr, ETH_ALEN);
neigh_node_free_ref(router);
skb = skb_clone(info->skb_packet, GFP_ATOMIC); skb = skb_clone(info->skb_packet, GFP_ATOMIC);
if (skb) if (skb)
...@@ -772,45 +787,29 @@ static void unicast_vis_packet(struct bat_priv *bat_priv, ...@@ -772,45 +787,29 @@ static void unicast_vis_packet(struct bat_priv *bat_priv,
struct vis_info *info) struct vis_info *info)
{ {
struct orig_node *orig_node; struct orig_node *orig_node;
struct neigh_node *neigh_node = NULL; struct neigh_node *router = NULL;
struct sk_buff *skb; struct sk_buff *skb;
struct vis_packet *packet; struct vis_packet *packet;
packet = (struct vis_packet *)info->skb_packet->data; packet = (struct vis_packet *)info->skb_packet->data;
rcu_read_lock();
orig_node = orig_hash_find(bat_priv, packet->target_orig); orig_node = orig_hash_find(bat_priv, packet->target_orig);
if (!orig_node) if (!orig_node)
goto unlock; goto out;
neigh_node = orig_node->router; router = orig_node_get_router(orig_node);
if (!router)
if (!neigh_node) goto out;
goto unlock;
if (!atomic_inc_not_zero(&neigh_node->refcount)) {
neigh_node = NULL;
goto unlock;
}
rcu_read_unlock();
skb = skb_clone(info->skb_packet, GFP_ATOMIC); skb = skb_clone(info->skb_packet, GFP_ATOMIC);
if (skb) if (skb)
send_skb_packet(skb, neigh_node->if_incoming, send_skb_packet(skb, router->if_incoming, router->addr);
neigh_node->addr);
goto out;
unlock:
rcu_read_unlock();
out: out:
if (neigh_node) if (router)
neigh_node_free_ref(neigh_node); neigh_node_free_ref(router);
if (orig_node) if (orig_node)
orig_node_free_ref(orig_node); orig_node_free_ref(orig_node);
return;
} }
/* only send one vis packet. called from send_vis_packets() */ /* only send one vis packet. called from send_vis_packets() */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment