Netdev List
 help / color / mirror / Atom feed
From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Gal Pressman <galp@mellanox.com>,
	Saeed Mahameed <saeedm@mellanox.com>
Subject: [net 11/14] net/mlx5e: Prevent possible races in VXLAN control flow
Date: Wed, 20 Dec 2017 00:24:53 +0200	[thread overview]
Message-ID: <20171219222456.29627-12-saeedm@mellanox.com> (raw)
In-Reply-To: <20171219222456.29627-1-saeedm@mellanox.com>

From: Gal Pressman <galp@mellanox.com>

When calling add/remove VXLAN port, a lock must be held in order to
prevent race scenarios when more than one add/remove happens at the
same time.
Fix by holding our state_lock (mutex) as done by all other parts of the
driver.
Note that the spinlock protecting the radix-tree is still needed in
order to synchronize radix-tree access from softirq context.

Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling")
Signed-off-by: Gal Pressman <galp@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
index 25f782344667..2f74953e4561 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
@@ -88,6 +88,7 @@ static void mlx5e_vxlan_add_port(struct work_struct *work)
 	struct mlx5e_vxlan *vxlan;
 	int err;
 
+	mutex_lock(&priv->state_lock);
 	vxlan = mlx5e_vxlan_lookup_port(priv, port);
 	if (vxlan) {
 		atomic_inc(&vxlan->refcount);
@@ -117,6 +118,7 @@ static void mlx5e_vxlan_add_port(struct work_struct *work)
 err_delete_port:
 	mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
 free_work:
+	mutex_unlock(&priv->state_lock);
 	kfree(vxlan_work);
 }
 
@@ -130,6 +132,7 @@ static void mlx5e_vxlan_del_port(struct work_struct *work)
 	struct mlx5e_vxlan *vxlan;
 	bool remove = false;
 
+	mutex_lock(&priv->state_lock);
 	spin_lock_bh(&vxlan_db->lock);
 	vxlan = radix_tree_lookup(&vxlan_db->tree, port);
 	if (!vxlan)
@@ -147,6 +150,7 @@ static void mlx5e_vxlan_del_port(struct work_struct *work)
 		mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
 		kfree(vxlan);
 	}
+	mutex_unlock(&priv->state_lock);
 	kfree(vxlan_work);
 }
 
-- 
2.13.0

  parent reply	other threads:[~2017-12-19 22:28 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-19 22:24 [pull request][net 00/14] Mellanox, mlx5 fixes 2017-12-19 Saeed Mahameed
2017-12-19 22:24 ` [net 01/14] net/mlx5: FPGA, return -EINVAL if size is zero Saeed Mahameed
2017-12-19 22:24 ` [net 02/14] Revert "mlx5: move affinity hints assignments to generic code" Saeed Mahameed
2017-12-19 22:42   ` Jes Sorensen
2017-12-25 13:53   ` Sagi Grimberg
2017-12-26 15:58     ` Saeed Mahameed
2017-12-26 17:14       ` Sagi Grimberg
2018-01-04 20:19         ` Saeed Mahameed
2017-12-19 22:24 ` [net 03/14] net/mlx5: Fix rate limit packet pacing naming and struct Saeed Mahameed
2017-12-19 22:24 ` [net 04/14] net/mlx5e: Fix ETS BW check Saeed Mahameed
2017-12-20  7:42   ` Or Gerlitz
2017-12-19 22:24 ` [net 05/14] net/mlx5e: Fix features check of IPv6 traffic Saeed Mahameed
2017-12-20  7:45   ` Or Gerlitz
2017-12-19 22:24 ` [net 06/14] net/mlx5e: Fix defaulting RX ring size when not needed Saeed Mahameed
2017-12-19 22:24 ` [net 07/14] net/mlx5: Fix misspelling in the error message and comment Saeed Mahameed
2017-12-19 22:24 ` [net 08/14] net/mlx5: Fix error flow in CREATE_QP command Saeed Mahameed
2017-12-19 22:24 ` [net 09/14] net/mlx5e: Fix possible deadlock of VXLAN lock Saeed Mahameed
2017-12-19 22:24 ` [net 10/14] net/mlx5e: Add refcount to VXLAN structure Saeed Mahameed
2017-12-19 22:24 ` Saeed Mahameed [this message]
2017-12-19 22:24 ` [net 12/14] net/mlx5: Fix steering memory leak Saeed Mahameed
2017-12-19 22:24 ` [net 13/14] net/mlx5: Cleanup IRQs in case of unload failure Saeed Mahameed
2017-12-19 22:24 ` [net 14/14] net/mlx5: Stay in polling mode when command EQ destroy fails Saeed Mahameed
2017-12-20 18:42 ` [pull request][net 00/14] Mellanox, mlx5 fixes 2017-12-19 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171219222456.29627-12-saeedm@mellanox.com \
    --to=saeedm@mellanox.com \
    --cc=davem@davemloft.net \
    --cc=galp@mellanox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox