B.A.T.M.A.N May 2018

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

12 participants
32 discussions

[B.A.T.M.A.N.] [maint v3] batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs
by Marek Lindner 11 May '18

11 May '18

A translation table TVLV changset sent with an OGM consists of a number of headers (one per VLAN) plus the changeset itself (addition and/or deletion of entries). The per-VLAN headers are used by OGM recipients for consistency checks. Said consistency check might determine that a full translation table request is needed to restore consistency. If the TT sender adds per-VLAN headers of empty VLANs into the OGM, recipients are led to believe to have reached an inconsistent state and thus request a full table update. The full table does not contain empty VLANs (due to missing entries) the cycle restarts when the next OGM is issued. Consequently, when the translation table TVLV headers are composed, empty VLANs are to be excluded. Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- v3: * rebased on top of maint v2: * moved changes into batadv_tt_prepare_tvlv_local_data() * updated 'fixes' commit id net/batman-adv/translation-table.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 23f9c212..39865513 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -931,15 +931,20 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, struct batadv_tvlv_tt_vlan_data *tt_vlan; struct batadv_softif_vlan *vlan; u16 num_vlan = 0; - u16 num_entries = 0; + u16 vlan_entries = 0; + u16 total_entries = 0; u16 tvlv_len; u8 *tt_change_ptr; int change_offset; spin_lock_bh(&bat_priv->softif_vlan_list_lock); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + vlan_entries = atomic_read(&vlan->tt.num_entries); + if (vlan_entries < 1) + continue; + num_vlan++; - num_entries += atomic_read(&vlan->tt.num_entries); + total_entries += vlan_entries; } change_offset = sizeof(**tt_data); @@ -947,7 +952,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, /* if tt_len is negative, allocate the space needed by the full table */ if (*tt_len < 0) - *tt_len = batadv_tt_len(num_entries); + *tt_len = batadv_tt_len(total_entries); tvlv_len = *tt_len; tvlv_len += change_offset; @@ -964,6 +969,10 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + vlan_entries = atomic_read(&vlan->tt.num_entries); + if (vlan_entries < 1) + continue; + tt_vlan->vid = htons(vlan->vid); tt_vlan->crc = htonl(vlan->tt.crc); -- 2.17.0

2 1

[B.A.T.M.A.N.] sanity check please
by dan 11 May '18

11 May '18

I'm trying to see how many bits I can push across batman-adv. My test setup is 1 Proxmox host with 3 ubuntu 16.04 VM's. VM1 bat0 (ens19) 192.168.5.1/24 VM2 bat0 (ens19,ens20) 192.168.5.2/24 VM3 bat0 (ens20) 192.168.5.3/24 So VM1 and VM3 are on different 'physical' network segments. I'm running iperf3 with VM1 the server and VM3 the client VM1 iperf3 -s VM3 iperf3 -c 192.168.5.1 -b 10000M -t 60 -P 1 output is 1.75Gbits -P 99 output is 831Mbps -P 99 *BUT* hitting the 'native' LAN address of 192.168.1.1 (each VM has an ens18 on this network) 4.8Gbps -P 99 from VM2 ~1.67Gbps So I am definitely putting batman-adv in the way and it's having a clear impact of throughput. I've also double checked that killing VM2 breaks the connection. Based on the number of retries and how they compound with more parallel streams, and that the only substantial CPU used here is iperf3 in the VM and virtio on the host, the virtio nic is the bottleneck. Hardware network should likely perform better. Ultimate goal here is to basically replicate the concept of SPB but with a small batman-adv node instead of a switch to replace and OSPF/MPLS/VPLS wISP network. I am running bat0 at mtu 1400 so I wouldn't have to switch out from linux bridges in prox but I don't expect that to have a substantial effect, maybe a couple % difference. Has anyone else performed similar tests on hardware/wired connections? There would be point-to-point half-duplex and full duplex wireless links but no multipoint 'wifi' style links. I've also added an 8021q vlan 8 on top of bat0 (ie bat0.8, tagged) and batman-adv seems quite happy to transport this VLAN. VM2 does NOT have the vlan config on bat0. I'm pretty happy with the results here, hoping I'm not missing some obvious "In a VM you get abnormally high performance and low CPU" situation. Seeing >1G is great, my maximum links have 1G ports so that's the bar. I'm hoping to compare notes with someone before spending the cash on the hardware to do a field test. That platform would likely be the PCEngines APU2 and/or soekris or other hardened x86 device with 3+ ethernet ports.

2 2

[B.A.T.M.A.N.] [RFC PATCH] batman-adv: mitigate issue when empty vlan is received
by Leonardo Mörlein 11 May '18

11 May '18

This patch is not a fix for the issue itself, but a fix for the other nodes, which are also influenced by the issue. - Some (affected) nodes send TT announcements for an empty vlan (for now only seen with vlan_id = 0). - This behaviour is a bug! Batman-adv nodes must not send TT announcements for empty vlans. - The receiving batman-adv can not handle incoming TT announcements with empty vlans. (The crc check routine batadv_tt_global_check_crc() fails.) - As the receiving node thinks, the crc is broken, it does a full table request then. - The announcing node sends a TT full table to the receiving node then, which also contains the empty vlan, so *batadv_tt_global_check_crc()* fails again on the receiver side. - This causes a lot of unneeded TT traffic. In Freifunk Hannover we decreased the amount of from ~20kpp/s to ~4kpp/s on our supernodes. We have ~800 nodes, which are connected via vpn to one of six supernodes. Those supernodes are connected with each other in a fully connected mesh. Signed-off-by: Leonardo Mörlein <me(a)irrelefant.net> --- net/batman-adv/translation-table.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0225616d..d2a843fd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2996,8 +2996,21 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, vlan = batadv_orig_node_vlan_get(orig_node, ntohs(tt_vlan_tmp->vid)); - if (!vlan) - return false; + if (!vlan) { + /* Due to a bug, some originators send TT + * announcements for empty vlans. As the receiving + * nodes will ignore those empty vlans (they do not + * add a batadv_orig_node_vlan into the transglobal + * for the originating node), crc check will fail + * here. To circumvent this issue, we skip the + * verification for the vlan if the crc is + * equal to 0x00000000. + */ + if (tt_vlan_tmp->crc == 0x00000000) + continue; + else + return false; + } crc = vlan->tt.crc; batadv_orig_node_vlan_put(vlan); -- 2.17.0

6 15

[B.A.T.M.A.N.] [PATCH v3 maint] batman-adv: Fix TT sync flags for intermediate TT responses
by Linus Lüssing 11 May '18

11 May '18

The previous TT sync fix so far only fixed TT responses issued by the target node directly. So far, TT responses issued by intermediate nodes still lead to the wrong flags being added, leading to CRC mismatches. This behaviour was observed at Freifunk Hannover in a 800 nodes setup where a considerable amount of nodes were still infected with 'WI' TT flags even with (most) nodes having the previous TT sync fix applied. I was able to reproduce the issue with intermediate TT responses in a four node test setup and this patch fixes this issue by ensuring to use the per originator instead of the summarized, OR'd ones. Fixes: fa614fd04692 ("batman-adv: fix tt_global_entries flags update") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes v3: - renamed batadv_tt_{local,global}_get_flags() back to batadv_tt_{global,local}_valid as Antonio and I could not come up with a generic naming suiting both purposes - renamed flags_cb back to valid_cb - undid the rename from orig_node to orig and just used a newline - moved the valid_cb not NULL check to the top of batadv_tt_tvlv_generate() as it is unclear what to do about the flags otherwise (technically this does not change behaviour as so far valid_cb is never and has never been NULL) Changes v2: - repurpose current valid_cb callback to get the flags -> saves us a second, duplicate orig-entry hash table lookup -> avoids the "guessing" of TT local vs. TT global / cb_data type --- net/batman-adv/translation-table.c | 60 +++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 78993dd7..5176db25 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1538,6 +1538,7 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, * handled by a given originator * @entry: the TT global entry to check * @orig_node: the originator to search in the list + * @flags: a pointer to store TT flags for the given @orig_node and @entry to * * find out if an orig_node is already in the list of a tt_global_entry. * @@ -1545,7 +1546,8 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, */ static bool batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, - const struct batadv_orig_node *orig_node) + const struct batadv_orig_node *orig_node, + u8 *flags) { struct batadv_tt_orig_list_entry *orig_entry; bool found = false; @@ -1553,6 +1555,10 @@ batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, orig_entry = batadv_tt_global_orig_entry_find(entry, orig_node); if (orig_entry) { found = true; + + if (flags) + *flags = orig_entry->flags; + batadv_tt_orig_list_entry_put(orig_entry); } @@ -1731,7 +1737,7 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, if (!(common->flags & BATADV_TT_CLIENT_TEMP)) goto out; if (batadv_tt_global_entry_has_orig(tt_global_entry, - orig_node)) + orig_node, NULL)) goto out_remove; batadv_tt_global_del_orig_list(tt_global_entry); goto add_orig_entry; @@ -2880,23 +2886,46 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv, } /** - * batadv_tt_local_valid() - verify that given tt entry is a valid one + * batadv_tt_local_valid() - verify local tt entry and get flags * @entry_ptr: to be checked local tt entry * @data_ptr: not used but definition required to satisfy the callback prototype + * @flags: a pointer to store TT flags for this client to + * + * Checks the validity of the given local TT entry. If it is, then the provided + * flags pointer is updated. * * Return: true if the entry is a valid, false otherwise. */ -static bool batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr) +static bool batadv_tt_local_valid(const void *entry_ptr, + const void *data_ptr, + u8 *flags) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW) return false; + + if (flags) + *flags = tt_common_entry->flags; + return true; } +/** + * batadv_tt_global_valid() - verify global tt entry and get flags + * @entry_ptr: to be checked global tt entry + * @data_ptr: an orig_node object (may be NULL) + * @flags: a pointer to store TT flags to + * + * Checks the validity of the given global TT entry. If it is, then the provided + * flags pointer is updated either with the common (summed) TT flags if data_ptr + * is NULL or the specific, per originator TT flags otherwise. + * + * Return: true if the entry is a valid, false otherwise. + */ static bool batadv_tt_global_valid(const void *entry_ptr, - const void *data_ptr) + const void *data_ptr, + u8 *flags) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; const struct batadv_tt_global_entry *tt_global_entry; @@ -2910,7 +2939,8 @@ static bool batadv_tt_global_valid(const void *entry_ptr, struct batadv_tt_global_entry, common); - return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node); + return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node, + flags); } /** @@ -2920,25 +2950,34 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * @hash: hash table containing the tt entries * @tt_len: expected tvlv tt data buffer length in number of bytes * @tvlv_buff: pointer to the buffer to fill with the TT data - * @valid_cb: function to filter tt change entries + * @valid_cb: function to filter tt change entries and to return TT flags * @cb_data: data passed to the filter function as argument + * + * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb + * is not provided then this becomes a no-op. */ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, struct batadv_hashtable *hash, void *tvlv_buff, u16 tt_len, bool (*valid_cb)(const void *, - const void *), + const void *, + u8 *flags), void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; struct hlist_head *head; u16 tt_tot, tt_num_entries = 0; + u8 flags; + bool ret; u32 i; tt_tot = batadv_tt_entries(tt_len); tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff; + if (!valid_cb) + return; + rcu_read_lock(); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -2948,11 +2987,12 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, if (tt_tot == tt_num_entries) break; - if ((valid_cb) && (!valid_cb(tt_common_entry, cb_data))) + ret = valid_cb(tt_common_entry, cb_data, &flags); + if (!ret) continue; ether_addr_copy(tt_change->addr, tt_common_entry->addr); - tt_change->flags = tt_common_entry->flags; + tt_change->flags = flags; tt_change->vid = htons(tt_common_entry->vid); memset(tt_change->reserved, 0, sizeof(tt_change->reserved)); -- 2.11.0

2 2

[B.A.T.M.A.N.] [RFC maint] batman-adv: fix adding VLANs with partial state
by Marek Lindner 10 May '18

