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 A4C87457A1 for ; Mon, 12 Aug 2024 15:04:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FB6B4065A; Mon, 12 Aug 2024 15:04:47 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id 1F691402C3 for ; Mon, 12 Aug 2024 15:04:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HkZxNDyrltHS7+W1j85mlHrQ5EukSsWaGxyKOWK06iYvQ4n2j8Ab5Ad+cwubgGmyv5CS7HWZcVsOREJBUQCtttJhaTkuDwBLkDHuA0KdOlc/vGY90JGJ4f9IlKNPoQoKHKa4rxxf75IeIvTgCUrufkZG9uFdK4in8T2DZAg05AtnRne3TwpHOYFtE6EVyVG52/K1Q8d5bax/B7VPhE0yDThWkePp5lV5Zk2JeG25hQia8HcaHHihb0tlA/SpR0yBTq2tmppVv/kk6CjD4xsSddf4Jmg8yTuE+lRkizkW82TOcXvg6MO1EchR0kWW3QhlPFonoH6iHIUB/Ue1SDmSRA== 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=2iwqFTbDLHK52eEdkc7/f+yKWWa0VxTnRIg1FSWpC6E=; b=QWN7nbWrMyy3IjpGrPQJPwbTFpBU08oFLFKtuwvJsexKAsZ1YRym1dEsjBPZ3lnx2UCtHBtPZP5zpgJxnPiXltifzaRPqHoVe4tEHLGmi1V80GR5kbQF1VPbVqEu7EjjzOHHwayPSFsT/TVH8LuY+qeyHwdxOoFVPIXQsOPOvjQJqnNLmRXR07g/3b38Rbxx0ohUnalJD/ekBsK4KPNOiQQWeqJ+dxL0WEpZoFQAttOS3wT7M5+J5OClvoR7z6m2VCcWpLC9VVZUxpgOsPhf6/cOAi5LKcKbX4tI0ubPnL3OyoaOOtLwmvDGWKvamopSjrnatQb3EPvbuZmA0qTxmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 (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=2iwqFTbDLHK52eEdkc7/f+yKWWa0VxTnRIg1FSWpC6E=; b=pz8YIxCvCnZW/lQLWkaIHjXfzb3BxGYyR3brNPCCq7b3qy+VEwgi+UTxwbrqUHNSKCQl2KF+peBUMqTXUAqooznDSqPCCWOFECetRUNbHlZevLpeoIfQYkD+M5dVVoaF/gz1RE7Rnr++xP5CZIUCYBI5C4vlL8yZQoctKcgEHvuaDMxh5QetvEKUycFBYrkDx6/jeiKiSO+QpJPctQnbj4wx3w+Fic71oFkwI4GDaiAVlfU8FPz3SCib6SVUGOSGt/asPNRxEE+VcLGsEuzzJBLRytNEX7aeAMi/HqcEXSBpj74Rw4fqxcKLmyOtiRTHwCMcM/I9n17J8I1aw24ZUw== Received: from MW4PR03CA0190.namprd03.prod.outlook.com (2603:10b6:303:b8::15) by CH3PR12MB9028.namprd12.prod.outlook.com (2603:10b6:610:123::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:04:44 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:303:b8:cafe::32) by MW4PR03CA0190.outlook.office365.com (2603:10b6:303:b8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 13:04:43 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) 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:43 +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:32 -0700 Received: from nvidia.com (10.126.231.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:30 -0700 From: Xueming Li To: Kaiwen Deng CC: , Hongbo Li , "Konstantin Ananyev" , dpdk stable Subject: patch 'examples/l3fwd: fix crash on multiple sockets' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:23 +0800 Message-ID: <20240812125035.389667-147-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.231.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: SJ5PEPF00000204:EE_|CH3PR12MB9028:EE_ X-MS-Office365-Filtering-Correlation-Id: 31e6e076-ea37-4ac9-00a0-08dcbacf5578 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nhWtshyrhT3hvq5056wwBTyYnz+7gDPT7fAEK7xrl8i/o9mkJivOIWA4svY8?= =?us-ascii?Q?Hb+GxvWiIZkObObpp5KPSW5fq4zUYFZ/zRpyEQD7kVsQrCDw5hu0GKxVu3hl?= =?us-ascii?Q?D6vHkYou2l8bjXiK/t51kq5g1EN+Asas7OPaI7xBfHH7lFkmkW8kd7rJuHOP?= =?us-ascii?Q?D7CP5U0kb0yWItJMa6g31B/fo3TPiEczBvjpJXHbAIuxosCzPOJFJ14fAir3?= =?us-ascii?Q?cMHpH8hqWtTZIp5WA8aZQ3+OcYw6pjfd68DeCLHvDYr/9pr8mv1w0ZM2gSyB?= =?us-ascii?Q?X5+8WXWbOtyhLjlNJluJMGIyX+GXbXAZPNP3tcYO6tSERDCbH0UsViB5uohk?= =?us-ascii?Q?i6wXu0oa86quxVqgPyS+2snasPRKuRxsTdplCunWGy43h8pg/wUv+CfphsQp?= =?us-ascii?Q?EK12kBIAfleZd/F8QqFXMHMGusuh+fopTq4qJQv15q9Sf4IhDat8QRle8J+f?= =?us-ascii?Q?yuKIiq6SmBC6t72mu3k/DZGCswor3S6xscRcLmC0BHd5NRLxn9A4TZlhjobP?= =?us-ascii?Q?/YUu2NRnGMLF4093mVGkjk48ZImZK1DdEWJx/4URcf9MgTc+TXGfp+jj+QvN?= =?us-ascii?Q?N+wDQbsDaM7BBjpuJPVTGDM2GPOHOQG/jXNSIn+wIuFYOKxAkd0vkpquBcYC?= =?us-ascii?Q?ByUs4+1nep6lYZgqqyBiqz6jTCoNXxpbz6dQaLEQAnlmfrtnZF8aDCkxX8Rj?= =?us-ascii?Q?Xf3gU3e0ol9cueqHfeDVwIE2dGpqkyACeE4qbfgQ9Ah5uqZFCjrsfVFkHPOv?= =?us-ascii?Q?ZXd+k9hxQeE7Fvv8iYFF46I642GNR6sd+8wYauOfiQVts32uJEF8V0AhBXgk?= =?us-ascii?Q?JFJI1TUms7c9gzl8hbr916lKZCPkwrYfXtnpDy342bkO7H5LuNlerztsHGax?= =?us-ascii?Q?VQL3SUIK0MvtJUerBRFuW64OnJsH19rFDJNGMhs/N7FecUc03NkWGSgQv+4W?= =?us-ascii?Q?b6pgzyb1FpBDG6Q8ojVCcSP2WgPegD4esVHF1ndEK/IGtrKcfUrZNSoF11pe?= =?us-ascii?Q?46xW3NNj8q5KWDlX+fF5aWOaBn6i/OWHpMEIIDI0b9IsYwx6qdopP/8DoIXw?= =?us-ascii?Q?CvYf+n+mVKL5ypESzvztHP4AOCMYxckHfDwX9TUnvoIL9qoyeCqKtVLt2l0u?= =?us-ascii?Q?wA8XaQFhGZsXAnnh5Wyfg6ccWXtTglXSbRX1OPFQbyW/VS12Sf//M4hOPV/1?= =?us-ascii?Q?OAYtjVzSiJFJkTnF5G+o3u3pmDxMyXc4Z7Yhwn+YwIihZQzCc432tssExZfq?= =?us-ascii?Q?UkY+9LD9KFQ0KXYgKc6PM3Dovkh/pZw5Ucbv84LFEBmSKszCP4vNehaXJVE+?= =?us-ascii?Q?SEiKHyPPmoQ9FmZhj8z1dgLkM0ujJeonT8zp+MgY5pGtLsVTq/uR4IY+Z5HM?= =?us-ascii?Q?i1BrePOKu4hyCVq57eaWp5e069e+ouH1DvwjZ4POmTE0QRntd6PUcSJKpN/B?= =?us-ascii?Q?7EGSSlwcoKXArccFDCcwUtBqrUq1/tjj?= 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)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:43.3598 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31e6e076-ea37-4ac9-00a0-08dcbacf5578 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9028 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=5fa2084ac31b33ccaf67c4491b6a7638178d6be4 Thanks. Xueming Li --- >From 5fa2084ac31b33ccaf67c4491b6a7638178d6be4 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Wed, 3 Jul 2024 15:50:37 +0800 Subject: [PATCH] examples/l3fwd: fix crash on multiple sockets Cc: Xueming Li [ upstream commit 0cf06d7d846523abd48307613d429830bfb45ac9 ] Setting acl will clear the acl config of other sockets, which will result in core dump. This commit will no longer clear the acl config when setting acl. Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example") Signed-off-by: Kaiwen Deng Tested-by: Hongbo Li Acked-by: Konstantin Ananyev --- examples/l3fwd/l3fwd_acl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c index d9e4ae543f..a1d87f4a40 100644 --- a/examples/l3fwd/l3fwd_acl.c +++ b/examples/l3fwd/l3fwd_acl.c @@ -962,8 +962,6 @@ setup_acl(const int socket_id) acl_log("IPv6 ACL entries %u:\n", acl_num_ipv6); dump_ipv6_rules((struct acl6_rule *)acl_base_ipv6, acl_num_ipv6, 1); - memset(&acl_config, 0, sizeof(acl_config)); - /* Check sockets a context should be created on */ if (socket_id >= NB_SOCKETS) { acl_log("Socket %d is out " @@ -973,6 +971,9 @@ setup_acl(const int socket_id) return; } + rte_acl_free(acl_config.acx_ipv4[socket_id]); + rte_acl_free(acl_config.acx_ipv6[socket_id]); + acl_config.acx_ipv4[socket_id] = app_acl_init(route_base_ipv4, acl_base_ipv4, route_num_ipv4, acl_num_ipv4, 0, socket_id); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.127427832 +0800 +++ 0146-examples-l3fwd-fix-crash-on-multiple-sockets.patch 2024-08-12 20:44:02.565069387 +0800 @@ -1 +1 @@ -From 0cf06d7d846523abd48307613d429830bfb45ac9 Mon Sep 17 00:00:00 2001 +From 5fa2084ac31b33ccaf67c4491b6a7638178d6be4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0cf06d7d846523abd48307613d429830bfb45ac9 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index ab8222c9db..2109ab0a8c 100644 +index d9e4ae543f..a1d87f4a40 100644 @@ -25 +27 @@ -@@ -950,8 +950,6 @@ setup_acl(const int socket_id) +@@ -962,8 +962,6 @@ setup_acl(const int socket_id) @@ -34 +36 @@ -@@ -961,6 +959,9 @@ setup_acl(const int socket_id) +@@ -973,6 +971,9 @@ setup_acl(const int socket_id)