B.A.T.M.A.N March 2014

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

19 participants
50 discussions

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix local TT check for outgoing arp requests in DAT
by Antonio Quartulli 29 Mar '14

29 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Change introduced by d6bd8b36fa1f3d72a6fd5942a6e9bde6ddafcd0d ("batman-adv: make DAT drop ARP requests targeting local clients") implements a check that prevents DAT from using the caching mechanism when the client that is supposed to provide a reply to an arp request is local. However change brought by 3e26722bc9f248ec4316749fc1957365c0fa5e4b ("batman-adv: make the Distributed ARP Table vlan aware") has not converted the above check into its vlan aware version thus making it useless when the local client is behind a vlan. Fix the behaviour by properly specifying the vlan when checking for a client being local or not. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- distributed-arp-table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 5bb37a8..a5d75be 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -940,8 +940,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, * additional DAT answer may trigger kernel warnings about * a packet coming from the wrong port. */ - if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, - BATADV_NO_FLAGS)) { + if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, vid)) { ret = true; goto out; } -- 1.8.3.2

1 0

[B.A.T.M.A.N.] Help to build batman 2013.4.o with openwrt trunk
by 3zl Trizonelabs 27 Mar '14

27 Mar '14

i tried different infos found but to no avail. Any hints/informations would be highly appreciated regards 3zl

2 1

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: properly count contexts for softif_vlan objects
by Antonio Quartulli 24 Mar '14

