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 D24B8457A1 for ; Mon, 12 Aug 2024 15:04:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD85F4065A; Mon, 12 Aug 2024 15:04:52 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2042.outbound.protection.outlook.com [40.107.243.42]) by mails.dpdk.org (Postfix) with ESMTP id 81A0C402C3 for ; Mon, 12 Aug 2024 15:04:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZU6Hbo4fJDd0DegY1jnE2A2Esu+rNeQfHTeVPtveDkVQNW5hTrQN2q5E8TeZo9m1+jFLbjw340McG/Ol5a81rN2DL8E/bu5LytM0pmGJwUWHNyA4JXKKG6qTcGV91LN3ubDpaWkbIlh6M7tV7NF9Ko/MoOA+YbdZ18+hJGqXO5v2bm/ScGBEoSTjuxlCqg3ffhyfOtp7iqBWIX2zhO79RX1nSg6SdpbTPreIEwbr1Y1y2a2SmCpyEieWYWJByn4SdT85H6TyWRXVzdgq4hW+n3XBso8JcQWvHkKWRv1/sTsqT59RQharzOTph/iAnvNQOc7OiYhrBJEiPImbOOFxiw== 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=zpnCgn+WdgnDoTGtxDqSB5EWf5//DL9FVr6G6FdC/AY=; b=GCBj6+bHLl/0/vjV0hVriO2S+oEWkIVPOmLlc5pTZS3lC2mPde4ZIs3BR64Aqh9yh74q+7GTmk3ezrBGK8Uqm6cIZU8EcFPnpN8iLjVkeAfmuRbo60Zc+Zcyx3K3Nr/+G3TfqpL2dNWuMoGpRFHC1hfaLB8KiDp0qPXoN//G4lcz6V6NP7FjBqOLSqq8IzqDZtRdd8mPzc/p4LAenGgrlN9JM1KXLwpYMImtLu/LZwep48gRqGYcvOs45NETXDjeVx+o1/VhyOjM24Xqa1GimQbA5WWesuY0Pg74RcKA9AjXgxn2gtAE1UWb5wUlPLyCCYh4VRGM+w77duib4WTVeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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=zpnCgn+WdgnDoTGtxDqSB5EWf5//DL9FVr6G6FdC/AY=; b=a++c+eg/l4B/PIhPlQ/FFjREXMIGUQ8ZQ7XASDCwjD2l3Y+M7Z64EH01Af26dmN8kbtmMifWCric4ytyofAnN1C8G9K8P+2kJIkDoPEhFd6k+i9WYkw6KEH71tOmd3PdHcM4974X6rA/Z/K+g+5zEquk7LTEvARnMtYET+4cOjXt9LV44FyfazxX0roI/yMAgZ002Afv7Fuqfsdpz+w2Rvf4DxNLgY/4FYKJ+hcoeyztpRU6gExivdzLY9VtYY7VVYBta9J1I1wfDcV6OHb2MPygs+vhJSC6ND/mgVIieV/OsFhhQK79VAvA8zNFd3cPmFwBazD+mV60tXWQ5X4KWg== Received: from SA1P222CA0112.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::25) by MN0PR12MB6200.namprd12.prod.outlook.com (2603:10b6:208:3c3::18) 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:47 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:3c5:cafe::a9) by SA1P222CA0112.outlook.office365.com (2603:10b6:806:3c5::25) 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:46 +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 SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) 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:45 +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:30 -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:29 -0700 From: Xueming Li To: Konstantin Ananyev CC: , dpdk stable Subject: patch 'examples/l3fwd: fix crash in ACL mode for mixed traffic' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:22 +0800 Message-ID: <20240812125035.389667-146-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: SN1PEPF0002636A:EE_|MN0PR12MB6200:EE_ X-MS-Office365-Filtering-Correlation-Id: fe13aa70-9767-4f8c-9c63-08dcbacf5701 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ba9/A+8dqh/6hEREwidotA6yYrFudWAFobcRYto/Z8uzkLvfTfsnWxKyCrhN?= =?us-ascii?Q?eofGv6LJrJpIPX/0IGzJQiUccp2vOF9mhFqNV16HRtV4xKlDY8LFek6eRC5S?= =?us-ascii?Q?6qf0vW1PFHnmVvNsMYJnd2SNrlOn33mjWrFvqBCdEQnc1QHVZVskF5HIssSw?= =?us-ascii?Q?5jaW0U5Z5ZOMZ1J/+/j1tdwnJ1wqZ49WBPGQYi33W08nI2LSpttIo3lUs5n9?= =?us-ascii?Q?x8UXwccJXt98QZ8s3JY8xioiHsaHwbITp9vtg6YJf7m8/5fDzUkXIIsK6tyB?= =?us-ascii?Q?imC97yD5Jripcec0vtaf93xUZhdPWi9MYJleAasa7twzSh8fEnrp5zgr71ah?= =?us-ascii?Q?azSm0gcNWK7pSvoSCeQoSg+nd0VGwiIGBaaS+pTHWd4W8Xt7rr2ER9FAIhqe?= =?us-ascii?Q?dCnmFsdU48gERy+/d5GaT3nuzfHHQY0s7OOr/S9+uxstTFM/3l35xi+LWFQH?= =?us-ascii?Q?qIeZAZHlN2wjdU0ohN0HywSHuSCulOXaPbx7G+4olPVepAG7QOROVfIfX8ku?= =?us-ascii?Q?jeBCOl4HaB01YzIVgLaj49Gz4zsxnCcQZHfDuAdG/w057c35LTXjVSZ15l5T?= =?us-ascii?Q?oxmwZ74uRpql1/hzeLo03QKy+cmGGu8MIUlWcHhdktF0FNE+qLjsxFYsY/XZ?= =?us-ascii?Q?667XfbkP2vAWHCi6XX/7oA5D0WDfcb8qtiwnY2k7Y23M6nhkJXg+Jq0ttxFW?= =?us-ascii?Q?8h8wgC1Ae8UphXVUENxU+fqduUf2d9PHz7Qe5ko5mjdhfyrbPTYFg0oGqcCC?= =?us-ascii?Q?n6zpgM/ljAFLMRGXIPPjtI1YnJmqyAj98n9ATn+cGPPkNF2C5EFqwQL7INxo?= =?us-ascii?Q?zhLomc0Gsv1vhwbEALpnOW8E5E8JinMvrB4eiY3Sj/XqKYu3kYS7TNSZVBDn?= =?us-ascii?Q?PCDNs+sK+r8g/fHUgc2Jwi4cRup6A+thRCBwzU9y1GUPxF7qYC9EVVSsJh5y?= =?us-ascii?Q?1KBMk/9T8fWopMfdrA8q4I7lIc5EmfkuRGIfCmP7BnxMpI2+ebJbSvCov0Af?= =?us-ascii?Q?kAtn0iGCRxKgEJtlzZIfVHLEGa/r2eOwFD+v0ko78cBerHke/aZEJ4yrwD48?= =?us-ascii?Q?KvgtGTTU/L4DvrxDZv1eHIwpyXBpTuJ6f13bO44PnFSHJGTmwQqs+7GSqQED?= =?us-ascii?Q?de/VjQ2EZ39ioJM28r0hy95zASYU5qa/j0u0Qhl+kvosqjBq/UKyNODYBoWo?= =?us-ascii?Q?0QnlcFnMbJZ4UCM7iFtZmjxG1jOxz2H7gC75BMYOoRh4Zem+1AQXNnJbxEfR?= =?us-ascii?Q?Td94vb4TeJBr9NtaoHmNnswj6mOJ5fYMjS4elPx1qx/iHl5HHuK2N0zPfLda?= =?us-ascii?Q?cI06fBSC9YpMBOYWvJCoS360nOJp5u9sPI/aNaa8mGlk+ejQ+yiKRvndvqqb?= =?us-ascii?Q?PWXe/7ZgquwHThhSkDCS/0+z3zduJMcieNKjG/al5C4IVZiZmKqstnJbtlei?= =?us-ascii?Q?c+BCmZQFN6Njewfhm08cvT86IMk36ox/?= 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)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:45.9081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe13aa70-9767-4f8c-9c63-08dcbacf5701 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: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6200 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=17082297291439dad25bffee52dba87eee737c02 Thanks. Xueming Li --- >From 17082297291439dad25bffee52dba87eee737c02 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 2 May 2024 16:28:15 +0100 Subject: [PATCH] examples/l3fwd: fix crash in ACL mode for mixed traffic Cc: Xueming Li [ upstream commit 659ded8eb733315878857f82bc22f0b03be5ce71 ] When running l3fwd in ACL mode, if we'll have mix of IPv4/IPv6 packets in the same burst, it will most likely cause a crash. The reason for that is that we split our burst of packets into 2 arrays - one for ipv4, another for ipv6 for classify(). But then we try to send all packets as one burst again, not taking into account that acl_search.res_ipv4[] will be set only for ipv4 packets. Same story for ipv6. The fix is straightforward: use two already split arrays for TX. Bugzilla ID: 1434 Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example") Signed-off-by: Konstantin Ananyev --- examples/l3fwd/l3fwd_acl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c index 401692bcec..d9e4ae543f 100644 --- a/examples/l3fwd/l3fwd_acl.c +++ b/examples/l3fwd/l3fwd_acl.c @@ -1073,9 +1073,9 @@ acl_main_loop(__rte_unused void *dummy) l3fwd_acl_send_packets( qconf, - pkts_burst, + acl_search.m_ipv4, acl_search.res_ipv4, - nb_rx); + acl_search.num_ipv4); } if (acl_search.num_ipv6) { @@ -1088,9 +1088,9 @@ acl_main_loop(__rte_unused void *dummy) l3fwd_acl_send_packets( qconf, - pkts_burst, + acl_search.m_ipv6, acl_search.res_ipv6, - nb_rx); + acl_search.num_ipv6); } } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.104204634 +0800 +++ 0145-examples-l3fwd-fix-crash-in-ACL-mode-for-mixed-traff.patch 2024-08-12 20:44:02.565069387 +0800 @@ -1 +1 @@ -From 659ded8eb733315878857f82bc22f0b03be5ce71 Mon Sep 17 00:00:00 2001 +From 17082297291439dad25bffee52dba87eee737c02 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 659ded8eb733315878857f82bc22f0b03be5ce71 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org