commits May 2014

commits@lists.open-mesh.org

1 participants
88 discussions

[batman-adv] master: Merge branch 'next' (cf7a3b7)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cf7a3b7465d1b1d2a3d23cd6b26da4dff0a9f6c1 Merge: 82febf6 a1b1426 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 15 05:16:44 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- cf7a3b7465d1b1d2a3d23cd6b26da4dff0a9f6c1 originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (a1b1426)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 236e603 batman-adv: fix typ0 in kerneldoc and comment a1b1426 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (a1b1426)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit a1b142620c8dad5e75fbb615925fb76846b5d45d Merge: 7ace0eb 236e603 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 15 05:16:19 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- a1b142620c8dad5e75fbb615925fb76846b5d45d originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: fix typ0 in kerneldoc and comment (236e603)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 236e60395e67b8311185cf932a899898773c6210 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed May 14 14:23:15 2014 +0200 batman-adv: fix typ0 in kerneldoc and comment Introduced by 9b9cdbe28e2b9c8bdf9c761f22ba9655963d13d4 ("batman-adv: fix removing neigh_ifinfo") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Reported-by: Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 236e60395e67b8311185cf932a899898773c6210 originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/originator.c b/originator.c index 9ebc40e..abf612d 100644 --- a/originator.c +++ b/originator.c @@ -704,7 +704,7 @@ free_orig_node: /** * batadv_purge_neigh_ifinfo - purge obsolete ifinfo entries from neighbor * @bat_priv: the bat priv with all the soft interface information - * @neigh_node: orig node which is to be checked + * @neigh: orig node which is to be checked */ static void batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv, @@ -842,7 +842,7 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, hlist_del_rcu(&neigh_node->list); batadv_neigh_node_free_ref(neigh_node); } else { - /* only neccesary if not the whole neighbor is to be + /* only necessary if not the whole neighbor is to be * deleted, but some interface has been removed. */ batadv_purge_neigh_ifinfo(bat_priv, neigh_node);

1 0

[batman-adv] master: Merge branch 'next' (82febf6)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 82febf64a28c2a845c73930744877638c5ef71f4 Merge: 86469da 7ace0eb Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 15 04:46:33 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 82febf64a28c2a845c73930744877638c5ef71f4 soft-interface.c | 60 +++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 ++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 74 insertions(+), 14 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (82febf6)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9729d20 batman-adv: fix TT VLAN inconsistency on VLAN re-add 7ace0eb Merge branch 'maint' into next 82febf6 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (7ace0eb)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 9729d20 batman-adv: fix TT VLAN inconsistency on VLAN re-add 7ace0eb Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (7ace0eb)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 7ace0eb8277cedde2bd0f1d0499ed84de63c758a Merge: 9d48399 9729d20 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu May 15 04:43:37 2014 +0800 Merge branch 'maint' into next Conflicts: translation-table.c >--------------------------------------------------------------- 7ace0eb8277cedde2bd0f1d0499ed84de63c758a soft-interface.c | 60 +++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 ++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 74 insertions(+), 14 deletions(-) diff --cc translation-table.c index d636bde,b689981..5f59e7f --- a/translation-table.c +++ b/translation-table.c @@@ -510,7 -484,8 +510,8 @@@ bool batadv_tt_local_add(struct net_dev { 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_tt_global_entry *tt_global = NULL; + struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry;

1 0

[batman-adv] maint: batman-adv: fix TT VLAN inconsistency on VLAN re-add (9729d20)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9729d2085c0fa4398eb1ee518b0097866dfdcd77 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Thu May 8 17:13:15 2014 +0200 batman-adv: fix TT VLAN inconsistency on VLAN re-add 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 (even if TT entries for this VLAN still exist). 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 issue destroy_vlan() has to not free the VLAN object immediately but it has to be kept alive until all the TT entries for this VLAN have been removed. destroy_vlan() still removes the sysfs folder so that the user has the feeling that everything went fine. If the same VLAN is re-added before the old object is free'd, then the latter is resurrected and re-used. 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9729d2085c0fa4398eb1ee518b0097866dfdcd77 soft-interface.c | 60 +++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 ++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 74 insertions(+), 14 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index d962363..5a9dc2f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -437,10 +437,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); + } } /** @@ -494,6 +499,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); @@ -505,6 +511,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 */ @@ -512,10 +522,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; } @@ -527,18 +533,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); } @@ -556,6 +557,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 @@ -565,7 +568,36 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, vid |= BATADV_VLAN_HAS_TAG; - return batadv_softif_create_vlan(bat_priv, vid); + /* if a new vlan is getting created and it already exists, it means that + * it was not deleted yet. batadv_softif_vlan_get() increases the + * refcount in order to revive the object. + * + * if it does not exist then create it. + */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + if (!vlan) + return batadv_softif_create_vlan(bat_priv, vid); + + /* recreate the sysfs object if it was already destroyed (and it should + * be since we received a kill_vid() for this vlan + */ + if (!vlan->kobj) { + ret = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); + if (ret) { + batadv_softif_vlan_free_ref(vlan); + return ret; + } + } + + /* add a new TT local entry. This one will be marked with the NOPURGE + * 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); + + return 0; } /** 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 0

[batman-adv] master: batman-adv: get rid of SET_ETHTOOL_OPS (86469da)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 86469da4eacf7844dcb1cfb7d089cfbe44f30aac Author: Wilfried Klaebe <w-lkml(a)lebenslange-mailadresse.de> Date: Wed May 14 19:54:35 2014 +0800 batman-adv: get rid of SET_ETHTOOL_OPS Dave Miller mentioned he'd like to see SET_ETHTOOL_OPS gone. This does that. Mostly done via coccinelle script: @@ struct ethtool_ops *ops; struct net_device *dev; @@ - SET_ETHTOOL_OPS(dev, ops); + dev->ethtool_ops = ops; Compile tested only, but I'd seriously wonder if this broke anything. Suggested-by: Dave Miller <davem(a)davemloft.net> Signed-off-by: Wilfried Klaebe <w-lkml(a)lebenslange-mailadresse.de> >--------------------------------------------------------------- 86469da4eacf7844dcb1cfb7d089cfbe44f30aac soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 9f070de..c7580be 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -890,7 +890,7 @@ static void batadv_softif_init_early(struct net_device *dev) /* generate random address */ eth_hw_addr_random(dev); - SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops); + dev->ethtool_ops = &batadv_ethtool_ops; memset(priv, 0, sizeof(*priv)); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2014