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.] [PATCH] batman-adv: (style) fix for switched vid-ifiindex parameter order
by Linus Lüssing 14 Jun '13

14 Jun '13

batadv_tt_local_add() first takes the vid and then the interface index parameter. One of these calls had the order switched. However in this case it is not a functional, but just a style fix because at the moment BATADV_NO_FLAGS is equal to BATADV_NULL_IFINDEX. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index f2f1137..a7ad6cb 100644 --- a/main.c +++ b/main.c @@ -128,7 +128,7 @@ int batadv_mesh_init(struct net_device *soft_iface) goto err; batadv_tt_local_add(soft_iface, soft_iface->dev_addr, - BATADV_NULL_IFINDEX, BATADV_NO_FLAGS); + BATADV_NO_FLAGS, BATADV_NULL_IFINDEX); ret = batadv_bla_init(bat_priv); if (ret < 0) -- 1.7.10.4

2 1

[B.A.T.M.A.N.] pull request for net: batman-adv 2013-06-11
by Antonio Quartulli 13 Jun '13

13 Jun '13

Hello David, here you have three patches intended for net/linux-3.10. Patch 1/3 is substituting a rtnl_trylock with a rtnl_lock. The trylock was used before to avoid deadlock, but since this situation has been fixed, the trylock is not necessary anymore. It only creates troubles every time batman-adv is initialised and the RTNL lock is taken by another component. Since the deadlock has been fixed in 3.8, I'd like to queue this patch for stable for 3.8+. Patch 2/3 fixes an important point in our routing protocol, in particular in the duplicate control messages detection. In the right condition, the protocol prevents some control packets to be forwarded making some nodes in the network totally unreachable and so breaking the mesh. The fix, by Simon Wunderlich, enhances the duplicate message detection and avoids this situation (the change may look a bit big, but it is just because a variable has been changed from int to enum to better describe the duplicate packet event). Please, enqueue this patch for -stable because the bug is there since a while.. Patch 3/3 fixes the Bridge Loop Avoidance component by avoiding a particular routine to run even if the aforementioned feature is off. This bug leads to some useless packets to be sent over the mesh. This one is not critical and therefore does not need to be enqueued for stable. Please pull or let me know if there is any problem! Thanks a lot, Antonio The following changes since commit 40edeff6e1c6f9a6f16536ae3375e3af9d648449: net_sched: qdisc_get_rtab() must check data[] array (2013-06-07 15:24:04 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to d5b4c93e67b0b1291aa8e2aaf694e40afc3412d0: batman-adv: Don't handle address updates when bla is disabled (2013-06-10 08:42:18 +0200) ---------------------------------------------------------------- Included change: - fix "rtnl locked" concurrent executions by using rtnl_lock instead of rtnl_trylock. This fix enables batman-adv initialisation to do not fail just because somewhere else in the system another code path is holding the rtnl lock. It is easy to see the problem when batman-adv is trying to start together with other networking components. - fix the routing protocol forwarding policy by enhancing the duplicate control packet detection. When the right circumstances trigger the issue, some nodes in the network become totally unreachable, so breaking the mesh connectivity. - fix the Bridge Loop Avoidance component by not running the originator address change handling routine when the component is disabled. The routine was generating useless packets that were sent over the network. ---------------------------------------------------------------- Matthias Schiffer (1): batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken Simon Wunderlich (2): batman-adv: forward late OGMs from best next hop batman-adv: Don't handle address updates when bla is disabled net/batman-adv/bat_iv_ogm.c | 86 ++++++++++++++++++++++------------ net/batman-adv/bridge_loop_avoidance.c | 4 ++ net/batman-adv/sysfs.c | 5 +- 3 files changed, 60 insertions(+), 35 deletions(-)

3 7

[B.A.T.M.A.N.] Basic Multicast Optimizations
by Linus Lüssing 12 Jun '13

12 Jun '13

This is the fourth revision of the basic multicast optimization patches. It adds a missing enum keyword to the return type of a mcast_forw_mode(). Cheers, Linus

2 7

[B.A.T.M.A.N.] [PATCHv5 1/2] batman-adv: add per VLAN interface attribute framework
by Antonio Quartulli 12 Jun '13

