leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

batman-adv: keep track of when unicast packets are sent

Browse Source 
To enable ELP to send probing packets over wireless links
only if needed, batman-adv must keep track of the last time
it sent a unicast packet towards every neighbour.

For this purpose a 2 main changes are introduced:
1) a new member of the elp_neigh_node structure stores the
   last time a unicast packet was sent towards this neighbour;
2) a wrapper function for sending unicast packets is
   implemented. This function will simply update the member
   describe din point 1) and then forward the packet to the
   real sending routine.

Point 2) implies that any code-path leading to a unicast
sending now has to use the new wrapper.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
This commit is contained in:
Antonio Quartulli 2016-01-16 16:40:15 +08:00 committed by Antonio Quartulli
parent 0b5ecc6811
commit 95d392784d
10 changed files with 75 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/batman-adv/bat_iv_ogm.c
View File

@ -478,7 +478,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);
batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,
skb->len + ETH_HLEN); skb->len + ETH_HLEN);
batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); batadv_send_broadcast_skb(skb, hard_iface);
} }
} }

2
net/batman-adv/bat_v_elp.c
View File

@ -104,7 +104,7 @@ static void batadv_v_elp_periodic_work(struct work_struct *work)
hard_iface->net_dev->name, hard_iface->net_dev->name,
atomic_read(&hard_iface->bat_v.elp_seqno)); atomic_read(&hard_iface->bat_v.elp_seqno));
batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); batadv_send_broadcast_skb(skb, hard_iface);
atomic_inc(&hard_iface->bat_v.elp_seqno); atomic_inc(&hard_iface->bat_v.elp_seqno);

2
net/batman-adv/bat_v_ogm.c
View File

@ -120,7 +120,7 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb,
batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,
skb->len + ETH_HLEN); skb->len + ETH_HLEN);
batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); batadv_send_broadcast_skb(skb, hard_iface);
} }
/** /**

4
net/batman-adv/distributed-arp-table.c
View File

@ -654,9 +654,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
goto free_neigh; goto free_neigh;
} }
send_status = batadv_send_skb_packet(tmp_skb, send_status = batadv_send_unicast_skb(tmp_skb, neigh_node);
neigh_node->if_incoming,
neigh_node->addr);
if (send_status == NET_XMIT_SUCCESS) { if (send_status == NET_XMIT_SUCCESS) {
/* count the sent packet */ /* count the sent packet */
switch (packet_subtype) { switch (packet_subtype) {

8
net/batman-adv/fragmentation.c
View File

@ -378,8 +378,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
skb->len + ETH_HLEN); skb->len + ETH_HLEN);
packet->ttl--; packet->ttl--;
batadv_send_skb_packet(skb, neigh_node->if_incoming, batadv_send_unicast_skb(skb, neigh_node);
neigh_node->addr);
ret = true; ret = true;
} }
@ -486,8 +485,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX); batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,
skb_fragment->len + ETH_HLEN); skb_fragment->len + ETH_HLEN);
batadv_send_skb_packet(skb_fragment, neigh_node->if_incoming, batadv_send_unicast_skb(skb_fragment, neigh_node);
neigh_node->addr);
frag_header.no++; frag_header.no++;
/* The initial check in this function should cover this case */ /* The initial check in this function should cover this case */
@ -506,7 +504,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX); batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,
skb->len + ETH_HLEN); skb->len + ETH_HLEN);
batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); batadv_send_unicast_skb(skb, neigh_node);
ret = true; ret = true;

2
net/batman-adv/icmp_socket.c
View File

@ -278,7 +278,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
ether_addr_copy(icmp_header->orig, primary_if->net_dev->dev_addr); ether_addr_copy(icmp_header->orig, primary_if->net_dev->dev_addr);
batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); batadv_send_unicast_skb(skb, neigh_node);
goto out; goto out;
dst_unreach: dst_unreach:

22
net/batman-adv/network-coding.c
View File

