[dpdk-dev] net/mlx5: fix socket assertion error during dev close
Checks
Commit Message
This patch fixed primary socket assertion error during close on a device
that failed to start.
Fixes: f8b9a3bad467 ("net/mlx5: install a socket to exchange a file descriptor")
Signed-off-by: Xueming Li <xuemingl@mellanox.com>
---
drivers/net/mlx5/mlx5.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
On Tue, Feb 06, 2018 at 08:54:22PM +0800, Xueming Li wrote:
> This patch fixed primary socket assertion error during close on a device
> that failed to start.
>
> Fixes: f8b9a3bad467 ("net/mlx5: install a socket to exchange a file descriptor")
> Signed-off-by: Xueming Li <xuemingl@mellanox.com>
> ---
> drivers/net/mlx5/mlx5.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index b66303d29..fb4463c2b 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -201,7 +201,8 @@ mlx5_dev_close(struct rte_eth_dev *dev)
> rte_free(priv->rss_conf.rss_key);
> if (priv->reta_idx != NULL)
> rte_free(priv->reta_idx);
> - priv_socket_uninit(priv);
> + if (priv->primary_socket)
> + priv_socket_uninit(priv);
> ret = mlx5_priv_hrxq_ibv_verify(priv);
> if (ret)
> WARN("%p: some Hash Rx queue still remain", (void *)priv);
> --
> 2.13.3
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
06/02/2018 14:22, Nélio Laranjeiro:
> On Tue, Feb 06, 2018 at 08:54:22PM +0800, Xueming Li wrote:
> > This patch fixed primary socket assertion error during close on a device
> > that failed to start.
> >
> > Fixes: f8b9a3bad467 ("net/mlx5: install a socket to exchange a file descriptor")
> > Signed-off-by: Xueming Li <xuemingl@mellanox.com>
>
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Applied, thanks
@@ -201,7 +201,8 @@ mlx5_dev_close(struct rte_eth_dev *dev)
rte_free(priv->rss_conf.rss_key);
if (priv->reta_idx != NULL)
rte_free(priv->reta_idx);
- priv_socket_uninit(priv);
+ if (priv->primary_socket)
+ priv_socket_uninit(priv);
ret = mlx5_priv_hrxq_ibv_verify(priv);
if (ret)
WARN("%p: some Hash Rx queue still remain", (void *)priv);