B.A.T.M.A.N June 2013

b.a.t.m.a.n@lists.open-mesh.org

13 participants
37 discussions

[B.A.T.M.A.N.] [PATCHv4 1/2] batman-adv: implement batadv_tt_entries
by Antonio Quartulli 05 Jun '13

05 Jun '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Implement batadv_tt_entries() to get the number of entries fitting in a given amount of bytes. This computation is done several times in the code and therefore it is useful to have an helper function. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- translation-table.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/translation-table.c b/translation-table.c index 8d9f5cc..d1957af 100644 --- a/translation-table.c +++ b/translation-table.c @@ -232,6 +232,17 @@ static int batadv_tt_len(int changes_num) return changes_num * sizeof(struct batadv_tvlv_tt_change); } +/** + * batadv_tt_entries - compute the number of entries fitting in tt_len bytes + * @tt_len: available space + * + * Return the number of entries. + */ +static uint16_t batadv_tt_entries(uint16_t tt_len) +{ + return tt_len / batadv_tt_len(1); +} + static int batadv_tt_local_init(struct batadv_priv *bat_priv) { if (bat_priv->tt.local_hash) @@ -406,7 +417,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) if (tt_diff_len == 0) goto container_register; - tt_diff_entries_num = tt_diff_len / batadv_tt_len(1); + tt_diff_entries_num = batadv_tt_entries(tt_diff_len); spin_lock_bh(&bat_priv->tt.changes_list_lock); atomic_set(&bat_priv->tt.local_changes, 0); @@ -1616,7 +1627,7 @@ batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_len -= tt_len % sizeof(struct batadv_tvlv_tt_change); } - tt_tot = tt_len / sizeof(struct batadv_tvlv_tt_change); + tt_tot = batadv_tt_entries(tt_len); tvlv_tt_data = kzalloc(sizeof(*tvlv_tt_data) + tt_len, GFP_ATOMIC); @@ -2567,7 +2578,7 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; tvlv_value_len -= sizeof(*tt_data); - num_entries = tvlv_value_len / batadv_tt_len(1); + num_entries = batadv_tt_entries(tvlv_value_len); batadv_tt_update_orig(bat_priv, orig, (unsigned char *)(tt_data + 1), @@ -2602,7 +2613,7 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; tvlv_value_len -= sizeof(*tt_data); - num_entries = tvlv_value_len / batadv_tt_len(1); + num_entries = batadv_tt_entries(tvlv_value_len); switch (tt_data->flags & BATADV_TT_DATA_TYPE_MASK) { case BATADV_TT_REQUEST: -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: fix possible memleak in fragmentation
by Martin Hundebøll 04 Jun '13

04 Jun '13