@ -575,9 +575,7 @@ batadv_nc_hash_find(struct batadv_hashtable *hash,
*/ */
static void batadv_nc_send_packet(struct batadv_nc_packet *nc_packet) static void batadv_nc_send_packet(struct batadv_nc_packet *nc_packet)
{ {
batadv_send_skb_packet(nc_packet->skb, batadv_send_unicast_skb(nc_packet->skb, nc_packet->neigh_node);
nc_packet->neigh_node->if_incoming,
nc_packet->nc_path->next_hop);
nc_packet->skb = NULL; nc_packet->skb = NULL;
batadv_nc_packet_free(nc_packet); batadv_nc_packet_free(nc_packet);
} }
@ -1067,11 +1065,11 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
struct batadv_unicast_packet *packet1; struct batadv_unicast_packet *packet1;
struct batadv_unicast_packet *packet2; struct batadv_unicast_packet *packet2;
struct batadv_coded_packet *coded_packet; struct batadv_coded_packet *coded_packet;
struct batadv_neigh_node *neigh_tmp, *router_neigh; struct batadv_neigh_node *neigh_tmp, *router_neigh, *first_dest;
struct batadv_neigh_node *router_coding = NULL; struct batadv_neigh_node *router_coding = NULL, *second_dest;
struct batadv_neigh_ifinfo *router_neigh_ifinfo = NULL; struct batadv_neigh_ifinfo *router_neigh_ifinfo = NULL;
struct batadv_neigh_ifinfo *router_coding_ifinfo = NULL; struct batadv_neigh_ifinfo *router_coding_ifinfo = NULL;
u8 *first_source, *first_dest, *second_source, *second_dest; u8 *first_source, *second_source;
__be32 packet_id1, packet_id2; __be32 packet_id1, packet_id2;
size_t count; size_t count;
bool res = false; bool res = false;
@ -1114,9 +1112,9 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
*/ */
if (tq_weighted_neigh >= tq_weighted_coding) { if (tq_weighted_neigh >= tq_weighted_coding) {
/* Destination from nc_packet is selected for MAC-header */ /* Destination from nc_packet is selected for MAC-header */
first_dest = nc_packet->nc_path->next_hop; first_dest = nc_packet->neigh_node;
first_source = nc_packet->nc_path->prev_hop; first_source = nc_packet->nc_path->prev_hop;
second_dest = neigh_node->addr; second_dest = neigh_node;
second_source = ethhdr->h_source; second_source = ethhdr->h_source;
packet1 = (struct batadv_unicast_packet *)nc_packet->skb->data; packet1 = (struct batadv_unicast_packet *)nc_packet->skb->data;
packet2 = (struct batadv_unicast_packet *)skb->data; packet2 = (struct batadv_unicast_packet *)skb->data;
@ -1125,9 +1123,9 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
skb->data + sizeof(*packet2)); skb->data + sizeof(*packet2));
} else { } else {
/* Destination for skb is selected for MAC-header */ /* Destination for skb is selected for MAC-header */
first_dest = neigh_node->addr; first_dest = neigh_node;
first_source = ethhdr->h_source; first_source = ethhdr->h_source;
second_dest = nc_packet->nc_path->next_hop; second_dest = nc_packet->neigh_node;
second_source = nc_packet->nc_path->prev_hop; second_source = nc_packet->nc_path->prev_hop;
packet1 = (struct batadv_unicast_packet *)skb->data; packet1 = (struct batadv_unicast_packet *)skb->data;
packet2 = (struct batadv_unicast_packet *)nc_packet->skb->data; packet2 = (struct batadv_unicast_packet *)nc_packet->skb->data;
@ -1169,7 +1167,7 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
coded_packet->first_ttvn = packet1->ttvn; coded_packet->first_ttvn = packet1->ttvn;
/* Info about second unicast packet */ /* Info about second unicast packet */
ether_addr_copy(coded_packet->second_dest, second_dest); ether_addr_copy(coded_packet->second_dest, second_dest->addr);
ether_addr_copy(coded_packet->second_source, second_source); ether_addr_copy(coded_packet->second_source, second_source);
ether_addr_copy(coded_packet->second_orig_dest, packet2->dest); ether_addr_copy(coded_packet->second_orig_dest, packet2->dest);
coded_packet->second_crc = packet_id2; coded_packet->second_crc = packet_id2;
@ -1224,7 +1222,7 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
batadv_nc_packet_free(nc_packet); batadv_nc_packet_free(nc_packet);
/* Send the coded packet and return true */ /* Send the coded packet and return true */
batadv_send_skb_packet(skb_dest, neigh_node->if_incoming, first_dest); batadv_send_unicast_skb(skb_dest, first_dest);
res = true; res = true;
out: out:
if (router_neigh) if (router_neigh)

55
net/batman-adv/send.c
View File

@ -49,16 +49,30 @@
static void batadv_send_outstanding_bcast_packet(struct work_struct *work); static void batadv_send_outstanding_bcast_packet(struct work_struct *work);
/* send out an already prepared packet to the given address via the /**
* specified batman interface * batadv_send_skb_packet - send an already prepared packet
* @skb: the packet to send
* @hard_iface: the interface to use to send the broadcast packet
* @dst_addr: the payload destination
*
* Send out an already prepared packet to the given neighbor or broadcast it
* using the specified interface. Either hard_iface or neigh_node must be not
* NULL.
* If neigh_node is NULL, then the packet is broadcasted using hard_iface,
* otherwise it is sent as unicast to the given neighbor.
*
* Return: NET_TX_DROP in case of error or the result of dev_queue_xmit(skb)
* otherwise
*/ */
int batadv_send_skb_packet(struct sk_buff *skb, int batadv_send_skb_packet(struct sk_buff *skb,
struct batadv_hard_iface *hard_iface, struct batadv_hard_iface *hard_iface,
const u8 *dst_addr) const u8 *dst_addr)
{ {
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_priv *bat_priv;
struct ethhdr *ethhdr; struct ethhdr *ethhdr;
bat_priv = netdev_priv(hard_iface->soft_iface);
if (hard_iface->if_status != BATADV_IF_ACTIVE) if (hard_iface->if_status != BATADV_IF_ACTIVE)
goto send_skb_err; goto send_skb_err;
@ -100,6 +114,35 @@ send_skb_err:
return NET_XMIT_DROP; return NET_XMIT_DROP;
} }
int batadv_send_broadcast_skb(struct sk_buff *skb,
struct batadv_hard_iface *hard_iface)
{
return batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);
}
int batadv_send_unicast_skb(struct sk_buff *skb,
struct batadv_neigh_node *neigh)
{
#ifdef CONFIG_BATMAN_ADV_BATMAN_V
struct batadv_hardif_neigh_node *hardif_neigh;
#endif
int ret;
ret = batadv_send_skb_packet(skb, neigh->if_incoming, neigh->addr);
#ifdef CONFIG_BATMAN_ADV_BATMAN_V
hardif_neigh = batadv_hardif_neigh_get(neigh->if_incoming, neigh->addr);
if ((hardif_neigh) && (ret != NET_XMIT_DROP))
hardif_neigh->bat_v.last_unicast_tx = jiffies;
if (hardif_neigh)
batadv_hardif_neigh_put(hardif_neigh);
#endif
return ret;
}
/** /**
* batadv_send_skb_to_orig - Lookup next-hop and transmit skb. * batadv_send_skb_to_orig - Lookup next-hop and transmit skb.
* @skb: Packet to be transmitted. * @skb: Packet to be transmitted.
@ -146,8 +189,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb,
if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) { if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) {
ret = NET_XMIT_POLICED; ret = NET_XMIT_POLICED;
} else { } else {
batadv_send_skb_packet(skb, neigh_node->if_incoming, batadv_send_unicast_skb(skb, neigh_node);
neigh_node->addr);
ret = NET_XMIT_SUCCESS; ret = NET_XMIT_SUCCESS;
} }
@ -538,8 +580,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
/* send a copy of the saved skb */ /* send a copy of the saved skb */
skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
if (skb1) if (skb1)
batadv_send_skb_packet(skb1, hard_iface, batadv_send_broadcast_skb(skb1, hard_iface);
batadv_broadcast_addr);
} }
rcu_read_unlock(); rcu_read_unlock();

