diff mbox series

[v2,1/1] net/mlx5: fix sharing context destroy order

Message ID 1554470945-14357-1-git-send-email-viacheslavo@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers
Series [v2,1/1] net/mlx5: fix sharing context destroy order |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Slava Ovsiienko April 5, 2019, 1:29 p.m. UTC 
  At the mlx5 device closing the shared IB context was destroyed
before cleanup routines completion. As it was found on some
setups (Netlink fails with old kernel drivers and we have to use
sysfs to retrieve interface index, this requires IB device name,
which is stored in shared context) the mlx5_nl_mac_addr_flush()
requires IB device name, and if shared context is removed it
causes the segmentation fault.

Fixes: 17e19bc4dde7 ("net/mlx5: add IB shared context alloc/free functions")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
v2:
    rebasing only

v1:
    http://patches.dpdk.org/patch/52193/
 
drivers/net/mlx5/mlx5.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

Comments

Shahaf Shuler April 8, 2019, 6 a.m. UTC | #1 
Friday, April 5, 2019 4:29 PM, Viacheslav Ovsiienko:
> Subject: [dpdk-dev] [PATCH v2 1/1] net/mlx5: fix sharing context destroy
> order
> 
> At the mlx5 device closing the shared IB context was destroyed before
> cleanup routines completion. As it was found on some setups (Netlink fails
> with old kernel drivers and we have to use sysfs to retrieve interface index,
> this requires IB device name, which is stored in shared context) the
> mlx5_nl_mac_addr_flush() requires IB device name, and if shared context is
> removed it causes the segmentation fault.
> 
> Fixes: 17e19bc4dde7 ("net/mlx5: add IB shared context alloc/free functions")
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

Applied to next-net-mlx, thanks.
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index b7e6234..475c93d 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -593,9 +593,6 @@  struct mlx5_dev_spawn_data {
 	mlx5_mr_release(dev);
 	assert(priv->sh);
 	mlx5_free_shared_dr(priv);
-	if (priv->sh)
-		mlx5_free_shared_ibctx(priv->sh);
-	priv->sh = NULL;
 	if (priv->rss_conf.rss_key != NULL)
 		rte_free(priv->rss_conf.rss_key);
 	if (priv->reta_idx != NULL)
@@ -608,6 +605,16 @@  struct mlx5_dev_spawn_data {
 		close(priv->nl_socket_rdma);
 	if (priv->tcf_context)
 		mlx5_flow_tcf_context_destroy(priv->tcf_context);
+	if (priv->sh) {
+		/*
+		 * Free the shared context in last turn, because the cleanup
+		 * routines above may use some shared fields, like
+		 * mlx5_nl_mac_addr_flush() uses ibdev_path for retrieveing
+		 * ifindex if Netlink fails.
+		 */
+		mlx5_free_shared_ibctx(priv->sh);
+		priv->sh = NULL;
+	}
 	ret = mlx5_hrxq_ibv_verify(dev);
 	if (ret)
 		DRV_LOG(WARNING, "port %u some hash Rx queue still remain",