Use a variable for return value in batadv_frag_insert_packet() to free the allocated struct batadv_frag_list_entry in all cases where it is not inserted into a chain. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- fragmentation.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index 6054ff6..ab85e75 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -129,10 +129,11 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, struct hlist_head *chain_out) { struct batadv_frag_table_entry *chain; - struct batadv_frag_list_entry *frag_entry_new, *frag_entry_curr; + struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr; struct batadv_frag_packet *frag_packet; uint8_t bucket; uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet); + bool ret = false; /* Linearize packet to avoid linearizing 16 packets in a row when doing * the later merge. Non-linear merge should be added to remove this @@ -162,6 +163,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_head(&frag_entry_new->list, &chain->head); chain->size = skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } @@ -177,6 +179,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, &frag_entry_curr->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } } @@ -186,6 +189,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; } out: @@ -202,14 +206,14 @@ out: chain->size = 0; } - spin_unlock_bh(&chain->lock); - return true; - err_unlock: spin_unlock_bh(&chain->lock); - kfree(frag_entry_new); + err: - return false; + if (!ret) + kfree(frag_entry_new); + + return ret; } /** -- 1.8.3

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove useless find_router look up
by Simon Wunderlich 04 Jun '13

04 Jun '13

From: Simon Wunderlich <simon(a)open-mesh.com> This is not used anymore with the new fragmentation, and it might actually mess up the bonding code because find_router() assumes it is only called once per packet. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- This patch was originally part of the RFC series "add network wide multi interface optimization", but since it is just a fix it is resent as PATCH to be applied now. --- send.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/send.c b/send.c index 8f74201..d780b9d 100644 --- a/send.c +++ b/send.c @@ -251,30 +251,19 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv, struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct batadv_unicast_packet *unicast_packet; struct batadv_orig_node *orig_node; - struct batadv_neigh_node *neigh_node; int ret = NET_RX_DROP; /* get routing information */ - if (is_multicast_ether_addr(ethhdr->h_dest)) { + if (is_multicast_ether_addr(ethhdr->h_dest)) orig_node = batadv_gw_get_selected_orig(bat_priv); - if (orig_node) - goto find_router; - } + else + /* check for tt host - increases orig_node refcount. + * returns NULL in case of AP isolation + */ + orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, + ethhdr->h_dest); - /* check for tt host - increases orig_node refcount. - * returns NULL in case of AP isolation - */ - orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, - ethhdr->h_dest); - -find_router: - /* find_router(): - * - if orig_node is NULL it returns NULL - * - increases neigh_nodes refcount if found. - */ - neigh_node = batadv_find_router(bat_priv, orig_node, NULL); - - if (!neigh_node) + if (!orig_node) goto out; switch (packet_type) { @@ -306,8 +295,6 @@ find_router: ret = 0; out: - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (orig_node) batadv_orig_node_free_ref(orig_node); if (ret == NET_RX_DROP) -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken
by Matthias Schiffer 04 Jun '13

04 Jun '13

The rtnl_lock in batadv_store_mesh_iface has been converted to a rtnl_trylock some time ago to avoid a possible deadlock between rtnl and s_active on removal of the sysfs nodes. The behaviour introduced by that was quite confusing as it could lead to the sysfs store to fail, making batman-adv setup scripts unreliable. As recently the sysfs removal was postponed to a worker not running with the rtnl taken, the deadlock can't occur any more and it is safe to change the trylock back to a lock to make the sysfs store reliable again. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysfs.c b/sysfs.c index 15a22ef..929e304 100644 --- a/sysfs.c +++ b/sysfs.c @@ -582,10 +582,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0)) goto out; - if (!rtnl_trylock()) { - ret = -ERESTARTSYS; - goto out; - } + rtnl_lock(); if (status_tmp == BATADV_IF_NOT_IN_USE) { batadv_hardif_disable_interface(hard_iface, -- 1.8.3

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove obsolete variable
by Marek Lindner 04 Jun '13

04 Jun '13

Introduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure") Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.c b/main.c index 1192e61..5d30fe0 100644 --- a/main.c +++ b/main.c @@ -1043,7 +1043,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, struct batadv_orig_node *orig_node; struct sk_buff *skb = NULL; unsigned char *tvlv_buff; - unsigned int tvlv_len, tvlv_long_hdr = 0; + unsigned int tvlv_len; ssize_t hdr_len = sizeof(*unicast_tvlv_packet); bool ret = false; @@ -1051,9 +1051,6 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, if (!orig_node) goto out; - if (tvlv_value_len > 255) - tvlv_long_hdr = 1; - tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len; skb = netdev_alloc_skb_ip_align(NULL, ETH_HLEN + hdr_len + tvlv_len); -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCH next] net: pass info struct via netdevice notifier
by Antonio Quartulli 04 Jun '13

04 Jun '13

From: Jiri Pirko <jiri(a)resnulli.us> So far, only net_device * could be passed along with netdevice notifier event. This patch provides a possibility to pass custom structure able to provide info that event listener needs to know. Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> v2->v3: fix typo on simeth shortened dev_getter shortened notifier_info struct name v1->v2: fix notifier_call parameter in call_netdevice_notifier() Signed-off-by: David S. Miller <davem(a)davemloft.net> [ordex(a)autistici.org: added compat code] Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 6 ++++++ hard-interface.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 08b7500..17ef089 100644 --- a/compat.h +++ b/compat.h @@ -302,4 +302,10 @@ static int __batadv_interface_set_mac_addr(x, y) #endif /* < KERNEL_VERSION(3, 10, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) + +#define netdev_notifier_info_to_dev(ptr) ptr + +#endif /* < KERNEL_VERSION(3, 11, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/hard-interface.c b/hard-interface.c index dc4ac29..c478e6b 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -645,7 +645,7 @@ void batadv_hardif_remove_interfaces(void) static int batadv_hard_if_event(struct notifier_block *this, unsigned long event, void *ptr) { - struct net_device *net_dev = ptr; + struct net_device *net_dev = netdev_notifier_info_to_dev(ptr); struct batadv_hard_iface *hard_iface; struct batadv_hard_iface *primary_if = NULL; struct batadv_priv *bat_priv; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv3 00/12] make the Translation Table component VLAN-aware
by Antonio Quartulli 04 Jun '13

04 Jun '13

Hello people, with this patchset I want to introduce a new feature in the TT code which makes it VLAN aware. This means that now clients belonging to different VLANs created on top of a generic bat0 are treated differently. One of the major reason for bringing this change is to allow BLA to selectively ignore TT entries belonging to a given VLAN. To allow the latter behaviour, the CRC logic has been divided on a per-VLAN basis. This means that the local TT table is logically divided in sub-tables containing all the entries belonging to the same VLAN and the CRC is then computed on each of them. As a natural consequence, each node now stores a set of local CRCs instead of one only. Due to this also the way the TVLV-TT object is built and announced has been changed. This patchset gives the possibility to: - enable AP isolation only on a selected VLAN rather than on all the traffic - make DAT work correctly when the same IP subnet is used on different VLANs - make BLA refuse global entries from certain VLANs - leave the possibility to future developers to implement more VLAN specific attributes This patchset is based on top of: "batman-adv: fix typo in kernel doc" Changes from v2: - CRC logic divided on a VLAN-basis - BLA can now select the TT entries to ignore based on the VLAN Changes from v1: - improved kernel doc - created batadv_get_vid() function - improved documentation for CRC computation - added compat code for kfree_rcu (struct batadv_priv_vlan) Cheers, Antonio Quartulli (12): batman-adv: implement batadv_tt_entries batman-adv: avoid cast by using void pointer as argument batman-adv: add the VLAN ID attribute to the TT entry batman-adv: use vid when computing local and global TT CRC batman-adv: print the VID together with the TT entries batman-adv: make the GW module correctly talk to the new VLAN-TT batman-adv: make the Distributed ARP Table vlan aware batman-adv: add per VLAN interface attribute framework batman-adv: make the AP isolation attribute VLAN specific batman-adv: make the backbone gw check VLAN specific batman-adv: make the TT global purge routine VLAN specific batman-adv: make the TT RC logic VLAN specific bridge_loop_avoidance.c | 58 ++- bridge_loop_avoidance.h | 10 +- compat.c | 18 + compat.h | 25 ++ distributed-arp-table.c | 125 ++++-- gateway_client.c | 18 +- main.c | 72 +++- main.h | 13 +- originator.c | 100 ++++- originator.h | 7 + packet.h | 30 +- routing.c | 28 +- send.c | 8 +- send.h | 16 +- soft-interface.c | 158 ++++++- sysfs.c | 140 ++++++ sysfs.h | 10 + translation-table.c | 1080 +++++++++++++++++++++++++++++++++++------------ translation-table.h | 23 +- types.h | 66 ++- 20 files changed, 1599 insertions(+), 406 deletions(-) -- 1.8.1.5

2 17

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2013