d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx4: fix Verbs FD leak in secondary process

Browse Source 
FDs passed from rte_mp_msg are duplicated to the secondary process and
need to be closed.

Fixes: 0203d33a10 ("net/mlx4: support secondary process")
Cc: stable@dpdk.org

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
This commit is contained in:
Long Li 2022-07-06 10:48:52 -07:00 committed by Raslan Darawsheh
parent 8ae946970e
commit ff9c3548c0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/mlx4/mlx4.c
View File

@ -877,6 +877,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
snprintf(name, sizeof(name), "%s port %u",
mlx4_glue->get_device_name(ibv_dev), port);
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
int fd;
eth_dev = rte_eth_dev_attach_secondary(name);
if (eth_dev == NULL) {
ERROR("can not attach rte ethdev");
@ -899,13 +901,14 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
if (err)
goto err_secondary;
/* Receive command fd from primary process. */
err = mlx4_mp_req_verbs_cmd_fd(eth_dev);
if (err < 0) {
fd = mlx4_mp_req_verbs_cmd_fd(eth_dev);
if (fd < 0) {
err = rte_errno;
goto err_secondary;
}
/* Remap UAR for Tx queues. */
err = mlx4_tx_uar_init_secondary(eth_dev, err);
err = mlx4_tx_uar_init_secondary(eth_dev, fd);
close(fd);
if (err) {
err = rte_errno;
goto err_secondary;

7
drivers/net/mlx4/mlx4_mp.c
View File

@ -6,6 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include <rte_eal.h>
#include <ethdev_driver.h>
@ -135,15 +136,19 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
mlx4_tx_uar_uninit_secondary(dev);
mlx4_proc_priv_uninit(dev);
ret = mlx4_proc_priv_init(dev);
if (ret)
if (ret) {
close(mp_msg->fds[0]);
return -rte_errno;
}
ret = mlx4_tx_uar_init_secondary(dev, mp_msg->fds[0]);
if (ret) {
close(mp_msg->fds[0]);
mlx4_proc_priv_uninit(dev);
return -rte_errno;
}
}
#endif
close(mp_msg->fds[0]);
rte_mb();
mp_init_msg(dev, &mp_res, param->type);
res->result = 0;