24 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When a VLAN interface (on top of batX) is removed and re-added within a short timeframe TT does not have enough time to properly cleanup. This creates an internal TT state mismatch as the newly created softif_vlan will be initialized from scratch with a TT client count of zero. The resulting TT messages are bogus due to the counter / tt client listing mismatch, thus creating inconsistencies on every node in the network To fix this a softif_vlan object has to be removed from the vlan list only when all the local TT entries of such VLAN have been destroyed. Implement such behaviour by increasing the reference counter of a softif_vlan object every time a new local TT entry for such VLAN is created and remove the object from the list only when all the TT entries have been destroyed. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Changes since v1: - destroy and create vlan sysfs folder within softif_vlan_destroy/create() to avoid lock troubles with soft-interface destruction and delayed jobs. soft-interface.c | 61 +++++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 +++++++++++++++++++++++ types.h | 4 ++++ 3 files changed, 78 insertions(+), 13 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index cbe9e33..f41ed79 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -442,10 +442,15 @@ out: * possibly free it * @softif_vlan: the vlan object to release */ -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) +void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) { - if (atomic_dec_and_test(&softif_vlan->refcount)) - kfree_rcu(softif_vlan, rcu); + if (atomic_dec_and_test(&vlan->refcount)) { + spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&vlan->list); + spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + + kfree_rcu(vlan, rcu); + } } /** @@ -478,6 +483,21 @@ struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv, } /** + * batadv_softif_vlan_destroy_finish - cleans up the sysfs folder of a vlan + * @work: work queue item + * + * Free the sysfs folder of the vlan object which can not be removed under + * rtnl lock (to prevent deadlock/unsolicited sleep situations). + */ +static void batadv_softif_vlan_destroy_finish(struct work_struct *work) +{ + struct batadv_softif_vlan *vlan; + + vlan = container_of(work, struct batadv_softif_vlan, cleanup_work); + +} + +/** * 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 @@ -499,8 +519,10 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) if (!vlan) return -ENOMEM; + vlan->bat_priv = bat_priv; vlan->vid = vid; atomic_set(&vlan->refcount, 1); + INIT_WORK(&vlan->cleanup_work, batadv_softif_vlan_destroy_finish); atomic_set(&vlan->ap_isolation, 0); @@ -510,6 +532,10 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) return err; } + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + /* add a new TT local entry. This one will be marked with the NOPURGE * flag */ @@ -517,10 +543,6 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) bat_priv->soft_iface->dev_addr, vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - return 0; } @@ -532,18 +554,13 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv, struct batadv_softif_vlan *vlan) { - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - - batadv_sysfs_del_vlan(bat_priv, vlan); - /* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag */ batadv_tt_local_remove(bat_priv, bat_priv->soft_iface->dev_addr, vlan->vid, "vlan interface destroyed", false); + batadv_sysfs_del_vlan(bat_priv, vlan); batadv_softif_vlan_free_ref(vlan); } @@ -561,6 +578,8 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, unsigned short vid) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; + int ret; /* only 802.1Q vlans are supported. * batman-adv does not know how to handle other types @@ -570,6 +589,22 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, vid |= BATADV_VLAN_HAS_TAG; + /* if a new vlan is getting created, but it is found in the list, it + * means that it was not deleted yet. Make batadv_softif_vlan_get() + * increase the refcounter by one and return + */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + if (vlan) { + ret = 0; + if (!vlan->kobj) { + ret = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); + if (ret) + batadv_softif_vlan_free_ref(vlan); + } + + return ret; + } + return batadv_softif_create_vlan(bat_priv, vid); } diff --git a/translation-table.c b/translation-table.c index 959dde7..b689981 100644 --- a/translation-table.c +++ b/translation-table.c @@ -485,6 +485,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_tt_local_entry *tt_local; struct batadv_tt_global_entry *tt_global; + struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; @@ -544,6 +545,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (!tt_local) goto out; + /* increase the refcounter of the related vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n", addr, BATADV_PRINT_VID(vid), @@ -573,6 +577,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ batadv_tt_local_entry_free_ref(tt_local); + batadv_softif_vlan_free_ref(vlan); goto out; } @@ -978,6 +983,7 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, { struct batadv_tt_local_entry *tt_local_entry; uint16_t flags, curr_flags = BATADV_NO_FLAGS; + struct batadv_softif_vlan *vlan; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); if (!tt_local_entry) @@ -1008,6 +1014,11 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, hlist_del_rcu(&tt_local_entry->common.hash_entry); batadv_tt_local_entry_free_ref(tt_local_entry); + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); @@ -1080,6 +1091,7 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; uint32_t i; @@ -1100,6 +1112,13 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) tt_local = container_of(tt_common_entry, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, + tt_common_entry->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); @@ -3078,6 +3097,7 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ @@ -3106,6 +3126,12 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) tt_local = container_of(tt_common, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); diff --git a/types.h b/types.h index 78370ab..5fe0930 100644 --- a/types.h +++ b/types.h @@ -638,6 +638,7 @@ struct batadv_priv_nc { /** * struct batadv_softif_vlan - per VLAN attributes set + * @bat_priv: pointer to the mesh object * @vid: VLAN identifier * @kobj: kobject for sysfs vlan subdirectory * @ap_isolation: AP isolation state @@ -645,8 +646,10 @@ struct batadv_priv_nc { * @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 + * @cleanup_work: queue item to used to schedule the object destruction */ struct batadv_softif_vlan { + struct batadv_priv *bat_priv; unsigned short vid; struct kobject *kobj; atomic_t ap_isolation; /* boolean */ @@ -654,6 +657,7 @@ struct batadv_softif_vlan { struct hlist_node list; atomic_t refcount; struct rcu_head rcu; + struct work_struct cleanup_work; }; /** -- 1.8.3.2

1 0

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
by Antonio Quartulli 24 Mar '14

24 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> The MAC address of the soft-interface is used to initialise the "non-purge" TT entry of each existing VLAN. Therefore when the user invokes ndo_set_mac_address() all the "non-purge" TT entries have to be updated, not only the one belonging to the non-tagged network. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Changes from v1: - declare vlan variable soft-interface.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index f82c267..cbe9e33 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -105,6 +105,7 @@ static struct net_device_stats *batadv_interface_stats(struct net_device *dev) static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; struct sockaddr *addr = p; uint8_t old_addr[ETH_ALEN]; @@ -115,12 +116,22 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + if (!atomic_inc_not_zero(&vlan->refcount)) + continue; + + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); + + batadv_softif_vlan_free_ref(vlan); } + rcu_read_unlock(); return 0; } -- 1.8.3.2

1 0

[B.A.T.M.A.N.] [PATCH maint] batman-adv: change the MAC of each VLAN upon ndo_set_mac_address
by Antonio Quartulli 24 Mar '14

24 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> The MAC address of the soft-interface is used to initialise the "non-purge" TT entry of each existing VLAN. Therefore when the user invokes ndo_set_mac_address() all the "non-purge" TT entries have to be updated, not only the one belonging to the non-tagged network. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- soft-interface.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index f82c267..d0cfe06 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -115,12 +115,22 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + if (!atomic_inc_not_zero(&vlan->refcount)) + continue; + + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); + + batadv_softif_vlan_free_ref(vlan); } + rcu_read_unlock(); return 0; } -- 1.8.3.2

1 0

[B.A.T.M.A.N.] IP connection lost when a node is rebooted
by Itamar Landsman 23 Mar '14

23 Mar '14

HI, I am running a project using Raspberry pi machines that create a batman-adv mesh. Each of the rpis has three wifi devices. each of the wifi devices hosts a separate ad-hoc network. This way I can get to work on three separate channels and let batman worry about paths. My problem is that whenever I reboot a device, it comes back to life but IP connection is never regained until; I reboot all other devices. I have tried to move the IP address from the bt0 interface to a bridge interface that hosts br0 with no success. Any ideas? I am using the "Out of the box" batman-adv modules and batctl that come with the most recent raspbian repo. Thanks in advance, Itamar

6 10

[B.A.T.M.A.N.] pull request: batman-adv 20140322
by Antonio Quartulli 22 Mar '14

22 Mar '14

Hello David, here you have our patchset for net-next/linux-3.15. They are 16 patches but most of them are just small cleanups and kerneldoc improvements. The only big change is the one from patch 8 to 13 by Linus Lüssing that introduces a new multicast packets optimisation. This new component aims to reduce the air overhead by sending multicast packets as bat-unicast when only one destination exists or by dropping them directly at the source if the multicast group is totally empty. In patch 11 Linus introduces an atomic_t variable, that like others that we already have is only object of write and read, thus making the atomic characteristic totally useless. Unfortunately this is part of our sysfs framework, that helps the developer to introduce new knobs by using few macros only. For this reason we decided to keep Linus' new knob for now, but I'd like to let you know that we are in the process of re-working such framework in order to convert all the current (useless) atomic_t to boolean in one go. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 65025079d2ddb8091d30b356c0b0f79a8d2254c4: Merge branch 'ptp-next' (2014-03-21 14:21:45 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 3f2532fcde67faf496fa21c5c04c5e8cf73c9e01: batman-adv: Start new development cycle (2014-03-22 09:18:59 +0100) ---------------------------------------------------------------- Included changes: - use ether_addr_copy instead of memcpy when possible - implement new multicast packet optimisation - improve several kerneldoc sections - minor code cleanups ---------------------------------------------------------------- Antonio Quartulli (4): batman-adv: prefer ether_addr_copy to memcpy batman-adv: add kerneldoc for dst_hint argument batman-adv: improve the TT flags documentation batman-adv: improve DAT documentation Fengguang Wu (1): batman-adv: fix coccinelle warnings Linus Lüssing (8): batman-adv: use vlan_/eth_hdr() instead of skb->data in interface_tx path batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() batman-adv: Multicast Listener Announcements via Translation Table batman-adv: introduce capability initialization bitfield batman-adv: Announce new capability via multicast TVLV batman-adv: Modified forwarding behaviour for multicast packets batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support batman-adv: Send multicast packets to nodes with a WANT_ALL flag Marek Lindner (1): batman-adv: call unregister_netdev() to have it handle the locking for us Simon Wunderlich (2): batman-adv: fix a few kerneldoc inconsistencies batman-adv: Start new development cycle Documentation/ABI/testing/sysfs-class-net-mesh | 9 + net/batman-adv/Kconfig | 9 + net/batman-adv/Makefile | 1 + net/batman-adv/bat_iv_ogm.c | 10 +- net/batman-adv/bridge_loop_avoidance.c | 35 +- net/batman-adv/distributed-arp-table.c | 9 +- net/batman-adv/distributed-arp-table.h | 3 + net/batman-adv/fragmentation.c | 4 +- net/batman-adv/gateway_client.c | 8 +- net/batman-adv/icmp_socket.c | 11 +- net/batman-adv/main.c | 19 +- net/batman-adv/main.h | 4 +- net/batman-adv/multicast.c | 748 +++++++++++++++++++++++++ net/batman-adv/multicast.h | 80 +++ net/batman-adv/network-coding.c | 26 +- net/batman-adv/originator.c | 11 +- net/batman-adv/packet.h | 53 +- net/batman-adv/routing.c | 17 +- net/batman-adv/send.c | 31 +- net/batman-adv/send.h | 7 + net/batman-adv/soft-interface.c | 48 +- net/batman-adv/sysfs.c | 6 + net/batman-adv/translation-table.c | 140 +++-- net/batman-adv/translation-table.h | 2 + net/batman-adv/types.h | 90 ++- 25 files changed, 1237 insertions(+), 144 deletions(-) create mode 100644 net/batman-adv/multicast.c create mode 100644 net/batman-adv/multicast.h

2 17

[B.A.T.M.A.N.] [PATCH maint] batman-adv: properly count contexts for softif_vlan objects
by Antonio Quartulli 22 Mar '14

22 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When a VLAN interface (on top of batX) is removed and re-added within a short timeframe TT does not have enough time to properly cleanup. This creates an internal TT state mismatch as the newly created softif_vlan will be initialized from scratch with a TT client count of zero. The resulting TT messages are bogus due to the counter / tt client listing mismatch, thus creating inconsistencies on every node in the network To fix this a softif_vlan object has to be removed from the vlan list only when all the local TT entries of such VLAN have been destroyed. Implement such behaviour by increasing the reference counter of a softif_vlan object every time a new local TT entry for such VLAN is created and remove the object from the list only when all the TT entries have been destroyed. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- soft-interface.c | 35 ++++++++++++++++++++++------------- translation-table.c | 26 ++++++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index d0cfe06..aa1ca48 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -441,10 +441,17 @@ out: * possibly free it * @softif_vlan: the vlan object to release */ -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) +void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) { - if (atomic_dec_and_test(&softif_vlan->refcount)) - kfree_rcu(softif_vlan, rcu); + if (atomic_dec_and_test(&vlan->refcount)) { + spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&vlan->list); + spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + + batadv_sysfs_del_vlan(vlan->bat_priv, vlan); + + kfree_rcu(vlan, rcu); + } } /** @@ -498,6 +505,7 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) if (!vlan) return -ENOMEM; + vlan->bat_priv = bat_priv; vlan->vid = vid; atomic_set(&vlan->refcount, 1); @@ -509,6 +517,10 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) return err; } + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + /* add a new TT local entry. This one will be marked with the NOPURGE * flag */ @@ -516,10 +528,6 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) bat_priv->soft_iface->dev_addr, vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - return 0; } @@ -531,12 +539,6 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv, struct batadv_softif_vlan *vlan) { - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - - batadv_sysfs_del_vlan(bat_priv, vlan); - /* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag */ @@ -569,6 +571,13 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, vid |= BATADV_VLAN_HAS_TAG; + /* if a new vlan is getting created, but it is found in the list, it + * means that it was not deleted yet. Make batadv_softif_vlan_get() + * increase the refcounter by one and return + */ + if (batadv_softif_vlan_get(bat_priv, vid)) + return 0; + return batadv_softif_create_vlan(bat_priv, vid); } diff --git a/translation-table.c b/translation-table.c index 959dde7..b689981 100644 --- a/translation-table.c +++ b/translation-table.c @@ -485,6 +485,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_tt_local_entry *tt_local; struct batadv_tt_global_entry *tt_global; + struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; @@ -544,6 +545,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (!tt_local) goto out; + /* increase the refcounter of the related vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n", addr, BATADV_PRINT_VID(vid), @@ -573,6 +577,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ batadv_tt_local_entry_free_ref(tt_local); + batadv_softif_vlan_free_ref(vlan); goto out; } @@ -978,6 +983,7 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, { struct batadv_tt_local_entry *tt_local_entry; uint16_t flags, curr_flags = BATADV_NO_FLAGS; + struct batadv_softif_vlan *vlan; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); if (!tt_local_entry) @@ -1008,6 +1014,11 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, hlist_del_rcu(&tt_local_entry->common.hash_entry); batadv_tt_local_entry_free_ref(tt_local_entry); + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); @@ -1080,6 +1091,7 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; uint32_t i; @@ -1100,6 +1112,13 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) tt_local = container_of(tt_common_entry, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, + tt_common_entry->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); @@ -3078,6 +3097,7 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ @@ -3106,6 +3126,12 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) tt_local = container_of(tt_common, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); diff --git a/types.h b/types.h index 78370ab..c4aba2f 100644 --- a/types.h +++ b/types.h @@ -638,6 +638,7 @@ struct batadv_priv_nc { /** * struct batadv_softif_vlan - per VLAN attributes set + * @bat_priv: pointer to the mesh object * @vid: VLAN identifier * @kobj: kobject for sysfs vlan subdirectory * @ap_isolation: AP isolation state @@ -647,6 +648,7 @@ struct batadv_priv_nc { * @rcu: struct used for freeing in a RCU-safe manner */ struct batadv_softif_vlan { + struct batadv_priv *bat_priv; unsigned short vid; struct kobject *kobj; atomic_t ap_isolation; /* boolean */ -- 1.8.3.2

1 0

[B.A.T.M.A.N.] Batman-adv + lxc
by Christof Schulze 21 Mar '14

21 Mar '14

Hello, This is my first post to this list. I would like to run batman-adv inside an lxc-container just as described in [1]. I do not want to do it to simulate a network having multiple nodes but to separate duties of different "virtual machines" - linux containers in my case and to be able to easily migrate the configuration to a differen machine lateron. I started by loading batman-adv on the host and bridging it into the container. After adding the interfaces inside the container where meshing should happen I cannot add a gateway because batctl complains that /sys/class/net/bat0/mesh does not exist. Indeed, in the container it does not exist. How can batman-adv be used from an lxc-container? Christof [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-September/005355.html -- () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments

3 3

[B.A.T.M.A.N.] [PATCHv4 next 01/11] batman-adv: remove useless goto
by Antonio Quartulli 21 Mar '14

21 Mar '14

There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v3: - simply has_bridge() function even more Changes from v2: - added compat code change to 2/11 to accommodate new use of netdev_master_upper_dev_get_rcu() Changes from v1: - change "we are out of memory" to "in case of memory allocation failure" in 3/11 - fix commit message in 10/11 multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false; dev_put(bridge); return true; -out: - return false; } /** -- 1.8.3.2

2 21

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N March 2014