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 04DEA45804 for ; Fri, 23 Aug 2024 18:24:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0021A4339E; Fri, 23 Aug 2024 18:24:10 +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 599224336D for ; Fri, 23 Aug 2024 18:24:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430248; 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=GI8mOU+wt4FZ4W74fOWh8grKASdIE7wqmK+5Va+Pcd8=; b=cqaJF+LMjlinm0psVLAAWxalstzdd0OidPhgP3Gh4fWNr4O5bPb5Xhfqwu57j+n/OT6pQQ JVjOjGuP7OrZneFdzZECLB3X68CyCA/8wL5edClH92sdkvLyXYAZuQC766nag4X0qgF10H lYpSqXZqftsNoHQruTSjLNZolPhjcjg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-3Ahj0UtGMDKa5pKUeyqEUQ-1; Fri, 23 Aug 2024 12:24:06 -0400 X-MC-Unique: 3Ahj0UtGMDKa5pKUeyqEUQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 137A91955D48; Fri, 23 Aug 2024 16:24:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DCDB819560A3; Fri, 23 Aug 2024 16:24:04 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'app/pdump: handle SIGTERM and SIGHUP' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:19:17 +0100 Message-ID: <20240823161929.1004778-129-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/717d90c8b8b7d33deb80fea44df756d9fea29c44 Thanks. Kevin --- >From 717d90c8b8b7d33deb80fea44df756d9fea29c44 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 3 Jul 2024 08:45:44 -0700 Subject: [PATCH] app/pdump: handle SIGTERM and SIGHUP [ upstream commit e1253df666fdc672bc378722db0da2ce3091a8dd ] The pdump application will leak ring and memory pool if killed by SIGTERM. Like dumpcap, the pdump process should cleanup if process terminates due to being killed or hangup. Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing") Signed-off-by: Stephen Hemminger --- app/pdump/main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index 71fd83dada..0986034e44 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -574,11 +574,7 @@ disable_primary_monitor(void) static void -signal_handler(int sig_num) +signal_handler(int sig_num __rte_unused) { - if (sig_num == SIGINT) { - printf("\n\nSignal %d received, preparing to exit...\n", - sig_num); - quit_signal = 1; - } + quit_signal = 1; } @@ -977,4 +973,9 @@ int main(int argc, char **argv) { + struct sigaction action = { + .sa_flags = SA_RESTART, + .sa_handler = signal_handler, + }; + struct sigaction origaction; int diag; int ret; @@ -985,6 +986,12 @@ main(int argc, char **argv) char *argp[argc + 2]; - /* catch ctrl-c so we can print on exit */ - signal(SIGINT, signal_handler); + /* catch ctrl-c so we can cleanup on exit */ + sigemptyset(&action.sa_mask); + sigaction(SIGTERM, &action, NULL); + sigaction(SIGINT, &action, NULL); + sigaction(SIGPIPE, &action, NULL); + sigaction(SIGHUP, NULL, &origaction); + if (origaction.sa_handler == SIG_DFL) + sigaction(SIGHUP, &action, NULL); argp[0] = argv[0]; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:13.568595568 +0100 +++ 0129-app-pdump-handle-SIGTERM-and-SIGHUP.patch 2024-08-23 17:18:09.892430706 +0100 @@ -1 +1 @@ -From e1253df666fdc672bc378722db0da2ce3091a8dd Mon Sep 17 00:00:00 2001 +From 717d90c8b8b7d33deb80fea44df756d9fea29c44 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1253df666fdc672bc378722db0da2ce3091a8dd ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - app/pdump/main.c | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) + app/pdump/main.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) @@ -19 +20 @@ -index 3bdbb8dc78..fa85859703 100644 +index 71fd83dada..0986034e44 100644 @@ -22 +23 @@ -@@ -572,9 +572,7 @@ disable_primary_monitor(void) +@@ -574,11 +574,7 @@ disable_primary_monitor(void) @@ -28,0 +30,2 @@ +- printf("\n\nSignal %d received, preparing to exit...\n", +- sig_num); @@ -34 +37 @@ -@@ -976,4 +974,9 @@ int +@@ -977,4 +973,9 @@ int @@ -44 +47 @@ -@@ -984,6 +987,12 @@ main(int argc, char **argv) +@@ -985,6 +986,12 @@ main(int argc, char **argv)