From: Kevin Traynor <ktraynor@redhat.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: dpdk stable <stable@dpdk.org>
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 [thread overview]
Message-ID: <20240823161929.1004778-129-ktraynor@redhat.com> (raw)
In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com>
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 <stephen@networkplumber.org>
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 <stephen@networkplumber.org>
---
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)
next prev parent reply other threads:[~2024-08-23 16:24 UTC|newest]
Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-23 16:17 patch 'bus/pci: fix build with musl 1.2.4 / Alpine 3.19' " Kevin Traynor
2024-08-23 16:17 ` patch 'eal/unix: support ZSTD compression for firmware' " Kevin Traynor
2024-08-23 16:17 ` patch 'pcapng: add memcpy check' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/virtio-user: " Kevin Traynor
2024-08-23 16:17 ` patch 'eal/windows: install sched.h file' " Kevin Traynor
2024-08-23 16:17 ` patch 'latencystats: fix literal float suffix' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/hns3: fix offload flag of IEEE 1588' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/hns3: fix Rx timestamp flag' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/hns3: fix double free for Rx/Tx queue' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/hns3: fix variable overflow' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/hns3: disable SCTP verification tag for RSS hash input' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/af_packet: align Rx/Tx structs to cache line' " Kevin Traynor
2024-08-23 16:17 ` patch 'doc: fix testpmd ring size command' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/af_xdp: fix port ID in Rx mbuf' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/af_xdp: count mbuf allocation failures' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/tap: fix file descriptor check in isolated flow' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix MDIO access for non-zero ports and CL45 PHYs' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: reset link when link never comes back' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix fluctuations for 1G Bel Fuse SFP' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: update DMA coherency values' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: disable interrupts during device removal' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix SFP codes check for DAC cables' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix connection for SFP+ active " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: check only minimum speed for " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix Tx flow on 30H HW' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: delay AN timeout during KR training' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/axgbe: fix linkup in PHY status' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ice: fix check for outer UDP checksum offload' " Kevin Traynor
2024-08-23 16:17 ` patch 'app/testpmd: fix outer IP " Kevin Traynor
2024-08-23 16:17 ` patch 'net/i40e: fix outer UDP checksum offload for X710' " Kevin Traynor
2024-08-23 16:17 ` patch 'app/testpmd: fix lcore ID restriction' " Kevin Traynor
2024-08-23 16:17 ` patch 'hash: fix return code description in Doxygen' " Kevin Traynor
2024-08-23 16:17 ` patch 'hash: check name when creating a hash' " Kevin Traynor
2024-08-23 16:17 ` patch 'vhost: fix build with GCC 13' " Kevin Traynor
2024-08-23 16:17 ` patch 'vhost: cleanup resubmit info before inflight setup' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/virtio: fix MAC table update' " Kevin Traynor
2024-08-23 16:17 ` patch 'event/sw: fix warning from useless snprintf' " Kevin Traynor
2024-08-23 16:17 ` patch 'eal: fix logs for '--lcores'' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/fm10k: fix cleanup during init failure' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ixgbe: do not update link status in secondary process' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ixgbe: do not create delayed interrupt handler twice' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/e1000/base: fix link power down' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ixgbe/base: revert advertising for X550 2.5G/5G' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ixgbe/base: fix 5G link speed reported on VF' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/ixgbe/base: fix PHY ID for X550' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/cnxk: fix RSS config' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/cnxk: fix outbound security with higher packet burst' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/cnxk: fix promiscuous state after MAC change' " Kevin Traynor
2024-08-23 16:17 ` patch 'hash: fix RCU reclamation size' " Kevin Traynor
2024-08-23 16:17 ` patch 'common/mlx5: fix unsigned/signed mismatch' " Kevin Traynor
2024-08-23 16:17 ` patch 'net/mlx5: fix indexed pool with invalid index' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/mlx5: fix hash Rx queue release in flow sample' " Kevin Traynor
2024-08-23 16:18 ` patch 'telemetry: lower log level on socket error' " Kevin Traynor
2024-08-23 16:18 ` patch 'app/bbdev: fix interrupt tests' " Kevin Traynor
2024-08-23 16:18 ` patch 'dmadev: fix structure alignment' " Kevin Traynor
2024-08-23 16:18 ` patch 'vdpa/sfc: remove dead code' " Kevin Traynor
2024-08-23 16:18 ` patch 'bpf: fix MOV instruction evaluation' " Kevin Traynor
2024-08-23 16:18 ` patch 'bpf: fix load hangs with six IPv6 addresses' " Kevin Traynor
2024-08-23 16:18 ` patch 'telemetry: fix connection parameter parsing' " Kevin Traynor
2024-08-23 16:18 ` patch 'baseband/la12xx: forbid secondary process' " Kevin Traynor
2024-08-23 16:18 ` patch 'crypto/cnxk: fix minimal input normalization' " Kevin Traynor
2024-08-23 16:18 ` patch 'cryptodev: fix build without crypto callbacks' " Kevin Traynor
2024-08-23 16:18 ` patch 'cryptodev: validate crypto callbacks from next node' " Kevin Traynor
2024-08-23 16:18 ` patch 'crypto/openssl: optimize 3DES-CTR context init' " Kevin Traynor
2024-08-23 16:18 ` patch 'crypto/openssl: set cipher padding once' " Kevin Traynor
2024-09-04 14:24 ` Kevin Traynor
2024-08-23 16:18 ` patch 'common/dpaax/caamflib: fix PDCP-SDAP watchdog error' " Kevin Traynor
2024-08-23 16:18 ` patch 'common/dpaax/caamflib: fix PDCP AES-AES " Kevin Traynor
2024-08-23 16:18 ` patch 'crypto/dpaa2_sec: fix event queue user context' " Kevin Traynor
2024-08-23 16:18 ` patch 'examples/ipsec-secgw: fix SA salt endianness' " Kevin Traynor
2024-08-26 8:07 ` [EXTERNAL] " Akhil Goyal
2024-08-26 11:06 ` Kevin Traynor
2024-08-23 16:18 ` patch 'fbarray: fix incorrect lookahead behavior' " Kevin Traynor
2024-08-23 16:18 ` patch 'fbarray: fix incorrect lookbehind " Kevin Traynor
2024-08-23 16:18 ` patch 'fbarray: fix lookahead ignore mask handling' " Kevin Traynor
2024-08-23 16:18 ` patch 'fbarray: fix lookbehind " Kevin Traynor
2024-08-23 16:18 ` patch 'eal/linux: lower log level on allocation attempt failure' " Kevin Traynor
2024-08-23 16:18 ` patch 'app/testpmd: fix help string of BPF load command' " Kevin Traynor
2024-08-23 16:18 ` patch 'bus/dpaa: fix bus scan for DMA devices' " Kevin Traynor
2024-08-23 16:18 ` patch 'bus/dpaa: fix memory leak in bus scan' " Kevin Traynor
2024-08-23 16:18 ` patch 'common/dpaax: fix IOVA table cleanup' " Kevin Traynor
2024-08-23 16:18 ` patch 'common/dpaax: fix node array overrun' " Kevin Traynor
2024-08-23 16:18 ` patch 'bus/dpaa: remove redundant file descriptor check' " Kevin Traynor
2024-08-23 16:18 ` patch 'fbarray: fix finding for unaligned length' " Kevin Traynor
2024-08-23 16:18 ` patch 'buildtools: fix build with clang 17 and ASan' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix pointer to variable outside scope' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix sign extension' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix size when allocating children arrays' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix GCS descriptor field offsets' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix return type of bitmap hamming weight' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix check for existing switch rule' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix potential TLV length overflow' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix board type definition' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ice/base: fix masking when reading context' " Kevin Traynor
2024-08-23 16:18 ` patch 'app/testpmd: handle IEEE1588 init failure' " Kevin Traynor
2024-08-23 16:18 ` patch 'app/testpmd: fix parsing for connection tracking item' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix tunnel packet parsing' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix flow filters in VT mode' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix Tx hang on queue disable' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: restrict configuration of VLAN strip offload' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: reconfigure more MAC Rx registers' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix VF promiscuous and allmulticast' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ngbe: keep PHY power down while device probing' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix hotplug remove' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ngbe: " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix MTU range' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ngbe: " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix memory leaks' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ngbe: " Kevin Traynor
2024-08-23 16:18 ` patch 'net/txgbe: fix Rx interrupt' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/vmxnet3: fix init logs' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/ena: fix bad checksum handling' " Kevin Traynor
2024-08-26 10:26 ` Brandes, Shai
2024-08-26 11:17 ` Kevin Traynor
2024-09-02 13:01 ` Brandes, Shai
2024-09-04 14:30 ` Kevin Traynor
2024-08-23 16:18 ` patch 'net/ena: fix return value check' " Kevin Traynor
2024-08-23 16:18 ` patch 'net/nfp: fix disabling 32-bit build' " Kevin Traynor
2024-08-23 16:19 ` patch 'test/crypto: fix allocation comment' " Kevin Traynor
2024-08-23 16:19 ` patch 'doc: fix typo in l2fwd-crypto guide' " Kevin Traynor
2024-08-23 16:19 ` patch 'test/crypto: fix asymmetric capability test' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/ice: fix memory leaks in raw pattern parsing' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/ice: fix return value for " Kevin Traynor
2024-08-23 16:19 ` patch 'net/mlx5: fix Arm build with GCC 9.1' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/mlx5: fix MTU configuration' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/mlx5: fix end condition of reading xstats' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/mlx5: fix uplink port probing in bonding mode' " Kevin Traynor
2024-08-23 16:19 ` patch 'common/mlx5: remove unneeded field when modify RQ table' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/hns3: check Rx DMA address alignmnent' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/ark: fix index arithmetic' " Kevin Traynor
2024-08-23 16:19 ` patch 'ethdev: fix GENEVE option item conversion' " Kevin Traynor
2024-08-23 16:19 ` patch 'app/testpmd: fix build on signed comparison' " Kevin Traynor
2024-08-23 16:19 ` patch 'bus/pci: fix UIO resource mapping in secondary process' " Kevin Traynor
2024-08-23 16:19 ` patch 'bus/pci: fix FD " Kevin Traynor
2024-08-23 16:19 ` patch 'app/dumpcap: handle SIGTERM and SIGHUP' " Kevin Traynor
2024-08-23 16:19 ` Kevin Traynor [this message]
2024-08-23 16:19 ` patch 'malloc: fix multi-process wait condition handling' " Kevin Traynor
2024-08-23 16:19 ` patch 'bus/vdev: fix device reinitialization' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/hns3: fix uninitialized variable in FEC query' " Kevin Traynor
2024-08-23 16:19 ` patch 'net/ice/base: fix temporary failures reading NVM' " Kevin Traynor
2024-08-23 16:19 ` patch 'doc: remove reference to mbuf pkt field' " Kevin Traynor
2024-08-23 16:19 ` patch 'examples/ipsec-secgw: revert SA salt endianness' " Kevin Traynor
2024-08-23 16:19 ` patch 'doc: add baseline mode in l3fwd-power guide' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240823161929.1004778-129-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).