10
net/batman-adv/send.h
View File

@ -28,12 +28,16 @@
struct sk_buff; struct sk_buff;
struct work_struct; struct work_struct;
int batadv_send_skb_packet(struct sk_buff *skb,
struct batadv_hard_iface *hard_iface,
const u8 *dst_addr);
int batadv_send_skb_to_orig(struct sk_buff *skb, int batadv_send_skb_to_orig(struct sk_buff *skb,
struct batadv_orig_node *orig_node, struct batadv_orig_node *orig_node,
struct batadv_hard_iface *recv_if); struct batadv_hard_iface *recv_if);
int batadv_send_skb_packet(struct sk_buff *skb,
struct batadv_hard_iface *hard_iface,
const u8 *dst_addr);
int batadv_send_broadcast_skb(struct sk_buff *skb,
struct batadv_hard_iface *hard_iface);
int batadv_send_unicast_skb(struct sk_buff *skb,
struct batadv_neigh_node *neigh_node);
void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface); void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface);
int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
const struct sk_buff *skb, const struct sk_buff *skb,

2
net/batman-adv/types.h
View File

@ -377,11 +377,13 @@ DECLARE_EWMA(throughput, 1024, 8)
* @throughput: ewma link throughput towards this neighbor * @throughput: ewma link throughput towards this neighbor
* @elp_interval: time interval between two ELP transmissions * @elp_interval: time interval between two ELP transmissions
* @elp_latest_seqno: latest and best known ELP sequence number * @elp_latest_seqno: latest and best known ELP sequence number
* @last_unicast_tx: when the last unicast packet has been sent to this neighbor
*/ */
struct batadv_hardif_neigh_node_bat_v { struct batadv_hardif_neigh_node_bat_v {
struct ewma_throughput throughput; struct ewma_throughput throughput;
u32 elp_interval; u32 elp_interval;
u32 elp_latest_seqno; u32 elp_latest_seqno;
unsigned long last_unicast_tx;
}; };
/** /**