12 Jun '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Since batman-adv is now fully VLAN-aware, a proper framework able to handle per-vlan-interface attributes is needed. Those attributes will affect the associated VLAN interface only, rather than the real soft_iface (which would result in every vlan interface having the same attribute configuration) To make the code simpler and easier to extend, attributes associated to the standalone soft_iface are now treated like belonging to yet another vlan having a special vid. This vid is different from the others because it is made up by all zeros and the VLAN_HAS_TAG bit is not set. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- v5: - tt-vlan patchset has been divided in several small patchsets (this is the first one) - change about bat0 being treated like another vlan has been merged in this patch - patch anticipating sysfs creation has been dropped. It could lead to race conditions compat.c | 9 ++++ compat.h | 24 +++++++++ hard-interface.c | 2 + main.c | 5 +- soft-interface.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ soft-interface.h | 1 + types.h | 21 ++++++++ 7 files changed, 204 insertions(+), 3 deletions(-) diff --git a/compat.c b/compat.c index da556a4..0a98fb7 100644 --- a/compat.c +++ b/compat.c @@ -27,6 +27,15 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) +void batadv_free_rcu_softif_vlan(struct rcu_head *rcu) +{ + struct batadv_softif_vlan *vlan; + + vlan = container_of(rcu, struct batadv_softif_vlan, rcu); + + kfree(vlan); +} + void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu) { struct batadv_tt_global_entry *global; diff --git a/compat.h b/compat.h index dbf1926..1ee0467 100644 --- a/compat.h +++ b/compat.h @@ -182,6 +182,7 @@ static const struct { \ #define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, batadv_free_rcu_##ptr) #define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) +void batadv_free_rcu_softif_vlan(struct rcu_head *rcu); void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu); void batadv_free_rcu_gw_node(struct rcu_head *rcu); void batadv_free_rcu_neigh_node(struct rcu_head *rcu); @@ -300,6 +301,29 @@ static int __batadv_interface_set_mac_addr(x, y) #include <linux/if_vlan.h> #define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid) +#define NETIF_F_HW_VLAN_CTAG_FILTER NETIF_F_HW_VLAN_FILTER + +#define batadv_interface_add_vid(x, y, z) \ +__batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static int batadv_interface_add_vid(struct net_device *dev, unsigned short vid)\ +{\ + return __batadv_interface_add_vid(dev, htons(ETH_P_8021Q), vid);\ +} \ +static int __batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + +#define batadv_interface_kill_vid(x, y, z) \ +__batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static int batadv_interface_kill_vid(struct net_device *dev,\ + unsigned short vid)\ +{\ + return __batadv_interface_kill_vid(dev, htons(ETH_P_8021Q), vid);\ +} \ +static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + #endif /* vlan_insert_tag */ #endif /* < KERNEL_VERSION(3, 10, 0) */ diff --git a/hard-interface.c b/hard-interface.c index d564af2..c5f871f 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -643,6 +643,8 @@ static int batadv_hard_if_event(struct notifier_block *this, if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) { batadv_sysfs_add_meshif(net_dev); + bat_priv = netdev_priv(net_dev); + batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS); return NOTIFY_DONE; } diff --git a/main.c b/main.c index f2f1137..fd7fac0 100644 --- a/main.c +++ b/main.c @@ -109,6 +109,7 @@ int batadv_mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->gw.list_lock); spin_lock_init(&bat_priv->tvlv.container_list_lock); spin_lock_init(&bat_priv->tvlv.handler_list_lock); + spin_lock_init(&bat_priv->softif_vlan_list_lock); INIT_HLIST_HEAD(&bat_priv->forw_bat_list); INIT_HLIST_HEAD(&bat_priv->forw_bcast_list); @@ -118,6 +119,7 @@ int batadv_mesh_init(struct net_device *soft_iface) INIT_LIST_HEAD(&bat_priv->tt.roam_list); INIT_HLIST_HEAD(&bat_priv->tvlv.container_list); INIT_HLIST_HEAD(&bat_priv->tvlv.handler_list); + INIT_LIST_HEAD(&bat_priv->softif_vlan_list); ret = batadv_originator_init(bat_priv); if (ret < 0) @@ -127,9 +129,6 @@ int batadv_mesh_init(struct net_device *soft_iface) if (ret < 0) goto err; - batadv_tt_local_add(soft_iface, soft_iface->dev_addr, - BATADV_NULL_IFINDEX, BATADV_NO_FLAGS); - ret = batadv_bla_init(bat_priv); if (ret < 0) goto err; diff --git a/soft-interface.c b/soft-interface.c index d897194..f7552c5 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -384,6 +384,148 @@ out: return; } +/** + * batadv_softif_vlan_free_ref - decrease the vlan object refcounter and + * possibly free it + * @softif_vlan: the vlan object to release + */ +static void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) +{ + if (atomic_dec_and_test(&softif_vlan->refcount)) + kfree_rcu(softif_vlan, rcu); +} + +/** + * batadv_softif_vlan_get - get the vlan object for a specific vid + * @bat_priv: the bat priv with all the soft interface information + * @vid: the identifier of the vlan object to retrieve + * + * Return the private data of the vlan matching the vid passed as argument or + * NULL otherwise. The refcounter of the returned object is incremented by 1. + */ +static struct batadv_softif_vlan * +batadv_softif_vlan_get(struct batadv_priv *bat_priv, unsigned short vid) +{ + struct batadv_softif_vlan *vlan, *vlan_tmp = NULL; + + rcu_read_lock(); + list_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + if (vlan->vid != vid) + continue; + + if (!atomic_inc_not_zero(&vlan->refcount)) + continue; + + vlan_tmp = vlan; + break; + } + rcu_read_unlock(); + + return vlan_tmp; +} + +/** + * batadv_create_vlan - allocate the needed resources for a new vlan + * @bat_priv: the bat priv with all the soft interface information + * @vid: the VLAN identifier + * + * Return 0 on success, a negative error otherwise. + */ +int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) +{ + struct batadv_softif_vlan *vlan; + + vlan = kzalloc(sizeof(*vlan), GFP_ATOMIC); + if (!vlan) + return -ENOMEM; + + vlan->vid = vid; + atomic_set(&vlan->refcount, 1); + + /* 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); + + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + list_add_rcu(&vlan->list, &bat_priv->softif_vlan_list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + + return 0; +} + +/** + * batadv_interface_add_vid - ndo_add_vid API implementation + * @dev: the netdev of the mesh interface + * @vid: identifier of the new vlan + * + * Set up all the internal structures for handling the new vlan on top of the + * mesh interface + * + * Return 0 on success or a negative error code in case of failure + */ +static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, + unsigned short vid) +{ + struct batadv_priv *bat_priv = netdev_priv(dev); + + /* only 802.1Q vlans are supported. + * batman-adv does not know how to handle other types + */ + if (proto != htons(ETH_P_8021Q)) + return -EINVAL; + + vid |= BATADV_VLAN_HAS_TAG; + + return batadv_softif_create_vlan(bat_priv, vid); +} + +/** + * batadv_interface_kill_vid - ndo_kill_vid API implementation + * @dev: the netdev of the mesh interface + * @vid: identifier of the deleted vlan + * + * Destroy all the internal structures used to handle the vlan identified by vid + * on top of the mesh interface + * + * Return 0 or -EINVAL if the specified prototype is not ETH_P_8021Q + */ +static int batadv_interface_kill_vid(struct net_device *dev, __be16 proto, + unsigned short vid) +{ + struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; + + /* only 802.1Q vlans are supported. batman-adv does not know how to + * handle other types + */ + if (proto != htons(ETH_P_8021Q)) + return -EINVAL; + + vlan = batadv_softif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG); + if (!vlan) + return -ENOENT; + + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + list_del_rcu(&vlan->list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + + /* explicitly remove the associated TT local entry because it is marked + * with the NOPURGE flag + */ + batadv_tt_local_remove(bat_priv, dev->dev_addr, vid, + "vlan interface destroyed", false); + + /* batadv_softif_vlan_get() increased the refcounter by 1 */ + batadv_softif_vlan_free_ref(vlan); + /* finally free the vlan object */ + batadv_softif_vlan_free_ref(vlan); + + return 0; +} + /* batman-adv network devices have devices nesting below it and are a special * "super class" of normal network devices; split their locks off into a * separate class since they always nest. @@ -585,6 +727,8 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_open = batadv_interface_open, .ndo_stop = batadv_interface_release, .ndo_get_stats = batadv_interface_stats, + .ndo_vlan_rx_add_vid = batadv_interface_add_vid, + .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, .ndo_set_mac_address = batadv_interface_set_mac_addr, .ndo_change_mtu = batadv_interface_change_mtu, .ndo_set_rx_mode = batadv_interface_set_rx_mode, @@ -624,6 +768,7 @@ static void batadv_softif_init_early(struct net_device *dev) dev->netdev_ops = &batadv_netdev_ops; dev->destructor = batadv_softif_free; + dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; dev->tx_queue_len = 0; /* can't call min_mtu, because the needed variables diff --git a/soft-interface.h b/soft-interface.h index 2f2472c..16d9be6 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -28,5 +28,6 @@ struct net_device *batadv_softif_create(const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; +int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid); #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ diff --git a/types.h b/types.h index 20a1bef..9fdf2c2 100644 --- a/types.h +++ b/types.h @@ -530,6 +530,22 @@ struct batadv_priv_nc { struct batadv_hashtable *decoding_hash; }; +/* + * struct batadv_softif_vlan - per VLAN attributes set + * @vid: VLAN identifier + * @kobj: kobject for sysfs vlan subdirectory + * @list: list node for bat_priv::softif_vlan_list + * @refcount: number of context where this object is currently in use + * @rcu: struct used for freeing in a RCU-safe manner + */ +struct batadv_softif_vlan { + unsigned short vid; + struct kobject *kobj; + struct list_head list; + atomic_t refcount; + struct rcu_head rcu; +}; + /** * struct batadv_priv - per mesh interface data * @mesh_state: current status of the mesh (inactive/active/deactivating) @@ -566,6 +582,9 @@ struct batadv_priv_nc { * @primary_if: one of the hard interfaces assigned to this mesh interface * becomes the primary interface * @bat_algo_ops: routing algorithm used by this mesh interface + * @softif_vlan_list: a list of softif_vlan structs, one per VLAN created on top + * of the mesh interface represented by this object + * @softif_vlan_list_lock: lock protecting softif_vlan_list * @bla: bridge loope avoidance data * @debug_log: holding debug logging relevant data * @gw: gateway data @@ -613,6 +632,8 @@ struct batadv_priv { struct work_struct cleanup_work; struct batadv_hard_iface __rcu *primary_if; /* rcu protected pointer */ struct batadv_algo_ops *bat_algo_ops; + struct list_head softif_vlan_list; + spinlock_t softif_vlan_list_lock; /* protects softif_vlan_list */ #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_priv_bla bla; #endif -- 1.8.1.5

