commits September 2015

commits@lists.open-mesh.org

1 participants
41 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (0437624)
by postmaster＠open-mesh.org 13 Sep '15

13 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: b307e72 batman-adv: lock crc access in bridge loop avoidance 0437624 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (0437624)
by postmaster＠open-mesh.org 13 Sep '15

13 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 04376241f586e8e49753b4372611c2d076624756 Merge: 6846ad8 b307e72 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Sep 13 18:22:15 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 04376241f586e8e49753b4372611c2d076624756 net/batman-adv/bridge_loop_avoidance.c | 35 +++++++++++++++++++++++++++++----- net/batman-adv/types.h | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --cc net/batman-adv/bridge_loop_avoidance.c index 191a702,c95268b..99dcae3 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -660,11 -670,12 +671,11 @@@ static void batadv_bla_del_claim(struc } /* check for ANNOUNCE frame, return 1 if handled */ -static int batadv_handle_announce(struct batadv_priv *bat_priv, - uint8_t *an_addr, uint8_t *backbone_addr, - unsigned short vid) +static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, + u8 *backbone_addr, unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; - u16 crc; - uint16_t backbone_crc, crc; ++ u16 backbone_crc, crc; if (memcmp(an_addr, batadv_announce_mac, 4) != 0) return 0; @@@ -1647,9 -1662,10 +1662,10 @@@ int batadv_bla_claim_table_seq_print_te struct batadv_bla_claim *claim; struct batadv_hard_iface *primary_if; struct hlist_head *head; - uint16_t backbone_crc; - uint32_t i; ++ u16 backbone_crc; + u32 i; bool is_own; - uint8_t *primary_addr; + u8 *primary_addr; primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) @@@ -1692,9 -1712,10 +1712,10 @@@ int batadv_bla_backbone_table_seq_print struct batadv_hard_iface *primary_if; struct hlist_head *head; int secs, msecs; - uint16_t backbone_crc; - uint32_t i; ++ u16 backbone_crc; + u32 i; bool is_own; - uint8_t *primary_addr; + u8 *primary_addr; primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) diff --cc net/batman-adv/types.h index d260efd,bd4ed75..1170962 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -896,7 -899,8 +897,8 @@@ struct batadv_bla_backbone_gw unsigned long lasttime; atomic_t wait_periods; atomic_t request_sent; - uint16_t crc; + u16 crc; + spinlock_t crc_lock; /* protects crc */ atomic_t refcount; struct rcu_head rcu; };

1 0

[batman-adv] maint: batman-adv: lock crc access in bridge loop avoidance (b307e72)
by postmaster＠open-mesh.org 13 Sep '15

13 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit b307e72d119f0ca5cf3c00d05d62320975261ef4 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Fri Sep 11 18:04:13 2015 +0200 batman-adv: lock crc access in bridge loop avoidance We have found some networks in which nodes were constantly requesting other nodes BLA claim tables to synchronize, just to ask for that again once completed. The reason was that the crc checksum of the asked nodes were out of sync due to missing locking and multiple writes to the same crc checksum when adding/removing entries. Therefore the asked nodes constantly reported the wrong crc, which caused repeating requests. To avoid multiple functions changing a backbone gateways crc entry at the same time, lock it using a spinlock. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Tested-by: Alfons Name <AlfonsName(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b307e72d119f0ca5cf3c00d05d62320975261ef4 net/batman-adv/bridge_loop_avoidance.c | 35 +++++++++++++++++++++++++++++----- net/batman-adv/types.h | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ba06092..c95268b 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -259,7 +259,9 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) } /* all claims gone, initialize CRC */ + spin_lock_bh(&backbone_gw->crc_lock); backbone_gw->crc = BATADV_BLA_CRC_INIT; + spin_unlock_bh(&backbone_gw->crc_lock); } /** @@ -407,6 +409,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, entry->lasttime = jiffies; entry->crc = BATADV_BLA_CRC_INIT; entry->bat_priv = bat_priv; + spin_lock_init(&entry->crc_lock); atomic_set(&entry->request_sent, 0); atomic_set(&entry->wait_periods, 0); ether_addr_copy(entry->orig, orig); @@ -556,7 +559,9 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, __be16 crc; memcpy(mac, batadv_announce_mac, 4); + spin_lock_bh(&backbone_gw->crc_lock); crc = htons(backbone_gw->crc); + spin_unlock_bh(&backbone_gw->crc_lock); memcpy(&mac[4], &crc, 2); batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid, @@ -617,14 +622,18 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, "bla_add_claim(): changing ownership for %pM, vid %d\n", mac, BATADV_PRINT_VID(vid)); + spin_lock_bh(&claim->backbone_gw->crc_lock); claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); + spin_unlock_bh(&claim->backbone_gw->crc_lock); batadv_backbone_gw_free_ref(claim->backbone_gw); } /* set (new) backbone gw */ atomic_inc(&backbone_gw->refcount); claim->backbone_gw = backbone_gw; + spin_lock_bh(&backbone_gw->crc_lock); backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); + spin_unlock_bh(&backbone_gw->crc_lock); backbone_gw->lasttime = jiffies; claim_free_ref: @@ -652,7 +661,9 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, batadv_choose_claim, claim); batadv_claim_free_ref(claim); /* reference from the hash is gone */ + spin_lock_bh(&claim->backbone_gw->crc_lock); claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); + spin_unlock_bh(&claim->backbone_gw->crc_lock); /* don't need the reference from hash_find() anymore */ batadv_claim_free_ref(claim); @@ -664,7 +675,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; - uint16_t crc; + uint16_t backbone_crc, crc; if (memcmp(an_addr, batadv_announce_mac, 4) != 0) return 0; @@ -683,12 +694,16 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", BATADV_PRINT_VID(vid), backbone_gw->orig, crc); - if (backbone_gw->crc != crc) { + spin_lock_bh(&backbone_gw->crc_lock); + backbone_crc = backbone_gw->crc; + spin_unlock_bh(&backbone_gw->crc_lock); + + if (backbone_crc != crc) { batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv, "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n", backbone_gw->orig, BATADV_PRINT_VID(backbone_gw->vid), - backbone_gw->crc, crc); + backbone_crc, crc); batadv_bla_send_request(backbone_gw); } else { @@ -1647,6 +1662,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) struct batadv_bla_claim *claim; struct batadv_hard_iface *primary_if; struct hlist_head *head; + uint16_t backbone_crc; uint32_t i; bool is_own; uint8_t *primary_addr; @@ -1669,11 +1685,15 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) hlist_for_each_entry_rcu(claim, head, hash_entry) { is_own = batadv_compare_eth(claim->backbone_gw->orig, primary_addr); + + spin_lock_bh(&claim->backbone_gw->crc_lock); + backbone_crc = claim->backbone_gw->crc; + spin_unlock_bh(&claim->backbone_gw->crc_lock); seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n", claim->addr, BATADV_PRINT_VID(claim->vid), claim->backbone_gw->orig, (is_own ? 'x' : ' '), - claim->backbone_gw->crc); + backbone_crc); } rcu_read_unlock(); } @@ -1692,6 +1712,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) struct batadv_hard_iface *primary_if; struct hlist_head *head; int secs, msecs; + uint16_t backbone_crc; uint32_t i; bool is_own; uint8_t *primary_addr; @@ -1722,10 +1743,14 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) if (is_own) continue; + spin_lock_bh(&backbone_gw->crc_lock); + backbone_crc = backbone_gw->crc; + spin_unlock_bh(&backbone_gw->crc_lock); + seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n", backbone_gw->orig, BATADV_PRINT_VID(backbone_gw->vid), secs, - msecs, backbone_gw->crc); + msecs, backbone_crc); } rcu_read_unlock(); } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 55610a8..bd4ed75 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -886,6 +886,7 @@ struct batadv_socket_packet { * backbone gateway - no bcast traffic is formwared until the situation was * resolved * @crc: crc16 checksum over all claims + * @crc_lock: lock protecting crc * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner */ @@ -899,6 +900,7 @@ struct batadv_bla_backbone_gw { atomic_t wait_periods; atomic_t request_sent; uint16_t crc; + spinlock_t crc_lock; /* protects crc */ atomic_t refcount; struct rcu_head rcu; };

1 0

[batman-adv] master: batman-adv: Fix typo 'wether' -> 'whether' (e72ce42)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e72ce421b9cce28a400c78b4bdc48a36750d0299 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 26 10:31:51 2015 +0200 batman-adv: Fix typo 'wether' -> 'whether' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e72ce421b9cce28a400c78b4bdc48a36750d0299 net/batman-adv/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 45952dc..5dbcb2e 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -908,7 +908,7 @@ end: * appropriate handlers * @bat_priv: the bat priv with all the soft interface information * @tvlv_handler: tvlv callback function handling the tvlv content - * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet + * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet * @orig_node: orig node emitting the ogm packet * @src: source mac address of the unicast packet * @dst: destination mac address of the unicast packet @@ -961,7 +961,7 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv, * batadv_tvlv_containers_process - parse the given tvlv buffer to call the * appropriate handlers * @bat_priv: the bat priv with all the soft interface information - * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet + * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet * @orig_node: orig node emitting the ogm packet * @src: source mac address of the unicast packet * @dst: destination mac address of the unicast packet

