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 DEB0D457A1 for ; Mon, 12 Aug 2024 15:04:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9A6F40A8A; Mon, 12 Aug 2024 15:04:25 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2074.outbound.protection.outlook.com [40.107.237.74]) by mails.dpdk.org (Postfix) with ESMTP id 703B1402C3 for ; Mon, 12 Aug 2024 15:04:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fTFhYHt78R4Z9jNs//0UAtDMFob7WTXC5eMbSLGqGM0Vnn4x4Pau/nSZN6DtnhuMDXeGCfHfwUyqoHoQwecWzofVZcpIIj3RHGBMI560NuqI0VciJlBGmb6Gw6pvIpNF15jdZJj9+uHhRgzjLhUJQS9Rljp+Xq3lsn3+QaBTDVJ1E3UlS0kYhebIFO4K/qGFJXRh8RQ1TSxFjV3AK8LhhHGtpHqxi9iPOQf+pgWd/rAB7W01x+5BADsNBOVkeuzZNNCoNwy3s2AY5iUBmT3+JBUnEXC4KGREDMmNKwkxWOG5/KFk+xVN/EpwIp6fNvGsgUzJAWYPqtXBV8FgHhX7wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YmNjiyQfK0XlWaawkchV1tWmczLQcegwarjMiEqSLOs=; b=uh1yR0UynrDPqrw47uFNP9eSiHhQ+0NyANMrb226erXfGITb6Ojte45cMvNes+sGWrKgMKkl+2fz0cMKAq9+wM1DoQWqou80qagGpEP4TvnCYq4CVDQtXyxEORY52EDNSLIMEQF/2Qgm6ET2f7cz9hWO5/6hf5WuvSVEB/snpPWCkVw4ek4qtQ7VAkzYJ41bqhEIrNoeHuRwgnMwWUbWliBSFJ/AxEVEs3dpBEwONVrW7sBDyMBd8JF1ziIHo2NIKkGhApEWLwairF4yGbOoVJQaeaZMI6ZeXkOyJB1O6jMKB49OgQdD74fu/lwoagd1FYJZqKYcK60E5vl6OjKc0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YmNjiyQfK0XlWaawkchV1tWmczLQcegwarjMiEqSLOs=; b=nqaG7rrlAhesDI2CPyrTxrPuOj0iCSa1dGNzPnQRtOqe7p/imlQ2My2fN5XoFWppNMrgD+DoCAtX6A2Eg2R4A12LLt0i/jyCrvjekZYBVMQcZijb2BHk/qJ+0xV7NDJ8bp/6tE/TAGDlZqPvkJiribmm3vbwgEyRrdl+PV971QeSlqiORhfRlgisFvty+lDQTF4v2i2DDffOlF7fCecuhAep8tZ3kvT9DhLV3nG7Kb9u/pITw/JDHuOJAfP+DSCN/NLn51syDaX0hGsRGSCuJUh5eH2hRwBWWOyfRnzbhSYYNts5NO3TIwDWNtFgs15QBdlJHPsr/5N9RJy2hJ2tJQ== Received: from SN6PR04CA0097.namprd04.prod.outlook.com (2603:10b6:805:f2::38) by CY8PR12MB7414.namprd12.prod.outlook.com (2603:10b6:930:5e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.19; Mon, 12 Aug 2024 13:04:20 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:805:f2:cafe::44) by SN6PR04CA0097.outlook.office365.com (2603:10b6:805:f2::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 13:04:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:04:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:04:05 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:04:03 -0700 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'app/pdump: handle SIGTERM and SIGHUP' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:18 +0800 Message-ID: <20240812125035.389667-142-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|CY8PR12MB7414:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fe31a0a-e83c-4488-5d4a-08dcbacf479e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zz8JZ5gZsl/cfnHjh8Ig2R5ODBcDVRKRbHtGtgPjogs+lQHpBZgqy0Vmi/ii?= =?us-ascii?Q?3Ch8AxohXg8kdW5CKlkE94g1ClYWFBhd4mnRv+EsEgD9Jq4gK9aceZ93rQAh?= =?us-ascii?Q?KeNarkJ7jNS/Dj8aTz8RNknapYdqO0S7aeTfhNLkD75u5zcZmPTYtamuPf0Q?= =?us-ascii?Q?FcxoiB/hs0KyxBQAeLyYWBNuN+1w0IQe0FzJTLmCZv5A0VEzUD8X2NOtqDo6?= =?us-ascii?Q?pISETTEhNt4T99oXeuAvre9SLIXSsqMHkMM/KNaKKPjMAZK2AErdfra9jzuI?= =?us-ascii?Q?apln/wfptKwkefvA0Sb7YqY9ZczrptNle2Nlel7FpwyCZb6ea2Fyh/qKrpJT?= =?us-ascii?Q?rYZYWq8rG+m497NwUv+0bWHrsl7y5M3ueUOTmEnY3OIHHlvUMalQI14/7jt+?= =?us-ascii?Q?YZEjgZEO9zPlWw+x8RrSCOIpakCeWRVB13NVLxtj2OVR7W2MSKioJE6qkQSO?= =?us-ascii?Q?kls1ofO8gbzQGG9712xppAM9UpTrROKIF+LxMVysofIopmdCaaxW7pvRvg7o?= =?us-ascii?Q?1IoA0TDz98lvje8kjY/sdc0mKl9HAaHZirS13Nz+uF4oShTECgvVNFRGwJYn?= =?us-ascii?Q?6G1nvEWzxApIzuKvvaN+aEp5Un8ksVBgJjMy6YZWgQSH8ghqqDqjTIp/Pce8?= =?us-ascii?Q?Tkg3fsEZ1lxx3OuwrCWrEfqMmYYPw12z0mpFt6G+QfejChZFnxwh0M3251ui?= =?us-ascii?Q?5pFNgl0MaCqHjxQLw3UQgfN1VVJnEzK/NSrTujRYRKQxDodEQmn358hnImwC?= =?us-ascii?Q?+baobjVljbFliWhD6YmXSx4xSLsmRSrOAqiWuEDTxBPhKzi6Je/UMUgmjH7y?= =?us-ascii?Q?gDAfBOD6j42FRvi0cNg2R2/H93uU0uP1Os1wDwIAJ7L8ZUcmPX7XfiolSDbU?= =?us-ascii?Q?bpR8n6W0HPGzMxwv+qFcjoDeVDrXbiGYQLUvmOK8Jsxdhukspj9czQAq31LR?= =?us-ascii?Q?7IUxAu77/md/RvU3TS5X/PYr50Pve1DajFVzlvyoDOemhJUSL9LTtASWiB3b?= =?us-ascii?Q?n8FCq7zt/BO2PkSMw5jbzH1U6hArCxtE4/x/uwobZbcuMr4QnW1yqW4U8L+O?= =?us-ascii?Q?0e1lBrVicRylVFyqmu7CxrcohyVi756Kx1/VbmzW3Lxj6q21QF3VH0r/Lc6z?= =?us-ascii?Q?RA4pwFEnfCYAJO1sReEtIeqrMkRnUJD/pVpHO6KwxOYIleXCTsaWUemDdyMG?= =?us-ascii?Q?fpNLe9LR/q4u1ZtaA26r+4zKtRQI3hscrxqeE2qHZVOBzE8kP5v+DiOsuKcZ?= =?us-ascii?Q?MniQiYbp5PBGadsvAsKRl7bb3kQ8i9+GLcRpK7FLrqsXrSmgb9FXEh4R6xzW?= =?us-ascii?Q?TnutHr10QVna6aWvUzrEUQgNurHX/yrlffDSIMEaraSYl1GFXzHqRFLn+80H?= =?us-ascii?Q?NKk4ZhXhbKgxGuTvecxiilaJBtwUfclJM5FIFbXulmm78MsMymBdeV1dBxtN?= =?us-ascii?Q?EDHR3H673HTf1MDGOaSuvZINIwFuBCOF?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:20.0919 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fe31a0a-e83c-4488-5d4a-08dcbacf479e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7414 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 23.11.2 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/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=52bf7488c319917236142521b2190d8d23ad225d Thanks. Xueming Li --- >From 52bf7488c319917236142521b2190d8d23ad225d 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 Cc: Xueming Li [ 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 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index a9205e130b..3592f8a865 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -571,11 +571,9 @@ disable_primary_monitor(void) } static void -signal_handler(int sig_num) +signal_handler(int sig_num __rte_unused) { - if (sig_num == SIGINT) { - quit_signal = 1; - } + quit_signal = 1; } static inline int @@ -975,6 +973,11 @@ enable_primary_monitor(void) int main(int argc, char **argv) { + struct sigaction action = { + .sa_flags = SA_RESTART, + .sa_handler = signal_handler, + }; + struct sigaction origaction; int diag; int ret; int i; @@ -983,8 +986,14 @@ main(int argc, char **argv) char mp_flag[] = "--proc-type=secondary"; 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]; argp[1] = n_flag; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:06.972453145 +0800 +++ 0141-app-pdump-handle-SIGTERM-and-SIGHUP.patch 2024-08-12 20:44:02.555069385 +0800 @@ -1 +1 @@ -From e1253df666fdc672bc378722db0da2ce3091a8dd Mon Sep 17 00:00:00 2001 +From 52bf7488c319917236142521b2190d8d23ad225d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e1253df666fdc672bc378722db0da2ce3091a8dd ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 3bdbb8dc78..fa85859703 100644 +index a9205e130b..3592f8a865 100644