1 1

Re: [B.A.T.M.A.N.] batctl bw performance
by Antonio Quartulli 10 Jun '13

10 Jun '13

Hello Gabriel, first of all thank you very much for testing the bw meter :-) answers follow inline. On Mon, Jun 03, 2013 at 12:57:24PM -0300, Gabriel Tolón wrote: > Hi Antonio, > > As you suggested, I've tested the bandwidth meter with batman-adv-devel > 38a1b72. I've installed it on two TP-Link WDR-3500 routers. > oky. However, since the bw_meter has not been merged yet, its branch changes from time to time because it gets rebased on top of the very latest development code. Therefore, when you decide to update your testbed, I'd suggest you to look at: http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/ordex/bw_meter and pick the commit ID of the last patch at the top. If you have problems in doing this, please ask. > Running normal iperf inside the routers, and without unloading any kernel > module, I get 60 Mbps using UDP, 80 Mbps using TCP (I don't understand why > TCP works better), and about 4 Mbps with batctl bw -t 10000. Any ideas? By > the way, the batctl ping between routers doesn't work, I get time-out. > Besides, there's another strange behaviour, when I try to pass traffic > from a PC client connected to one router, to the other router using iperf, > if I use UDP values of about 100 Mbps, the router that receives the > traffic and redirects it, reboots. Thanks. > Ok..well, first of all I'd rather check what is wrong in the mesh. If batctl ping does not work, then it means that there is something else which is not working/configured properly. For this reason I'll first suggest you to update to this commit id: d672369 . Then, does "batctl o" properly shows the other node with a "reasonable TQ"? By the way, your iperf tests have been done on top of batman-adv? or directly on the wifi interface? Cheers, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