10 May '18

Whenever a new VLAN is created on top of batman virtual interfaces the batman-adv kernel module creates internal structures to track the status of said VLAN. Amongst other things, the MAC address of the VLAN interface itself has to be stored. Without this change a VLAN and its infrastructure could be created while the interface MAC address is not stored without triggering any error, thus creating issues in other parts of the code. Prevent the VLAN from being created if the MAC address can not be stored. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/soft-interface.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index edeffcb9..f7c3a313 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -572,6 +572,7 @@ struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv, int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) { struct batadv_softif_vlan *vlan; + bool client_added; int err; vlan = batadv_softif_vlan_get(bat_priv, vid); @@ -604,13 +605,18 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) /* add a new TT local entry. This one will be marked with the NOPURGE * flag */ - batadv_tt_local_add(bat_priv->soft_iface, - bat_priv->soft_iface->dev_addr, vid, - BATADV_NULL_IFINDEX, BATADV_NO_MARK); + client_added = batadv_tt_local_add(bat_priv->soft_iface, + bat_priv->soft_iface->dev_addr, vid, + BATADV_NULL_IFINDEX, BATADV_NO_MARK); /* don't return reference to new softif_vlan */ batadv_softif_vlan_put(vlan); + if (!client_added) { + batadv_softif_destroy_vlan(bat_priv, vlan); + return -ENOENT; + } + return 0; } @@ -648,6 +654,7 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, { struct batadv_priv *bat_priv = netdev_priv(dev); struct batadv_softif_vlan *vlan; + bool client_added; int ret; /* only 802.1Q vlans are supported. @@ -683,9 +690,14 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, * flag. This must be added again, even if the vlan object already * exists, because the entry was deleted by kill_vid() */ - batadv_tt_local_add(bat_priv->soft_iface, - bat_priv->soft_iface->dev_addr, vid, - BATADV_NULL_IFINDEX, BATADV_NO_MARK); + client_added = batadv_tt_local_add(bat_priv->soft_iface, + bat_priv->soft_iface->dev_addr, vid, + BATADV_NULL_IFINDEX, BATADV_NO_MARK); + + if (!client_added) { + batadv_softif_destroy_vlan(bat_priv, vlan); + return -ENOENT; + } return 0; } -- 2.17.0

3 3

[B.A.T.M.A.N.] [PATCH v2 maint] batman-adv: Fix TT sync flags for intermediate TT responses
by Linus Lüssing 10 May '18

10 May '18

The previous TT sync fix so far only fixed TT responses issued by the target node directly. So far, TT responses issued by intermediate nodes still lead to the wrong flags being added, leading to CRC mismatches. This behaviour was observed at Freifunk Hannover in a 800 nodes setup where a considerable amount of nodes were still infected with 'WI' TT flags even with (most) nodes having the previous TT sync fix applied. I was able to reproduce the issue with intermediate TT responses in a four node test setup and this patch fixes this issue by ensuring to use the per originator instead of the summarized, OR'd ones. Fixes: fa614fd04692 ("batman-adv: fix tt_global_entries flags update") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes v2: - repurpose current valid_cb callback to get the flags -> saves us a second, duplicate orig-entry hash table lookup -> avoids the "guessing" of TT local vs. TT global / cb_data type --- net/batman-adv/translation-table.c | 62 +++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 78993dd7..511cad0e 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1538,6 +1538,7 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, * handled by a given originator * @entry: the TT global entry to check * @orig_node: the originator to search in the list + * @flags: a pointer to store flags to (may be NULL) * * find out if an orig_node is already in the list of a tt_global_entry. * @@ -1545,7 +1546,8 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, */ static bool batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, - const struct batadv_orig_node *orig_node) + const struct batadv_orig_node *orig_node, + u8 *flags) { struct batadv_tt_orig_list_entry *orig_entry; bool found = false; @@ -1553,6 +1555,10 @@ batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, orig_entry = batadv_tt_global_orig_entry_find(entry, orig_node); if (orig_entry) { found = true; + + if (flags) + *flags = orig_entry->flags; + batadv_tt_orig_list_entry_put(orig_entry); } @@ -1731,7 +1737,7 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, if (!(common->flags & BATADV_TT_CLIENT_TEMP)) goto out; if (batadv_tt_global_entry_has_orig(tt_global_entry, - orig_node)) + orig_node, NULL)) goto out_remove; batadv_tt_global_del_orig_list(tt_global_entry); goto add_orig_entry; @@ -2880,27 +2886,49 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv, } /** - * batadv_tt_local_valid() - verify that given tt entry is a valid one + * batadv_tt_local_get_flags() - verify local tt entry and get flags * @entry_ptr: to be checked local tt entry * @data_ptr: not used but definition required to satisfy the callback prototype + * @flags: a pointer to store flags to + * + * Checks the validity of the given local TT entry. If it is, then the provided + * flags pointer is updated. * * Return: true if the entry is a valid, false otherwise. */ -static bool batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr) +static bool batadv_tt_local_get_flags(const void *entry_ptr, + const void *data_ptr, + u8 *flags) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW) return false; + + *flags = tt_common_entry->flags; + return true; } -static bool batadv_tt_global_valid(const void *entry_ptr, - const void *data_ptr) +/** + * batadv_tt_global_get_flags() - verify global tt entry and get flags + * @entry_ptr: to be checked global tt entry + * @data_ptr: an orig_node object (may be NULL) + * @flags: a pointer to store flags to + * + * Checks the validity of the given global TT entry. If it is, then the provided + * flags pointer is updated either with the common (summed) TT flags if data_ptr + * is NULL or the specific, per originator TT flags otherwise. + * + * Return: true if the entry is a valid, false otherwise. + */ +static bool batadv_tt_global_get_flags(const void *entry_ptr, + const void *data_ptr, + u8 *flags) { 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; + const struct batadv_orig_node *orig = data_ptr; if (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM || tt_common_entry->flags & BATADV_TT_CLIENT_TEMP) @@ -2910,7 +2938,7 @@ static bool batadv_tt_global_valid(const void *entry_ptr, struct batadv_tt_global_entry, common); - return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node); + return batadv_tt_global_entry_has_orig(tt_global_entry, orig, flags); } /** @@ -2920,20 +2948,23 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * @hash: hash table containing the tt entries * @tt_len: expected tvlv tt data buffer length in number of bytes * @tvlv_buff: pointer to the buffer to fill with the TT data - * @valid_cb: function to filter tt change entries + * @flags_cb: function to filter tt change entries and to return flags * @cb_data: data passed to the filter function as argument */ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, struct batadv_hashtable *hash, void *tvlv_buff, u16 tt_len, - bool (*valid_cb)(const void *, - const void *), + bool (*flags_cb)(const void *, + const void *, + u8 *flags), void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; struct hlist_head *head; u16 tt_tot, tt_num_entries = 0; + u8 flags; + bool ret; u32 i; tt_tot = batadv_tt_entries(tt_len); @@ -2948,11 +2979,12 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, if (tt_tot == tt_num_entries) break; - if ((valid_cb) && (!valid_cb(tt_common_entry, cb_data))) + ret = flags_cb(tt_common_entry, cb_data, &flags); + if (!ret) continue; ether_addr_copy(tt_change->addr, tt_common_entry->addr); - tt_change->flags = tt_common_entry->flags; + tt_change->flags = flags; tt_change->vid = htons(tt_common_entry->vid); memset(tt_change->reserved, 0, sizeof(tt_change->reserved)); @@ -3247,7 +3279,7 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, /* 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, + batadv_tt_global_get_flags, req_dst_orig_node); } @@ -3376,7 +3408,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, /* 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); + batadv_tt_local_get_flags, NULL); } tvlv_tt_data->flags = BATADV_TT_RESPONSE; -- 2.11.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix argument name in kernel-doc
by Antonio Quartulli 10 May '18

10 May '18

Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- net/batman-adv/tp_meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 11520de9..55d8e4c1 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -808,7 +808,7 @@ static int batadv_tp_wait_available(struct batadv_tp_vars *tp_vars, size_t plen) /** * batadv_tp_send() - main sending thread of a tp meter session - * @arg: address of the related tp_vars + * @work: address of the related tp_vars * * Return: nothing, this function never returns */ -- 2.17.0

2 2

[B.A.T.M.A.N.] [PATCH maint v2] batman-adv: Avoid race in TT TVLV allocator helper
by Sven Eckelmann 10 May '18

10 May '18

The functions batadv_tt_prepare_tvlv_local_data and batadv_tt_prepare_tvlv_global_data are responsible for preparing a buffer which can be used to store the TVLV container for TT and add the VLAN information to it. This will be done in three phases: 1. count the number of VLANs and their entries 2. allocate the buffer using the counters from the previous step and limits from the caller (parameter tt_len) 3. insert the VLAN information to the buffer The step 1 and 3 operate on a list which contains the VLANs. The access to these lists must be protected with an appropriate lock or otherwise they might operate on on different entries. This could for example happen when another context is adding VLAN entries to this list. This could lead to a buffer overflow in these functions when enough entries were added between step 1 and 3 to the VLAN lists that the buffer room for the entries (*tt_change) is smaller then the now required extra buffer for new VLAN entries. Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - adjusted last paragraph because tt_change (third parameter "return") doesn't depend on step 3 This change is completely untested. The issue for this problem can be found in https://www.open-mesh.org/issues/354 net/batman-adv/translation-table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0225616d..7fa3a0a0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -862,7 +862,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, struct batadv_orig_node_vlan *vlan; u8 *tt_change_ptr; - rcu_read_lock(); + spin_lock_bh(&orig_node->vlan_list_lock); hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) { num_vlan++; num_entries += atomic_read(&vlan->tt.num_entries); @@ -900,7 +900,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; out: - rcu_read_unlock(); + spin_unlock_bh(&orig_node->vlan_list_lock); return tvlv_len; } @@ -936,7 +936,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, u8 *tt_change_ptr; int change_offset; - rcu_read_lock(); + spin_lock_bh(&bat_priv->softif_vlan_list_lock); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { num_vlan++; num_entries += atomic_read(&vlan->tt.num_entries); @@ -974,7 +974,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; out: - rcu_read_unlock(); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); return tvlv_len; } -- 2.17.0

2 2

[B.A.T.M.A.N.] batman-adv: Bug: Missing TT entry leads to inconsistent but stable TT state
by me 10 May '18

10 May '18

We have three nodes, which have the following topology: NDS-Agenda21Haus70 <-> sn04 <-> sn03 Something happened, so they came into a stable (for hours) but inconsistent state of their translation tables: - sn03 has 11 entries in its translocal table and crc = 0x2b6d458c - sn04 has only 10 entries in the table for sn03 but still crc = 0x2b6d458c - NDS-Agenda21Haus70 has also 10 entries in the table for sn03 but crc = 0x74fb4f96 It seems as like something (erroneously) removed the entry 33:33:00:00:00:01 from table on node sn04 without recalculating the crc sum. In the following are the outputs of the table states: root@NDS-Agenda21Haus70:~# batctl tr 88:e6:40:20:30:01 traceroute to 88:e6:40:20:30:01 (88:e6:40:20:30:01), 50 hops max, 20 byte packets 1: 88:e6:40:20:40:01 16.567 ms 20.593 ms 16.324 ms 2: 88:e6:40:20:30:01 20.760 ms 19.826 ms 19.840 ms root@NDS-Agenda21Haus70:~# batctl tg | grep 88:e6:40:20:30:01 * 33:33:ff:06:3e:25 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) * 33:33:ff:00:18:32 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) 33:33:00:00:00:02 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) 01:00:5e:00:00:fc -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) 01:00:5e:00:00:01 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) 33:33:ff:00:00:00 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) * 33:33:ff:00:30:01 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) * 2a:d7:9a:06:3e:25 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) * 33:33:ff:00:01:08 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) 33:33:00:01:00:03 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x74fb4f96) [root@sn04]:~ # batctl tg | grep 88:e6:40:20:30:01 * 33:33:ff:06:3e:25 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) * 33:33:ff:00:18:32 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) 33:33:00:00:00:02 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) 01:00:5e:00:00:fc -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) 01:00:5e:00:00:01 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) 33:33:ff:00:00:00 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) * 33:33:ff:00:30:01 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) * 2a:d7:9a:06:3e:25 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) * 33:33:ff:00:01:08 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) 33:33:00:01:00:03 -1 [....] ( 3) 88:e6:40:20:30:01 ( 3) (0x2b6d458c) [root@sn03]:~ # batctl tl [B.A.T.M.A.N. adv 2018.0-3-g4b2b8c68, MainIF/MAC: mesh_fastd/88:e6:40:20:30:01 (bat0/2a:d7:9a:06:3e:25 BATMAN_IV), TTVN: 3] Client VID Flags Last seen (CRC ) 33:33:ff:06:3e:25 -1 [.P....] 0.000 (0x2b6d458c) 33:33:ff:00:18:32 -1 [.P....] 0.000 (0x2b6d458c) 33:33:00:00:00:02 -1 [.P....] 0.000 (0x2b6d458c) 01:00:5e:00:00:fc -1 [.P....] 0.000 (0x2b6d458c) 01:00:5e:00:00:01 -1 [.P....] 0.000 (0x2b6d458c) 33:33:ff:00:00:00 -1 [.P....] 0.000 (0x2b6d458c) 33:33:ff:00:30:01 -1 [.P....] 0.000 (0x2b6d458c) 2a:d7:9a:06:3e:25 -1 [.P....] 0.000 (0x2b6d458c) 33:33:ff:00:01:08 -1 [.P....] 0.000 (0x2b6d458c) 33:33:00:01:00:03 -1 [.P....] 0.000 (0x2b6d458c) 33:33:00:00:00:01 -1 [.P....] 0.000 (0x2b6d458c) In the attachment, I added a capture of the received full table response from sn04 -> NDS-Agenda21Haus70 taken on NDS-Agenda21Haus70. I checked, that this is really an intermediate response of sn04 and not a direct response from sn03 (sn03 is not receiving queries from NDS-Agenda21Haus70). Kind regards, Leonardo Mörlein

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Avoid race in TT TVLV allocator helper
by Sven Eckelmann 09 May '18

09 May '18

The functions batadv_tt_prepare_tvlv_local_data and batadv_tt_prepare_tvlv_global_data are responsible for preparing a buffer which can be used to store the TVLV container for TT and add the VLAN information to it. This will be done in three phases: 1. count the number of VLANs and their entries 2. allocate the buffer using the counters from the previous step and limits from the caller (parameter tt_len) 3. insert the VLAN information to the buffer The step 1 and 3 operate on a list which contains the VLANs. The access to these lists must be protected with an appropriate lock or otherwise they might operate on on different entries. This could for example happen when another context is adding VLAN entries to this list. This could lead to a buffer overflow in these functions when enough entries are added to the VLAN lists that the extra buffer for the entries is smaller then the now required extra buffer for new VLAN entries. Or the buffer overflow can happen when the caller now does no longer gets its requested extra buffer size tt_len. Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This change is completely untested. The issue for this problem can be found in https://www.open-mesh.org/issues/354 net/batman-adv/translation-table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0225616d..7fa3a0a0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -862,7 +862,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, struct batadv_orig_node_vlan *vlan; u8 *tt_change_ptr; - rcu_read_lock(); + spin_lock_bh(&orig_node->vlan_list_lock); hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) { num_vlan++; num_entries += atomic_read(&vlan->tt.num_entries); @@ -900,7 +900,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; out: - rcu_read_unlock(); + spin_unlock_bh(&orig_node->vlan_list_lock); return tvlv_len; } @@ -936,7 +936,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, u8 *tt_change_ptr; int change_offset; - rcu_read_lock(); + spin_lock_bh(&bat_priv->softif_vlan_list_lock); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { num_vlan++; num_entries += atomic_read(&vlan->tt.num_entries); @@ -974,7 +974,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; out: - rcu_read_unlock(); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); return tvlv_len; } -- 2.17.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2018