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 CF0D342ECF for ; Thu, 20 Jul 2023 17:23:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB8EF40685; Thu, 20 Jul 2023 17:23:24 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 78725400D6 for ; Thu, 20 Jul 2023 17:23:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866603; 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=5fT0j5Kvz695a2JOGwXD/bql4pigQ/1k9y8c7paO9sk=; b=QXFrp0Oe5krRXtATyXnjbfDjiX/VXwsxHRGIoT3a2qjB+sdI1RAxSBU53bebyRg3sVb//S LA2OZdOqTExT6TDW0Ej0kvdl3YvIMjqd32qUxEDQftMHoLNBLX8qUm0QKT8BJbJfQk/tvM pANwpgTJdKG2jOHjO/FtqmqCrG/o6os= 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-76-QkkcKCVjPK6X08b6yJXnmQ-1; Thu, 20 Jul 2023 11:23:16 -0400 X-MC-Unique: QkkcKCVjPK6X08b6yJXnmQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0FF1936D5E; Thu, 20 Jul 2023 15:22:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95A344CD0E3; Thu, 20 Jul 2023 15:22:46 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: Chengwen Feng , Anatoly Burakov , dpdk stable Subject: patch 'ipc: fix file descriptor leakage with unhandled messages' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:02 +0100 Message-ID: <20230720151942.262154-111-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/ac5250b965af48a3af548cfe18bdc1bbd904430e Thanks. Kevin --- >From ac5250b965af48a3af548cfe18bdc1bbd904430e Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 28 Jun 2023 15:19:38 +0300 Subject: [PATCH] ipc: fix file descriptor leakage with unhandled messages [ upstream commit a64a4564705d18d20d20cfa16c79e795b7bf0f1e ] The sendmsg()/recvmsg() API is used to establish communication between the DPDK processes. The API supposes inter-process file descriptors sending and conversion, the recipient sees the resulting descriptors in the received message - the operating systems creates ones in the right context. The message receiving is performed by EAL in the dedicated thread and it might happen the message is received by EAL and not handled by addressed PMD or application due to some reasons (timeouts, race condition, etc). EAL just dropped unhandled messages causing the file descriptor leakage if these ones were presented in the message. The patch closes the descriptors (if any) in unhandled messages. Fixes: 783b6e54971d ("eal: add synchronous multi-process communication") Signed-off-by: Viacheslav Ovsiienko Acked-by: Chengwen Feng Acked-by: Anatoly Burakov --- lib/eal/common/eal_common_proc.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index 50f0668148..38a2164f71 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -324,4 +324,13 @@ retry: } +static void +cleanup_msg_fds(const struct rte_mp_msg *msg) +{ + int i; + + for (i = 0; i < msg->num_fds; i++) + close(msg->fds[i]); +} + static void process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) @@ -352,6 +361,8 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) req = async_reply_handle_thread_unsafe( pending_req); - } else + } else { RTE_LOG(ERR, EAL, "Drop mp reply: %s\n", msg->name); + cleanup_msg_fds(msg); + } pthread_mutex_unlock(&pending_requests.lock); @@ -383,4 +394,5 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) msg->name); } + cleanup_msg_fds(msg); } else if (action(msg, s->sun_path) < 0) { RTE_LOG(ERR, EAL, "Fail to handle message: %s\n", msg->name); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:08.557262549 +0100 +++ 0111-ipc-fix-file-descriptor-leakage-with-unhandled-messa.patch 2023-07-20 16:17:55.098752293 +0100 @@ -1 +1 @@ -From a64a4564705d18d20d20cfa16c79e795b7bf0f1e Mon Sep 17 00:00:00 2001 +From ac5250b965af48a3af548cfe18bdc1bbd904430e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a64a4564705d18d20d20cfa16c79e795b7bf0f1e ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 7a038e0a3c..02d4599d67 100644 +index 50f0668148..38a2164f71 100644 @@ -34 +35 @@ -@@ -322,4 +322,13 @@ retry: +@@ -324,4 +324,13 @@ retry: @@ -48 +49 @@ -@@ -350,6 +359,8 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) +@@ -352,6 +361,8 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) @@ -58 +59 @@ -@@ -381,4 +392,5 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) +@@ -383,4 +394,5 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)