1 0

[batman-adv] master: batman-adv: Use chain pointer when purging fragments (d54f7c8)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d54f7c88c25064c5eee38ab1d1eabe020f8b023c Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 26 10:31:50 2015 +0200 batman-adv: Use chain pointer when purging fragments The chain pointer was already created in batadv_frag_purge_orig to make the checks more readable. Just use the chain pointer everywhere instead of having the same dereference + array access in the most lines of this function. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d54f7c88c25064c5eee38ab1d1eabe020f8b023c net/batman-adv/fragmentation.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 700c96c..20d9282 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -71,14 +71,14 @@ void batadv_frag_purge_orig(struct batadv_orig_node *orig_node, for (i = 0; i < BATADV_FRAG_BUFFER_COUNT; i++) { chain = &orig_node->fragments[i]; - spin_lock_bh(&orig_node->fragments[i].lock); + spin_lock_bh(&chain->lock); if (!check_cb || check_cb(chain)) { - batadv_frag_clear_chain(&orig_node->fragments[i].head); - orig_node->fragments[i].size = 0; + batadv_frag_clear_chain(&chain->head); + chain->size = 0; } - spin_unlock_bh(&orig_node->fragments[i].lock); + spin_unlock_bh(&chain->lock); } }

1 0

[batman-adv] master: batman-adv: unify flags access style in tt global add (d738025)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d7380251fc66cc3902c4b00643f4715ff4c71e2e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Aug 26 16:33:34 2015 +0200 batman-adv: unify flags access style in tt global add This should slightly improve readability Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d7380251fc66cc3902c4b00643f4715ff4c71e2e net/batman-adv/translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index dc422be..445dc23 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1441,7 +1441,7 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, * TT_CLIENT_WIFI, therefore they have to be copied in the * client entry */ - tt_global_entry->common.flags |= flags; + common->flags |= flags; /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a

1 0

[batman-adv] master: Merge branch 'next' (2a938c7)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2a938c750a3ffe57baa22ce37e7a20617899473d Merge: 41e304b 6846ad8 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Sep 6 16:27:38 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 2a938c750a3ffe57baa22ce37e7a20617899473d net/batman-adv/routing.c | 19 +++++++++++++++---- net/batman-adv/translation-table.c | 24 +++++++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (2a938c7)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 2decb5f batman-adv: fix speedy join for DAT cache replies 4a73d74 batman-adv: avoid keeping false temporary entry 2dd1d9f batman-adv: detect local excess vlans in TT request 6846ad8 Merge branch 'maint' into next 2a938c7 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (6846ad8)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 6846ad869ff55346cb572e90fb5fb9440c60061f Merge: 5c11589 2dd1d9f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Sep 6 16:25:32 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 6846ad869ff55346cb572e90fb5fb9440c60061f net/batman-adv/routing.c | 19 +++++++++++++++---- net/batman-adv/translation-table.c | 24 +++++++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --cc net/batman-adv/routing.c index 8d990b0,96b5daa..3207667 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -833,9 -833,10 +833,10 @@@ int batadv_recv_unicast_packet(struct s struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct batadv_unicast_packet *unicast_packet; struct batadv_unicast_4addr_packet *unicast_4addr_packet; - uint8_t *orig_addr; + u8 *orig_addr; struct batadv_orig_node *orig_node = NULL; int check, hdr_size = sizeof(*unicast_packet); + enum batadv_subtype subtype; bool is4addr; unicast_packet = (struct batadv_unicast_packet *)skb->data; diff --cc net/batman-adv/translation-table.c index 4228b10,7e4657e..dc422be --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2411,8 -2394,8 +2417,8 @@@ static bool batadv_tt_global_check_crc( { struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp; struct batadv_orig_node_vlan *vlan; + int i, orig_num_vlan; - uint32_t crc; + u32 crc; - int i; /* check if each received CRC matches the locally stored one */ for (i = 0; i < num_vlan; i++) { @@@ -2438,6 -2421,18 +2444,18 @@@ return false; } + /* check if any excess VLANs exist locally for the originator + * which are not mentioned in the TVLV from the originator. + */ + rcu_read_lock(); + orig_num_vlan = 0; - list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) ++ hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) + orig_num_vlan++; + rcu_read_unlock(); + + if (orig_num_vlan > num_vlan) + return false; + return true; }

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (6846ad8)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 2decb5f batman-adv: fix speedy join for DAT cache replies 4a73d74 batman-adv: avoid keeping false temporary entry 2dd1d9f batman-adv: detect local excess vlans in TT request 6846ad8 Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2015