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 496B7A054A for ; Tue, 25 Oct 2022 17:09:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 420DA42C4E; Tue, 25 Oct 2022 17:09:33 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AC2C542C41 for ; Tue, 25 Oct 2022 17:09:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tPLsax5Zb+iCI/kA87QJiIdgWD3usltfshFdJL3UK00=; b=PvfXRfcoNTgM7V8lvKtKN9YEeZAzOnHxfcI5+oJv7wxr202ngLzO74CZFLwqJRvVI4L8VK ahyjaRjf8AgGeO9BaLE2t/2q1/FxJl8KUVnsySu8+ObhpUfAWY/ajrwl4/F8lUvb/Pwfyw O7OYMXt1VDIYUP0D1UPvCvoXbbNPSdU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-127-QRKqXMt9P4mczlztIY6JSw-1; Tue, 25 Oct 2022 11:09:29 -0400 X-MC-Unique: QRKqXMt9P4mczlztIY6JSw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 60EA0811E84; Tue, 25 Oct 2022 15:09:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 994FB47505E; Tue, 25 Oct 2022 15:09:27 +0000 (UTC) From: Kevin Traynor To: Long Li Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx4: fix Verbs FD leak in secondary process' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:59 +0100 Message-Id: <20221025150734.142189-64-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/43ebf47ac3d079d39744f9e56fc91458ae8ac30f Thanks. Kevin --- >From 43ebf47ac3d079d39744f9e56fc91458ae8ac30f Mon Sep 17 00:00:00 2001 From: Long Li Date: Wed, 6 Jul 2022 10:48:52 -0700 Subject: [PATCH] net/mlx4: fix Verbs FD leak in secondary process [ upstream commit ff9c3548c05b356753a4f53bc945c625263c1ee9 ] FDs passed from rte_mp_msg are duplicated to the secondary process and need to be closed. Fixes: 0203d33a10 ("net/mlx4: support secondary process") Signed-off-by: Long Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx4/mlx4.c | 9 ++++++--- drivers/net/mlx4/mlx4_mp.c | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 3f3c4a7c72..2e0b4a17e2 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -878,4 +878,6 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) 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) { @@ -900,11 +902,12 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) 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; diff --git a/drivers/net/mlx4/mlx4_mp.c b/drivers/net/mlx4/mlx4_mp.c index 8fcfb5490e..b0bb48c8f1 100644 --- a/drivers/net/mlx4/mlx4_mp.c +++ b/drivers/net/mlx4/mlx4_mp.c @@ -6,4 +6,5 @@ #include #include +#include #include @@ -135,8 +136,11 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) 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; @@ -144,4 +148,5 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) } #endif + close(mp_msg->fds[0]); rte_mb(); mp_init_msg(dev, &mp_res, param->type); -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.996117818 +0100 +++ 0064-net-mlx4-fix-Verbs-FD-leak-in-secondary-process.patch 2022-10-25 14:18:58.469798299 +0100 @@ -1 +1 @@ -From ff9c3548c05b356753a4f53bc945c625263c1ee9 Mon Sep 17 00:00:00 2001 +From 43ebf47ac3d079d39744f9e56fc91458ae8ac30f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff9c3548c05b356753a4f53bc945c625263c1ee9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7e7e1824ef..a54016f4a2 100644 +index 3f3c4a7c72..2e0b4a17e2 100644 @@ -47 +48 @@ -index 3282afceda..534cb31151 100644 +index 8fcfb5490e..b0bb48c8f1 100644 @@ -50,2 +51,2 @@ -@@ -7,4 +7,5 @@ - #include +@@ -6,4 +6,5 @@ + #include @@ -56 +57 @@ -@@ -136,8 +137,11 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +@@ -135,8 +136,11 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) @@ -69 +70 @@ -@@ -145,4 +149,5 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +@@ -144,4 +148,5 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)