3 22

[B.A.T.M.A.N.] Basic Multicast Optimizations
by Linus Lüssing 10 Jun '13

10 Jun '13

This is the third revision of the basic multicast optimization patches. It includes one functional and some compat fixes, and some style improvements, thanks to Simons feedback: PATCHv3 1/3: * the pmc_rcu functions got removed - they weren't actually used in the submitted revision - so there's no more patch for net to export for_each_pmc_rcu() needed anymore. Should also fix Simon's compat error. * Compat code for netdev_for_each_mc_addr() added. (I needed to introduce a batadv_hw_addr because I wasn't able to achieve backwards compatibility with a netdev_hw_addr - my "official reasoning" will be that netdev_hw_addr is unnecessarily bloated, struct batadv_hw_addr has just the right size to do the job) * Compat fix for IFF_BRIDGE_PORT * Removed primary_if->soft_iface in batadv_mcast_mla_tt_update() as we can always use bat_priv->soft_iface instead. PATCHv3 2/3 * Renamed num_non_aware to a more specific num_no_mla - because we will need things like a num_no_tracker for instance with the multicast tracker feature in the future. * Fixed removal of orig_node's without BATADV_MCAST_LISTENER_ANNOUNCEMENT flag, update num_no_mla properly now. PATCHv3 3/3 * Renamed batadv_mcast_flood() to batadv_mcast_forw_mode() because it does not only show whether to flood or not (=drop), but also whether to forward via unicast. In the future with the multicast tracker feature a fourth return value is going to be added, making the name "batadv_mcast_flood()" even less fitting. * Simon's style suggestions for batadv_mcast_forw_mode() and batadv_interface_tx(). * batadv_mcast_forw_mode() now returns an enum (thanks to Marek and Antonio for the suggestion). I did not change: > I don't quite understand why you return -1, maybe the packet could still > be forwarded even if it could not be pulled? Because if it returns -1 then something is wrong, for instance we could be out of memory. If we are out of memory then we probably won't be able to forward any packet. Also we shouldn't allocate any more memory for one thing but I think it is also better to drop/free packets to save some memory to increase the possibility of the system to recover without crashing. Cheers, Linus

