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 B3A5F457A1 for ; Mon, 12 Aug 2024 15:04:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9563406BB; Mon, 12 Aug 2024 15:04:24 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2080.outbound.protection.outlook.com [40.107.223.80]) by mails.dpdk.org (Postfix) with ESMTP id A7D774065A for ; Mon, 12 Aug 2024 15:04:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mHi7k1XvGmUyAc2lX4Nkz25LK0X1EPdNTQO19xDcq2y4pgyGokqqjgwOrDRQpLThb2ucD+jWC0EEoM3idMltq9BGO8AdoInE0yAzk7/WOeQCx45nw7f79fCvfMFVUee0x7JeLiKOhhwXzK7uxy8wgDX1F+bjuHoeBLvVVYRJKl02TkabPp24j0ImPCFI1c5OwFIKKB/fN8o3+7DeltrQzWQOrl//3Th+ksanoh1F9EsW3HjfqsShwYe5TXU8KpG5uqXa1yWLwbHrqZfbDYzctBSD1YKIUYTQMHqDRR9xCKXY3YHXtlwft+2LAPENeHCY7Emb/25fz2XB+SvlUFkqGA== 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=vtwMm0EJo8P+f5MT7zMDEZaH6xyzlb06DDYllyJ9TkM=; b=p9RtGFOb5apJh1M3+QjlB/C0v3PVl3Vih3e2rHyr+K+cgTkgnejF43hdq3TJN+i4+vhpM+oXohHPC6JIb4OFD6DJmsXgvfLMaYKvFzJtteqX9havpDDdID7CAHlp3RDi7lN/pPveFCY4gNWUWULPE3oa0UpU8bSg2VQj7eNyQjdYf1Sop8fYf318DsMNP308l2HEOGDgRtvIXsz5hZbSI2/r1KGr+bSoALECKBezLCDzzXfF2fnq2PmTWRj3DRB8fijD6puAYKWQ/4b4FZJkMCUY0hkeP+nPWxrv+ZveJXtJ/CMgy2aMh0ksyEYFB/yH5DJGTxk78aYaOPBAzxuduw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=vtwMm0EJo8P+f5MT7zMDEZaH6xyzlb06DDYllyJ9TkM=; b=Ninv05fB0eqx92IJaQGh+rfp6m3ZXw+tvuxfK9eCMaQmUCmNfMPOoVVJOrXy2nadUI3BVX8lB8+LD3gttSEgxl+7SU7UNLdEp+pSaXvrc3MWF6GlgF3sIUU8QNkru409hh3KKubrLSLwlSHl5Xzz9SknfXPwGz9P7Xcp+R3i5nWdtmeDnbjc0reaYvYMxD+t9dobwo19KIahbCCvViE2vcmPylG7w8zTDVoR3bMCsFZ5uVhQwIZV+oAeQCodZSkWLp/elV5TlVQpYoWHeYIVIGlm/GS5cRAGeNGdt5hHOL0jPS1iBDBIi33aSW7YMfjg7MS3gFyKlof6+xI2VI9Eew== Received: from BY5PR13CA0029.namprd13.prod.outlook.com (2603:10b6:a03:180::42) by SN7PR12MB6742.namprd12.prod.outlook.com (2603:10b6:806:26e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 13:04:15 +0000 Received: from SJ5PEPF00000207.namprd05.prod.outlook.com (2603:10b6:a03:180:cafe::9c) by BY5PR13CA0029.outlook.office365.com (2603:10b6:a03:180::42) 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:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF00000207.mail.protection.outlook.com (10.167.244.40) 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:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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 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:02 -0700 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'app/dumpcap: handle SIGTERM and SIGHUP' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:17 +0800 Message-ID: <20240812125035.389667-141-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: SJ5PEPF00000207:EE_|SN7PR12MB6742:EE_ X-MS-Office365-Filtering-Correlation-Id: 68e9ee68-7621-497c-a050-08dcbacf4470 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2jRNkq0GYl1gYIA/l8PENJS2ex/LqcB1NAEgp0CwLiCfIKimbqZjncK56OTv?= =?us-ascii?Q?FfBK5aDDEDEKIb9KGzzXqY01Z6Tl8Gol2KGU7+Nhva0XzKjuaQjKi8ylHFq0?= =?us-ascii?Q?VmLrmeO/5W1/+0wPHN0WvDgvUPdICYIfMbatNnTwZImomFWl8xNto8iq6JsA?= =?us-ascii?Q?FT94KPwtRbX4PPWLpn2FTpVq2zA6f2PTaJoxBmk0sKiqY8V0UjfbxJR4ldSw?= =?us-ascii?Q?aX1tn+KTWLS8cNtW2os0CioL9KyIMfgIFob7764LA8MOZT9G4jQg5bdseVoJ?= =?us-ascii?Q?5WNOTwSPO8dPbCjvQOHlfHKofILdjQl9+2NBUroIlmdGGiKydWYtBhtd2gYs?= =?us-ascii?Q?lKWwtpHheafNIhD+Eu+csX5EkzHklvjgxo84EWAbtQd61Cm9pxz5ITJzyDy4?= =?us-ascii?Q?yKA778CJ4lgFuY2LLszsEbQwBI/XbX5wydN5CHuZGwbg8RUhYcQhxYpU7mjF?= =?us-ascii?Q?GtDQMlEBvI2dN21bIr5Vd1TFq80CVhDYsX4vbmKWCwXhfWHyydH5w8NbPvqY?= =?us-ascii?Q?u2qgO/uwl4KK4o/uANvCYuTbC9zvYAypWvw5MW3SnPhv/WGE1wrb2XF3GodS?= =?us-ascii?Q?b23bHRfcAfpmjX74dcHTi8AGP4MjAmI3GfUUF7+SvmhyQ6/Q8nGaTnZcR4fB?= =?us-ascii?Q?YV7OkD8G1igj2mGTrvGS2fPbn8PidkQaGSw5/oDsAUDO9uKDlSRw152oopNr?= =?us-ascii?Q?g549q0TxaYxHp4PvDdW/8KgiM5yEtoz2AbYlAFKHAbGGaQ7KGD27zZZLFHHw?= =?us-ascii?Q?2wyR0zCmVKwsStK/9KfH4suKEh3pixdIau5FLy5tQdtvsVKNUG/vefalq/7e?= =?us-ascii?Q?aNJf0QuXvt7X0uqcE0yF4bT7PD7mIlq6osmI8mI9srcBOFsm1m+B/RZe/qTP?= =?us-ascii?Q?mBGUlahQrAlHkfLLj8M+6WUW8wX9yUkaVHOLvors7F/Mmt5cm/hlr7+QGBOk?= =?us-ascii?Q?Mk0C/X3QcShqNuJsKGZXssu1T0M2SkRCJEmIK+J4KNxTMWsxWZLvJq+URSxd?= =?us-ascii?Q?Ch1HAArykbMBOL+PgIqvA53s8iiksLIUQh1sAVrDFN6nGuoMkT3I/uuSpzme?= =?us-ascii?Q?tC/xI7VLIbTQqyWq16FtOubtmfCOHxp/h74RvnIGBypAGFOPncDYwwdeddlF?= =?us-ascii?Q?8ih+nX+QKNaRDZURTtxsdKwAGxEQYzduS3+jho/46cb3KqAV27zn7Se5BJkG?= =?us-ascii?Q?XTIxtmBLuUUivyGRVvJfvBSPVvCsrW/dQtMtrSSHjRF3Xmu947gfZl4/yb2m?= =?us-ascii?Q?xYGUospgGnxr1OK/ihbBsJfArejOxXzvRArQ3uqwUjrR1Acw0nDXvJyA3v3X?= =?us-ascii?Q?tD/Kihhgt1AgHCS1ZfDD1nqXmPKTelL6hUFahyXRYTdRj/FTphrocjRZoKBD?= =?us-ascii?Q?SbPsoixLckB3/vu8NPwD9aBgmSlhlDItf7EhZp5Q7NxUmcriyw=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:14.8527 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68e9ee68-7621-497c-a050-08dcbacf4470 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF00000207.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6742 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=6bed8020a34aae0ff8b59febdc0d0678c8890067 Thanks. Xueming Li --- >From 6bed8020a34aae0ff8b59febdc0d0678c8890067 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 3 Jul 2024 08:45:43 -0700 Subject: [PATCH] app/dumpcap: handle SIGTERM and SIGHUP Cc: Xueming Li [ upstream commit b04d11bdc672cf8afb7a544077303a941a6a2baa ] If the dumpcap is killed it does not cleanup which leaves the ring buffer and the memory pool behind. Until resource are exhausted devices will continue to fill the ring. Fix by having the application handle SIGTERM, SIGHUP, and SIGPIPE. These are the same signals handled in same way by the wireshark dumpcap application. Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application") Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index d57db0589a..76c7475114 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -939,6 +939,11 @@ int main(int argc, char **argv) { struct rte_ring *r; struct rte_mempool *mp; + struct sigaction action = { + .sa_flags = SA_RESTART, + .sa_handler = signal_handler, + }; + struct sigaction origaction; dumpcap_out_t out; char *p; @@ -964,8 +969,13 @@ int main(int argc, char **argv) compile_filters(); - signal(SIGINT, signal_handler); - signal(SIGPIPE, SIG_IGN); + 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); enable_primary_monitor(); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:06.933993048 +0800 +++ 0140-app-dumpcap-handle-SIGTERM-and-SIGHUP.patch 2024-08-12 20:44:02.555069385 +0800 @@ -1 +1 @@ -From b04d11bdc672cf8afb7a544077303a941a6a2baa Mon Sep 17 00:00:00 2001 +From 6bed8020a34aae0ff8b59febdc0d0678c8890067 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b04d11bdc672cf8afb7a544077303a941a6a2baa ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index b25b95e2fc..ba91ca94d0 100644 +index d57db0589a..76c7475114 100644 @@ -26 +28 @@ -@@ -936,6 +936,11 @@ int main(int argc, char **argv) +@@ -939,6 +939,11 @@ int main(int argc, char **argv) @@ -38 +40 @@ -@@ -961,8 +966,13 @@ int main(int argc, char **argv) +@@ -964,8 +969,13 @@ int main(int argc, char **argv)