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 9136B41D8D for ; Mon, 27 Feb 2023 08:05:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C60540ED6; Mon, 27 Feb 2023 08:05:42 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10hn2244.outbound.protection.outlook.com [52.100.157.244]) by mails.dpdk.org (Postfix) with ESMTP id E5EEF40A7D for ; Mon, 27 Feb 2023 08:05:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pv37Wlwm3UcAaODNDoYyYGbECkS2qYP3GIkOKKYuF3yZwy2N4grdDjUkT8Oo/KBa2QPDZHhFVtknh4cQIyDxi0qYARNzl0ETfHtjkCrI63WrL2AZedrT8wUwa35HhkjWp498lgRqYGOIVYx3f3vwX4NVOxza9xuynUz+ud1gWWkrqxkGOSYdpL3VQwliAocgqTXjQhAPbaZgLwr/yWrGZrUrXXePeEvXZgCd5BUGVEbrrb3hwRw+CYfFibkJbSLOb8az28KxiiBNScZf/5pF+Rpnkh2M+CcckGzjrITn9WPFbDHBB7tCSGxoPNvplmc7nLAdeunVWYpaOCXESmLbGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=tIPaO1Gs9BDaUhub7NMwzx5kNXNdr5WNiexSh/onvSA=; b=DtO7Kz72KEfaBFsYL20J8P+BLYKDqA4qQiT8h3dtbL8H11AHZZG+pTr2w/Fn95EtNg3ZYSosfKq7d1dddnNY+kV4PwLQuIbQAtZrYI7mWywM+r/gYyqM4R9msCtPZDHiuPMabZGtgNE/ZFmfOmzzJ1/+xGVDb1+d9ogVqFKpT5tf9IbwCPxgm5d8vLnnTUGz6ascrLdnbUWNPw3dGvVMwfz6icaucOCv5vKwQlshOW0OgeiyXu03o8ZKmcgLpmyvWOckd3mYUd+VC8DqHE3DAZ9LXrig7+SLOjl1P1gman5I06skmXk9KFh8hvq8L1xzZK3V8nLSgJaiXta01dG72A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.com 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 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=tIPaO1Gs9BDaUhub7NMwzx5kNXNdr5WNiexSh/onvSA=; b=TBNvXzcl3yj7jGt2QyhQRQYcxZuMMxxupf2HJXVKe9zmDdZKBVm4LQd4yDK0PjlbpcWAMSS99cTm0UD8xBjUZ4Bwx0unZqOUz0AWlURIjU56l8U1w+VgPh3D8K6FjseZQ6kuu1g+AKEAl7JDS20PEXyEoIvYClhIXcA5jCdWvKqMkO2e+1Cgokg4rR/f/F7GXpfJn5N00WSNFLudmDnyhl9Gx1L9oGLxynTd/AHDkjNyIVt4sW6S9RNtAp9I+6OVypymLyZUG77DZE+hPda3+u9q12B9Onozvl1NCLOCJQszkxhClEmYSOeGSJnw1U5TuVfBSEwgv878jfFvgPL9Mg== Received: from MWH0EPF00056D11.namprd21.prod.outlook.com (2603:10b6:30f:fff2:0:1:0:14) by IA1PR12MB8264.namprd12.prod.outlook.com (2603:10b6:208:3f5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.25; Mon, 27 Feb 2023 07:05:38 +0000 Received: from CO1NAM11FT003.eop-nam11.prod.protection.outlook.com (2a01:111:f400:7eab::201) by MWH0EPF00056D11.outlook.office365.com (2603:1036:d20::b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.1 via Frontend Transport; Mon, 27 Feb 2023 07:05:38 +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 CO1NAM11FT003.mail.protection.outlook.com (10.13.175.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:05:38 +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.986.36; Sun, 26 Feb 2023 23:05:19 -0800 Received: from nvidia.com (10.126.231.37) 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.986.37; Sun, 26 Feb 2023 23:05:16 -0800 From: Xueming Li To: Ben Magistro CC: Stephen Hemminger , dpdk stable Subject: patch 'app/dumpcap: fix storing port identifier' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:06 +0800 Message-ID: <20230227070107.15664-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT003:EE_|IA1PR12MB8264:EE_ X-MS-Office365-Filtering-Correlation-Id: 796b1659-360f-4f59-bd24-08db189107e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FhbJsMBFCTOPWCoGYCeIosa4a+MmslrHm701WjxoRRuHVdzAz5VUNO0yZ8FJAQb00ZzxERmcgYjRhlYmCMiZ8pKkzgFWLTTg0jbQwBv1qyLyK5gDkEqiec616LFvIMiqu1ZVABLDrLMAR+oWuhS3/he3LzD+vm16hwelaWJXusn8/DwwjIjHDsYxacuF2cmhYu4gLBp1IF9FPXL6J9RDqV3UOcouslHUO0Bg0JjaHyIrBI/6lyqSWiutkrG8EG8Y5MpI2bzHWcC3ALFuDSzBQ+GkN159wDnUA9gHT0fI3oGaOQJy6jUE9fKOTokv+40jYJguNJ9Qa5CEmSKKDU0oou/Ee7Xmb6cMUUPFEQcPqPcjJRB8xdl9/eASCvB/x7miR1hlMaFpYCzE5fq3XijZcJ1aqpR5sQkY/wvyecr35GfVD7QPE01rgcQ+QaO2Bk5vHbgBgalXPIcj3jY3B1j5yjeGC6XfmxgQax1fzURhF1CCgKXE4H8fib/S9JmI4sAhyaglbzQqSBSRjS03UYrhk5hhwoXsaF5Lq+cztssoy45m2cV2DQj3Y+E4ZKw8jtdne+6rgaVAxbHbRmiO5CJ59nW6X6ZI9C+lzVRfEYchc+vqL7yUipSsAH3uG1NCAMAkcLUYLMt/RwmP11Uz6FclaSmf4THonyol5sHvKj4gZZHQK4ZrvETfr2qo04Qxvjqis9tukd2ifQotaGevD5UdiQNMfG6A+T4UthsbeaFRa0zuK5CcR770WxM0jTNB7qHyds0MCltj5vOnr6GecBmt846zLplKz9anofn+/kVQqxebyYlnd3JeAZaw7z6QI5cKuZQ9exsytL7hbMHBG3zHG/cR9EfbV1RABfsUhZyC3+s= 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:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(5400799012)(451199018)(36840700001)(46966006)(40470700004)(40460700003)(16526019)(6286002)(478600001)(82740400003)(7636003)(356005)(70206006)(6916009)(8676002)(4326008)(70586007)(2906002)(34020700004)(41300700001)(5660300002)(40480700001)(186003)(26005)(7696005)(336012)(55016003)(2616005)(426003)(1076003)(6666004)(53546011)(47076005)(8936002)(36860700001)(966005)(83380400001)(36756003)(82310400005)(86362001)(316002)(54906003)(12100799018); DIR:OUT; SFP:1501; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:05:38.3447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 796b1659-360f-4f59-bd24-08db189107e7 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: CO1NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8264 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 22.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 03/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=573de4f522af407466956c71c61af5418a6d6b37 Thanks. Xueming Li --- >From 573de4f522af407466956c71c61af5418a6d6b37 Mon Sep 17 00:00:00 2001 From: Ben Magistro Date: Tue, 3 Jan 2023 19:38:10 -0800 Subject: [PATCH] app/dumpcap: fix storing port identifier Cc: Xueming Li [ upstream commit dbb27d6fd88ed9e8177d9e49347905dbd2bae300 ] When dumpcap adds an interface, the port was not being preserved. This results in the structure being initialized and the port field being set to 0 regardless of what port was actually selected. This unset field is then used in both the enable and cleanup calls. This could result in the capture occurring on the wrong interface. Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application") Signed-off-by: Ben Magistro Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 2eb8414efa..4751ca26b8 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -202,6 +202,7 @@ static void add_interface(uint16_t port, const char *name) rte_exit(EXIT_FAILURE, "no memory for interface\n"); memset(intf, 0, sizeof(*intf)); + intf->port = port; rte_strscpy(intf->name, name, sizeof(intf->name)); printf("Capturing on '%s'\n", name); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:42.171153900 +0800 +++ 0039-app-dumpcap-fix-storing-port-identifier.patch 2023-02-27 14:08:40.749237000 +0800 @@ -1 +1 @@ -From dbb27d6fd88ed9e8177d9e49347905dbd2bae300 Mon Sep 17 00:00:00 2001 +From 573de4f522af407466956c71c61af5418a6d6b37 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dbb27d6fd88ed9e8177d9e49347905dbd2bae300 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d1c70f769b..5ccafd4c3c 100644 +index 2eb8414efa..4751ca26b8 100644 @@ -25 +27 @@ -@@ -208,6 +208,7 @@ static void add_interface(uint16_t port, const char *name) +@@ -202,6 +202,7 @@ static void add_interface(uint16_t port, const char *name)