* [net-next 01/11] net/mlx5e: Extract code that queues neigh update work into function
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Jianbo Liu, Roi Dayan,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
As a preparation for following refactoring that removes rtnl lock
dependency from neigh hash entry handlers, extract code that enqueues neigh
update work into standalone function. This commit doesn't change
functionality.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 38 +++++++++++--------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 7ce5cb6e527e..85a503f0423b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -821,6 +821,28 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb,
return NOTIFY_OK;
}
+static void
+mlx5e_rep_queue_neigh_update_work(struct mlx5e_priv *priv,
+ struct mlx5e_neigh_hash_entry *nhe,
+ struct neighbour *n)
+{
+ /* Take a reference to ensure the neighbour and mlx5 encap
+ * entry won't be destructed until we drop the reference in
+ * delayed work.
+ */
+ neigh_hold(n);
+
+ /* This assignment is valid as long as the the neigh reference
+ * is taken
+ */
+ nhe->n = n;
+
+ if (!queue_work(priv->wq, &nhe->neigh_update_work)) {
+ mlx5e_rep_neigh_entry_release(nhe);
+ neigh_release(n);
+ }
+}
+
static struct mlx5e_neigh_hash_entry *
mlx5e_rep_neigh_entry_lookup(struct mlx5e_priv *priv,
struct mlx5e_neigh *m_neigh);
@@ -864,22 +886,8 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb,
return NOTIFY_DONE;
}
- /* This assignment is valid as long as the the neigh reference
- * is taken
- */
- nhe->n = n;
-
- /* Take a reference to ensure the neighbour and mlx5 encap
- * entry won't be destructed until we drop the reference in
- * delayed work.
- */
- neigh_hold(n);
mlx5e_rep_neigh_entry_hold(nhe);
-
- if (!queue_work(priv->wq, &nhe->neigh_update_work)) {
- mlx5e_rep_neigh_entry_release(nhe);
- neigh_release(n);
- }
+ mlx5e_rep_queue_neigh_update_work(priv, nhe, n);
spin_unlock_bh(&neigh_update->encap_lock);
break;
--
2.21.0
^ permalink raw reply related
* [net-next 02/11] net/mlx5e: Always take reference to neigh entry
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Jianbo Liu, Roi Dayan,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
Neigh entry has reference counter, however it is only used when scheduling
neigh update event. In all other cases reference to neigh entry is not
taken while working with it. Neigh code relies on synchronization provided
by rtnl lock and uses encap list size as implicit reference counter.
To remove dependency on rtnl lock, always take reference to neigh entry
while using it. Remove neigh entry from hash table and delete it only when
reference counter reaches zero. This can result spurious neigh update
events, when there is an event on entry that has zero encaps attached.
However, such events are rare and properly handled by neigh update handler.
Extend encap entry with reference to neigh hash entry in order to be able
to directly release it when encap is detached, instead of lookup nhe by key
through hash table. Extend nhe with reference to device priv structure to
guarantee correctness when nhe is used with stack devices, bond setup, in
which case it is non-trivial to determine correct device when releasing the
nhe.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 76 +++++++++----------
.../net/ethernet/mellanox/mlx5/core/en_rep.h | 3 +
2 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 85a503f0423b..23087f9abe74 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -524,6 +524,21 @@ void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv)
neigh_update->min_interval);
}
+static bool mlx5e_rep_neigh_entry_hold(struct mlx5e_neigh_hash_entry *nhe)
+{
+ return refcount_inc_not_zero(&nhe->refcnt);
+}
+
+static void mlx5e_rep_neigh_entry_remove(struct mlx5e_neigh_hash_entry *nhe);
+
+static void mlx5e_rep_neigh_entry_release(struct mlx5e_neigh_hash_entry *nhe)
+{
+ if (refcount_dec_and_test(&nhe->refcnt)) {
+ mlx5e_rep_neigh_entry_remove(nhe);
+ kfree(nhe);
+ }
+}
+
static void mlx5e_rep_neigh_stats_work(struct work_struct *work)
{
struct mlx5e_rep_priv *rpriv = container_of(work, struct mlx5e_rep_priv,
@@ -536,23 +551,16 @@ static void mlx5e_rep_neigh_stats_work(struct work_struct *work)
if (!list_empty(&rpriv->neigh_update.neigh_list))
mlx5e_rep_queue_neigh_stats_work(priv);
- list_for_each_entry(nhe, &rpriv->neigh_update.neigh_list, neigh_list)
- mlx5e_tc_update_neigh_used_value(nhe);
+ list_for_each_entry(nhe, &rpriv->neigh_update.neigh_list, neigh_list) {
+ if (mlx5e_rep_neigh_entry_hold(nhe)) {
+ mlx5e_tc_update_neigh_used_value(nhe);
+ mlx5e_rep_neigh_entry_release(nhe);
+ }
+ }
rtnl_unlock();
}
-static void mlx5e_rep_neigh_entry_hold(struct mlx5e_neigh_hash_entry *nhe)
-{
- refcount_inc(&nhe->refcnt);
-}
-
-static void mlx5e_rep_neigh_entry_release(struct mlx5e_neigh_hash_entry *nhe)
-{
- if (refcount_dec_and_test(&nhe->refcnt))
- kfree(nhe);
-}
-
static void mlx5e_rep_update_flows(struct mlx5e_priv *priv,
struct mlx5e_encap_entry *e,
bool neigh_connected,
@@ -881,14 +889,11 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb,
*/
spin_lock_bh(&neigh_update->encap_lock);
nhe = mlx5e_rep_neigh_entry_lookup(priv, &m_neigh);
- if (!nhe) {
- spin_unlock_bh(&neigh_update->encap_lock);
+ spin_unlock_bh(&neigh_update->encap_lock);
+ if (!nhe)
return NOTIFY_DONE;
- }
- mlx5e_rep_neigh_entry_hold(nhe);
mlx5e_rep_queue_neigh_update_work(priv, nhe, n);
- spin_unlock_bh(&neigh_update->encap_lock);
break;
case NETEVENT_DELAY_PROBE_TIME_UPDATE:
@@ -995,10 +1000,9 @@ static int mlx5e_rep_neigh_entry_insert(struct mlx5e_priv *priv,
return err;
}
-static void mlx5e_rep_neigh_entry_remove(struct mlx5e_priv *priv,
- struct mlx5e_neigh_hash_entry *nhe)
+static void mlx5e_rep_neigh_entry_remove(struct mlx5e_neigh_hash_entry *nhe)
{
- struct mlx5e_rep_priv *rpriv = priv->ppriv;
+ struct mlx5e_rep_priv *rpriv = nhe->priv->ppriv;
spin_lock_bh(&rpriv->neigh_update.encap_lock);
@@ -1019,9 +1023,11 @@ mlx5e_rep_neigh_entry_lookup(struct mlx5e_priv *priv,
{
struct mlx5e_rep_priv *rpriv = priv->ppriv;
struct mlx5e_neigh_update_table *neigh_update = &rpriv->neigh_update;
+ struct mlx5e_neigh_hash_entry *nhe;
- return rhashtable_lookup_fast(&neigh_update->neigh_ht, m_neigh,
- mlx5e_neigh_ht_params);
+ nhe = rhashtable_lookup_fast(&neigh_update->neigh_ht, m_neigh,
+ mlx5e_neigh_ht_params);
+ return nhe && mlx5e_rep_neigh_entry_hold(nhe) ? nhe : NULL;
}
static int mlx5e_rep_neigh_entry_create(struct mlx5e_priv *priv,
@@ -1034,6 +1040,7 @@ static int mlx5e_rep_neigh_entry_create(struct mlx5e_priv *priv,
if (!*nhe)
return -ENOMEM;
+ (*nhe)->priv = priv;
memcpy(&(*nhe)->m_neigh, &e->m_neigh, sizeof(e->m_neigh));
INIT_WORK(&(*nhe)->neigh_update_work, mlx5e_rep_neigh_update);
INIT_LIST_HEAD(&(*nhe)->encap_list);
@@ -1049,19 +1056,6 @@ static int mlx5e_rep_neigh_entry_create(struct mlx5e_priv *priv,
return err;
}
-static void mlx5e_rep_neigh_entry_destroy(struct mlx5e_priv *priv,
- struct mlx5e_neigh_hash_entry *nhe)
-{
- /* The neigh hash entry must be removed from the hash table regardless
- * of the reference count value, so it won't be found by the next
- * neigh notification call. The neigh hash entry reference count is
- * incremented only during creation and neigh notification calls and
- * protects from freeing the nhe struct.
- */
- mlx5e_rep_neigh_entry_remove(priv, nhe);
- mlx5e_rep_neigh_entry_release(nhe);
-}
-
int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv,
struct mlx5e_encap_entry *e)
{
@@ -1083,6 +1077,7 @@ int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv,
return err;
}
}
+ e->nhe = nhe;
list_add(&e->encap_list, &nhe->encap_list);
return 0;
}
@@ -1093,13 +1088,14 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv,
struct mlx5e_rep_priv *rpriv = priv->ppriv;
struct mlx5_rep_uplink_priv *uplink_priv = &rpriv->uplink_priv;
struct mlx5_tun_entropy *tun_entropy = &uplink_priv->tun_entropy;
- struct mlx5e_neigh_hash_entry *nhe;
+
+ if (!e->nhe)
+ return;
list_del(&e->encap_list);
- nhe = mlx5e_rep_neigh_entry_lookup(priv, &e->m_neigh);
- if (list_empty(&nhe->encap_list))
- mlx5e_rep_neigh_entry_destroy(priv, nhe);
+ mlx5e_rep_neigh_entry_release(e->nhe);
+ e->nhe = NULL;
mlx5_tun_entropy_refcount_dec(tun_entropy, e->reformat_type);
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index 8ac96727cad8..f5bc9772be98 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -110,6 +110,7 @@ struct mlx5e_neigh {
struct mlx5e_neigh_hash_entry {
struct rhash_head rhash_node;
struct mlx5e_neigh m_neigh;
+ struct mlx5e_priv *priv;
/* Save the neigh hash entry in a list on the representor in
* addition to the hash table. In order to iterate easily over the
@@ -145,6 +146,8 @@ enum {
};
struct mlx5e_encap_entry {
+ /* attached neigh hash entry */
+ struct mlx5e_neigh_hash_entry *nhe;
/* neigh hash entry list of encaps sharing the same neigh */
struct list_head encap_list;
struct mlx5e_neigh m_neigh;
--
2.21.0
^ permalink raw reply related
* [net-next 03/11] net/mlx5e: Extend neigh hash entry with rcu
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Jianbo Liu, Roi Dayan,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
To remove dependency on rtnl lock and to allow unlocked iteration over list
of neigh hash entries, extend nhe with rcu. Change operations on neigh list
to their rcu counterparts and free neigh hash entry with rcu timeout.
Introduce mlx5e_get_next_nhe() helper that is used to iterate over rcu
neigh list with reference to nhe taken.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 68 ++++++++++++-------
.../net/ethernet/mellanox/mlx5/core/en_rep.h | 2 +
2 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 23087f9abe74..a294dc6b5a0c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -535,28 +535,56 @@ static void mlx5e_rep_neigh_entry_release(struct mlx5e_neigh_hash_entry *nhe)
{
if (refcount_dec_and_test(&nhe->refcnt)) {
mlx5e_rep_neigh_entry_remove(nhe);
- kfree(nhe);
+ kfree_rcu(nhe, rcu);
}
}
+static struct mlx5e_neigh_hash_entry *
+mlx5e_get_next_nhe(struct mlx5e_rep_priv *rpriv,
+ struct mlx5e_neigh_hash_entry *nhe)
+{
+ struct mlx5e_neigh_hash_entry *next = NULL;
+
+ rcu_read_lock();
+
+ for (next = nhe ?
+ list_next_or_null_rcu(&rpriv->neigh_update.neigh_list,
+ &nhe->neigh_list,
+ struct mlx5e_neigh_hash_entry,
+ neigh_list) :
+ list_first_or_null_rcu(&rpriv->neigh_update.neigh_list,
+ struct mlx5e_neigh_hash_entry,
+ neigh_list);
+ next;
+ next = list_next_or_null_rcu(&rpriv->neigh_update.neigh_list,
+ &next->neigh_list,
+ struct mlx5e_neigh_hash_entry,
+ neigh_list))
+ if (mlx5e_rep_neigh_entry_hold(next))
+ break;
+
+ rcu_read_unlock();
+
+ if (nhe)
+ mlx5e_rep_neigh_entry_release(nhe);
+
+ return next;
+}
+
static void mlx5e_rep_neigh_stats_work(struct work_struct *work)
{
struct mlx5e_rep_priv *rpriv = container_of(work, struct mlx5e_rep_priv,
neigh_update.neigh_stats_work.work);
struct net_device *netdev = rpriv->netdev;
struct mlx5e_priv *priv = netdev_priv(netdev);
- struct mlx5e_neigh_hash_entry *nhe;
+ struct mlx5e_neigh_hash_entry *nhe = NULL;
rtnl_lock();
if (!list_empty(&rpriv->neigh_update.neigh_list))
mlx5e_rep_queue_neigh_stats_work(priv);
- list_for_each_entry(nhe, &rpriv->neigh_update.neigh_list, neigh_list) {
- if (mlx5e_rep_neigh_entry_hold(nhe)) {
- mlx5e_tc_update_neigh_used_value(nhe);
- mlx5e_rep_neigh_entry_release(nhe);
- }
- }
+ while ((nhe = mlx5e_get_next_nhe(rpriv, nhe)) != NULL)
+ mlx5e_tc_update_neigh_used_value(nhe);
rtnl_unlock();
}
@@ -883,13 +911,9 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb,
m_neigh.family = n->ops->family;
memcpy(&m_neigh.dst_ip, n->primary_key, n->tbl->key_len);
- /* We are in atomic context and can't take RTNL mutex, so use
- * spin_lock_bh to lookup the neigh table. bh is used since
- * netevent can be called from a softirq context.
- */
- spin_lock_bh(&neigh_update->encap_lock);
+ rcu_read_lock();
nhe = mlx5e_rep_neigh_entry_lookup(priv, &m_neigh);
- spin_unlock_bh(&neigh_update->encap_lock);
+ rcu_read_unlock();
if (!nhe)
return NOTIFY_DONE;
@@ -910,19 +934,15 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb,
#endif
return NOTIFY_DONE;
- /* We are in atomic context and can't take RTNL mutex,
- * so use spin_lock_bh to walk the neigh list and look for
- * the relevant device. bh is used since netevent can be
- * called from a softirq context.
- */
- spin_lock_bh(&neigh_update->encap_lock);
- list_for_each_entry(nhe, &neigh_update->neigh_list, neigh_list) {
+ rcu_read_lock();
+ list_for_each_entry_rcu(nhe, &neigh_update->neigh_list,
+ neigh_list) {
if (p->dev == nhe->m_neigh.dev) {
found = true;
break;
}
}
- spin_unlock_bh(&neigh_update->encap_lock);
+ rcu_read_unlock();
if (!found)
return NOTIFY_DONE;
@@ -995,7 +1015,7 @@ static int mlx5e_rep_neigh_entry_insert(struct mlx5e_priv *priv,
if (err)
return err;
- list_add(&nhe->neigh_list, &rpriv->neigh_update.neigh_list);
+ list_add_rcu(&nhe->neigh_list, &rpriv->neigh_update.neigh_list);
return err;
}
@@ -1006,7 +1026,7 @@ static void mlx5e_rep_neigh_entry_remove(struct mlx5e_neigh_hash_entry *nhe)
spin_lock_bh(&rpriv->neigh_update.encap_lock);
- list_del(&nhe->neigh_list);
+ list_del_rcu(&nhe->neigh_list);
rhashtable_remove_fast(&rpriv->neigh_update.neigh_ht,
&nhe->rhash_node,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index f5bc9772be98..d057e401b0de 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -138,6 +138,8 @@ struct mlx5e_neigh_hash_entry {
* 'used' value and avoid neigh deleting by the kernel.
*/
unsigned long reported_lastuse;
+
+ struct rcu_head rcu;
};
enum {
--
2.21.0
^ permalink raw reply related
* [net-next 04/11] net/mlx5e: Refactor mlx5e_neigh_update_table->encap_lock
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Jianbo Liu, Roi Dayan,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
To remove dependency on rtnl lock, always take neigh update encap lock when
modifying neigh update hash table and list. Originally, this lock was only
used to synchronize with netevent handler function, which is called from bh
context and cannot use rtnl lock for synchronization. Take lock in encap
entry attach function to prevent concurrent modifications of neigh update
hash table and list.
Taking the encap lock when creating new nhe introduces a problem that we
need to allocate new entry with sleeping GFP_KERNEL flag while holding a
spinlock. However, since previous patch in this series has already
converted lookup in netevent handler function to user rcu read lock instead
of encap lock, we can safely convert the lock type to mutex.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 17 ++++++++++++-----
.../net/ethernet/mellanox/mlx5/core/en_rep.h | 3 ++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index a294dc6b5a0c..218772d5c062 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -973,7 +973,7 @@ static int mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv)
return err;
INIT_LIST_HEAD(&neigh_update->neigh_list);
- spin_lock_init(&neigh_update->encap_lock);
+ mutex_init(&neigh_update->encap_lock);
INIT_DELAYED_WORK(&neigh_update->neigh_stats_work,
mlx5e_rep_neigh_stats_work);
mlx5e_rep_neigh_update_init_interval(rpriv);
@@ -1000,6 +1000,7 @@ static void mlx5e_rep_neigh_cleanup(struct mlx5e_rep_priv *rpriv)
cancel_delayed_work_sync(&rpriv->neigh_update.neigh_stats_work);
+ mutex_destroy(&neigh_update->encap_lock);
rhashtable_destroy(&neigh_update->neigh_ht);
}
@@ -1024,18 +1025,18 @@ static void mlx5e_rep_neigh_entry_remove(struct mlx5e_neigh_hash_entry *nhe)
{
struct mlx5e_rep_priv *rpriv = nhe->priv->ppriv;
- spin_lock_bh(&rpriv->neigh_update.encap_lock);
+ mutex_lock(&rpriv->neigh_update.encap_lock);
list_del_rcu(&nhe->neigh_list);
rhashtable_remove_fast(&rpriv->neigh_update.neigh_ht,
&nhe->rhash_node,
mlx5e_neigh_ht_params);
- spin_unlock_bh(&rpriv->neigh_update.encap_lock);
+ mutex_unlock(&rpriv->neigh_update.encap_lock);
}
-/* This function must only be called under RTNL lock or under the
- * representor's encap_lock in case RTNL mutex can't be held.
+/* This function must only be called under the representor's encap_lock or
+ * inside rcu read lock section.
*/
static struct mlx5e_neigh_hash_entry *
mlx5e_rep_neigh_entry_lookup(struct mlx5e_priv *priv,
@@ -1088,17 +1089,23 @@ int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv,
err = mlx5_tun_entropy_refcount_inc(tun_entropy, e->reformat_type);
if (err)
return err;
+
+ mutex_lock(&rpriv->neigh_update.encap_lock);
nhe = mlx5e_rep_neigh_entry_lookup(priv, &e->m_neigh);
if (!nhe) {
err = mlx5e_rep_neigh_entry_create(priv, e, &nhe);
if (err) {
+ mutex_unlock(&rpriv->neigh_update.encap_lock);
mlx5_tun_entropy_refcount_dec(tun_entropy,
e->reformat_type);
return err;
}
}
+
e->nhe = nhe;
list_add(&e->encap_list, &nhe->encap_list);
+ mutex_unlock(&rpriv->neigh_update.encap_lock);
+
return 0;
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index d057e401b0de..8fa27832bd81 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -35,6 +35,7 @@
#include <net/ip_tunnels.h>
#include <linux/rhashtable.h>
+#include <linux/mutex.h>
#include "eswitch.h"
#include "en.h"
#include "lib/port_tun.h"
@@ -48,7 +49,7 @@ struct mlx5e_neigh_update_table {
*/
struct list_head neigh_list;
/* protect lookup/remove operations */
- spinlock_t encap_lock;
+ struct mutex encap_lock;
struct notifier_block netevent_nb;
struct delayed_work neigh_stats_work;
unsigned long min_interval; /* jiffies */
--
2.21.0
^ permalink raw reply related
* [net-next 05/11] net/mlx5e: Protect neigh hash encap list with spinlock and rcu
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Jianbo Liu, Roi Dayan,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
Rcu-ify mlx5e_neigh_hash_entry->encap_list by changing operations on encap
list to their rcu counterparts and extending encap structure with rcu_head
to free the encap instances after rcu grace period. Use rcu read lock when
traversing encap list. Implement helper mlx5e_get_next_valid_encap()
function that is used by mlx5e_tc_update_neigh_used_value() to safely
iterate over valid entries of nhe->encap_list.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 10 ++-
.../net/ethernet/mellanox/mlx5/core/en_rep.h | 3 +
.../net/ethernet/mellanox/mlx5/core/en_tc.c | 64 ++++++++++++++++---
3 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 218772d5c062..f26edf458152 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -1064,6 +1064,7 @@ static int mlx5e_rep_neigh_entry_create(struct mlx5e_priv *priv,
(*nhe)->priv = priv;
memcpy(&(*nhe)->m_neigh, &e->m_neigh, sizeof(e->m_neigh));
INIT_WORK(&(*nhe)->neigh_update_work, mlx5e_rep_neigh_update);
+ spin_lock_init(&(*nhe)->encap_list_lock);
INIT_LIST_HEAD(&(*nhe)->encap_list);
refcount_set(&(*nhe)->refcnt, 1);
@@ -1103,7 +1104,10 @@ int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv,
}
e->nhe = nhe;
- list_add(&e->encap_list, &nhe->encap_list);
+ spin_lock(&nhe->encap_list_lock);
+ list_add_rcu(&e->encap_list, &nhe->encap_list);
+ spin_unlock(&nhe->encap_list_lock);
+
mutex_unlock(&rpriv->neigh_update.encap_lock);
return 0;
@@ -1119,7 +1123,9 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv,
if (!e->nhe)
return;
- list_del(&e->encap_list);
+ spin_lock(&e->nhe->encap_list_lock);
+ list_del_rcu(&e->encap_list);
+ spin_unlock(&e->nhe->encap_list_lock);
mlx5e_rep_neigh_entry_release(e->nhe);
e->nhe = NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index 8fa27832bd81..a0ae5069d8c3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -119,6 +119,8 @@ struct mlx5e_neigh_hash_entry {
*/
struct list_head neigh_list;
+ /* protects encap list */
+ spinlock_t encap_list_lock;
/* encap list sharing the same neigh */
struct list_head encap_list;
@@ -173,6 +175,7 @@ struct mlx5e_encap_entry {
refcount_t refcnt;
struct completion res_ready;
int compl_result;
+ struct rcu_head rcu;
};
struct mlx5e_rep_sq {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 3917834b48ff..a4d11274be30 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1412,11 +1412,56 @@ static struct mlx5_fc *mlx5e_tc_get_counter(struct mlx5e_tc_flow *flow)
return flow->nic_attr->counter;
}
+static struct mlx5e_encap_entry *
+mlx5e_get_next_valid_encap(struct mlx5e_neigh_hash_entry *nhe,
+ struct mlx5e_encap_entry *e)
+{
+ struct mlx5e_encap_entry *next = NULL;
+
+retry:
+ rcu_read_lock();
+
+ /* find encap with non-zero reference counter value */
+ for (next = e ?
+ list_next_or_null_rcu(&nhe->encap_list,
+ &e->encap_list,
+ struct mlx5e_encap_entry,
+ encap_list) :
+ list_first_or_null_rcu(&nhe->encap_list,
+ struct mlx5e_encap_entry,
+ encap_list);
+ next;
+ next = list_next_or_null_rcu(&nhe->encap_list,
+ &next->encap_list,
+ struct mlx5e_encap_entry,
+ encap_list))
+ if (mlx5e_encap_take(next))
+ break;
+
+ rcu_read_unlock();
+
+ /* release starting encap */
+ if (e)
+ mlx5e_encap_put(netdev_priv(e->out_dev), e);
+ if (!next)
+ return next;
+
+ /* wait for encap to be fully initialized */
+ wait_for_completion(&next->res_ready);
+ /* continue searching if encap entry is not in valid state after completion */
+ if (!(next->flags & MLX5_ENCAP_ENTRY_VALID)) {
+ e = next;
+ goto retry;
+ }
+
+ return next;
+}
+
void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
{
struct mlx5e_neigh *m_neigh = &nhe->m_neigh;
+ struct mlx5e_encap_entry *e = NULL;
struct mlx5e_tc_flow *flow;
- struct mlx5e_encap_entry *e;
struct mlx5_fc *counter;
struct neigh_table *tbl;
bool neigh_used = false;
@@ -1432,13 +1477,12 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
else
return;
- list_for_each_entry(e, &nhe->encap_list, encap_list) {
+ /* mlx5e_get_next_valid_encap() releases previous encap before returning
+ * next one.
+ */
+ while ((e = mlx5e_get_next_valid_encap(nhe, e)) != NULL) {
struct encap_flow_item *efi, *tmp;
- if (!(e->flags & MLX5_ENCAP_ENTRY_VALID) ||
- !mlx5e_encap_take(e))
- continue;
-
list_for_each_entry_safe(efi, tmp, &e->flows, list) {
flow = container_of(efi, struct mlx5e_tc_flow,
encaps[efi->index]);
@@ -1458,9 +1502,11 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
mlx5e_flow_put(netdev_priv(e->out_dev), flow);
}
- mlx5e_encap_put(netdev_priv(e->out_dev), e);
- if (neigh_used)
+ if (neigh_used) {
+ /* release current encap before breaking the loop */
+ mlx5e_encap_put(netdev_priv(e->out_dev), e);
break;
+ }
}
if (neigh_used) {
@@ -1490,7 +1536,7 @@ static void mlx5e_encap_dealloc(struct mlx5e_priv *priv, struct mlx5e_encap_entr
}
kfree(e->encap_header);
- kfree(e);
+ kfree_rcu(e, rcu);
}
void mlx5e_encap_put(struct mlx5e_priv *priv, struct mlx5e_encap_entry *e)
--
2.21.0
^ permalink raw reply related
* [net-next 06/11] net/mlx5e: Refactor neigh used value update for concurrent execution
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Roi Dayan, Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
In order to remove dependency on rtnl lock and allow neigh used value
update workqueue task to execute concurrently with tc, refactor
mlx5e_tc_update_neigh_used_value() for concurrent execution:
- Lock encap table when accessing encap entry to prevent concurrent
changes.
- Save offloaded encap flows to temporary list and release them after encap
entry is updated. Add mlx5e_put_encap_flow_list() helper which is
intended to be shared with neigh update code in following patch in this
series. This is necessary because mlx5e_flow_put() can't be called while
holding encap_tbl_lock.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_tc.c | 23 +++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index a4d11274be30..3a562189af71 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -126,6 +126,7 @@ struct mlx5e_tc_flow {
struct list_head hairpin; /* flows sharing the same hairpin */
struct list_head peer; /* flows with peer flow */
struct list_head unready; /* flows not ready to be offloaded (e.g due to missing route) */
+ struct list_head tmp_list; /* temporary flow list used by neigh update */
refcount_t refcnt;
struct rcu_head rcu_head;
union {
@@ -1412,6 +1413,15 @@ static struct mlx5_fc *mlx5e_tc_get_counter(struct mlx5e_tc_flow *flow)
return flow->nic_attr->counter;
}
+/* Iterate over tmp_list of flows attached to flow_list head. */
+static void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list)
+{
+ struct mlx5e_tc_flow *flow, *tmp;
+
+ list_for_each_entry_safe(flow, tmp, flow_list, tmp_list)
+ mlx5e_flow_put(priv, flow);
+}
+
static struct mlx5e_encap_entry *
mlx5e_get_next_valid_encap(struct mlx5e_neigh_hash_entry *nhe,
struct mlx5e_encap_entry *e)
@@ -1481,30 +1491,35 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
* next one.
*/
while ((e = mlx5e_get_next_valid_encap(nhe, e)) != NULL) {
+ struct mlx5e_priv *priv = netdev_priv(e->out_dev);
struct encap_flow_item *efi, *tmp;
+ struct mlx5_eswitch *esw;
+ LIST_HEAD(flow_list);
+ esw = priv->mdev->priv.eswitch;
+ mutex_lock(&esw->offloads.encap_tbl_lock);
list_for_each_entry_safe(efi, tmp, &e->flows, list) {
flow = container_of(efi, struct mlx5e_tc_flow,
encaps[efi->index]);
if (IS_ERR(mlx5e_flow_get(flow)))
continue;
+ list_add(&flow->tmp_list, &flow_list);
if (mlx5e_is_offloaded_flow(flow)) {
counter = mlx5e_tc_get_counter(flow);
lastuse = mlx5_fc_query_lastuse(counter);
if (time_after((unsigned long)lastuse, nhe->reported_lastuse)) {
- mlx5e_flow_put(netdev_priv(e->out_dev), flow);
neigh_used = true;
break;
}
}
-
- mlx5e_flow_put(netdev_priv(e->out_dev), flow);
}
+ mutex_unlock(&esw->offloads.encap_tbl_lock);
+ mlx5e_put_encap_flow_list(priv, &flow_list);
if (neigh_used) {
/* release current encap before breaking the loop */
- mlx5e_encap_put(netdev_priv(e->out_dev), e);
+ mlx5e_encap_put(priv, e);
break;
}
}
--
2.21.0
^ permalink raw reply related
* [net-next 07/11] net/mlx5e: Refactor neigh update for concurrent execution
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Roi Dayan, Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
In order to remove dependency on rtnl lock and allow neigh update workqueue
task to execute concurrently with tc, refactor mlx5e_rep_neigh_update() for
concurrent execution:
- Lock encap table when accessing encap entry to prevent concurrent
changes. To do this properly, the initial encap state check is moved from
mlx5e_rep_neigh_update() into mlx5e_rep_update_flows() to be performed
under encap_tbl_lock protection.
- Wait for encap to be fully initialized before accessing it by means of
'res_ready' completion.
- Add mlx5e_take_all_encap_flows() helper which is used to construct a
temporary list of flows and efi indexes that is used to access current
encap data in flow which can be attached to multiple encaps
simultaneously. Release the flows from temporary list after
encap_tbl_lock critical section. This is necessary because
mlx5e_flow_put() can't be called while holding encap_tbl_lock.
- Modify mlx5e_tc_encap_flows_add() and mlx5e_tc_encap_flows_del() to work
with user-provided list of flows built by mlx5e_take_all_encap_flows(),
instead of traversing encap flow list directly.
This is first step in complex neigh update refactoring, which is finished
by following commit in this series.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 29 ++++++---
.../net/ethernet/mellanox/mlx5/core/en_tc.c | 59 ++++++++++---------
.../net/ethernet/mellanox/mlx5/core/en_tc.h | 9 ++-
3 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index f26edf458152..5217f39828a4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -595,12 +595,26 @@ static void mlx5e_rep_update_flows(struct mlx5e_priv *priv,
unsigned char ha[ETH_ALEN])
{
struct ethhdr *eth = (struct ethhdr *)e->encap_header;
+ struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+ bool encap_connected;
+ LIST_HEAD(flow_list);
ASSERT_RTNL();
+ /* wait for encap to be fully initialized */
+ wait_for_completion(&e->res_ready);
+
+ mutex_lock(&esw->offloads.encap_tbl_lock);
+ encap_connected = !!(e->flags & MLX5_ENCAP_ENTRY_VALID);
+ if (e->compl_result || (encap_connected == neigh_connected &&
+ ether_addr_equal(e->h_dest, ha)))
+ goto unlock;
+
+ mlx5e_take_all_encap_flows(e, &flow_list);
+
if ((e->flags & MLX5_ENCAP_ENTRY_VALID) &&
(!neigh_connected || !ether_addr_equal(e->h_dest, ha)))
- mlx5e_tc_encap_flows_del(priv, e);
+ mlx5e_tc_encap_flows_del(priv, e, &flow_list);
if (neigh_connected && !(e->flags & MLX5_ENCAP_ENTRY_VALID)) {
ether_addr_copy(e->h_dest, ha);
@@ -610,8 +624,11 @@ static void mlx5e_rep_update_flows(struct mlx5e_priv *priv,
*/
ether_addr_copy(eth->h_source, e->route_dev->dev_addr);
- mlx5e_tc_encap_flows_add(priv, e);
+ mlx5e_tc_encap_flows_add(priv, e, &flow_list);
}
+unlock:
+ mutex_unlock(&esw->offloads.encap_tbl_lock);
+ mlx5e_put_encap_flow_list(priv, &flow_list);
}
static void mlx5e_rep_neigh_update(struct work_struct *work)
@@ -623,7 +640,6 @@ static void mlx5e_rep_neigh_update(struct work_struct *work)
unsigned char ha[ETH_ALEN];
struct mlx5e_priv *priv;
bool neigh_connected;
- bool encap_connected;
u8 nud_state, dead;
rtnl_lock();
@@ -645,13 +661,8 @@ static void mlx5e_rep_neigh_update(struct work_struct *work)
if (!mlx5e_encap_take(e))
continue;
- encap_connected = !!(e->flags & MLX5_ENCAP_ENTRY_VALID);
priv = netdev_priv(e->out_dev);
-
- if (encap_connected != neigh_connected ||
- !ether_addr_equal(e->h_dest, ha))
- mlx5e_rep_update_flows(priv, e, neigh_connected, ha);
-
+ mlx5e_rep_update_flows(priv, e, neigh_connected, ha);
mlx5e_encap_put(priv, e);
}
mlx5e_rep_neigh_entry_release(nhe);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 3a562189af71..b63bae05955b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -126,6 +126,7 @@ struct mlx5e_tc_flow {
struct list_head hairpin; /* flows sharing the same hairpin */
struct list_head peer; /* flows with peer flow */
struct list_head unready; /* flows not ready to be offloaded (e.g due to missing route) */
+ int tmp_efi_index;
struct list_head tmp_list; /* temporary flow list used by neigh update */
refcount_t refcnt;
struct rcu_head rcu_head;
@@ -1291,11 +1292,11 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
}
void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
- struct mlx5e_encap_entry *e)
+ struct mlx5e_encap_entry *e,
+ struct list_head *flow_list)
{
struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
struct mlx5_esw_flow_attr slow_attr, *esw_attr;
- struct encap_flow_item *efi, *tmp;
struct mlx5_flow_handle *rule;
struct mlx5_flow_spec *spec;
struct mlx5e_tc_flow *flow;
@@ -1314,19 +1315,15 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
e->flags |= MLX5_ENCAP_ENTRY_VALID;
mlx5e_rep_queue_neigh_stats_work(priv);
- list_for_each_entry_safe(efi, tmp, &e->flows, list) {
+ list_for_each_entry(flow, flow_list, tmp_list) {
bool all_flow_encaps_valid = true;
int i;
- flow = container_of(efi, struct mlx5e_tc_flow, encaps[efi->index]);
- if (IS_ERR(mlx5e_flow_get(flow)))
- continue;
-
esw_attr = flow->esw_attr;
spec = &esw_attr->parse_attr->spec;
- esw_attr->dests[efi->index].encap_id = e->encap_id;
- esw_attr->dests[efi->index].flags |= MLX5_ESW_DEST_ENCAP_VALID;
+ esw_attr->dests[flow->tmp_efi_index].encap_id = e->encap_id;
+ esw_attr->dests[flow->tmp_efi_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;
/* Flow can be associated with multiple encap entries.
* Before offloading the flow verify that all of them have
* a valid neighbour.
@@ -1341,63 +1338,53 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
}
/* Do not offload flows with unresolved neighbors */
if (!all_flow_encaps_valid)
- goto loop_cont;
+ continue;
/* update from slow path rule to encap rule */
rule = mlx5e_tc_offload_fdb_rules(esw, flow, spec, esw_attr);
if (IS_ERR(rule)) {
err = PTR_ERR(rule);
mlx5_core_warn(priv->mdev, "Failed to update cached encapsulation flow, %d\n",
err);
- goto loop_cont;
+ continue;
}
mlx5e_tc_unoffload_from_slow_path(esw, flow, &slow_attr);
flow->rule[0] = rule;
/* was unset when slow path rule removed */
flow_flag_set(flow, OFFLOADED);
-
-loop_cont:
- mlx5e_flow_put(priv, flow);
}
}
void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv,
- struct mlx5e_encap_entry *e)
+ struct mlx5e_encap_entry *e,
+ struct list_head *flow_list)
{
struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
struct mlx5_esw_flow_attr slow_attr;
- struct encap_flow_item *efi, *tmp;
struct mlx5_flow_handle *rule;
struct mlx5_flow_spec *spec;
struct mlx5e_tc_flow *flow;
int err;
- list_for_each_entry_safe(efi, tmp, &e->flows, list) {
- flow = container_of(efi, struct mlx5e_tc_flow, encaps[efi->index]);
- if (IS_ERR(mlx5e_flow_get(flow)))
- continue;
-
+ list_for_each_entry(flow, flow_list, tmp_list) {
spec = &flow->esw_attr->parse_attr->spec;
/* update from encap rule to slow path rule */
rule = mlx5e_tc_offload_to_slow_path(esw, flow, spec, &slow_attr);
/* mark the flow's encap dest as non-valid */
- flow->esw_attr->dests[efi->index].flags &= ~MLX5_ESW_DEST_ENCAP_VALID;
+ flow->esw_attr->dests[flow->tmp_efi_index].flags &= ~MLX5_ESW_DEST_ENCAP_VALID;
if (IS_ERR(rule)) {
err = PTR_ERR(rule);
mlx5_core_warn(priv->mdev, "Failed to update slow path (encap) flow, %d\n",
err);
- goto loop_cont;
+ continue;
}
mlx5e_tc_unoffload_fdb_rules(esw, flow, flow->esw_attr);
flow->rule[0] = rule;
/* was unset when fast path rule removed */
flow_flag_set(flow, OFFLOADED);
-
-loop_cont:
- mlx5e_flow_put(priv, flow);
}
/* we know that the encap is valid */
@@ -1413,8 +1400,26 @@ static struct mlx5_fc *mlx5e_tc_get_counter(struct mlx5e_tc_flow *flow)
return flow->nic_attr->counter;
}
+/* Takes reference to all flows attached to encap and adds the flows to
+ * flow_list using 'tmp_list' list_head in mlx5e_tc_flow.
+ */
+void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry *e, struct list_head *flow_list)
+{
+ struct encap_flow_item *efi;
+ struct mlx5e_tc_flow *flow;
+
+ list_for_each_entry(efi, &e->flows, list) {
+ flow = container_of(efi, struct mlx5e_tc_flow, encaps[efi->index]);
+ if (IS_ERR(mlx5e_flow_get(flow)))
+ continue;
+
+ flow->tmp_efi_index = efi->index;
+ list_add(&flow->tmp_list, flow_list);
+ }
+}
+
/* Iterate over tmp_list of flows attached to flow_list head. */
-static void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list)
+void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list)
{
struct mlx5e_tc_flow *flow, *tmp;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index ea2072e2fe84..924c6ef86a14 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -72,12 +72,17 @@ void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,
struct mlx5e_encap_entry;
void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
- struct mlx5e_encap_entry *e);
+ struct mlx5e_encap_entry *e,
+ struct list_head *flow_list);
void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv,
- struct mlx5e_encap_entry *e);
+ struct mlx5e_encap_entry *e,
+ struct list_head *flow_list);
bool mlx5e_encap_take(struct mlx5e_encap_entry *e);
void mlx5e_encap_put(struct mlx5e_priv *priv, struct mlx5e_encap_entry *e);
+void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry *e, struct list_head *flow_list);
+void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list);
+
struct mlx5e_neigh_hash_entry;
void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);
--
2.21.0
^ permalink raw reply related
* [net-next 08/11] net/mlx5e: Only access fully initialized flows in neigh update
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Roi Dayan, Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
To remove dependency on rtnl lock and prevent neigh update code from
accessing uninitialized flows when executing concurrently with tc, extend
mlx5e_tc_flow with 'init_done' completion. Modify helper
mlx5e_take_all_encap_flows() to wait for flow completion after obtaining
reference to it. Modify mlx5e_tc_encap_flows_del() and
mlx5e_tc_encap_flows_add() to skip flows that don't have OFFLOADED flag
set, which can happen if concurrent flow initialization failed.
This commit finishes neigh update refactoring for concurrent execution
started in previous change in this series.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index b63bae05955b..5d4ce3d58832 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -130,6 +130,7 @@ struct mlx5e_tc_flow {
struct list_head tmp_list; /* temporary flow list used by neigh update */
refcount_t refcnt;
struct rcu_head rcu_head;
+ struct completion init_done;
union {
struct mlx5_esw_flow_attr esw_attr[0];
struct mlx5_nic_flow_attr nic_attr[0];
@@ -1319,6 +1320,8 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
bool all_flow_encaps_valid = true;
int i;
+ if (!mlx5e_is_offloaded_flow(flow))
+ continue;
esw_attr = flow->esw_attr;
spec = &esw_attr->parse_attr->spec;
@@ -1367,6 +1370,8 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv,
int err;
list_for_each_entry(flow, flow_list, tmp_list) {
+ if (!mlx5e_is_offloaded_flow(flow))
+ continue;
spec = &flow->esw_attr->parse_attr->spec;
/* update from encap rule to slow path rule */
@@ -1412,6 +1417,7 @@ void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry *e, struct list_head *f
flow = container_of(efi, struct mlx5e_tc_flow, encaps[efi->index]);
if (IS_ERR(mlx5e_flow_get(flow)))
continue;
+ wait_for_completion(&flow->init_done);
flow->tmp_efi_index = efi->index;
list_add(&flow->tmp_list, flow_list);
@@ -3492,6 +3498,7 @@ mlx5e_alloc_flow(struct mlx5e_priv *priv, int attr_size,
INIT_LIST_HEAD(&flow->mod_hdr);
INIT_LIST_HEAD(&flow->hairpin);
refcount_set(&flow->refcnt, 1);
+ init_completion(&flow->init_done);
*__flow = flow;
*__parse_attr = parse_attr;
@@ -3564,6 +3571,7 @@ __mlx5e_add_fdb_flow(struct mlx5e_priv *priv,
goto err_free;
err = mlx5e_tc_add_fdb_flow(priv, flow, extack);
+ complete_all(&flow->init_done);
if (err) {
if (!(err == -ENETUNREACH && mlx5_lag_is_multipath(in_mdev)))
goto err_free;
--
2.21.0
^ permalink raw reply related
* [net-next 09/11] net/mlx5e: Add tc flower tracepoints
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Dmytro Linkin, Vlad Buslov,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Dmytro Linkin <dmitrolin@mellanox.com>
Implemented following tracepoints:
1. Configure flower (mlx5e_configure_flower)
2. Delete flower (mlx5e_delete_flower)
3. Stats flower (mlx5e_stats_flower)
Usage example:
># cd /sys/kernel/debug/tracing
># echo mlx5:mlx5e_configure_flower >> set_event
># cat trace
...
tc-6535 [019] ...1 2672.404466: mlx5e_configure_flower: cookie=0000000067874a55 actions= REDIRECT
Added corresponding documentation in
Documentation/networking/device-driver/mellanox/mlx5.rst
Signed-off-by: Dmytro Linkin <dmitrolin@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../device_drivers/mellanox/mlx5.rst | 32 +++++++
.../net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
.../mlx5/core/diag/en_tc_tracepoint.c | 58 +++++++++++++
.../mlx5/core/diag/en_tc_tracepoint.h | 83 +++++++++++++++++++
.../net/ethernet/mellanox/mlx5/core/en_tc.c | 4 +
include/net/flow_offload.h | 1 +
6 files changed, 179 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
diff --git a/Documentation/networking/device_drivers/mellanox/mlx5.rst b/Documentation/networking/device_drivers/mellanox/mlx5.rst
index cfda464e52de..1339dbf52431 100644
--- a/Documentation/networking/device_drivers/mellanox/mlx5.rst
+++ b/Documentation/networking/device_drivers/mellanox/mlx5.rst
@@ -12,6 +12,7 @@ Contents
- `Enabling the driver and kconfig options`_
- `Devlink info`_
- `Devlink health reporters`_
+- `mlx5 tracepoints`_
Enabling the driver and kconfig options
================================================
@@ -219,3 +220,34 @@ User commands examples:
$ devlink health dump show pci/0000:82:00.1 reporter fw_fatal
NOTE: This command can run only on PF.
+
+mlx5 tracepoints
+================
+
+mlx5 driver provides internal trace points for tracking and debugging using
+kernel tracepoints interfaces (refer to Documentation/trace/ftrase.rst).
+
+For the list of support mlx5 events check /sys/kernel/debug/tracing/events/mlx5/
+
+tc and eswitch offloads tracepoints:
+
+- mlx5e_configure_flower: trace flower filter actions and cookies offloaded to mlx5::
+
+ $ echo mlx5:mlx5e_configure_flower >> /sys/kernel/debug/tracing/set_event
+ $ cat /sys/kernel/debug/tracing/trace
+ ...
+ tc-6535 [019] ...1 2672.404466: mlx5e_configure_flower: cookie=0000000067874a55 actions= REDIRECT
+
+- mlx5e_delete_flower: trace flower filter actions and cookies deleted from mlx5::
+
+ $ echo mlx5:mlx5e_delete_flower >> /sys/kernel/debug/tracing/set_event
+ $ cat /sys/kernel/debug/tracing/trace
+ ...
+ tc-6569 [010] .N.1 2686.379075: mlx5e_delete_flower: cookie=0000000067874a55 actions= NULL
+
+- mlx5e_stats_flower: trace flower stats request::
+
+ $ echo mlx5:mlx5e_stats_flower >> /sys/kernel/debug/tracing/set_event
+ $ cat /sys/kernel/debug/tracing/trace
+ ...
+ tc-6546 [010] ...1 2679.704889: mlx5e_stats_flower: cookie=0000000060eb3d6a bytes=0 packets=0 lastused=4295560217
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index a3b9659649a8..bcf36552f069 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -35,7 +35,7 @@ mlx5_core-$(CONFIG_MLX5_EN_RXNFC) += en_fs_ethtool.o
mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o en/port_buffer.o
mlx5_core-$(CONFIG_MLX5_ESWITCH) += en_rep.o en_tc.o en/tc_tun.o lib/port_tun.o lag_mp.o \
lib/geneve.o en/tc_tun_vxlan.o en/tc_tun_gre.o \
- en/tc_tun_geneve.o
+ en/tc_tun_geneve.o diag/en_tc_tracepoint.o
#
# Core extra
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c
new file mode 100644
index 000000000000..c5dc6c50fa87
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+/* Copyright (c) 2019 Mellanox Technologies. */
+
+#define CREATE_TRACE_POINTS
+#include "en_tc_tracepoint.h"
+
+void put_ids_to_array(int *ids,
+ const struct flow_action_entry *entries,
+ unsigned int num)
+{
+ unsigned int i;
+
+ for (i = 0; i < num; i++)
+ ids[i] = entries[i].id;
+}
+
+#define NAME_SIZE 16
+
+static const char FLOWACT2STR[NUM_FLOW_ACTIONS][NAME_SIZE] = {
+ [FLOW_ACTION_ACCEPT] = "ACCEPT",
+ [FLOW_ACTION_DROP] = "DROP",
+ [FLOW_ACTION_TRAP] = "TRAP",
+ [FLOW_ACTION_GOTO] = "GOTO",
+ [FLOW_ACTION_REDIRECT] = "REDIRECT",
+ [FLOW_ACTION_MIRRED] = "MIRRED",
+ [FLOW_ACTION_VLAN_PUSH] = "VLAN_PUSH",
+ [FLOW_ACTION_VLAN_POP] = "VLAN_POP",
+ [FLOW_ACTION_VLAN_MANGLE] = "VLAN_MANGLE",
+ [FLOW_ACTION_TUNNEL_ENCAP] = "TUNNEL_ENCAP",
+ [FLOW_ACTION_TUNNEL_DECAP] = "TUNNEL_DECAP",
+ [FLOW_ACTION_MANGLE] = "MANGLE",
+ [FLOW_ACTION_ADD] = "ADD",
+ [FLOW_ACTION_CSUM] = "CSUM",
+ [FLOW_ACTION_MARK] = "MARK",
+ [FLOW_ACTION_WAKE] = "WAKE",
+ [FLOW_ACTION_QUEUE] = "QUEUE",
+ [FLOW_ACTION_SAMPLE] = "SAMPLE",
+ [FLOW_ACTION_POLICE] = "POLICE",
+ [FLOW_ACTION_CT] = "CT",
+};
+
+const char *parse_action(struct trace_seq *p,
+ int *ids,
+ unsigned int num)
+{
+ const char *ret = trace_seq_buffer_ptr(p);
+ unsigned int i;
+
+ for (i = 0; i < num; i++) {
+ if (ids[i] < NUM_FLOW_ACTIONS)
+ trace_seq_printf(p, "%s ", FLOWACT2STR[ids[i]]);
+ else
+ trace_seq_printf(p, "UNKNOWN ");
+ }
+
+ trace_seq_putc(p, 0);
+ return ret;
+}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
new file mode 100644
index 000000000000..a362100fe6d3
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
@@ -0,0 +1,83 @@
+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
+/* Copyright (c) 2019 Mellanox Technologies. */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mlx5
+
+#if !defined(_MLX5_TC_TP_) || defined(TRACE_HEADER_MULTI_READ)
+#define _MLX5_TC_TP_
+
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+#include <net/flow_offload.h>
+
+#define __parse_action(ids, num) parse_action(p, ids, num)
+
+void put_ids_to_array(int *ids,
+ const struct flow_action_entry *entries,
+ unsigned int num);
+
+const char *parse_action(struct trace_seq *p,
+ int *ids,
+ unsigned int num);
+
+DECLARE_EVENT_CLASS(mlx5e_flower_template,
+ TP_PROTO(const struct flow_cls_offload *f),
+ TP_ARGS(f),
+ TP_STRUCT__entry(__field(void *, cookie)
+ __field(unsigned int, num)
+ __dynamic_array(int, ids, f->rule ?
+ f->rule->action.num_entries : 0)
+ ),
+ TP_fast_assign(__entry->cookie = (void *)f->cookie;
+ __entry->num = (f->rule ?
+ f->rule->action.num_entries : 0);
+ if (__entry->num)
+ put_ids_to_array(__get_dynamic_array(ids),
+ f->rule->action.entries,
+ f->rule->action.num_entries);
+ ),
+ TP_printk("cookie=%p actions= %s\n",
+ __entry->cookie, __entry->num ?
+ __parse_action(__get_dynamic_array(ids),
+ __entry->num) : "NULL"
+ )
+);
+
+DEFINE_EVENT(mlx5e_flower_template, mlx5e_configure_flower,
+ TP_PROTO(const struct flow_cls_offload *f),
+ TP_ARGS(f)
+ );
+
+DEFINE_EVENT(mlx5e_flower_template, mlx5e_delete_flower,
+ TP_PROTO(const struct flow_cls_offload *f),
+ TP_ARGS(f)
+ );
+
+TRACE_EVENT(mlx5e_stats_flower,
+ TP_PROTO(const struct flow_cls_offload *f),
+ TP_ARGS(f),
+ TP_STRUCT__entry(__field(void *, cookie)
+ __field(u64, bytes)
+ __field(u64, packets)
+ __field(u64, lastused)
+ ),
+ TP_fast_assign(__entry->cookie = (void *)f->cookie;
+ __entry->bytes = f->stats.bytes;
+ __entry->packets = f->stats.pkts;
+ __entry->lastused = f->stats.lastused;
+ ),
+ TP_printk("cookie=%p bytes=%llu packets=%llu lastused=%llu\n",
+ __entry->cookie, __entry->bytes,
+ __entry->packets, __entry->lastused
+ )
+);
+
+#endif /* _MLX5_TC_TP_ */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ./diag
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE en_tc_tracepoint
+#include <trace/define_trace.h>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 5d4ce3d58832..c40cca08c8cc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -56,6 +56,7 @@
#include "en/tc_tun.h"
#include "lib/devcom.h"
#include "lib/geneve.h"
+#include "diag/en_tc_tracepoint.h"
struct mlx5_nic_flow_attr {
u32 action;
@@ -3769,6 +3770,7 @@ int mlx5e_configure_flower(struct net_device *dev, struct mlx5e_priv *priv,
goto out;
}
+ trace_mlx5e_configure_flower(f);
err = mlx5e_tc_add_flow(priv, f, flags, dev, &flow);
if (err)
goto out;
@@ -3818,6 +3820,7 @@ int mlx5e_delete_flower(struct net_device *dev, struct mlx5e_priv *priv,
rhashtable_remove_fast(tc_ht, &flow->node, tc_ht_params);
rcu_read_unlock();
+ trace_mlx5e_delete_flower(f);
mlx5e_flow_put(priv, flow);
return 0;
@@ -3887,6 +3890,7 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv,
mlx5_devcom_release_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);
out:
flow_stats_update(&f->stats, bytes, packets, lastuse);
+ trace_mlx5e_stats_flower(f);
errout:
mlx5e_flow_put(priv, flow);
return err;
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index e8069b6c474c..757fa84de654 100644
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -138,6 +138,7 @@ enum flow_action_id {
FLOW_ACTION_MPLS_PUSH,
FLOW_ACTION_MPLS_POP,
FLOW_ACTION_MPLS_MANGLE,
+ NUM_FLOW_ACTIONS,
};
/* This is mirroring enum pedit_header_type definition for easy mapping between
--
2.21.0
^ permalink raw reply related
* [net-next 10/11] net/mlx5e: Add trace point for neigh used value update
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Dmytro Linkin,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
Allow tracing result of neigh used value update task that is executed
periodically on workqueue.
Usage example:
># cd /sys/kernel/debug/tracing
># echo mlx5:mlx5e_tc_update_neigh_used_value >> set_event
># cat trace
...
kworker/u48:4-8806 [009] ...1 55117.882428: mlx5e_tc_update_neigh_used_value:
netdev: ens1f0 IPv4: 1.1.1.10 IPv6: ::ffff:1.1.1.10 neigh_used=1
Added corresponding documentation in
Documentation/networking/device-driver/mellanox/mlx5.rst
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../device_drivers/mellanox/mlx5.rst | 7 +++++
.../mlx5/core/diag/en_tc_tracepoint.h | 31 +++++++++++++++++++
.../net/ethernet/mellanox/mlx5/core/en_tc.c | 2 ++
3 files changed, 40 insertions(+)
diff --git a/Documentation/networking/device_drivers/mellanox/mlx5.rst b/Documentation/networking/device_drivers/mellanox/mlx5.rst
index 1339dbf52431..b2f21ce9b090 100644
--- a/Documentation/networking/device_drivers/mellanox/mlx5.rst
+++ b/Documentation/networking/device_drivers/mellanox/mlx5.rst
@@ -251,3 +251,10 @@ tc and eswitch offloads tracepoints:
$ cat /sys/kernel/debug/tracing/trace
...
tc-6546 [010] ...1 2679.704889: mlx5e_stats_flower: cookie=0000000060eb3d6a bytes=0 packets=0 lastused=4295560217
+
+- mlx5e_tc_update_neigh_used_value: trace tunnel rule neigh update value offloaded to mlx5::
+
+ $ echo mlx5:mlx5e_tc_update_neigh_used_value >> /sys/kernel/debug/tracing/set_event
+ $ cat /sys/kernel/debug/tracing/trace
+ ...
+ kworker/u48:4-8806 [009] ...1 55117.882428: mlx5e_tc_update_neigh_used_value: netdev: ens1f0 IPv4: 1.1.1.10 IPv6: ::ffff:1.1.1.10 neigh_used=1
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
index a362100fe6d3..d4e6cfaaade3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
@@ -10,6 +10,7 @@
#include <linux/tracepoint.h>
#include <linux/trace_seq.h>
#include <net/flow_offload.h>
+#include "en_rep.h"
#define __parse_action(ids, num) parse_action(p, ids, num)
@@ -73,6 +74,36 @@ TRACE_EVENT(mlx5e_stats_flower,
)
);
+TRACE_EVENT(mlx5e_tc_update_neigh_used_value,
+ TP_PROTO(const struct mlx5e_neigh_hash_entry *nhe, bool neigh_used),
+ TP_ARGS(nhe, neigh_used),
+ TP_STRUCT__entry(__string(devname, nhe->m_neigh.dev->name)
+ __array(u8, v4, 4)
+ __array(u8, v6, 16)
+ __field(bool, neigh_used)
+ ),
+ TP_fast_assign(const struct mlx5e_neigh *mn = &nhe->m_neigh;
+ struct in6_addr *pin6;
+ __be32 *p32;
+
+ __assign_str(devname, mn->dev->name);
+ __entry->neigh_used = neigh_used;
+
+ p32 = (__be32 *)__entry->v4;
+ pin6 = (struct in6_addr *)__entry->v6;
+ if (mn->family == AF_INET) {
+ *p32 = mn->dst_ip.v4;
+ ipv6_addr_set_v4mapped(*p32, pin6);
+ } else if (mn->family == AF_INET6) {
+ *pin6 = mn->dst_ip.v6;
+ }
+ ),
+ TP_printk("netdev: %s IPv4: %pI4 IPv6: %pI6c neigh_used=%d\n",
+ __get_str(devname), __entry->v4, __entry->v6,
+ __entry->neigh_used
+ )
+);
+
#endif /* _MLX5_TC_TP_ */
/* This part must be outside protection */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index c40cca08c8cc..5581a8045ede 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1536,6 +1536,8 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe)
}
}
+ trace_mlx5e_tc_update_neigh_used_value(nhe, neigh_used);
+
if (neigh_used) {
nhe->reported_lastuse = jiffies;
--
2.21.0
^ permalink raw reply related
* [net-next 11/11] net/mlx5e: Add trace point for neigh update
From: Saeed Mahameed @ 2019-08-21 23:28 UTC (permalink / raw)
To: David S. Miller
Cc: netdev@vger.kernel.org, Vlad Buslov, Dmytro Linkin,
Saeed Mahameed
In-Reply-To: <20190821232806.21847-1-saeedm@mellanox.com>
From: Vlad Buslov <vladbu@mellanox.com>
Allow tracing neigh state during neigh update task that is executed on
workqueue and is scheduled by neigh state change event.
Usage example:
># cd /sys/kernel/debug/tracing
># echo mlx5:mlx5e_rep_neigh_update >> set_event
># cat trace
...
kworker/u48:7-2221 [009] ...1 1475.387435: mlx5e_rep_neigh_update:
netdev: ens1f0 MAC: 24:8a:07:9a:17:9a IPv4: 1.1.1.10 IPv6: ::ffff:1.1.1.10 neigh_connected=1
Added corresponding documentation in
Documentation/networking/device-driver/mellanox/mlx5.rst
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../device_drivers/mellanox/mlx5.rst | 7 +++
.../mlx5/core/diag/en_rep_tracepoint.h | 54 +++++++++++++++++++
.../net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++
3 files changed, 65 insertions(+)
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h
diff --git a/Documentation/networking/device_drivers/mellanox/mlx5.rst b/Documentation/networking/device_drivers/mellanox/mlx5.rst
index b2f21ce9b090..b30a63dbf4b7 100644
--- a/Documentation/networking/device_drivers/mellanox/mlx5.rst
+++ b/Documentation/networking/device_drivers/mellanox/mlx5.rst
@@ -258,3 +258,10 @@ tc and eswitch offloads tracepoints:
$ cat /sys/kernel/debug/tracing/trace
...
kworker/u48:4-8806 [009] ...1 55117.882428: mlx5e_tc_update_neigh_used_value: netdev: ens1f0 IPv4: 1.1.1.10 IPv6: ::ffff:1.1.1.10 neigh_used=1
+
+- mlx5e_rep_neigh_update: trace neigh update tasks scheduled due to neigh state change events::
+
+ $ echo mlx5:mlx5e_rep_neigh_update >> /sys/kernel/debug/tracing/set_event
+ $ cat /sys/kernel/debug/tracing/trace
+ ...
+ kworker/u48:7-2221 [009] ...1 1475.387435: mlx5e_rep_neigh_update: netdev: ens1f0 MAC: 24:8a:07:9a:17:9a IPv4: 1.1.1.10 IPv6: ::ffff:1.1.1.10 neigh_connected=1
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h
new file mode 100644
index 000000000000..1177860a2ee4
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
+/* Copyright (c) 2019 Mellanox Technologies. */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mlx5
+
+#if !defined(_MLX5_EN_REP_TP_) || defined(TRACE_HEADER_MULTI_READ)
+#define _MLX5_EN_REP_TP_
+
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+#include "en_rep.h"
+
+TRACE_EVENT(mlx5e_rep_neigh_update,
+ TP_PROTO(const struct mlx5e_neigh_hash_entry *nhe, const u8 *ha,
+ bool neigh_connected),
+ TP_ARGS(nhe, ha, neigh_connected),
+ TP_STRUCT__entry(__string(devname, nhe->m_neigh.dev->name)
+ __array(u8, ha, ETH_ALEN)
+ __array(u8, v4, 4)
+ __array(u8, v6, 16)
+ __field(bool, neigh_connected)
+ ),
+ TP_fast_assign(const struct mlx5e_neigh *mn = &nhe->m_neigh;
+ struct in6_addr *pin6;
+ __be32 *p32;
+
+ __assign_str(devname, mn->dev->name);
+ __entry->neigh_connected = neigh_connected;
+ memcpy(__entry->ha, ha, ETH_ALEN);
+
+ p32 = (__be32 *)__entry->v4;
+ pin6 = (struct in6_addr *)__entry->v6;
+ if (mn->family == AF_INET) {
+ *p32 = mn->dst_ip.v4;
+ ipv6_addr_set_v4mapped(*p32, pin6);
+ } else if (mn->family == AF_INET6) {
+ *pin6 = mn->dst_ip.v6;
+ }
+ ),
+ TP_printk("netdev: %s MAC: %pM IPv4: %pI4 IPv6: %pI6c neigh_connected=%d\n",
+ __get_str(devname), __entry->ha,
+ __entry->v4, __entry->v6, __entry->neigh_connected
+ )
+);
+
+#endif /* _MLX5_EN_REP_TP_ */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ./diag
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE en_rep_tracepoint
+#include <trace/define_trace.h>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 5217f39828a4..3c0d36b2b91c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -46,6 +46,8 @@
#include "en/tc_tun.h"
#include "fs_core.h"
#include "lib/port_tun.h"
+#define CREATE_TRACE_POINTS
+#include "diag/en_rep_tracepoint.h"
#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
@@ -657,6 +659,8 @@ static void mlx5e_rep_neigh_update(struct work_struct *work)
neigh_connected = (nud_state & NUD_VALID) && !dead;
+ trace_mlx5e_rep_neigh_update(nhe, ha, neigh_connected);
+
list_for_each_entry(e, &nhe->encap_list, encap_list) {
if (!mlx5e_encap_take(e))
continue;
--
2.21.0
^ permalink raw reply related
* Re: [RFC 1/4] Add usb_get_address and usb_set_address support
From: Charles.Hyde @ 2019-08-21 23:35 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, linux-acpi, Mario.Limonciello, oliver, netdev,
nic_swsd
In-Reply-To: <20190820222602.GC8120@kroah.com>
<snipped>
>
> This is a VERY cdc-net-specific function. It is not a "generic" USB
> function at all. Why does it belong in the USB core? Shouldn't it live
> in the code that handles the other cdc-net-specific logic?
>
> thanks,
>
> greg k-h
Thank you for this feedback, Greg. I was not sure about adding this to message.c, because of the USB_CDC_GET_NET_ADDRESS. I had found references to SET_ADDRESS in the USB protocol at https://wiki.osdev.org/Universal_Serial_Bus#USB_Protocol. If one wanted a generic USB function for SET_ADDRESS, to be used for both sending a MAC address and receiving one, how would you suggest this be implemented? This is a legit question because I am curious.
Your feedback led to moving the functionality into cdc_ncm.c for today's testing, and removing all changes from messages.c, usb.h, usbnet.c, and usbnet.h. This may be where I end up long term, but I would like to learn if there is a possible solution that could live in message.c and be callable from other USB-to-Ethernet aware drivers.
Thank you again,
Charles Hyde
^ permalink raw reply
* [PATCH bpf-next v3 0/4] selftests/bpf: test_progs: misc fixes
From: Stanislav Fomichev @ 2019-08-21 23:44 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrii Nakryiko
* add test__skip to indicate skipped tests
* remove global success/error counts (use environment)
* remove asserts from the tests
* remove unused ret from send_signal test
v3:
* QCHECK -> CHECK_FAIL (Daniel Borkmann)
v2:
* drop patch that changes output to keep consistent with test_verifier
(Alexei Starovoitov)
* QCHECK instead of test__fail (Andrii Nakryiko)
* test__skip count number of subtests (Andrii Nakryiko)
Cc: Andrii Nakryiko <andriin@fb.com>
Stanislav Fomichev (4):
selftests/bpf: test_progs: test__skip
selftests/bpf: test_progs: remove global fail/success counts
selftests/bpf: test_progs: remove asserts from subtests
selftests/bpf: test_progs: remove unused ret
.../selftests/bpf/prog_tests/bpf_obj_id.c | 20 +++++----
.../bpf/prog_tests/bpf_verif_scale.c | 9 +---
.../selftests/bpf/prog_tests/flow_dissector.c | 4 +-
.../bpf/prog_tests/get_stack_raw_tp.c | 3 --
.../selftests/bpf/prog_tests/global_data.c | 20 +++------
.../selftests/bpf/prog_tests/l4lb_all.c | 9 ++--
.../selftests/bpf/prog_tests/map_lock.c | 38 ++++++++--------
.../selftests/bpf/prog_tests/pkt_access.c | 4 +-
.../selftests/bpf/prog_tests/pkt_md_access.c | 4 +-
.../bpf/prog_tests/queue_stack_map.c | 8 +---
.../bpf/prog_tests/reference_tracking.c | 4 +-
.../selftests/bpf/prog_tests/send_signal.c | 43 +++++++++----------
.../selftests/bpf/prog_tests/spinlock.c | 16 +++----
.../bpf/prog_tests/stacktrace_build_id.c | 7 +--
.../bpf/prog_tests/stacktrace_build_id_nmi.c | 7 +--
.../selftests/bpf/prog_tests/stacktrace_map.c | 17 +++-----
.../bpf/prog_tests/stacktrace_map_raw_tp.c | 9 ++--
.../bpf/prog_tests/task_fd_query_rawtp.c | 3 --
.../bpf/prog_tests/task_fd_query_tp.c | 5 ---
.../selftests/bpf/prog_tests/tcp_estats.c | 4 +-
tools/testing/selftests/bpf/prog_tests/xdp.c | 4 +-
.../bpf/prog_tests/xdp_adjust_tail.c | 4 +-
.../selftests/bpf/prog_tests/xdp_noinline.c | 8 ++--
tools/testing/selftests/bpf/test_progs.c | 41 ++++++++++++------
tools/testing/selftests/bpf/test_progs.h | 19 +++++---
25 files changed, 138 insertions(+), 172 deletions(-)
--
2.23.0.187.g17f5b7556c-goog
^ permalink raw reply
* [PATCH bpf-next v3 1/4] selftests/bpf: test_progs: test__skip
From: Stanislav Fomichev @ 2019-08-21 23:44 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrii Nakryiko
In-Reply-To: <20190821234427.179886-1-sdf@google.com>
Export test__skip() to indicate skipped tests and use it in
test_send_signal_nmi().
Cc: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
.../selftests/bpf/prog_tests/send_signal.c | 1 +
tools/testing/selftests/bpf/test_progs.c | 20 +++++++++++++++++--
tools/testing/selftests/bpf/test_progs.h | 2 ++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/testing/selftests/bpf/prog_tests/send_signal.c
index 1575f0a1f586..40c2c5efdd3e 100644
--- a/tools/testing/selftests/bpf/prog_tests/send_signal.c
+++ b/tools/testing/selftests/bpf/prog_tests/send_signal.c
@@ -204,6 +204,7 @@ static int test_send_signal_nmi(void)
if (errno == ENOENT) {
printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n",
__func__);
+ test__skip();
return 0;
}
/* Let the test fail with a more informative message */
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 12895d03d58b..e545dfb55872 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -17,6 +17,7 @@ struct prog_test_def {
bool force_log;
int pass_cnt;
int error_cnt;
+ int skip_cnt;
bool tested;
const char *subtest_name;
@@ -56,6 +57,14 @@ static void dump_test_log(const struct prog_test_def *test, bool failed)
fseeko(stdout, 0, SEEK_SET); /* rewind */
}
+static void skip_account(void)
+{
+ if (env.test->skip_cnt) {
+ env.skip_cnt++;
+ env.test->skip_cnt = 0;
+ }
+}
+
void test__end_subtest()
{
struct prog_test_def *test = env.test;
@@ -65,6 +74,7 @@ void test__end_subtest()
env.fail_cnt++;
else
env.sub_succ_cnt++;
+ skip_account();
dump_test_log(test, sub_error_cnt);
@@ -105,6 +115,11 @@ void test__force_log() {
env.test->force_log = true;
}
+void test__skip(void)
+{
+ env.test->skip_cnt++;
+}
+
struct ipv4_packet pkt_v4 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
@@ -510,6 +525,7 @@ int main(int argc, char **argv)
env.fail_cnt++;
else
env.succ_cnt++;
+ skip_account();
dump_test_log(test, test->error_cnt);
@@ -518,8 +534,8 @@ int main(int argc, char **argv)
test->error_cnt ? "FAIL" : "OK");
}
stdio_restore();
- printf("Summary: %d/%d PASSED, %d FAILED\n",
- env.succ_cnt, env.sub_succ_cnt, env.fail_cnt);
+ printf("Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n",
+ env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt);
free(env.test_selector.num_set);
free(env.subtest_selector.num_set);
diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 37d427f5a1e5..9defd35cb6c0 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -64,6 +64,7 @@ struct test_env {
int succ_cnt; /* successful tests */
int sub_succ_cnt; /* successful sub-tests */
int fail_cnt; /* total failed tests + sub-tests */
+ int skip_cnt; /* skipped tests */
};
extern int error_cnt;
@@ -72,6 +73,7 @@ extern struct test_env env;
extern void test__force_log();
extern bool test__start_subtest(const char *name);
+extern void test__skip(void);
#define MAGIC_BYTES 123
--
2.23.0.187.g17f5b7556c-goog
^ permalink raw reply related
* [PATCH bpf-next v3 2/4] selftests/bpf: test_progs: remove global fail/success counts
From: Stanislav Fomichev @ 2019-08-21 23:44 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrii Nakryiko
In-Reply-To: <20190821234427.179886-1-sdf@google.com>
Now that we have a global per-test/per-environment state, there
is no longer need to have global fail/success counters (and there
is no need to save/get the diff before/after the test).
Introduce CHECK_FAIL macro (suggested by Andrii) and covert existing tests
to it. CHECK_FAIL uses new test__fail() to record the failure.
Cc: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
.../selftests/bpf/prog_tests/bpf_obj_id.c | 3 +--
.../bpf/prog_tests/bpf_verif_scale.c | 9 +-------
.../selftests/bpf/prog_tests/flow_dissector.c | 4 +---
.../bpf/prog_tests/get_stack_raw_tp.c | 3 ---
.../selftests/bpf/prog_tests/global_data.c | 20 +++++-------------
.../selftests/bpf/prog_tests/l4lb_all.c | 9 +++-----
.../selftests/bpf/prog_tests/map_lock.c | 17 ++++++---------
.../selftests/bpf/prog_tests/pkt_access.c | 4 +---
.../selftests/bpf/prog_tests/pkt_md_access.c | 4 +---
.../bpf/prog_tests/queue_stack_map.c | 8 ++-----
.../bpf/prog_tests/reference_tracking.c | 4 +---
.../selftests/bpf/prog_tests/spinlock.c | 6 ++----
.../selftests/bpf/prog_tests/stacktrace_map.c | 17 +++++++--------
.../bpf/prog_tests/stacktrace_map_raw_tp.c | 9 +++-----
.../bpf/prog_tests/task_fd_query_rawtp.c | 3 ---
.../bpf/prog_tests/task_fd_query_tp.c | 5 -----
.../selftests/bpf/prog_tests/tcp_estats.c | 4 +---
tools/testing/selftests/bpf/prog_tests/xdp.c | 4 +---
.../bpf/prog_tests/xdp_adjust_tail.c | 4 +---
.../selftests/bpf/prog_tests/xdp_noinline.c | 8 +++----
tools/testing/selftests/bpf/test_progs.c | 21 ++++++++-----------
tools/testing/selftests/bpf/test_progs.h | 17 +++++++++------
22 files changed, 60 insertions(+), 123 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
index fb5840a62548..5dd6ca1255d0 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
@@ -48,8 +48,7 @@ void test_bpf_obj_id(void)
/* test_obj_id.o is a dumb prog. It should never fail
* to load.
*/
- if (err)
- error_cnt++;
+ CHECK_FAIL(err);
assert(!err);
/* Insert a magic value to the map */
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c b/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
index 1a1eae356f81..1c01ee2600a9 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
@@ -28,8 +28,6 @@ static int check_load(const char *file, enum bpf_prog_type type)
attr.prog_flags = BPF_F_TEST_RND_HI32;
err = bpf_prog_load_xattr(&attr, &obj, &prog_fd);
bpf_object__close(obj);
- if (err)
- error_cnt++;
return err;
}
@@ -105,12 +103,7 @@ void test_bpf_verif_scale(void)
continue;
err = check_load(test->file, test->attach_type);
- if (test->fails) { /* expected to fail */
- if (err)
- error_cnt--;
- else
- error_cnt++;
- }
+ CHECK_FAIL(err && !test->fails);
}
if (env.verifier_stats)
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
index 6892b88ae065..aee0cda7870b 100644
--- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
@@ -452,10 +452,8 @@ void test_flow_dissector(void)
err = bpf_flow_load(&obj, "./bpf_flow.o", "flow_dissector",
"jmp_table", "last_dissection", &prog_fd, &keys_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
for (i = 0; i < ARRAY_SIZE(tests); i++) {
struct bpf_flow_keys flow_keys;
diff --git a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c
index 3d59b3c841fe..eba9a970703b 100644
--- a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c
+++ b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c
@@ -135,10 +135,7 @@ void test_get_stack_raw_tp(void)
exp_cnt -= err;
}
- goto close_prog_noerr;
close_prog:
- error_cnt++;
-close_prog_noerr:
if (!IS_ERR_OR_NULL(link))
bpf_link__destroy(link);
if (!IS_ERR_OR_NULL(pb))
diff --git a/tools/testing/selftests/bpf/prog_tests/global_data.c b/tools/testing/selftests/bpf/prog_tests/global_data.c
index d011079fb0bf..c680926fce73 100644
--- a/tools/testing/selftests/bpf/prog_tests/global_data.c
+++ b/tools/testing/selftests/bpf/prog_tests/global_data.c
@@ -7,10 +7,8 @@ static void test_global_data_number(struct bpf_object *obj, __u32 duration)
uint64_t num;
map_fd = bpf_find_map(__func__, obj, "result_number");
- if (map_fd < 0) {
- error_cnt++;
+ if (CHECK_FAIL(map_fd < 0))
return;
- }
struct {
char *name;
@@ -44,10 +42,8 @@ static void test_global_data_string(struct bpf_object *obj, __u32 duration)
char str[32];
map_fd = bpf_find_map(__func__, obj, "result_string");
- if (map_fd < 0) {
- error_cnt++;
+ if (CHECK_FAIL(map_fd < 0))
return;
- }
struct {
char *name;
@@ -81,10 +77,8 @@ static void test_global_data_struct(struct bpf_object *obj, __u32 duration)
struct foo val;
map_fd = bpf_find_map(__func__, obj, "result_struct");
- if (map_fd < 0) {
- error_cnt++;
+ if (CHECK_FAIL(map_fd < 0))
return;
- }
struct {
char *name;
@@ -112,16 +106,12 @@ static void test_global_data_rdonly(struct bpf_object *obj, __u32 duration)
__u8 *buff;
map = bpf_object__find_map_by_name(obj, "test_glo.rodata");
- if (!map || !bpf_map__is_internal(map)) {
- error_cnt++;
+ if (CHECK_FAIL(!map || !bpf_map__is_internal(map)))
return;
- }
map_fd = bpf_map__fd(map);
- if (map_fd < 0) {
- error_cnt++;
+ if (CHECK_FAIL(map_fd < 0))
return;
- }
buff = malloc(bpf_map__def(map)->value_size);
if (buff)
diff --git a/tools/testing/selftests/bpf/prog_tests/l4lb_all.c b/tools/testing/selftests/bpf/prog_tests/l4lb_all.c
index 20ddca830e68..eaf64595be88 100644
--- a/tools/testing/selftests/bpf/prog_tests/l4lb_all.c
+++ b/tools/testing/selftests/bpf/prog_tests/l4lb_all.c
@@ -30,10 +30,8 @@ static void test_l4lb(const char *file)
u32 *magic = (u32 *)buf;
err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
map_fd = bpf_find_map(__func__, obj, "vip_map");
if (map_fd < 0)
@@ -72,10 +70,9 @@ static void test_l4lb(const char *file)
bytes += stats[i].bytes;
pkts += stats[i].pkts;
}
- if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
- error_cnt++;
+ if (CHECK_FAIL(bytes != MAGIC_BYTES * NUM_ITER * 2 ||
+ pkts != NUM_ITER * 2))
printf("test_l4lb:FAIL:stats %lld %lld\n", bytes, pkts);
- }
out:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/map_lock.c b/tools/testing/selftests/bpf/prog_tests/map_lock.c
index ee99368c595c..15993b6a194b 100644
--- a/tools/testing/selftests/bpf/prog_tests/map_lock.c
+++ b/tools/testing/selftests/bpf/prog_tests/map_lock.c
@@ -8,14 +8,12 @@ static void *parallel_map_access(void *arg)
for (i = 0; i < 10000; i++) {
err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
- if (err) {
+ if (CHECK_FAIL(err)) {
printf("lookup failed\n");
- error_cnt++;
goto out;
}
- if (vars[0] != 0) {
+ if (CHECK_FAIL(vars[0] != 0)) {
printf("lookup #%d var[0]=%d\n", i, vars[0]);
- error_cnt++;
goto out;
}
rnd = vars[1];
@@ -24,7 +22,7 @@ static void *parallel_map_access(void *arg)
continue;
printf("lookup #%d var[1]=%d var[%d]=%d\n",
i, rnd, j, vars[j]);
- error_cnt++;
+ CHECK_FAIL(vars[j] != rnd);
goto out;
}
}
@@ -42,15 +40,15 @@ void test_map_lock(void)
void *ret;
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
- if (err) {
+ if (CHECK_FAIL(err)) {
printf("test_map_lock:bpf_prog_load errno %d\n", errno);
goto close_prog;
}
map_fd[0] = bpf_find_map(__func__, obj, "hash_map");
- if (map_fd[0] < 0)
+ if (CHECK_FAIL(map_fd[0] < 0))
goto close_prog;
map_fd[1] = bpf_find_map(__func__, obj, "array_map");
- if (map_fd[1] < 0)
+ if (CHECK_FAIL(map_fd[1] < 0))
goto close_prog;
bpf_map_update_elem(map_fd[0], &key, vars, BPF_F_LOCK);
@@ -67,9 +65,6 @@ void test_map_lock(void)
for (i = 4; i < 6; i++)
assert(pthread_join(thread_id[i], &ret) == 0 &&
ret == (void *)&map_fd[i - 4]);
- goto close_prog_noerr;
close_prog:
- error_cnt++;
-close_prog_noerr:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/pkt_access.c b/tools/testing/selftests/bpf/prog_tests/pkt_access.c
index 4ecfd721a044..a2537dfa899c 100644
--- a/tools/testing/selftests/bpf/prog_tests/pkt_access.c
+++ b/tools/testing/selftests/bpf/prog_tests/pkt_access.c
@@ -9,10 +9,8 @@ void test_pkt_access(void)
int err, prog_fd;
err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
err = bpf_prog_test_run(prog_fd, 100000, &pkt_v4, sizeof(pkt_v4),
NULL, NULL, &retval, &duration);
diff --git a/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c b/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
index ac0d43435806..5f7aea605019 100644
--- a/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
+++ b/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
@@ -9,10 +9,8 @@ void test_pkt_md_access(void)
int err, prog_fd;
err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4),
NULL, NULL, &retval, &duration);
diff --git a/tools/testing/selftests/bpf/prog_tests/queue_stack_map.c b/tools/testing/selftests/bpf/prog_tests/queue_stack_map.c
index e60cd5ff1f55..faccc66f4e39 100644
--- a/tools/testing/selftests/bpf/prog_tests/queue_stack_map.c
+++ b/tools/testing/selftests/bpf/prog_tests/queue_stack_map.c
@@ -27,10 +27,8 @@ static void test_queue_stack_map_by_type(int type)
return;
err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
map_in_fd = bpf_find_map(__func__, obj, "map_in");
if (map_in_fd < 0)
@@ -43,10 +41,8 @@ static void test_queue_stack_map_by_type(int type)
/* Push 32 elements to the input map */
for (i = 0; i < MAP_SIZE; i++) {
err = bpf_map_update_elem(map_in_fd, NULL, &vals[i], 0);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
goto out;
- }
}
/* The eBPF program pushes iph.saddr in the output map,
diff --git a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
index 4a4f428d1a78..5c78e2b5a917 100644
--- a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
+++ b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
@@ -10,10 +10,8 @@ void test_reference_tracking(void)
int err = 0;
obj = bpf_object__open(file);
- if (IS_ERR(obj)) {
- error_cnt++;
+ if (CHECK_FAIL(IS_ERR(obj)))
return;
- }
bpf_object__for_each_program(prog, obj) {
const char *title;
diff --git a/tools/testing/selftests/bpf/prog_tests/spinlock.c b/tools/testing/selftests/bpf/prog_tests/spinlock.c
index 114ebe6a438e..d71fb3dda376 100644
--- a/tools/testing/selftests/bpf/prog_tests/spinlock.c
+++ b/tools/testing/selftests/bpf/prog_tests/spinlock.c
@@ -11,7 +11,7 @@ void test_spinlock(void)
void *ret;
err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
- if (err) {
+ if (CHECK_FAIL(err)) {
printf("test_spin_lock:bpf_prog_load errno %d\n", errno);
goto close_prog;
}
@@ -21,9 +21,7 @@ void test_spinlock(void)
for (i = 0; i < 4; i++)
assert(pthread_join(thread_id[i], &ret) == 0 &&
ret == (void *)&prog_fd);
- goto close_prog_noerr;
+
close_prog:
- error_cnt++;
-close_prog_noerr:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
index fc539335c5b3..37269d23df93 100644
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
@@ -26,19 +26,19 @@ void test_stacktrace_map(void)
/* find map fds */
control_map_fd = bpf_find_map(__func__, obj, "control_map");
- if (control_map_fd < 0)
+ if (CHECK_FAIL(control_map_fd < 0))
goto disable_pmu;
stackid_hmap_fd = bpf_find_map(__func__, obj, "stackid_hmap");
- if (stackid_hmap_fd < 0)
+ if (CHECK_FAIL(stackid_hmap_fd < 0))
goto disable_pmu;
stackmap_fd = bpf_find_map(__func__, obj, "stackmap");
- if (stackmap_fd < 0)
+ if (CHECK_FAIL(stackmap_fd < 0))
goto disable_pmu;
stack_amap_fd = bpf_find_map(__func__, obj, "stack_amap");
- if (stack_amap_fd < 0)
+ if (CHECK_FAIL(stack_amap_fd < 0))
goto disable_pmu;
/* give some time for bpf program run */
@@ -55,23 +55,20 @@ void test_stacktrace_map(void)
err = compare_map_keys(stackid_hmap_fd, stackmap_fd);
if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",
"err %d errno %d\n", err, errno))
- goto disable_pmu_noerr;
+ goto disable_pmu;
err = compare_map_keys(stackmap_fd, stackid_hmap_fd);
if (CHECK(err, "compare_map_keys stackmap vs. stackid_hmap",
"err %d errno %d\n", err, errno))
- goto disable_pmu_noerr;
+ goto disable_pmu;
stack_trace_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);
if (CHECK(err, "compare_stack_ips stackmap vs. stack_amap",
"err %d errno %d\n", err, errno))
- goto disable_pmu_noerr;
+ goto disable_pmu;
- goto disable_pmu_noerr;
disable_pmu:
- error_cnt++;
-disable_pmu_noerr:
bpf_link__destroy(link);
close_prog:
bpf_object__close(obj);
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
index fbfa8e76cf63..404a5498e1a3 100644
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
@@ -26,15 +26,15 @@ void test_stacktrace_map_raw_tp(void)
/* find map fds */
control_map_fd = bpf_find_map(__func__, obj, "control_map");
- if (control_map_fd < 0)
+ if (CHECK_FAIL(control_map_fd < 0))
goto close_prog;
stackid_hmap_fd = bpf_find_map(__func__, obj, "stackid_hmap");
- if (stackid_hmap_fd < 0)
+ if (CHECK_FAIL(stackid_hmap_fd < 0))
goto close_prog;
stackmap_fd = bpf_find_map(__func__, obj, "stackmap");
- if (stackmap_fd < 0)
+ if (CHECK_FAIL(stackmap_fd < 0))
goto close_prog;
/* give some time for bpf program run */
@@ -58,10 +58,7 @@ void test_stacktrace_map_raw_tp(void)
"err %d errno %d\n", err, errno))
goto close_prog;
- goto close_prog_noerr;
close_prog:
- error_cnt++;
-close_prog_noerr:
if (!IS_ERR_OR_NULL(link))
bpf_link__destroy(link);
bpf_object__close(obj);
diff --git a/tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c b/tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c
index 958a3d88de99..1bdc1d86a50c 100644
--- a/tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c
+++ b/tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c
@@ -70,9 +70,6 @@ void test_task_fd_query_rawtp(void)
if (CHECK(!err, "check_results", "fd_type %d len %u\n", fd_type, len))
goto close_prog;
- goto close_prog_noerr;
close_prog:
- error_cnt++;
-close_prog_noerr:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c b/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
index f9b70e81682b..3f131b8fe328 100644
--- a/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
+++ b/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
@@ -62,14 +62,9 @@ static void test_task_fd_query_tp_core(const char *probe_name,
fd_type, buf))
goto close_pmu;
- close(pmu_fd);
- goto close_prog_noerr;
-
close_pmu:
close(pmu_fd);
close_prog:
- error_cnt++;
-close_prog_noerr:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_estats.c b/tools/testing/selftests/bpf/prog_tests/tcp_estats.c
index bb8759d69099..594307dffd13 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcp_estats.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_estats.c
@@ -10,10 +10,8 @@ void test_tcp_estats(void)
err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
CHECK(err, "", "err %d errno %d\n", err, errno);
- if (err) {
- error_cnt++;
+ if (err)
return;
- }
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp.c b/tools/testing/selftests/bpf/prog_tests/xdp.c
index a74167289545..dcb5ecac778e 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp.c
@@ -16,10 +16,8 @@ void test_xdp(void)
int err, prog_fd, map_fd;
err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
map_fd = bpf_find_map(__func__, obj, "vip2tnl");
if (map_fd < 0)
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
index 922aa0a19764..3744196d7cba 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
@@ -10,10 +10,8 @@ void test_xdp_adjust_tail(void)
int err, prog_fd;
err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
err = bpf_prog_test_run(prog_fd, 1, &pkt_v4, sizeof(pkt_v4),
buf, &size, &retval, &duration);
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_noinline.c b/tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
index 15f7c272edb0..c9404e6b226e 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
@@ -31,10 +31,8 @@ void test_xdp_noinline(void)
u32 *magic = (u32 *)buf;
err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
- if (err) {
- error_cnt++;
+ if (CHECK_FAIL(err))
return;
- }
map_fd = bpf_find_map(__func__, obj, "vip_map");
if (map_fd < 0)
@@ -73,8 +71,8 @@ void test_xdp_noinline(void)
bytes += stats[i].bytes;
pkts += stats[i].pkts;
}
- if (bytes != MAGIC_BYTES * NUM_ITER * 2 || pkts != NUM_ITER * 2) {
- error_cnt++;
+ if (CHECK_FAIL(bytes != MAGIC_BYTES * NUM_ITER * 2 ||
+ pkts != NUM_ITER * 2)) {
printf("test_xdp_noinline:FAIL:stats %lld %lld\n",
bytes, pkts);
}
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index e545dfb55872..e5892cb60eca 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -8,14 +8,12 @@
/* defined in test_progs.h */
struct test_env env;
-int error_cnt, pass_cnt;
struct prog_test_def {
const char *test_name;
int test_num;
void (*run_test)(void);
bool force_log;
- int pass_cnt;
int error_cnt;
int skip_cnt;
bool tested;
@@ -24,7 +22,6 @@ struct prog_test_def {
int subtest_num;
/* store counts before subtest started */
- int old_pass_cnt;
int old_error_cnt;
};
@@ -68,7 +65,7 @@ static void skip_account(void)
void test__end_subtest()
{
struct prog_test_def *test = env.test;
- int sub_error_cnt = error_cnt - test->old_error_cnt;
+ int sub_error_cnt = test->error_cnt - test->old_error_cnt;
if (sub_error_cnt)
env.fail_cnt++;
@@ -105,8 +102,7 @@ bool test__start_subtest(const char *name)
return false;
test->subtest_name = name;
- env.test->old_pass_cnt = pass_cnt;
- env.test->old_error_cnt = error_cnt;
+ env.test->old_error_cnt = env.test->error_cnt;
return true;
}
@@ -120,6 +116,11 @@ void test__skip(void)
env.test->skip_cnt++;
}
+void test__fail(void)
+{
+ env.test->error_cnt++;
+}
+
struct ipv4_packet pkt_v4 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
@@ -144,7 +145,7 @@ int bpf_find_map(const char *test, struct bpf_object *obj, const char *name)
map = bpf_object__find_map_by_name(obj, name);
if (!map) {
printf("%s:FAIL:map '%s' not found\n", test, name);
- error_cnt++;
+ test__fail();
return -1;
}
return bpf_map__fd(map);
@@ -503,8 +504,6 @@ int main(int argc, char **argv)
stdio_hijack();
for (i = 0; i < prog_test_cnt; i++) {
struct prog_test_def *test = &prog_test_defs[i];
- int old_pass_cnt = pass_cnt;
- int old_error_cnt = error_cnt;
env.test = test;
test->test_num = i + 1;
@@ -519,8 +518,6 @@ int main(int argc, char **argv)
test__end_subtest();
test->tested = true;
- test->pass_cnt = pass_cnt - old_pass_cnt;
- test->error_cnt = error_cnt - old_error_cnt;
if (test->error_cnt)
env.fail_cnt++;
else
@@ -540,5 +537,5 @@ int main(int argc, char **argv)
free(env.test_selector.num_set);
free(env.subtest_selector.num_set);
- return error_cnt ? EXIT_FAILURE : EXIT_SUCCESS;
+ return env.fail_cnt ? EXIT_FAILURE : EXIT_SUCCESS;
}
diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 9defd35cb6c0..33da849cb765 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -38,8 +38,6 @@ typedef __u16 __sum16;
#include "trace_helpers.h"
#include "flow_dissector_load.h"
-struct prog_test_def;
-
struct test_selector {
const char *name;
bool *num_set;
@@ -67,13 +65,12 @@ struct test_env {
int skip_cnt; /* skipped tests */
};
-extern int error_cnt;
-extern int pass_cnt;
extern struct test_env env;
extern void test__force_log();
extern bool test__start_subtest(const char *name);
extern void test__skip(void);
+extern void test__fail(void);
#define MAGIC_BYTES 123
@@ -96,17 +93,25 @@ extern struct ipv6_packet pkt_v6;
#define _CHECK(condition, tag, duration, format...) ({ \
int __ret = !!(condition); \
if (__ret) { \
- error_cnt++; \
+ test__fail(); \
printf("%s:FAIL:%s ", __func__, tag); \
printf(format); \
} else { \
- pass_cnt++; \
printf("%s:PASS:%s %d nsec\n", \
__func__, tag, duration); \
} \
__ret; \
})
+#define CHECK_FAIL(condition) ({ \
+ int __ret = !!(condition); \
+ if (__ret) { \
+ test__fail(); \
+ printf("%s:FAIL:%d ", __func__, __LINE__); \
+ } \
+ __ret; \
+})
+
#define CHECK(condition, tag, format...) \
_CHECK(condition, tag, duration, format)
#define CHECK_ATTR(condition, tag, format...) \
--
2.23.0.187.g17f5b7556c-goog
^ permalink raw reply related
* [PATCH bpf-next v3 3/4] selftests/bpf: test_progs: remove asserts from subtests
From: Stanislav Fomichev @ 2019-08-21 23:44 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrii Nakryiko
In-Reply-To: <20190821234427.179886-1-sdf@google.com>
Otherwise they can bring the whole process down.
Cc: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
.../selftests/bpf/prog_tests/bpf_obj_id.c | 19 ++++++++++-------
.../selftests/bpf/prog_tests/map_lock.c | 21 ++++++++++++-------
.../selftests/bpf/prog_tests/spinlock.c | 12 ++++++-----
.../bpf/prog_tests/stacktrace_build_id.c | 7 ++++---
.../bpf/prog_tests/stacktrace_build_id_nmi.c | 7 ++++---
5 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
index 5dd6ca1255d0..f10029821e16 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
@@ -48,15 +48,17 @@ void test_bpf_obj_id(void)
/* test_obj_id.o is a dumb prog. It should never fail
* to load.
*/
- CHECK_FAIL(err);
- assert(!err);
+ if (CHECK_FAIL(err))
+ continue;
/* Insert a magic value to the map */
map_fds[i] = bpf_find_map(__func__, objs[i], "test_map_id");
- assert(map_fds[i] >= 0);
+ if (CHECK_FAIL(map_fds[i] < 0))
+ goto done;
err = bpf_map_update_elem(map_fds[i], &array_key,
&array_magic_value, 0);
- assert(!err);
+ if (CHECK_FAIL(err))
+ goto done;
/* Check getting map info */
info_len = sizeof(struct bpf_map_info) * 2;
@@ -95,9 +97,11 @@ void test_bpf_obj_id(void)
prog_infos[i].map_ids = ptr_to_u64(map_ids + i);
prog_infos[i].nr_map_ids = 2;
err = clock_gettime(CLOCK_REALTIME, &real_time_ts);
- assert(!err);
+ if (CHECK_FAIL(err))
+ goto done;
err = clock_gettime(CLOCK_BOOTTIME, &boot_time_ts);
- assert(!err);
+ if (CHECK_FAIL(err))
+ goto done;
err = bpf_obj_get_info_by_fd(prog_fds[i], &prog_infos[i],
&info_len);
load_time = (real_time_ts.tv_sec - boot_time_ts.tv_sec)
@@ -223,7 +227,8 @@ void test_bpf_obj_id(void)
nr_id_found++;
err = bpf_map_lookup_elem(map_fd, &array_key, &array_value);
- assert(!err);
+ if (CHECK_FAIL(err))
+ goto done;
err = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
CHECK(err || info_len != sizeof(struct bpf_map_info) ||
diff --git a/tools/testing/selftests/bpf/prog_tests/map_lock.c b/tools/testing/selftests/bpf/prog_tests/map_lock.c
index 15993b6a194b..8f91f1881d11 100644
--- a/tools/testing/selftests/bpf/prog_tests/map_lock.c
+++ b/tools/testing/selftests/bpf/prog_tests/map_lock.c
@@ -54,17 +54,22 @@ void test_map_lock(void)
bpf_map_update_elem(map_fd[0], &key, vars, BPF_F_LOCK);
for (i = 0; i < 4; i++)
- assert(pthread_create(&thread_id[i], NULL,
- &spin_lock_thread, &prog_fd) == 0);
+ if (CHECK_FAIL(pthread_create(&thread_id[i], NULL,
+ &spin_lock_thread, &prog_fd)))
+ goto close_prog;
for (i = 4; i < 6; i++)
- assert(pthread_create(&thread_id[i], NULL,
- ¶llel_map_access, &map_fd[i - 4]) == 0);
+ if (CHECK_FAIL(pthread_create(&thread_id[i], NULL,
+ ¶llel_map_access,
+ &map_fd[i - 4])))
+ goto close_prog;
for (i = 0; i < 4; i++)
- assert(pthread_join(thread_id[i], &ret) == 0 &&
- ret == (void *)&prog_fd);
+ if (CHECK_FAIL(pthread_join(thread_id[i], &ret) ||
+ ret != (void *)&prog_fd))
+ goto close_prog;
for (i = 4; i < 6; i++)
- assert(pthread_join(thread_id[i], &ret) == 0 &&
- ret == (void *)&map_fd[i - 4]);
+ if (CHECK_FAIL(pthread_join(thread_id[i], &ret) ||
+ ret != (void *)&map_fd[i - 4]))
+ goto close_prog;
close_prog:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/spinlock.c b/tools/testing/selftests/bpf/prog_tests/spinlock.c
index d71fb3dda376..1ae00cd3174e 100644
--- a/tools/testing/selftests/bpf/prog_tests/spinlock.c
+++ b/tools/testing/selftests/bpf/prog_tests/spinlock.c
@@ -16,12 +16,14 @@ void test_spinlock(void)
goto close_prog;
}
for (i = 0; i < 4; i++)
- assert(pthread_create(&thread_id[i], NULL,
- &spin_lock_thread, &prog_fd) == 0);
- for (i = 0; i < 4; i++)
- assert(pthread_join(thread_id[i], &ret) == 0 &&
- ret == (void *)&prog_fd);
+ if (CHECK_FAIL(pthread_create(&thread_id[i], NULL,
+ &spin_lock_thread, &prog_fd)))
+ goto close_prog;
+ for (i = 0; i < 4; i++)
+ if (CHECK_FAIL(pthread_join(thread_id[i], &ret) ||
+ ret != (void *)&prog_fd))
+ goto close_prog;
close_prog:
bpf_object__close(obj);
}
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
index ac44fda84833..d841dced971f 100644
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
@@ -51,9 +51,10 @@ void test_stacktrace_build_id(void)
"err %d errno %d\n", err, errno))
goto disable_pmu;
- assert(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null")
- == 0);
- assert(system("./urandom_read") == 0);
+ if (CHECK_FAIL(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null")))
+ goto disable_pmu;
+ if (CHECK_FAIL(system("./urandom_read")))
+ goto disable_pmu;
/* disable stack trace collection */
key = 0;
val = 1;
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
index 9557b7dfb782..f62aa0eb959b 100644
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
@@ -82,9 +82,10 @@ void test_stacktrace_build_id_nmi(void)
"err %d errno %d\n", err, errno))
goto disable_pmu;
- assert(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null")
- == 0);
- assert(system("taskset 0x1 ./urandom_read 100000") == 0);
+ if (CHECK_FAIL(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null")))
+ goto disable_pmu;
+ if (CHECK_FAIL(system("taskset 0x1 ./urandom_read 100000")))
+ goto disable_pmu;
/* disable stack trace collection */
key = 0;
val = 1;
--
2.23.0.187.g17f5b7556c-goog
^ permalink raw reply related
* [PATCH bpf-next v3 4/4] selftests/bpf: test_progs: remove unused ret
From: Stanislav Fomichev @ 2019-08-21 23:44 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev
In-Reply-To: <20190821234427.179886-1-sdf@google.com>
send_signal test returns static codes from the subtests which
nobody looks at, let's rely on the CHECK macros instead.
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
.../selftests/bpf/prog_tests/send_signal.c | 42 +++++++++----------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/testing/selftests/bpf/prog_tests/send_signal.c
index 40c2c5efdd3e..b607112c64e7 100644
--- a/tools/testing/selftests/bpf/prog_tests/send_signal.c
+++ b/tools/testing/selftests/bpf/prog_tests/send_signal.c
@@ -8,7 +8,7 @@ static void sigusr1_handler(int signum)
sigusr1_received++;
}
-static int test_send_signal_common(struct perf_event_attr *attr,
+static void test_send_signal_common(struct perf_event_attr *attr,
int prog_type,
const char *test_name)
{
@@ -23,13 +23,13 @@ static int test_send_signal_common(struct perf_event_attr *attr,
if (CHECK(pipe(pipe_c2p), test_name,
"pipe pipe_c2p error: %s\n", strerror(errno)))
- goto no_fork_done;
+ return;
if (CHECK(pipe(pipe_p2c), test_name,
"pipe pipe_p2c error: %s\n", strerror(errno))) {
close(pipe_c2p[0]);
close(pipe_c2p[1]);
- goto no_fork_done;
+ return;
}
pid = fork();
@@ -38,7 +38,7 @@ static int test_send_signal_common(struct perf_event_attr *attr,
close(pipe_c2p[1]);
close(pipe_p2c[0]);
close(pipe_p2c[1]);
- goto no_fork_done;
+ return;
}
if (pid == 0) {
@@ -125,7 +125,7 @@ static int test_send_signal_common(struct perf_event_attr *attr,
goto disable_pmu;
}
- err = CHECK(buf[0] != '2', test_name, "incorrect result\n");
+ CHECK(buf[0] != '2', test_name, "incorrect result\n");
/* notify child safe to exit */
write(pipe_p2c[1], buf, 1);
@@ -138,11 +138,9 @@ static int test_send_signal_common(struct perf_event_attr *attr,
close(pipe_c2p[0]);
close(pipe_p2c[1]);
wait(NULL);
-no_fork_done:
- return err;
}
-static int test_send_signal_tracepoint(void)
+static void test_send_signal_tracepoint(void)
{
const char *id_path = "/sys/kernel/debug/tracing/events/syscalls/sys_enter_nanosleep/id";
struct perf_event_attr attr = {
@@ -159,21 +157,21 @@ static int test_send_signal_tracepoint(void)
if (CHECK(efd < 0, "tracepoint",
"open syscalls/sys_enter_nanosleep/id failure: %s\n",
strerror(errno)))
- return -1;
+ return;
bytes = read(efd, buf, sizeof(buf));
close(efd);
if (CHECK(bytes <= 0 || bytes >= sizeof(buf), "tracepoint",
"read syscalls/sys_enter_nanosleep/id failure: %s\n",
strerror(errno)))
- return -1;
+ return;
attr.config = strtol(buf, NULL, 0);
- return test_send_signal_common(&attr, BPF_PROG_TYPE_TRACEPOINT, "tracepoint");
+ test_send_signal_common(&attr, BPF_PROG_TYPE_TRACEPOINT, "tracepoint");
}
-static int test_send_signal_perf(void)
+static void test_send_signal_perf(void)
{
struct perf_event_attr attr = {
.sample_period = 1,
@@ -181,11 +179,11 @@ static int test_send_signal_perf(void)
.config = PERF_COUNT_SW_CPU_CLOCK,
};
- return test_send_signal_common(&attr, BPF_PROG_TYPE_PERF_EVENT,
- "perf_sw_event");
+ test_send_signal_common(&attr, BPF_PROG_TYPE_PERF_EVENT,
+ "perf_sw_event");
}
-static int test_send_signal_nmi(void)
+static void test_send_signal_nmi(void)
{
struct perf_event_attr attr = {
.sample_freq = 50,
@@ -205,25 +203,23 @@ static int test_send_signal_nmi(void)
printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n",
__func__);
test__skip();
- return 0;
+ return;
}
/* Let the test fail with a more informative message */
} else {
close(pmu_fd);
}
- return test_send_signal_common(&attr, BPF_PROG_TYPE_PERF_EVENT,
- "perf_hw_event");
+ test_send_signal_common(&attr, BPF_PROG_TYPE_PERF_EVENT,
+ "perf_hw_event");
}
void test_send_signal(void)
{
- int ret = 0;
-
if (test__start_subtest("send_signal_tracepoint"))
- ret |= test_send_signal_tracepoint();
+ test_send_signal_tracepoint();
if (test__start_subtest("send_signal_perf"))
- ret |= test_send_signal_perf();
+ test_send_signal_perf();
if (test__start_subtest("send_signal_nmi"))
- ret |= test_send_signal_nmi();
+ test_send_signal_nmi();
}
--
2.23.0.187.g17f5b7556c-goog
^ permalink raw reply related
* Re: [RFC 1/4] Add usb_get_address and usb_set_address support
From: Charles.Hyde @ 2019-08-21 23:45 UTC (permalink / raw)
To: andrew
Cc: linux-usb, linux-acpi, gregkh, Mario.Limonciello, oliver, netdev,
nic_swsd
In-Reply-To: <20190821012258.GB4285@lunn.ch>
>> The core USB driver message.c is missing get/set address functionality
>> that stops ifconfig from being able to push MAC addresses out to USB
>> based ethernet devices. Without this functionality, some USB devices
>> stop responding to ethernet packets when using ifconfig to change MAC
>> addresses.
>
> Hi Charles
>
> ifconfig has been deprecated for years, maybe a decade. Please
> reference the current tools, iproute2.
>
> Andrew
Thank you. I would, but that is not available on the system under test, while ifconfig is.
Charles Hyde
^ permalink raw reply
* [PATCH net] net: dsa: bcm_sf2: Do not configure PHYLINK on CPU port
From: Florian Fainelli @ 2019-08-22 0:07 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, Andrew Lunn, Vivien Didelot, David S. Miller,
open list
The SF2 binding does not specify that the CPU port should have
properties mandatory for successfully instantiating a PHYLINK object. As
such, there will be missing properties (including fixed-link) and when
attempting to validate and later configure link modes, we will have an
incorrect set of parameters (interface, speed, duplex).
Simply prevent the CPU port from being configured through PHYLINK since
bcm_sf2_imp_setup() takes care of that already.
Fixes: 0e27921816ad ("net: dsa: Use PHYLINK for the CPU/DSA ports")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/dsa/bcm_sf2.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 3811fdbda13e..28c963a21dac 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -478,6 +478,7 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
unsigned long *supported,
struct phylink_link_state *state)
{
+ struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
if (!phy_interface_mode_is_rgmii(state->interface) &&
@@ -487,8 +488,10 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
state->interface != PHY_INTERFACE_MODE_INTERNAL &&
state->interface != PHY_INTERFACE_MODE_MOCA) {
bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
- dev_err(ds->dev,
- "Unsupported interface: %d\n", state->interface);
+ if (port != core_readl(priv, CORE_IMP0_PRT_ID))
+ dev_err(ds->dev,
+ "Unsupported interface: %d for port %d\n",
+ state->interface, port);
return;
}
@@ -526,6 +529,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
u32 id_mode_dis = 0, port_mode;
u32 reg, offset;
+ if (port == core_readl(priv, CORE_IMP0_PRT_ID))
+ return;
+
if (priv->type == BCM7445_DEVICE_ID)
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
else
--
2.17.1
^ permalink raw reply related
* [PATCH net] openvswitch: Fix conntrack cache with timeout
From: Yi-Hung Wei @ 2019-08-22 0:14 UTC (permalink / raw)
To: netdev, pshelar; +Cc: Yi-Hung Wei
This patch addresses a conntrack cache issue with timeout policy.
Currently, we do not check if the timeout extension is set properly in the
cached conntrack entry. Thus, after packet recirculate from conntrack
action, the timeout policy is not applied properly. This patch fixes the
aforementioned issue.
Fixes: 06bd2bdf19d2 ("openvswitch: Add timeout support to ct action")
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
net/openvswitch/conntrack.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 848c6eb55064..45498fcf540d 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -67,6 +67,7 @@ struct ovs_conntrack_info {
struct md_mark mark;
struct md_labels labels;
char timeout[CTNL_TIMEOUT_NAME_MAX];
+ struct nf_ct_timeout *nf_ct_timeout;
#if IS_ENABLED(CONFIG_NF_NAT)
struct nf_nat_range2 range; /* Only present for SRC NAT and DST NAT. */
#endif
@@ -697,6 +698,14 @@ static bool skb_nfct_cached(struct net *net,
if (help && rcu_access_pointer(help->helper) != info->helper)
return false;
}
+ if (info->nf_ct_timeout) {
+ struct nf_conn_timeout *timeout_ext;
+
+ timeout_ext = nf_ct_timeout_find(ct);
+ if (!timeout_ext ||
+ info->nf_ct_timeout != timeout_ext->timeout)
+ return false;
+ }
/* Force conntrack entry direction to the current packet? */
if (info->force && CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL) {
/* Delete the conntrack entry if confirmed, else just release
@@ -1657,6 +1666,10 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr,
ct_info.timeout))
pr_info_ratelimited("Failed to associated timeout "
"policy `%s'\n", ct_info.timeout);
+ else
+ ct_info.nf_ct_timeout =
+ nf_ct_timeout_find(ct_info.ct)->timeout;
+
}
if (helper) {
--
2.7.4
^ permalink raw reply related
* [PATCH net] openvswitch: Fix log message in ovs conntrack
From: Yi-Hung Wei @ 2019-08-22 0:16 UTC (permalink / raw)
To: netdev, pshelar; +Cc: Yi-Hung Wei
Fixes: 06bd2bdf19d2 ("openvswitch: Add timeout support to ct action")
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 45498fcf540d..0d5ab4957ec0 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1574,7 +1574,7 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
case OVS_CT_ATTR_TIMEOUT:
memcpy(info->timeout, nla_data(a), nla_len(a));
if (!memchr(info->timeout, '\0', nla_len(a))) {
- OVS_NLERR(log, "Invalid conntrack helper");
+ OVS_NLERR(log, "Invalid conntrack timeout");
return -EINVAL;
}
break;
--
2.7.4
^ permalink raw reply related
* RE: [PATCH v2 net-next] net: fec: add C45 MDIO read/write support
From: Andy Duan @ 2019-08-22 1:29 UTC (permalink / raw)
To: Marco Hartmann, davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Christian Herber
In-Reply-To: <1566387814-7034-1-git-send-email-marco.hartmann@nxp.com>
From: Marco Hartman Sent: Wednesday, August 21, 2019 7:44 PM
> IEEE 802.3ae clause 45 defines a modified MDIO protocol that uses a two
> staged access model in order to increase the address space.
>
> This patch adds support for C45 MDIO read and write accesses, which are
> used whenever the MII_ADDR_C45 flag in the regnum argument is set.
> In case it is not set, C22 accesses are used as before.
>
> Signed-off-by: Marco Hartmann <marco.hartmann@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
> ---
> Changes in v2:
> - use bool variable is_c45
> - add missing goto statements
> ---
> ---
> drivers/net/ethernet/freescale/fec_main.c | 70
> ++++++++++++++++++++++++++++---
> 1 file changed, 64 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index c01d3ec3e9af..cb3ce27fb27a 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -208,8 +208,11 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet
> MAC address");
>
> /* FEC MII MMFR bits definition */
> #define FEC_MMFR_ST (1 << 30)
> +#define FEC_MMFR_ST_C45 (0)
> #define FEC_MMFR_OP_READ (2 << 28)
> +#define FEC_MMFR_OP_READ_C45 (3 << 28)
> #define FEC_MMFR_OP_WRITE (1 << 28)
> +#define FEC_MMFR_OP_ADDR_WRITE (0)
> #define FEC_MMFR_PA(v) ((v & 0x1f) << 23)
> #define FEC_MMFR_RA(v) ((v & 0x1f) << 18)
> #define FEC_MMFR_TA (2 << 16)
> @@ -1767,7 +1770,8 @@ static int fec_enet_mdio_read(struct mii_bus *bus,
> int mii_id, int regnum)
> struct fec_enet_private *fep = bus->priv;
> struct device *dev = &fep->pdev->dev;
> unsigned long time_left;
> - int ret = 0;
> + int ret = 0, frame_start, frame_addr, frame_op;
> + bool is_c45 = !!(regnum & MII_ADDR_C45);
>
> ret = pm_runtime_get_sync(dev);
> if (ret < 0)
> @@ -1775,9 +1779,37 @@ static int fec_enet_mdio_read(struct mii_bus
> *bus, int mii_id, int regnum)
>
> reinit_completion(&fep->mdio_done);
>
> + if (is_c45) {
> + frame_start = FEC_MMFR_ST_C45;
> +
> + /* write address */
> + frame_addr = (regnum >> 16);
> + writel(frame_start | FEC_MMFR_OP_ADDR_WRITE |
> + FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(frame_addr) |
> + FEC_MMFR_TA | (regnum & 0xFFFF),
> + fep->hwp + FEC_MII_DATA);
> +
> + /* wait for end of transfer */
> + time_left = wait_for_completion_timeout(&fep->mdio_done,
> + usecs_to_jiffies(FEC_MII_TIMEOUT));
> + if (time_left == 0) {
> + netdev_err(fep->netdev, "MDIO address write timeout\n");
> + ret = -ETIMEDOUT;
> + goto out;
> + }
> +
> + frame_op = FEC_MMFR_OP_READ_C45;
> +
> + } else {
> + /* C22 read */
> + frame_op = FEC_MMFR_OP_READ;
> + frame_start = FEC_MMFR_ST;
> + frame_addr = regnum;
> + }
> +
> /* start a read op */
> - writel(FEC_MMFR_ST | FEC_MMFR_OP_READ |
> - FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(regnum) |
> + writel(frame_start | frame_op |
> + FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(frame_addr) |
> FEC_MMFR_TA, fep->hwp + FEC_MII_DATA);
>
> /* wait for end of transfer */
> @@ -1804,7 +1836,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus,
> int mii_id, int regnum,
> struct fec_enet_private *fep = bus->priv;
> struct device *dev = &fep->pdev->dev;
> unsigned long time_left;
> - int ret;
> + int ret, frame_start, frame_addr;
> + bool is_c45 = !!(regnum & MII_ADDR_C45);
>
> ret = pm_runtime_get_sync(dev);
> if (ret < 0)
> @@ -1814,9 +1847,33 @@ static int fec_enet_mdio_write(struct mii_bus
> *bus, int mii_id, int regnum,
>
> reinit_completion(&fep->mdio_done);
>
> + if (is_c45) {
> + frame_start = FEC_MMFR_ST_C45;
> +
> + /* write address */
> + frame_addr = (regnum >> 16);
> + writel(frame_start | FEC_MMFR_OP_ADDR_WRITE |
> + FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(frame_addr) |
> + FEC_MMFR_TA | (regnum & 0xFFFF),
> + fep->hwp + FEC_MII_DATA);
> +
> + /* wait for end of transfer */
> + time_left = wait_for_completion_timeout(&fep->mdio_done,
> + usecs_to_jiffies(FEC_MII_TIMEOUT));
> + if (time_left == 0) {
> + netdev_err(fep->netdev, "MDIO address write timeout\n");
> + ret = -ETIMEDOUT;
> + goto out;
> + }
> + } else {
> + /* C22 write */
> + frame_start = FEC_MMFR_ST;
> + frame_addr = regnum;
> + }
> +
> /* start a write op */
> - writel(FEC_MMFR_ST | FEC_MMFR_OP_WRITE |
> - FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(regnum) |
> + writel(frame_start | FEC_MMFR_OP_WRITE |
> + FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(frame_addr) |
> FEC_MMFR_TA | FEC_MMFR_DATA(value),
> fep->hwp + FEC_MII_DATA);
>
> @@ -1828,6 +1885,7 @@ static int fec_enet_mdio_write(struct mii_bus *bus,
> int mii_id, int regnum,
> ret = -ETIMEDOUT;
> }
>
> +out:
> pm_runtime_mark_last_busy(dev);
> pm_runtime_put_autosuspend(dev);
>
> --
> 2.7.4
^ permalink raw reply
* Re: [PATCH v3] tun: fix use-after-free when register netdev failed
From: Jason Wang @ 2019-08-22 2:13 UTC (permalink / raw)
To: David Miller, yangyingliang
Cc: netdev, eric.dumazet, xiyou.wangcong, weiyongjun1
In-Reply-To: <ceeafaf2-6aa4-b815-0b5f-ecc663216f43@redhat.com>
On 2019/8/20 上午10:28, Jason Wang wrote:
>
> On 2019/8/20 上午9:25, David Miller wrote:
>> From: Yang Yingliang <yangyingliang@huawei.com>
>> Date: Mon, 19 Aug 2019 21:31:19 +0800
>>
>>> Call tun_attach() after register_netdevice() to make sure tfile->tun
>>> is not published until the netdevice is registered. So the read/write
>>> thread can not use the tun pointer that may freed by free_netdev().
>>> (The tun and dev pointer are allocated by alloc_netdev_mqs(), they can
>>> be freed by netdev_freemem().)
>> register_netdevice() must always be the last operation in the order of
>> network device setup.
>>
>> At the point register_netdevice() is called, the device is visible
>> globally
>> and therefore all of it's software state must be fully initialized and
>> ready for us.
>>
>> You're going to have to find another solution to these problems.
>
>
> The device is loosely coupled with sockets/queues. Each side is
> allowed to be go away without caring the other side. So in this case,
> there's a small window that network stack think the device has one
> queue but actually not, the code can then safely drop them. Maybe it's
> ok here with some comments?
>
> Or if not, we can try to hold the device before tun_attach and drop it
> after register_netdevice().
Hi Yang:
I think maybe we can try to hold refcnt instead of playing real num
queues here. Do you want to post a V4?
Thanks
>
> Thanks
>
^ permalink raw reply
* Re: BUG: MAX_STACK_TRACE_ENTRIES too low in tipc_topsrv_exit_net
From: Eric Biggers @ 2019-08-22 3:05 UTC (permalink / raw)
To: syzbot
Cc: davem, jon.maloy, linux-kernel, netdev, syzkaller-bugs,
tipc-discussion, ying.xue
In-Reply-To: <00000000000071c72c0590776357@google.com>
On Mon, Aug 19, 2019 at 05:22:07AM -0700, syzbot wrote:
> Hello,
>
> syzbot found the following crash on:
>
> HEAD commit: 5181b473 net: phy: realtek: add NBase-T PHY auto-detection
> git tree: net-next
> console output: https://syzkaller.appspot.com/x/log.txt?x=156b731c600000
> kernel config: https://syzkaller.appspot.com/x/.config?x=d4cf1ffb87d590d7
> dashboard link: https://syzkaller.appspot.com/bug?extid=5f97459a05652f579f6c
> compiler: gcc (GCC) 9.0.0 20181231 (experimental)
>
> Unfortunately, I don't have any reproducer for this crash yet.
>
> IMPORTANT: if you fix the bug, please add the following tag to the commit:
> Reported-by: syzbot+5f97459a05652f579f6c@syzkaller.appspotmail.com
>
> BUG: MAX_STACK_TRACE_ENTRIES too low!
> turning off the locking correctness validator.
> CPU: 0 PID: 2581 Comm: kworker/u4:4 Not tainted 5.3.0-rc3+ #132
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
> Google 01/01/2011
> Workqueue: netns cleanup_net
> Call Trace:
> __dump_stack lib/dump_stack.c:77 [inline]
> dump_stack+0x172/0x1f0 lib/dump_stack.c:113
> save_trace kernel/locking/lockdep.c:473 [inline]
> save_trace.isra.0.cold+0x14/0x19 kernel/locking/lockdep.c:458
> mark_lock+0x3db/0x11e0 kernel/locking/lockdep.c:3583
> mark_usage kernel/locking/lockdep.c:3517 [inline]
> __lock_acquire+0x538/0x4c30 kernel/locking/lockdep.c:3834
> lock_acquire+0x190/0x410 kernel/locking/lockdep.c:4412
> flush_workqueue+0x126/0x14b0 kernel/workqueue.c:2774
> drain_workqueue+0x1b4/0x470 kernel/workqueue.c:2939
> destroy_workqueue+0x21/0x6c0 kernel/workqueue.c:4320
> tipc_topsrv_work_stop net/tipc/topsrv.c:636 [inline]
> tipc_topsrv_stop net/tipc/topsrv.c:694 [inline]
> tipc_topsrv_exit_net+0x3fe/0x5d8 net/tipc/topsrv.c:706
> ops_exit_list.isra.0+0xaa/0x150 net/core/net_namespace.c:172
> cleanup_net+0x4e2/0xa70 net/core/net_namespace.c:594
> process_one_work+0x9af/0x1740 kernel/workqueue.c:2269
> worker_thread+0x98/0xe40 kernel/workqueue.c:2415
> kthread+0x361/0x430 kernel/kthread.c:255
> ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352
> kobject: 'rx-0' (000000000e2c91cd): kobject_cleanup, parent 000000002003fefb
> kobject: 'rx-0' (000000000e2c91cd): auto cleanup 'remove' event
> kobject: 'rx-0' (000000000e2c91cd): kobject_uevent_env
> kobject: 'rx-0' (000000000e2c91cd): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000000e2c91cd): auto cleanup kobject_del
> kobject: 'rx-0' (000000000e2c91cd): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000058b6f726): kobject_cleanup, parent 000000002003fefb
> kobject: 'tx-0' (0000000058b6f726): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000058b6f726): kobject_uevent_env
> kobject: 'tx-0' (0000000058b6f726): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000058b6f726): auto cleanup kobject_del
> kobject: 'tx-0' (0000000058b6f726): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000002003fefb): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000002003fefb): calling ktype release
> kobject: 'queues' (000000002003fefb): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (0000000018a24d65): kobject_uevent_env
> kobject: 'ip6gre0' (0000000018a24d65): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000940b22b0): kobject_cleanup, parent 0000000005a1fc3a
> kobject: 'rx-0' (00000000940b22b0): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000940b22b0): kobject_uevent_env
> kobject: 'rx-0' (00000000940b22b0): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000940b22b0): auto cleanup kobject_del
> kobject: 'rx-0' (00000000940b22b0): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000278e85e2): kobject_cleanup, parent 0000000005a1fc3a
> kobject: 'tx-0' (00000000278e85e2): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000278e85e2): kobject_uevent_env
> kobject: 'tx-0' (00000000278e85e2): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000278e85e2): auto cleanup kobject_del
> kobject: 'tx-0' (00000000278e85e2): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000005a1fc3a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000005a1fc3a): calling ktype release
> kobject: 'queues' (0000000005a1fc3a): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000c78b955b): kobject_uevent_env
> kobject: 'ip6gre0' (00000000c78b955b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000000fa7c1d1): kobject_cleanup, parent 00000000d264d5b4
> kobject: 'rx-0' (000000000fa7c1d1): auto cleanup 'remove' event
> kobject: 'rx-0' (000000000fa7c1d1): kobject_uevent_env
> kobject: 'rx-0' (000000000fa7c1d1): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000000fa7c1d1): auto cleanup kobject_del
> kobject: 'rx-0' (000000000fa7c1d1): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000000f66c80c): kobject_cleanup, parent 00000000d264d5b4
> kobject: 'tx-0' (000000000f66c80c): auto cleanup 'remove' event
> kobject: 'tx-0' (000000000f66c80c): kobject_uevent_env
> kobject: 'tx-0' (000000000f66c80c): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000000f66c80c): auto cleanup kobject_del
> kobject: 'tx-0' (000000000f66c80c): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000d264d5b4): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000d264d5b4): calling ktype release
> kobject: 'queues' (00000000d264d5b4): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000ef80dc29): kobject_uevent_env
> kobject: 'ip6gre0' (00000000ef80dc29): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f928d911): kobject_cleanup, parent 000000003c7c9951
> kobject: 'rx-0' (00000000f928d911): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000f928d911): kobject_uevent_env
> kobject: 'rx-0' (00000000f928d911): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f928d911): auto cleanup kobject_del
> kobject: 'rx-0' (00000000f928d911): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000009bf7cc90): kobject_cleanup, parent 000000003c7c9951
> kobject: 'tx-0' (000000009bf7cc90): auto cleanup 'remove' event
> kobject: 'tx-0' (000000009bf7cc90): kobject_uevent_env
> kobject: 'tx-0' (000000009bf7cc90): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000009bf7cc90): auto cleanup kobject_del
> kobject: 'tx-0' (000000009bf7cc90): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000003c7c9951): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000003c7c9951): calling ktype release
> kobject: 'queues' (000000003c7c9951): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000acb4e121): kobject_uevent_env
> kobject: 'ip6gre0' (00000000acb4e121): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000045fca4e1): kobject_cleanup, parent 000000001c9d9e42
> kobject: 'rx-0' (0000000045fca4e1): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000045fca4e1): kobject_uevent_env
> kobject: 'rx-0' (0000000045fca4e1): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000045fca4e1): auto cleanup kobject_del
> kobject: 'rx-0' (0000000045fca4e1): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000a309e805): kobject_cleanup, parent 000000001c9d9e42
> kobject: 'tx-0' (00000000a309e805): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000a309e805): kobject_uevent_env
> kobject: 'tx-0' (00000000a309e805): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000a309e805): auto cleanup kobject_del
> kobject: 'tx-0' (00000000a309e805): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000001c9d9e42): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000001c9d9e42): calling ktype release
> kobject: 'queues' (000000001c9d9e42): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (0000000094fbf7bb): kobject_uevent_env
> kobject: 'ip6gre0' (0000000094fbf7bb): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000443242e0): kobject_cleanup, parent 000000009f9df3e8
> kobject: 'rx-0' (00000000443242e0): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000443242e0): kobject_uevent_env
> kobject: 'rx-0' (00000000443242e0): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000443242e0): auto cleanup kobject_del
> kobject: 'rx-0' (00000000443242e0): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000005588ef99): kobject_cleanup, parent 000000009f9df3e8
> kobject: 'tx-0' (000000005588ef99): auto cleanup 'remove' event
> kobject: 'tx-0' (000000005588ef99): kobject_uevent_env
> kobject: 'tx-0' (000000005588ef99): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000005588ef99): auto cleanup kobject_del
> kobject: 'tx-0' (000000005588ef99): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000009f9df3e8): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000009f9df3e8): calling ktype release
> kobject: 'queues' (000000009f9df3e8): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (0000000060028093): kobject_uevent_env
> kobject: 'ip6gre0' (0000000060028093): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000002c2db56): kobject_cleanup, parent 000000000ee23264
> kobject: 'rx-0' (0000000002c2db56): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000002c2db56): kobject_uevent_env
> kobject: 'rx-0' (0000000002c2db56): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000002c2db56): auto cleanup kobject_del
> kobject: 'rx-0' (0000000002c2db56): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000831daf90): kobject_cleanup, parent 000000000ee23264
> kobject: 'tx-0' (00000000831daf90): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000831daf90): kobject_uevent_env
> kobject: 'tx-0' (00000000831daf90): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000831daf90): auto cleanup kobject_del
> kobject: 'tx-0' (00000000831daf90): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000000ee23264): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000000ee23264): calling ktype release
> kobject: 'queues' (000000000ee23264): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000e217374d): kobject_uevent_env
> kobject: 'ip6gre0' (00000000e217374d): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f8e7f44b): kobject_cleanup, parent 000000003daaa7c9
> kobject: 'rx-0' (00000000f8e7f44b): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000f8e7f44b): kobject_uevent_env
> kobject: 'rx-0' (00000000f8e7f44b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f8e7f44b): auto cleanup kobject_del
> kobject: 'rx-0' (00000000f8e7f44b): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000001277c9de): kobject_cleanup, parent 000000003daaa7c9
> kobject: 'tx-0' (000000001277c9de): auto cleanup 'remove' event
> kobject: 'tx-0' (000000001277c9de): kobject_uevent_env
> kobject: 'tx-0' (000000001277c9de): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000001277c9de): auto cleanup kobject_del
> kobject: 'tx-0' (000000001277c9de): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000003daaa7c9): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000003daaa7c9): calling ktype release
> kobject: 'queues' (000000003daaa7c9): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000597e3c0a): kobject_uevent_env
> kobject: 'ip6gre0' (00000000597e3c0a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000eb376580): kobject_cleanup, parent 0000000054d719cb
> kobject: 'rx-0' (00000000eb376580): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000eb376580): kobject_uevent_env
> kobject: 'rx-0' (00000000eb376580): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000eb376580): auto cleanup kobject_del
> kobject: 'rx-0' (00000000eb376580): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000040024191): kobject_cleanup, parent 0000000054d719cb
> kobject: 'tx-0' (0000000040024191): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000040024191): kobject_uevent_env
> kobject: 'tx-0' (0000000040024191): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000040024191): auto cleanup kobject_del
> kobject: 'tx-0' (0000000040024191): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000054d719cb): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000054d719cb): calling ktype release
> kobject: 'queues' (0000000054d719cb): kset_release
> kobject: 'queues': free name
> kobject: 'ip6gre0' (00000000995a4c19): kobject_uevent_env
> kobject: 'ip6gre0' (00000000995a4c19): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'ip6gre0' (0000000018a24d65): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (0000000018a24d65): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000c78b955b): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000c78b955b): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000ef80dc29): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000ef80dc29): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000acb4e121): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000acb4e121): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (0000000094fbf7bb): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (0000000094fbf7bb): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (0000000060028093): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (0000000060028093): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000e217374d): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000e217374d): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000597e3c0a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000597e3c0a): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'ip6gre0' (00000000995a4c19): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6gre0' (00000000995a4c19): calling ktype release
> kobject: 'ip6gre0': free name
> kobject: 'rx-0' (00000000a530319b): kobject_cleanup, parent 0000000044c197cb
> kobject: 'rx-0' (00000000a530319b): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000a530319b): kobject_uevent_env
> kobject: 'rx-0' (00000000a530319b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000a530319b): auto cleanup kobject_del
> kobject: 'rx-0' (00000000a530319b): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000036817586): kobject_cleanup, parent 0000000044c197cb
> kobject: 'tx-0' (0000000036817586): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000036817586): kobject_uevent_env
> kobject: 'tx-0' (0000000036817586): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000036817586): auto cleanup kobject_del
> kobject: 'tx-0' (0000000036817586): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000044c197cb): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000044c197cb): calling ktype release
> kobject: 'queues' (0000000044c197cb): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (000000004d7cdca9): kobject_uevent_env
> kobject: 'ip6tnl0' (000000004d7cdca9): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000009ad0ffcd): kobject_cleanup, parent 000000006632a50a
> kobject: 'rx-0' (000000009ad0ffcd): auto cleanup 'remove' event
> kobject: 'rx-0' (000000009ad0ffcd): kobject_uevent_env
> kobject: 'rx-0' (000000009ad0ffcd): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000009ad0ffcd): auto cleanup kobject_del
> kobject: 'rx-0' (000000009ad0ffcd): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000cc8f7d89): kobject_cleanup, parent 000000006632a50a
> kobject: 'tx-0' (00000000cc8f7d89): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000cc8f7d89): kobject_uevent_env
> kobject: 'tx-0' (00000000cc8f7d89): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000cc8f7d89): auto cleanup kobject_del
> kobject: 'tx-0' (00000000cc8f7d89): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000006632a50a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000006632a50a): calling ktype release
> kobject: 'queues' (000000006632a50a): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (00000000af12a50a): kobject_uevent_env
> kobject: 'ip6tnl0' (00000000af12a50a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000000f3a002b): kobject_cleanup, parent 000000008e667009
> kobject: 'rx-0' (000000000f3a002b): auto cleanup 'remove' event
> kobject: 'rx-0' (000000000f3a002b): kobject_uevent_env
> kobject: 'rx-0' (000000000f3a002b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000000f3a002b): auto cleanup kobject_del
> kobject: 'rx-0' (000000000f3a002b): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000003dd814d2): kobject_cleanup, parent 000000008e667009
> kobject: 'tx-0' (000000003dd814d2): auto cleanup 'remove' event
> kobject: 'tx-0' (000000003dd814d2): kobject_uevent_env
> kobject: 'tx-0' (000000003dd814d2): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000003dd814d2): auto cleanup kobject_del
> kobject: 'tx-0' (000000003dd814d2): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000008e667009): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000008e667009): calling ktype release
> kobject: 'queues' (000000008e667009): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (00000000ad24f481): kobject_uevent_env
> kobject: 'ip6tnl0' (00000000ad24f481): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000b57b4b94): kobject_cleanup, parent 00000000c8f88c97
> kobject: 'rx-0' (00000000b57b4b94): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000b57b4b94): kobject_uevent_env
> kobject: 'rx-0' (00000000b57b4b94): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000b57b4b94): auto cleanup kobject_del
> kobject: 'rx-0' (00000000b57b4b94): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000035a9b1c): kobject_cleanup, parent 00000000c8f88c97
> kobject: 'tx-0' (00000000035a9b1c): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000035a9b1c): kobject_uevent_env
> kobject: 'tx-0' (00000000035a9b1c): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000035a9b1c): auto cleanup kobject_del
> kobject: 'tx-0' (00000000035a9b1c): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000c8f88c97): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000c8f88c97): calling ktype release
> kobject: 'queues' (00000000c8f88c97): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (00000000e4871037): kobject_uevent_env
> kobject: 'ip6tnl0' (00000000e4871037): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000009e5eabee): kobject_cleanup, parent 000000000bef0c44
> kobject: 'rx-0' (000000009e5eabee): auto cleanup 'remove' event
> kobject: 'rx-0' (000000009e5eabee): kobject_uevent_env
> kobject: 'rx-0' (000000009e5eabee): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000009e5eabee): auto cleanup kobject_del
> kobject: 'rx-0' (000000009e5eabee): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000917837d7): kobject_cleanup, parent 000000000bef0c44
> kobject: 'tx-0' (00000000917837d7): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000917837d7): kobject_uevent_env
> kobject: 'tx-0' (00000000917837d7): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000917837d7): auto cleanup kobject_del
> kobject: 'tx-0' (00000000917837d7): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000000bef0c44): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000000bef0c44): calling ktype release
> kobject: 'queues' (000000000bef0c44): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (00000000a48d6ad0): kobject_uevent_env
> kobject: 'ip6tnl0' (00000000a48d6ad0): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000099277526): kobject_cleanup, parent 0000000085f382c3
> kobject: 'rx-0' (0000000099277526): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000099277526): kobject_uevent_env
> kobject: 'rx-0' (0000000099277526): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000099277526): auto cleanup kobject_del
> kobject: 'rx-0' (0000000099277526): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000e28e65a5): kobject_cleanup, parent 0000000085f382c3
> kobject: 'tx-0' (00000000e28e65a5): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000e28e65a5): kobject_uevent_env
> kobject: 'tx-0' (00000000e28e65a5): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000e28e65a5): auto cleanup kobject_del
> kobject: 'tx-0' (00000000e28e65a5): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000085f382c3): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000085f382c3): calling ktype release
> kobject: 'queues' (0000000085f382c3): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (000000002480b06a): kobject_uevent_env
> kobject: 'ip6tnl0' (000000002480b06a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000ad1f374e): kobject_cleanup, parent 000000004552107a
> kobject: 'rx-0' (00000000ad1f374e): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000ad1f374e): kobject_uevent_env
> kobject: 'rx-0' (00000000ad1f374e): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000ad1f374e): auto cleanup kobject_del
> kobject: 'rx-0' (00000000ad1f374e): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000a52c4930): kobject_cleanup, parent 000000004552107a
> kobject: 'tx-0' (00000000a52c4930): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000a52c4930): kobject_uevent_env
> kobject: 'tx-0' (00000000a52c4930): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000a52c4930): auto cleanup kobject_del
> kobject: 'tx-0' (00000000a52c4930): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000004552107a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000004552107a): calling ktype release
> kobject: 'queues' (000000004552107a): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (00000000b5c75a98): kobject_uevent_env
> kobject: 'ip6tnl0' (00000000b5c75a98): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000069cf2cec): kobject_cleanup, parent 000000000effb6b7
> kobject: 'rx-0' (0000000069cf2cec): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000069cf2cec): kobject_uevent_env
> kobject: 'rx-0' (0000000069cf2cec): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000069cf2cec): auto cleanup kobject_del
> kobject: 'rx-0' (0000000069cf2cec): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000f6dd67a1): kobject_cleanup, parent 000000000effb6b7
> kobject: 'tx-0' (00000000f6dd67a1): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000f6dd67a1): kobject_uevent_env
> kobject: 'tx-0' (00000000f6dd67a1): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000f6dd67a1): auto cleanup kobject_del
> kobject: 'tx-0' (00000000f6dd67a1): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000000effb6b7): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000000effb6b7): calling ktype release
> kobject: 'queues' (000000000effb6b7): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (0000000017bab338): kobject_uevent_env
> kobject: 'ip6tnl0' (0000000017bab338): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000005bed9a62): kobject_cleanup, parent 000000002a90c11d
> kobject: 'rx-0' (000000005bed9a62): auto cleanup 'remove' event
> kobject: 'rx-0' (000000005bed9a62): kobject_uevent_env
> kobject: 'rx-0' (000000005bed9a62): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000005bed9a62): auto cleanup kobject_del
> kobject: 'rx-0' (000000005bed9a62): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000148a89bb): kobject_cleanup, parent 000000002a90c11d
> kobject: 'tx-0' (00000000148a89bb): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000148a89bb): kobject_uevent_env
> kobject: 'tx-0' (00000000148a89bb): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000148a89bb): auto cleanup kobject_del
> kobject: 'tx-0' (00000000148a89bb): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000002a90c11d): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000002a90c11d): calling ktype release
> kobject: 'queues' (000000002a90c11d): kset_release
> kobject: 'queues': free name
> kobject: 'ip6tnl0' (000000007855542e): kobject_uevent_env
> kobject: 'ip6tnl0' (000000007855542e): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'ip6tnl0' (000000004d7cdca9): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (000000004d7cdca9): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (00000000af12a50a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (00000000af12a50a): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (00000000ad24f481): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (00000000ad24f481): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (00000000e4871037): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (00000000e4871037): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (00000000a48d6ad0): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (00000000a48d6ad0): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (000000002480b06a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (000000002480b06a): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (00000000b5c75a98): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (00000000b5c75a98): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (0000000017bab338): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (0000000017bab338): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'ip6tnl0' (000000007855542e): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6tnl0' (000000007855542e): calling ktype release
> kobject: 'ip6tnl0': free name
> kobject: 'rx-0' (00000000faff8a75): kobject_cleanup, parent 000000003555e997
> kobject: 'rx-0' (00000000faff8a75): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000faff8a75): kobject_uevent_env
> kobject: 'rx-0' (00000000faff8a75): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000faff8a75): auto cleanup kobject_del
> kobject: 'rx-0' (00000000faff8a75): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000003377944b): kobject_cleanup, parent 000000003555e997
> kobject: 'tx-0' (000000003377944b): auto cleanup 'remove' event
> kobject: 'tx-0' (000000003377944b): kobject_uevent_env
> kobject: 'tx-0' (000000003377944b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000003377944b): auto cleanup kobject_del
> kobject: 'tx-0' (000000003377944b): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000003555e997): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000003555e997): calling ktype release
> kobject: 'queues' (000000003555e997): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (00000000ba6470e9): kobject_uevent_env
> kobject: 'sit0' (00000000ba6470e9): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000003577adaa): kobject_cleanup, parent 00000000c5fbab92
> kobject: 'rx-0' (000000003577adaa): auto cleanup 'remove' event
> kobject: 'rx-0' (000000003577adaa): kobject_uevent_env
> kobject: 'rx-0' (000000003577adaa): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000003577adaa): auto cleanup kobject_del
> kobject: 'rx-0' (000000003577adaa): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000f519527f): kobject_cleanup, parent 00000000c5fbab92
> kobject: 'tx-0' (00000000f519527f): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000f519527f): kobject_uevent_env
> kobject: 'tx-0' (00000000f519527f): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000f519527f): auto cleanup kobject_del
> kobject: 'tx-0' (00000000f519527f): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000c5fbab92): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000c5fbab92): calling ktype release
> kobject: 'queues' (00000000c5fbab92): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (000000009f74c826): kobject_uevent_env
> kobject: 'sit0' (000000009f74c826): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000137dfc9e): kobject_cleanup, parent 00000000e8ee822b
> kobject: 'rx-0' (00000000137dfc9e): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000137dfc9e): kobject_uevent_env
> kobject: 'rx-0' (00000000137dfc9e): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000137dfc9e): auto cleanup kobject_del
> kobject: 'rx-0' (00000000137dfc9e): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000cf51e058): kobject_cleanup, parent 00000000e8ee822b
> kobject: 'tx-0' (00000000cf51e058): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000cf51e058): kobject_uevent_env
> kobject: 'tx-0' (00000000cf51e058): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000cf51e058): auto cleanup kobject_del
> kobject: 'tx-0' (00000000cf51e058): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000e8ee822b): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000e8ee822b): calling ktype release
> kobject: 'queues' (00000000e8ee822b): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (0000000065e536c8): kobject_uevent_env
> kobject: 'sit0' (0000000065e536c8): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000265aa8c8): kobject_cleanup, parent 000000001c613bad
> kobject: 'rx-0' (00000000265aa8c8): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000265aa8c8): kobject_uevent_env
> kobject: 'rx-0' (00000000265aa8c8): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000265aa8c8): auto cleanup kobject_del
> kobject: 'rx-0' (00000000265aa8c8): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000669b1a88): kobject_cleanup, parent 000000001c613bad
> kobject: 'tx-0' (00000000669b1a88): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000669b1a88): kobject_uevent_env
> kobject: 'tx-0' (00000000669b1a88): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000669b1a88): auto cleanup kobject_del
> kobject: 'tx-0' (00000000669b1a88): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000001c613bad): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000001c613bad): calling ktype release
> kobject: 'queues' (000000001c613bad): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (00000000b0b0bf77): kobject_uevent_env
> kobject: 'sit0' (00000000b0b0bf77): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000c08b3e35): kobject_cleanup, parent 000000004d964cab
> kobject: 'rx-0' (00000000c08b3e35): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000c08b3e35): kobject_uevent_env
> kobject: 'rx-0' (00000000c08b3e35): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000c08b3e35): auto cleanup kobject_del
> kobject: 'rx-0' (00000000c08b3e35): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000006bb20443): kobject_cleanup, parent 000000004d964cab
> kobject: 'tx-0' (000000006bb20443): auto cleanup 'remove' event
> kobject: 'tx-0' (000000006bb20443): kobject_uevent_env
> kobject: 'tx-0' (000000006bb20443): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000006bb20443): auto cleanup kobject_del
> kobject: 'tx-0' (000000006bb20443): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000004d964cab): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000004d964cab): calling ktype release
> kobject: 'queues' (000000004d964cab): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (00000000e3a2a337): kobject_uevent_env
> kobject: 'sit0' (00000000e3a2a337): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000fcf6c2df): kobject_cleanup, parent 000000001f378765
> kobject: 'rx-0' (00000000fcf6c2df): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000fcf6c2df): kobject_uevent_env
> kobject: 'rx-0' (00000000fcf6c2df): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000fcf6c2df): auto cleanup kobject_del
> kobject: 'rx-0' (00000000fcf6c2df): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000306e361a): kobject_cleanup, parent 000000001f378765
> kobject: 'tx-0' (00000000306e361a): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000306e361a): kobject_uevent_env
> kobject: 'tx-0' (00000000306e361a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000306e361a): auto cleanup kobject_del
> kobject: 'tx-0' (00000000306e361a): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000001f378765): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000001f378765): calling ktype release
> kobject: 'queues' (000000001f378765): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (0000000058d12d0d): kobject_uevent_env
> kobject: 'sit0' (0000000058d12d0d): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000078d95bd): kobject_cleanup, parent 000000003596feb5
> kobject: 'rx-0' (00000000078d95bd): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000078d95bd): kobject_uevent_env
> kobject: 'rx-0' (00000000078d95bd): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000078d95bd): auto cleanup kobject_del
> kobject: 'rx-0' (00000000078d95bd): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000037709752): kobject_cleanup, parent 000000003596feb5
> kobject: 'tx-0' (0000000037709752): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000037709752): kobject_uevent_env
> kobject: 'tx-0' (0000000037709752): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000037709752): auto cleanup kobject_del
> kobject: 'tx-0' (0000000037709752): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000003596feb5): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000003596feb5): calling ktype release
> kobject: 'queues' (000000003596feb5): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (000000008276eda5): kobject_uevent_env
> kobject: 'sit0' (000000008276eda5): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000004d3b044b): kobject_cleanup, parent 000000006b53a9a0
> kobject: 'rx-0' (000000004d3b044b): auto cleanup 'remove' event
> kobject: 'rx-0' (000000004d3b044b): kobject_uevent_env
> kobject: 'rx-0' (000000004d3b044b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000004d3b044b): auto cleanup kobject_del
> kobject: 'rx-0' (000000004d3b044b): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000273da9ae): kobject_cleanup, parent 000000006b53a9a0
> kobject: 'tx-0' (00000000273da9ae): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000273da9ae): kobject_uevent_env
> kobject: 'tx-0' (00000000273da9ae): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000273da9ae): auto cleanup kobject_del
> kobject: 'tx-0' (00000000273da9ae): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000006b53a9a0): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000006b53a9a0): calling ktype release
> kobject: 'queues' (000000006b53a9a0): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (000000005ed040cc): kobject_uevent_env
> kobject: 'sit0' (000000005ed040cc): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f150476e): kobject_cleanup, parent 00000000a0cff6dd
> kobject: 'rx-0' (00000000f150476e): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000f150476e): kobject_uevent_env
> kobject: 'rx-0' (00000000f150476e): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000f150476e): auto cleanup kobject_del
> kobject: 'rx-0' (00000000f150476e): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000c81ff56b): kobject_cleanup, parent 00000000a0cff6dd
> kobject: 'tx-0' (00000000c81ff56b): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000c81ff56b): kobject_uevent_env
> kobject: 'tx-0' (00000000c81ff56b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000c81ff56b): auto cleanup kobject_del
> kobject: 'tx-0' (00000000c81ff56b): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000a0cff6dd): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000a0cff6dd): calling ktype release
> kobject: 'queues' (00000000a0cff6dd): kset_release
> kobject: 'queues': free name
> kobject: 'sit0' (000000009ebda3df): kobject_uevent_env
> kobject: 'sit0' (000000009ebda3df): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'sit0' (00000000ba6470e9): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (00000000ba6470e9): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (000000009f74c826): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (000000009f74c826): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (0000000065e536c8): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (0000000065e536c8): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (00000000b0b0bf77): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (00000000b0b0bf77): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (00000000e3a2a337): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (00000000e3a2a337): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (0000000058d12d0d): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (0000000058d12d0d): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (000000008276eda5): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (000000008276eda5): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (000000005ed040cc): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (000000005ed040cc): calling ktype release
> kobject: 'sit0': free name
> kobject: 'sit0' (000000009ebda3df): kobject_cleanup, parent 000000009c061a32
> kobject: 'sit0' (000000009ebda3df): calling ktype release
> kobject: 'sit0': free name
> kobject: 'rx-0' (00000000011781b4): kobject_cleanup, parent 0000000037662b61
> kobject: 'rx-0' (00000000011781b4): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000011781b4): kobject_uevent_env
> kobject: 'rx-0' (00000000011781b4): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000011781b4): auto cleanup kobject_del
> kobject: 'rx-0' (00000000011781b4): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000002bafd647): kobject_cleanup, parent 0000000037662b61
> kobject: 'tx-0' (000000002bafd647): auto cleanup 'remove' event
> kobject: 'tx-0' (000000002bafd647): kobject_uevent_env
> kobject: 'tx-0' (000000002bafd647): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000002bafd647): auto cleanup kobject_del
> kobject: 'tx-0' (000000002bafd647): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000037662b61): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000037662b61): calling ktype release
> kobject: 'queues' (0000000037662b61): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (000000000e5b1a5c): kobject_uevent_env
> kobject: 'ip6_vti0' (000000000e5b1a5c): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000068311350): kobject_cleanup, parent 00000000facffc2f
> kobject: 'rx-0' (0000000068311350): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000068311350): kobject_uevent_env
> kobject: 'rx-0' (0000000068311350): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000068311350): auto cleanup kobject_del
> kobject: 'rx-0' (0000000068311350): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000d6e81326): kobject_cleanup, parent 00000000facffc2f
> kobject: 'tx-0' (00000000d6e81326): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000d6e81326): kobject_uevent_env
> kobject: 'tx-0' (00000000d6e81326): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000d6e81326): auto cleanup kobject_del
> kobject: 'tx-0' (00000000d6e81326): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000facffc2f): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000facffc2f): calling ktype release
> kobject: 'queues' (00000000facffc2f): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (0000000084bcfa3e): kobject_uevent_env
> kobject: 'ip6_vti0' (0000000084bcfa3e): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000ce1fbf9a): kobject_cleanup, parent 00000000faad76b9
> kobject: 'rx-0' (00000000ce1fbf9a): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000ce1fbf9a): kobject_uevent_env
> kobject: 'rx-0' (00000000ce1fbf9a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000ce1fbf9a): auto cleanup kobject_del
> kobject: 'rx-0' (00000000ce1fbf9a): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000054a9318d): kobject_cleanup, parent 00000000faad76b9
> kobject: 'tx-0' (0000000054a9318d): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000054a9318d): kobject_uevent_env
> kobject: 'tx-0' (0000000054a9318d): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000054a9318d): auto cleanup kobject_del
> kobject: 'tx-0' (0000000054a9318d): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000faad76b9): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000faad76b9): calling ktype release
> kobject: 'queues' (00000000faad76b9): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (00000000a17dcb7a): kobject_uevent_env
> kobject: 'ip6_vti0' (00000000a17dcb7a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000e1ec0489): kobject_cleanup, parent 0000000032133323
> kobject: 'rx-0' (00000000e1ec0489): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000e1ec0489): kobject_uevent_env
> kobject: 'rx-0' (00000000e1ec0489): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000e1ec0489): auto cleanup kobject_del
> kobject: 'rx-0' (00000000e1ec0489): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000c69707b0): kobject_cleanup, parent 0000000032133323
> kobject: 'tx-0' (00000000c69707b0): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000c69707b0): kobject_uevent_env
> kobject: 'tx-0' (00000000c69707b0): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000c69707b0): auto cleanup kobject_del
> kobject: 'tx-0' (00000000c69707b0): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000032133323): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000032133323): calling ktype release
> kobject: 'queues' (0000000032133323): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (00000000f1a1ebea): kobject_uevent_env
> kobject: 'ip6_vti0' (00000000f1a1ebea): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000310059d9): kobject_cleanup, parent 000000002f7c701e
> kobject: 'rx-0' (00000000310059d9): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000310059d9): kobject_uevent_env
> kobject: 'rx-0' (00000000310059d9): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000310059d9): auto cleanup kobject_del
> kobject: 'rx-0' (00000000310059d9): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000463fbeb0): kobject_cleanup, parent 000000002f7c701e
> kobject: 'tx-0' (00000000463fbeb0): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000463fbeb0): kobject_uevent_env
> kobject: 'tx-0' (00000000463fbeb0): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000463fbeb0): auto cleanup kobject_del
> kobject: 'tx-0' (00000000463fbeb0): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000002f7c701e): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000002f7c701e): calling ktype release
> kobject: 'queues' (000000002f7c701e): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (00000000e99a1c16): kobject_uevent_env
> kobject: 'ip6_vti0' (00000000e99a1c16): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000fc3878f1): kobject_cleanup, parent 0000000039005ce6
> kobject: 'rx-0' (00000000fc3878f1): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000fc3878f1): kobject_uevent_env
> kobject: 'rx-0' (00000000fc3878f1): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000fc3878f1): auto cleanup kobject_del
> kobject: 'rx-0' (00000000fc3878f1): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (000000003da8a217): kobject_cleanup, parent 0000000039005ce6
> kobject: 'tx-0' (000000003da8a217): auto cleanup 'remove' event
> kobject: 'tx-0' (000000003da8a217): kobject_uevent_env
> kobject: 'tx-0' (000000003da8a217): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (000000003da8a217): auto cleanup kobject_del
> kobject: 'tx-0' (000000003da8a217): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (0000000039005ce6): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (0000000039005ce6): calling ktype release
> kobject: 'queues' (0000000039005ce6): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (000000003f213163): kobject_uevent_env
> kobject: 'ip6_vti0' (000000003f213163): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000066dc1b5f): kobject_cleanup, parent 00000000e169d802
> kobject: 'rx-0' (0000000066dc1b5f): auto cleanup 'remove' event
> kobject: 'rx-0' (0000000066dc1b5f): kobject_uevent_env
> kobject: 'rx-0' (0000000066dc1b5f): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (0000000066dc1b5f): auto cleanup kobject_del
> kobject: 'rx-0' (0000000066dc1b5f): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000b99448c7): kobject_cleanup, parent 00000000e169d802
> kobject: 'tx-0' (00000000b99448c7): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000b99448c7): kobject_uevent_env
> kobject: 'tx-0' (00000000b99448c7): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000b99448c7): auto cleanup kobject_del
> kobject: 'tx-0' (00000000b99448c7): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000e169d802): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000e169d802): calling ktype release
> kobject: 'queues' (00000000e169d802): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (000000003422603c): kobject_uevent_env
> kobject: 'ip6_vti0' (000000003422603c): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000b6464399): kobject_cleanup, parent 00000000785ed365
> kobject: 'rx-0' (00000000b6464399): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000b6464399): kobject_uevent_env
> kobject: 'rx-0' (00000000b6464399): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000b6464399): auto cleanup kobject_del
> kobject: 'rx-0' (00000000b6464399): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000c2beb7d2): kobject_cleanup, parent 00000000785ed365
> kobject: 'tx-0' (00000000c2beb7d2): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000c2beb7d2): kobject_uevent_env
> kobject: 'tx-0' (00000000c2beb7d2): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000c2beb7d2): auto cleanup kobject_del
> kobject: 'tx-0' (00000000c2beb7d2): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000785ed365): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000785ed365): calling ktype release
> kobject: 'queues' (00000000785ed365): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (0000000031ab464d): kobject_uevent_env
> kobject: 'ip6_vti0' (0000000031ab464d): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000a7d5a6f7): kobject_cleanup, parent 00000000ed628333
> kobject: 'rx-0' (00000000a7d5a6f7): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000a7d5a6f7): kobject_uevent_env
> kobject: 'rx-0' (00000000a7d5a6f7): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000a7d5a6f7): auto cleanup kobject_del
> kobject: 'rx-0' (00000000a7d5a6f7): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000564c497f): kobject_cleanup, parent 00000000ed628333
> kobject: 'tx-0' (00000000564c497f): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000564c497f): kobject_uevent_env
> kobject: 'tx-0' (00000000564c497f): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000564c497f): auto cleanup kobject_del
> kobject: 'tx-0' (00000000564c497f): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000ed628333): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (00000000ed628333): calling ktype release
> kobject: 'queues' (00000000ed628333): kset_release
> kobject: 'queues': free name
> kobject: 'ip6_vti0' (00000000fb053a2a): kobject_uevent_env
> kobject: 'ip6_vti0' (00000000fb053a2a): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'ip6_vti0' (000000000e5b1a5c): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (000000000e5b1a5c): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (0000000084bcfa3e): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (0000000084bcfa3e): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (00000000a17dcb7a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (00000000a17dcb7a): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (00000000f1a1ebea): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (00000000f1a1ebea): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (00000000e99a1c16): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (00000000e99a1c16): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (000000003f213163): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (000000003f213163): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (000000003422603c): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (000000003422603c): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (0000000031ab464d): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (0000000031ab464d): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'ip6_vti0' (00000000fb053a2a): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'ip6_vti0' (00000000fb053a2a): calling ktype release
> kobject: 'ip6_vti0': free name
> kobject: 'rx-0' (00000000c827514b): kobject_cleanup, parent 000000004e70d3ea
> kobject: 'rx-0' (00000000c827514b): auto cleanup 'remove' event
> kobject: 'rx-0' (00000000c827514b): kobject_uevent_env
> kobject: 'rx-0' (00000000c827514b): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (00000000c827514b): auto cleanup kobject_del
> kobject: 'rx-0' (00000000c827514b): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (00000000e9330ec4): kobject_cleanup, parent 000000004e70d3ea
> kobject: 'tx-0' (00000000e9330ec4): auto cleanup 'remove' event
> kobject: 'tx-0' (00000000e9330ec4): kobject_uevent_env
> kobject: 'tx-0' (00000000e9330ec4): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (00000000e9330ec4): auto cleanup kobject_del
> kobject: 'tx-0' (00000000e9330ec4): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (000000004e70d3ea): kobject_cleanup, parent
> 000000009c061a32
> kobject: 'queues' (000000004e70d3ea): calling ktype release
> kobject: 'queues' (000000004e70d3ea): kset_release
> kobject: 'queues': free name
> kobject: 'ip_vti0' (000000004ee7ad23): kobject_uevent_env
> kobject: 'ip_vti0' (000000004ee7ad23): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000004dda38d8): kobject_cleanup, parent 00000000025cb3fe
> kobject: 'rx-0' (000000004dda38d8): auto cleanup 'remove' event
> kobject: 'rx-0' (000000004dda38d8): kobject_uevent_env
> kobject: 'rx-0' (000000004dda38d8): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'rx-0' (000000004dda38d8): auto cleanup kobject_del
> kobject: 'rx-0' (000000004dda38d8): calling ktype release
> kobject: 'rx-0': free name
> kobject: 'tx-0' (0000000097fba38d): kobject_cleanup, parent 00000000025cb3fe
> kobject: 'tx-0' (0000000097fba38d): auto cleanup 'remove' event
> kobject: 'tx-0' (0000000097fba38d): kobject_uevent_env
> kobject: 'tx-0' (0000000097fba38d): kobject_uevent_env: uevent_suppress
> caused the event to drop!
> kobject: 'tx-0' (0000000097fba38d): auto cleanup kobject_del
> kobject: 'tx-0' (0000000097fba38d): calling ktype release
> kobject: 'tx-0': free name
> kobject: 'queues' (00000000025cb3fe): kobject_cleanup, parent
> 000000009c061a32
>
>
> ---
> This bug is generated by a bot. It may contain errors.
> See https://goo.gl/tpsmEJ for more information about syzbot.
> syzbot engineers can be reached at syzkaller@googlegroups.com.
>
> syzbot will keep track of this bug report. See:
> https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
>
> --
> You received this message because you are subscribed to the Google Groups "syzkaller-bugs" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to syzkaller-bugs+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/syzkaller-bugs/00000000000071c72c0590776357%40google.com.
Looks to be:
#syz dup: BUG: MAX_STACK_TRACE_ENTRIES too low! (2)
Original thread: https://lkml.kernel.org/lkml/0000000000005ff8b20585395280@google.com/T/#u
The caller isn't really meaningful for "MAX_STACK_TRACE_ENTRIES too low" bugs,
so I think
https://github.com/google/syzkaller/pull/1332/commits/ccbd11f30158d198e84953b1bb5eaa33464d9311
should be reverted...
- Eric
^ permalink raw reply
* [PATCH net-next] net/rds: Fix info leak in rds6_inc_info_copy()
From: Ka-Cheong Poon @ 2019-08-22 3:18 UTC (permalink / raw)
To: netdev; +Cc: santosh.shilimkar, davem, rds-devel
The rds6_inc_info_copy() function has a couple struct members which
are leaking stack information. The ->tos field should hold actual
information and the ->flags field needs to be zeroed out.
Fixes: 3eb450367d08 ("rds: add type of service(tos) infrastructure")
Fixes: b7ff8b1036f0 ("rds: Extend RDS API for IPv6 support")
Reported-by: 黄ID蝴蝶 <butterflyhuangxx@gmail.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ka-Cheong Poon <ka-cheong.poon@oracle.com>
---
net/rds/recv.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 853de48..a42ba7f 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -811,6 +811,7 @@ void rds6_inc_info_copy(struct rds_incoming *inc,
minfo6.seq = be64_to_cpu(inc->i_hdr.h_sequence);
minfo6.len = be32_to_cpu(inc->i_hdr.h_len);
+ minfo6.tos = inc->i_conn->c_tos;
if (flip) {
minfo6.laddr = *daddr;
@@ -824,6 +825,8 @@ void rds6_inc_info_copy(struct rds_incoming *inc,
minfo6.fport = inc->i_hdr.h_dport;
}
+ minfo6.flags = 0;
+
rds_info_copy(iter, &minfo6, sizeof(minfo6));
}
#endif
--
1.8.3.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox