From: Long Li <lon...@microsoft.com>
FDs passed from rte_mp_msg are duplicated to the secondary process and
need to be closed.
Fixes: 9a8ab29b84 ("net/mlx5: replace IPC socket with EAL API")
Signed-off-by: Long Li <lon...@microsoft.com>
---
Change in v2: handle error case where mlx5_proc_priv_init() might fail
drivers/net/mlx5/linux/mlx5_mp_os.c | 6 +++++-
drivers/net/mlx5/linux/mlx5_os.c | 8 +++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c
b/drivers/net/mlx5/linux/mlx5_mp_os.c
index c448a3e9eb..0ba2208fe0 100644
--- a/drivers/net/mlx5/linux/mlx5_mp_os.c
+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c
@@ -177,14 +177,18 @@ struct rte_mp_msg mp_res;
mlx5_tx_uar_uninit_secondary(dev);
mlx5_proc_priv_uninit(dev);
ret = mlx5_proc_priv_init(dev);
- if (ret)
+ if (ret) {
+ close(mp_msg->fds[0]);
return -rte_errno;
+ }
ret = mlx5_tx_uar_init_secondary(dev, mp_msg->fds[0]);
if (ret) {
+ close(mp_msg->fds[0]);
mlx5_proc_priv_uninit(dev);
return -rte_errno;
}
}
+ close(mp_msg->fds[0]);
rte_mb();
mp_init_msg(&priv->mp_id, &mp_res, param->type);
res->result = 0;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index c29fe3d92b..69ae3c944b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -933,6 +933,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(DEBUG, "naming Ethernet device \"%s\"", name);
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
struct mlx5_mp_id mp_id;
+ int fd;
eth_dev = rte_eth_dev_attach_secondary(name);
if (eth_dev == NULL) {
@@ -949,11 +950,12 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
return NULL;
mlx5_mp_id_init(&mp_id, eth_dev->data->port_id);
/* Receive command fd from primary process */
- err = mlx5_mp_req_verbs_cmd_fd(&mp_id);
- if (err < 0)
+ fd = mlx5_mp_req_verbs_cmd_fd(&mp_id);
+ if (fd < 0)
goto err_secondary;
/* Remap UAR for Tx queues. */
- err = mlx5_tx_uar_init_secondary(eth_dev, err);
+ err = mlx5_tx_uar_init_secondary(eth_dev, fd);
+ close(fd);
if (err)
goto err_secondary;
/*
--
2.17.1
