B.A.T.M.A.N August 2013

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

12 participants
45 discussions

[B.A.T.M.A.N.] [PATCH 00/10] Improving the routing protocol abstraction
by Antonio Quartulli 10 Aug '13

10 Aug '13

Hello list, After two iterations of this patchset as RFC, I'm here sending the first real PATCH series :) This patchset is introducing a new set of routing API functions meant to improve the routing protocol abstraction. Also the orig_node and the neigh_node structure have been heavily modified in order to split their generic members from those which are metric related. (the rest of the message is what you already had in the RFC cover letter). This changes have been written while developing batman V. The latter helped me in understanding what batman iv and v have in common and what not. The main problem was the metric: the two protocols use different metric domains and different semantics. Therefore all the functions handling/printing the metric needed to be generalised and rearranged to let the protocols decide what to do. Another issue was the way routing protocols handle the orig and neigh node structures. Also these two have been changed and some small APIs have been provided as well. Moreover, after Simon's RFC about the new multi-interface optimisation, we saw the need for a better abstraction so that mechanisms like that could easily be re-used by new algorithms (like batman v) with little effort. This is the second version of this RFC where I introduced some changes to the names of some functions and some other minor changes discussed in the previous RFC thread. + metric related: - bat_metric_get - bat_metric_is_equiv_or_better - bat_metric_compare + orig_node related: - bat_orig_print: print the originator table - bat_orig_free - bat_orig_add_if - bat_orig_del_if Cheers, Antonio Quartulli (10): batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print function API batman-adv: add bat_metric_get API function batman-adv: add bat_metric_is_equiv_or_better API function batman-adv: add bat_metric_compare API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions bat_iv_ogm.c | 358 +++++++++++++++++++++++++++++++++++++++++++--------- gateway_client.c | 16 +-- main.c | 5 +- main.h | 6 + network-coding.c | 8 +- originator.c | 230 +++++++-------------------------- originator.h | 5 +- routing.c | 35 +++-- routing.h | 3 +- translation-table.c | 31 +++-- types.h | 85 +++++++++---- 11 files changed, 476 insertions(+), 306 deletions(-) -- 1.8.1.5

1 10

[B.A.T.M.A.N.] [RFCv2 00/10] Improving the routing protocol abstraction
by Antonio Quartulli 10 Aug '13

10 Aug '13

Hello list, with this RFC I'd like to introduce some new routing API functions meant to improve the routing protocol abstraction. This changes have been written while developing batman V. The latter helped me in understanding what batman iv and v have in common and what not. The main problem was the metric: the two protocols use different metric domains and different semantics. Therefore all the functions handling/printing the metric needed to be generalised and rearranged to let the protocols decide what to do. Another issue was the way routing protocols handle the orig and neigh node structures. Also these two have been changed and some small APIs have been provided as well. Moreover, after Simon's RFC about the new multi-interface optimisation, we saw the need for a better abstraction so that mechanisms like that could easily be re-used by new algorithms (like batman v) with little effort. This is the second version of this RFC where I introduced some changes to the names of some functions and some other minor changes discussed in the previous RFC thread. The new API functions are the following: + metric related: - bat_metric_get - bat_metric_is_similar - bat_metric_compare + orig_node related: - bat_orig_print: print the originator table - bat_orig_add_if - bat_orig_del_if - bat_orig_free Any feedback will surely be welcome :-) Cheers, Antonio Quartulli (10): batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print function API batman-adv: add bat_metric_get API function batman-adv: add bat_metric_is_equiv_or_better API function batman-adv: add bat_metric_compare API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions bat_iv_ogm.c | 359 +++++++++++++++++++++++++++++++++++++++++++--------- gateway_client.c | 16 +-- main.c | 5 +- main.h | 6 + network-coding.c | 8 +- originator.c | 230 +++++++-------------------------- originator.h | 5 +- routing.c | 37 ++++-- routing.h | 3 +- translation-table.c | 31 +++-- types.h | 86 +++++++++---- 11 files changed, 480 insertions(+), 306 deletions(-) -- 1.8.1.5

2 18

[B.A.T.M.A.N.] Alfred, Unix connections randomly refusing a connection
by Joshua Head 09 Aug '13

09 Aug '13

Hey, Just querying for some information on the best way to debug Alfred. It's currently at random points in time, independent of each node refusing to connect to a Linux socket. We have 4 nodes and the refusal is only localised that particular node. Restarting Alfred helps. But it's not a long term solution. We are very interested in Alfred. It solves a lot of our problems with our scripts. Basically if you have any direction for debugging it, or need any dumps. Feel free to ask. As far as I'm aware the Alfred is working, it's updating our test script. Just randomly stops accepting connections. Thanks, Joshua Head

2 1

[B.A.T.M.A.N.] [PATCHv2 0/2] TT-VLAN: BLA2 integration
by Antonio Quartulli 08 Aug '13

08 Aug '13

Hello people, this is the last patchset of the TT-VLAN series and requires the last one to be applied (per-VLAN TT CRC). In a few words... These changes enable BLA2 to filter only those TT entries belonging to the VLAN where BLA discovered other backbone nodes. The current code instead assumes that _all_ the local clients are shared among the backbones, despite of the VLAN used to interconnect them. Example. Imagine 2 nodes having several vlans over the wired connection. Node1 having eth0.1 and eth0.2 Node2 having eth0.1 and eth0.3 Node1 and Node2 are connected using a cable and so they hear each other on eth0.1. Clients connected to eth0.2 and eth0.3 are reachable only through the respective nodes therefore, if Node1 wanted to talk to a client connected to eth0.3 needs to know that it is served by Node2. In the current implementation this is not possible because BLA would consider all the clients reachable through any node of the LAN and will reject all the global TT entries from any other backbone, so losing this TT information. With this patchset, instead, BLA will detect that the backbone connection is only over eth0.1 and so will continue to store all the global clients belonging to the other VLANs. I hope the example did not create more confusion :) Cheers, Changes from v1: - fixed kernel doc Antonio Quartulli (2): batman-adv: make the TT global purge routine VLAN specific batman-adv: make the backbone gw check VLAN specific bridge_loop_avoidance.c | 23 +++++++++++--------- bridge_loop_avoidance.h | 10 +++++---- originator.c | 2 +- routing.c | 2 +- translation-table.c | 58 ++++++++++++++++++++++--------------------------- translation-table.h | 2 +- 6 files changed, 48 insertions(+), 49 deletions(-) -- 1.8.1.5

2 4

[B.A.T.M.A.N.] [PATCH next] batman-adv: use proper network order conversion
by Antonio Quartulli 08 Aug '13

08 Aug '13

Introduced by eb7643628a608cb338d48d298ce7ca15fadfb239 ("batman-adv: set skb priority according to content") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index ed97382..58c98b6 100644 --- a/main.c +++ b/main.c @@ -283,7 +283,7 @@ void batadv_skb_set_priority(struct sk_buff *skb, int offset) sizeof(*vhdr), &vhdr_tmp); if (!vhdr) return; - prio = htons(vhdr->h_vlan_TCI) & VLAN_PRIO_MASK; + prio = ntohs(vhdr->h_vlan_TCI) & VLAN_PRIO_MASK; prio = prio >> VLAN_PRIO_SHIFT; break; case htons(ETH_P_IP): -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat compile error
by Marek Lindner 08 Aug '13

08 Aug '13

Introduced by e4ff5c153dab054a6cd1c4132f87bc5e77127456 ("batman-adv: add sysfs framework for VLAN") Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat.c b/compat.c index fcd5bec..68c2258 100644 --- a/compat.c +++ b/compat.c @@ -31,7 +31,7 @@ void batadv_free_rcu_orig_vlan(struct rcu_head *rcu) { struct batadv_orig_node_vlan *vlan; - vlan = container_of(rcu, structbatadv_orig_node_vlan, rcu); + vlan = container_of(rcu, struct batadv_orig_node_vlan, rcu); kfree(vlan); } -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: fix memory leak in batadv_softif_create_vlan()
by Antonio Quartulli 08 Aug '13

