From patchwork Mon Jun 14 09:12:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 94164 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1180FA0548; Mon, 14 Jun 2021 11:12:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0F8D40E0F; Mon, 14 Jun 2021 11:12:52 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id E9E994067A for ; Mon, 14 Jun 2021 11:12:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623661969; 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; bh=XOhHH3v0Vk5wiMDXfqkImHi7T3tC7Ld89bQjHrkDFRQ=; b=TdiQZN8lftjzRXYco3759IUOJAPKoATaOzTC7EaqPsDxlxYB8tU0/GBrsPSvlg25XaRFcU dWhRYgfOVTSVsmJAdw+uClZf6wUWAmG067tlX6ir5vi2uZDh5g4Ukj2dtkyWnAAfEvS1w3 F3fDEMwiqXEu0Ot1JFr0+UV7DF9Or4Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-549-p4F217TSMpyhbvLq3R_u5Q-1; Mon, 14 Jun 2021 05:12:48 -0400 X-MC-Unique: p4F217TSMpyhbvLq3R_u5Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F1EA19057A6; Mon, 14 Jun 2021 09:12:47 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65B946060F; Mon, 14 Jun 2021 09:12:45 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: ohilyard@iol.unh.edu, stable@dpdk.org, Anatoly Burakov , Qi Zhang Date: Mon, 14 Jun 2021 11:12:13 +0200 Message-Id: <20210614091213.3953-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] ipc: stop mp control thread on cleanup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When calling rte_eal_cleanup, the mp channel cleanup routine only sets mp_fd to -1 leaving the rte_mp_handle control thread running. This control thread can spew warnings on reading on an invalid fd. To handle this situation, sets mp_fd to -1 to signal the control thread it should exit, but since this thread might be sleeping on the socket, cancel the thread too. Fixes: 85d6815fa6d0 ("eal: close multi-process socket during cleanup") Cc: stable@dpdk.org Signed-off-by: David Marchand Reported-by: Owen Hilyard --- lib/eal/common/eal_common_proc.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index dc4a2efa82..2c46c21421 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -35,6 +35,7 @@ #include "eal_internal_cfg.h" static int mp_fd = -1; +static pthread_t mp_handle_tid; static char mp_filter[PATH_MAX]; /* Filter for secondary process sockets */ static char mp_dir_path[PATH_MAX]; /* The directory path for all mp sockets */ static pthread_mutex_t mp_mutex_action = PTHREAD_MUTEX_INITIALIZER; @@ -383,7 +384,7 @@ mp_handle(void *arg __rte_unused) struct mp_msg_internal msg; struct sockaddr_un sa; - while (1) { + while (mp_fd >= 0) { if (read_msg(&msg, &sa) == 0) process_msg(&msg, &sa); } @@ -566,25 +567,11 @@ open_socket_fd(void) return mp_fd; } -static void -close_socket_fd(void) -{ - char path[PATH_MAX]; - - if (mp_fd < 0) - return; - - close(mp_fd); - create_socket_path(peer_name, path, sizeof(path)); - unlink(path); -} - int rte_mp_channel_init(void) { char path[PATH_MAX]; int dir_fd; - pthread_t mp_handle_tid; const struct internal_config *internal_conf = eal_get_internal_configuration(); @@ -645,7 +632,19 @@ rte_mp_channel_init(void) void rte_mp_channel_cleanup(void) { - close_socket_fd(); + char path[PATH_MAX]; + int fd; + + if (mp_fd < 0) + return; + + fd = mp_fd; + mp_fd = -1; + pthread_cancel(mp_handle_tid); + pthread_join(mp_handle_tid, NULL); + close(fd); + create_socket_path(peer_name, path, sizeof(path)); + unlink(path); } /**