From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 80297A0544 for ; Wed, 16 Nov 2022 20:25:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B1CC40E03; Wed, 16 Nov 2022 20:25:59 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 8B0BB40DFB for ; Wed, 16 Nov 2022 20:25:57 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1004) id ACEA520B717A; Wed, 16 Nov 2022 11:25:56 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com ACEA520B717A From: Long Li To: stable@dpdk.org Cc: longli@microsoft.com Subject: [PATCH 19.11] net/mlx5: fix Verbs FD leak in secondary process Date: Wed, 16 Nov 2022 11:25:38 -0800 Message-Id: <1668626738-30282-1-git-send-email-longli@microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: longli@microsoft.com Errors-To: stable-bounces@dpdk.org [ upstream commit bc5d8fdb7008210e2698fa1f91e51d7dfba00f77 ] 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") Cc: stable@dpdk.org Signed-off-by: Long Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5.c | 9 ++++++--- drivers/net/mlx5/mlx5_mp.c | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index dee018bbba..2d0f9625fb 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2291,6 +2291,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, } DRV_LOG(DEBUG, "naming Ethernet device \"%s\"", name); if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + int fd; + eth_dev = rte_eth_dev_attach_secondary(name); if (eth_dev == NULL) { DRV_LOG(ERR, "can not attach rte ethdev"); @@ -2303,11 +2305,12 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, if (err) return NULL; /* Receive command fd from primary process */ - err = mlx5_mp_req_verbs_cmd_fd(eth_dev); - if (err < 0) + fd = mlx5_mp_req_verbs_cmd_fd(eth_dev); + 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; /* diff --git a/drivers/net/mlx5/mlx5_mp.c b/drivers/net/mlx5/mlx5_mp.c index 6b7f5f3dcb..7e05217cda 100644 --- a/drivers/net/mlx5/mlx5_mp.c +++ b/drivers/net/mlx5/mlx5_mp.c @@ -142,14 +142,18 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) 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(dev, &mp_res, param->type); res->result = 0; -- 2.17.1