08 Aug '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Introduced by e4ff5c153dab054a6cd1c4132f87bc5e77127456 ("batman-adv: add sysfs framework for VLAN") Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- soft-interface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 7cd23f5..d018c49 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -457,17 +457,20 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) vlan->vid = vid; atomic_set(&vlan->refcount, 1); + atomic_set(&vlan->ap_isolation, 0); + + err = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); + if (err) { + kfree(vlan); + return err; + } + /* 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); - atomic_set(&vlan->ap_isolation, 0); - - err = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); - if (err) - return err; spin_lock_bh(&bat_priv->softif_vlan_list_lock); hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix memory leak in batadv_softif_create_vlan()
by Antonio Quartulli 08 Aug '13

08 Aug '13

2 2

[B.A.T.M.A.N.] [PATCH] batctl: make the TT CRC logic VLAN specific
by Antonio Quartulli 08 Aug '13

08 Aug '13

From: Antonio Quartulli <antonio(a)open-mesh.com> This change allows nodes to handle the TT table on a per-VLAN basis. This is needed because nodes may have to store only some of the global entries advertised by another node. In this scenario such nodes would re-create only a partial global table and would not be able to compute a correct CRC anymore. This patch splits the logic and introduces one CRC per VLAN. In this way a node fetching only some entries belonging to some VLANs is still able to compute the needed CRCs and still check the table correctness. With this patch the shape of the TVLV-TT is changed too because now a node needs to advertise all the CRCs of all the VLANs that it is wired to. The debug output of the local Translation Table now shows the CRC along with each entry since there is not a common value for the entire table anymore. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- packet.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packet.h b/packet.h index 08e175a..f4bbb05 100644 --- a/packet.h +++ b/packet.h @@ -391,14 +391,26 @@ struct batadv_tvlv_gateway_data { * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number - * @reserved: field reserved for future use - * @crc: crc32 checksum of the local translation table + * @vlan_num: number of announced VLANs. In the TVLV this struct is followed by + * one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data { uint8_t flags; uint8_t ttvn; + __be16 num_vlan; +}; + +/** + * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through + * the tt tvlv container + * @crc: crc32 checksum of the entries belonging to this vlan + * @vid: vlan identifier + * @reserved: unused, useful for alignment purposes + */ +struct batadv_tvlv_tt_vlan_data { + __be32 crc; + __be16 vid; uint16_t reserved; - __be32 crc; }; /** -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv9 0/2] per-VLAN TT CRC
by Antonio Quartulli 07 Aug '13

07 Aug '13

This is the second patchset of the TT-VLAN improvement. It brings a not negligible change into the TT logic since it is splitting the CRC mechanism on a per-VLAN basis. Since it is not so easy to digest I decided to send it alone. This change is required by an improvement which will come right after: VLAN based TT filtering for BLA2 enabled nodes (third patchset of the TT-VLAN feature). In a few words.... Right now a backbone node rejects any TT entry announced by another backbone. With this change it will be possible to filter out only those TT entries belonging to the VLAN where BLA2 is running on. In this way, the others VLANs will still be able to contact each other. Before implementing the new feature, the first patch is introducing a new lock to make any change to the local and global TT table atomic. In this way a TT Reply cannot be sent during a writing operation on one of the TT tables. This will prevent the TT Reply from containing any inconsistent data. Thank you for the feedback! Cheers, Changes from v8: - removed bogus kernel doc in 2/2 Changes from v7: - improved kernel doc and commit message in 1/2 - fixed some kernel doc typ0s in 2/2 - moved change_offset computation inside batadv_tt_prepare_tvlv_global_data() and batadv_tt_prepare_tvlv_local_data() to avoid code replication in 2/2 Changes from v6: - remove orig_node_vlan from the list after freeing - introduce locking around TT operations with 1/2 - fixed refcounting - fixed style Antonio Quartulli (2): batman-adv: lock around TT operations to avoid sending inconsistent data batman-adv: make the TT CRC logic VLAN specific compat.c | 9 + compat.h | 1 + main.c | 1 + originator.c | 102 +++++++- originator.h | 7 + packet.h | 18 +- translation-table.c | 738 ++++++++++++++++++++++++++++++++++++++++++---------- types.h | 54 +++- 8 files changed, 772 insertions(+), 158 deletions(-) -- 1.8.1.5

2 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N August 2013