1 4

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

09 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 Somebody asked me to send the AP Isolation improvement in a separate patchset, but I did not do that because it is only one patch and it is not worth. This patchset is based on top of master plus these two patches: "batman-adv: implement batadv_tt_entries" "batman-adv: make batadv_tt_save_orig_buffer() generic" Changes from v3: - split the per-VLAN CRC patch in two: - generalise the VLAN structures to be used by the "untagged" lan - introduce per-VLAN CRC logic - initialize sysfs earlier to allow the VLAN code to create the subfolders during soft_iface init - changed path for ap_isolation in sysfs-class-net-mesh 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 (13): 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: initialise sysfs folder in softif_create() batman-adv: treat bat0 like yet another VLAN batman-adv: add sysfs framework for VLAN 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 CRC 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 +- hard-interface.c | 5 +- main.c | 72 +++- main.h | 13 +- originator.c | 100 ++++- originator.h | 7 + packet.h | 32 +- routing.c | 28 +- send.c | 8 +- send.h | 16 +- soft-interface.c | 174 +++++++- sysfs-class-net-mesh | 2 +- sysfs.c | 148 ++++++- sysfs.h | 10 + translation-table.c | 1070 +++++++++++++++++++++++++++++++++++------------ translation-table.h | 23 +- types.h | 68 ++- 22 files changed, 1613 insertions(+), 417 deletions(-) -- 1.8.1.5

2 20

[B.A.T.M.A.N.] [PATCHv2] batman-adv: forward late OGMs from best next hop
by Simon Wunderlich 09 Jun '13

09 Jun '13

From: Simon Wunderlich <simon(a)open-mesh.com> When a packet is received from another node first and later from the best next hop, this packet is dropped. However the first OGM was sent with the BATADV_NOT_BEST_NEXT_HOP flag and thus dropped by neighbors. The late OGM from the best neighbor is then dropped because it is a duplicate. If this situation happens constantly, a node might end up not forwarding the "valid" OGMs anymore, and nodes behind will starve from not getting valid OGMs. Fix this by refining the duplicate checking behaviour: The actions should depend on whether it was a duplicate for a neighbor only or for the originator. OGMs which are not duplicates for a specific neighbor will now be considered in batadv_iv_ogm_forward(), but only actually forwarded for the best next hop. Therefore, late OGMs from the best next hop are forwarded now and not dropped as duplicates anymore. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCHv1: * use enum to distinguish different duplicate states * fix typo "is_simlar -> is_similar" * remove antonios sign off (the patch changed, feel free to add it if he is ok with it, it was his idea originally ...) --- bat_iv_ogm.c | 86 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 31 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 8d87f87..2b94fdd 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -701,6 +701,21 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_hardif_free_ref(primary_if); } +/** + * batadv_dup_status - duplicate status + * @BATADV_NO_DUP: the packet is a duplicate + * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the + * neighbor) + * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor + * @BATADV_PROTECTED: originator is currently protected (after reboot) + */ +enum batadv_dup_status { + BATADV_NO_DUP = 0, + BATADV_ORIG_DUP, + BATADV_NEIGH_DUP, + BATADV_PROTECTED, +}; + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -708,7 +723,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, const struct batadv_ogm_packet *batadv_ogm_packet, struct batadv_hard_iface *if_incoming, const unsigned char *tt_buff, - int is_duplicate) + enum batadv_dup_status dup_status) { struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; struct batadv_neigh_node *router = NULL; @@ -734,7 +749,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, continue; } - if (is_duplicate) + if (dup_status != BATADV_NO_DUP) continue; spin_lock_bh(&tmp_neigh_node->lq_update_lock); @@ -774,7 +789,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, neigh_node->tq_avg = batadv_ring_buffer_avg(neigh_node->tq_recv); spin_unlock_bh(&neigh_node->lq_update_lock); - if (!is_duplicate) { + if (dup_status == BATADV_NO_DUP) { orig_node->last_ttl = batadv_ogm_packet->header.ttl; neigh_node->last_ttl = batadv_ogm_packet->header.ttl; } @@ -932,15 +947,16 @@ out: return ret; } -/* processes a batman packet for all interfaces, adjusts the sequence number and - * finds out whether it is a duplicate. +/** + * batadv_iv_ogm_update_seqnos - processes a batman packet for all interfaces, + * adjusts the sequence number and finds out whether it is a duplicate. + * @ethhdr: Ethernet header of the packet + * @batadv_ogm_packet: OGM packet to be considered + * @if_incoming: interface where the OGM packet was received + * Returns: duplicate status as enum batadv_dup_status * returns: - * 1 the packet is a duplicate - * 0 the packet has not yet been received - * -1 the packet is old and has been received while the seqno window - * was protected. Caller should drop it. - */ -static int + */ +enum batadv_dup_status batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, const struct batadv_ogm_packet *batadv_ogm_packet, const struct batadv_hard_iface *if_incoming) @@ -948,17 +964,18 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_orig_node *orig_node; struct batadv_neigh_node *tmp_neigh_node; - int is_duplicate = 0; + int is_dup; int32_t seq_diff; int need_update = 0; - int set_mark, ret = -1; + int set_mark; + enum batadv_dup_status ret = BATADV_NO_DUP; uint32_t seqno = ntohl(batadv_ogm_packet->seqno); uint8_t *neigh_addr; uint8_t packet_count; orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig); if (!orig_node) - return 0; + return BATADV_NO_DUP; spin_lock_bh(&orig_node->ogm_cnt_lock); seq_diff = seqno - orig_node->last_real_seqno; @@ -966,22 +983,29 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, /* signalize caller that the packet is to be dropped. */ if (!hlist_empty(&orig_node->neigh_list) && batadv_window_protected(bat_priv, seq_diff, - &orig_node->batman_seqno_reset)) + &orig_node->batman_seqno_reset)) { + ret = BATADV_PROTECTED; goto out; + } rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { - is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, - orig_node->last_real_seqno, - seqno); - neigh_addr = tmp_neigh_node->addr; + is_dup = batadv_test_bit(tmp_neigh_node->real_bits, + orig_node->last_real_seqno, + seqno); + if (batadv_compare_eth(neigh_addr, ethhdr->h_source) && - tmp_neigh_node->if_incoming == if_incoming) + tmp_neigh_node->if_incoming == if_incoming) { set_mark = 1; - else + if (is_dup) + ret = BATADV_NEIGH_DUP; + } else { set_mark = 0; + if (is_dup && (ret != BATADV_NEIGH_DUP)) + ret = BATADV_ORIG_DUP; + } /* if the window moved, set the update flag. */ need_update |= batadv_bit_get_packet(bat_priv, @@ -1001,8 +1025,6 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, orig_node->last_real_seqno = seqno; } - ret = is_duplicate; - out: spin_unlock_bh(&orig_node->ogm_cnt_lock); batadv_orig_node_free_ref(orig_node); @@ -1024,7 +1046,8 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, int is_bidirect; bool is_single_hop_neigh = false; bool is_from_best_next_hop = false; - int is_duplicate, sameseq, simlar_ttl; + int sameseq, similar_ttl; + enum batadv_dup_status dup_status; uint32_t if_incoming_seqno; uint8_t *prev_sender; @@ -1149,10 +1172,10 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (!orig_node) return; - is_duplicate = batadv_iv_ogm_update_seqnos(ethhdr, batadv_ogm_packet, - if_incoming); + dup_status = batadv_iv_ogm_update_seqnos(ethhdr, batadv_ogm_packet, + if_incoming); - if (is_duplicate == -1) { + if (dup_status == BATADV_PROTECTED) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: packet within seqno protection time (sender: %pM)\n", ethhdr->h_source); @@ -1224,11 +1247,12 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, * seqno and similar ttl as the non-duplicate */ sameseq = orig_node->last_real_seqno == ntohl(batadv_ogm_packet->seqno); - simlar_ttl = orig_node->last_ttl - 3 <= batadv_ogm_packet->header.ttl; - if (is_bidirect && (!is_duplicate || (sameseq && simlar_ttl))) + similar_ttl = orig_node->last_ttl - 3 <= batadv_ogm_packet->header.ttl; + if (is_bidirect && ((dup_status == BATADV_NO_DUP) || + (sameseq && similar_ttl))) batadv_iv_ogm_orig_update(bat_priv, orig_node, ethhdr, batadv_ogm_packet, if_incoming, - tt_buff, is_duplicate); + tt_buff, dup_status); /* is single hop (direct) neighbor */ if (is_single_hop_neigh) { @@ -1249,7 +1273,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, goto out_neigh; } - if (is_duplicate) { + if (dup_status == BATADV_NEIGH_DUP) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: duplicate packet received\n"); goto out_neigh; -- 1.7.10.4

4 6

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Add dummy soft-interface rx mode handler
by Linus Lüssing 09 Jun '13

09 Jun '13

We do not actually need to set any rx filters for the virtual batman soft interface. However a dummy handler enables a user to set static multicast listeners for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * Fixes issue #171 v2: added kernel doc soft-interface.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 2bad57f..54b3991 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -137,6 +137,18 @@ static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) return 0; } +/** + * batadv_interface_set_rx_mode - set the rx mode of a device + * @dev: registered network device to modify + * + * We do not actually need to set any rx filters for the virtual batman + * soft interface. However a dummy handler enables a user to set static + * multicast listeners for instance. + */ +static void batadv_interface_set_rx_mode(struct net_device *dev) +{ +} + static int batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { @@ -572,6 +584,7 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_get_stats = batadv_interface_stats, .ndo_set_mac_address = batadv_interface_set_mac_addr, .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_set_rx_mode = batadv_interface_set_rx_mode, .ndo_start_xmit = batadv_interface_tx, .ndo_validate_addr = eth_validate_addr, .ndo_add_slave = batadv_softif_slave_add, -- 1.7.10.4

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't handle address updates when bla is disabled
by Simon Wunderlich 09 Jun '13

09 Jun '13

From: Simon Wunderlich <simon(a)open-mesh.com> The bridge loop avoidance has a hook to handle address updates of the originator. These should not be handled when bridge loop avoidance is disabled - it might send some bridge loop avoidance packets which should not appear if bla is disabled. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- bridge_loop_avoidance.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index ab537ec..6ea7ccf 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1073,6 +1073,10 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, group = htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN)); bat_priv->bla.claim_dest.group = group; + /* purge everything when bridge loop avoidance is turned off. */ + if (!atomic_read(&bat_priv->bridge_loop_avoidance)) + oldif = NULL; + if (!oldif) { batadv_bla_purge_claims(bat_priv, NULL, 1); batadv_bla_purge_backbone_gw(bat_priv, 1); -- 1.7.10.4

3 2

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