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 2E719431D5 for ; Sun, 22 Oct 2023 16:32:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D8BE40A6C; Sun, 22 Oct 2023 16:32:01 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2080.outbound.protection.outlook.com [40.107.92.80]) by mails.dpdk.org (Postfix) with ESMTP id 4D76F402C5 for ; Sun, 22 Oct 2023 16:31:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+vXVAPWXsiIUHg2GiawLS/dGm8SHizbveYBzOqSWkTlBBOmzGXYUaXz/G6pifaOf+cDbjijO7WCF7bIH1z8cBfEbFV9DVISUWTP+PB3RuPNQyI9On2vTXxLY/yVQWReKEw2pQ7lfr7z5A/2SgHc0h65heuGlLP0nTHnjOU90wB0Dagqo6GGVbJ1E6rzDeidCGKMGCxNBlxwybbUqZOjqxeeZJBJYZZKjoZfVIieK3jce+8MAYbbSNPt8rpz+2NhU/HrgVZ1miG+F6ACwGz9hvDuiLGoY9Mz/FhG0K339onGCOndTpiI9790y85PabJX+dIMmrgKSDKTxbPKuzRCEg== 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=xB2PqAeilNToOTevU9MnGTDfirH5fF2Q0MV2OhlENPs=; b=EVyuuUHlA7+muFUY+l65o7iDxDmBOUbL9MQJ4S3FuskqUzgtXQpE7zwzSuBa+ty1Vor95WH1pTZt7J7iI0slG6Hrj9XCUazT3m1Ek8WQBkG45NSAJKy8LO5B4nIQriaSkEmj4j7kEl312215Q8ozB2n+91un8y05BYXx0Ckw0uK9HKpEsOtkqHTZRSliwgXyayF/5qskLS4kfQHQ2c6dtKvhLzvAvejX1eLYEhv8l+3Qwsb2/SimCCWM/WmKsSc6BuP1Gmf23LAKhejD5rRAGrv2pKs37+RsTLQPgaD7TBpYCUpc5lXUujUnh+AAA768OvUQvwbUhP+Te6cOuVGEtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 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=xB2PqAeilNToOTevU9MnGTDfirH5fF2Q0MV2OhlENPs=; b=VOo5JgkIdkkkHuwyvhEyDtw8wu6Y5TeQojctcZW2MWJrlkz2ZexB5q4HOTFOLvs6pwiSbu17zjdNr5PoKC2RPWV7AomCiikDL0+UCxYs8v58gayx552wVa4/M+74oKDPZIkUH5yYYHMN86qiV2lG8dfLDP7kUNDz3eiBEMB8ecj/izAg0FLHbC7jJ7rh05vukOnot/nGs3sTwlu4RGJ0FiOFmh0feH+WEeelyQh/wBmrxzqoRzlLTyJVOOee7GV+xR/QxiSxw8kf96eIjotLiGJG2ypGyEO1zU4/JIs5EXnqNO9+oA0pzWsfl4YfbTrZneSPfpXvpJeOvyWkYFW6Kw== Received: from DS7PR05CA0018.namprd05.prod.outlook.com (2603:10b6:5:3b9::23) by DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:31:57 +0000 Received: from CY4PEPF0000EE32.namprd05.prod.outlook.com (2603:10b6:5:3b9:cafe::b) by DS7PR05CA0018.outlook.office365.com (2603:10b6:5:3b9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.14 via Frontend Transport; Sun, 22 Oct 2023 14:31:56 +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 CY4PEPF0000EE32.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:31:56 +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.41; Sun, 22 Oct 2023 07:31:53 -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.986.41; Sun, 22 Oct 2023 07:31:52 -0700 From: Xueming Li To: Vladimir Medvedkin CC: dpdk stable Subject: patch 'fib: fix adding default route overwriting entire table' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:12 +0800 Message-ID: <20231022142250.10324-104-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: CY4PEPF0000EE32:EE_|DM4PR12MB5229:EE_ X-MS-Office365-Filtering-Correlation-Id: 98a1811e-a8cb-4c83-f056-08dbd30ba4f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vcnNDsesa5gkmA18UEnawqR0PfBYR+icSzayr7daZL3FxA891RRXX8MGhU2HhrhjY39HW+puYBokW4uFAOYmdFi38zu6RWllist0KHG8uDAVDte+1kaWwV/AU/GA21s/zILwaBZuWJimE5khvLAkAx40lIOliWl19U3DbV5/GKADjiL2ArjMo2YgpJRVZSqvKNpAyvSNFUaTz914/jbogudTtEewOcdUYQO70n5RIbg5BPvWk0Uarvp6b6bKvGruAci4fZq97Sx1iYWiX6sxAMXEN2/0lvou5EXiPlWXlXijzY7Qw0CwkBhs//g8RIaKnWpbRMFLK6AcecBVTYr8DAQ+qV9+p798PyTu1qg9dAgX8Smn4dyJ9kMud1uhZxJtBsjBE7RBmUPFnqgAJ9AgzSjSmjVX19QFdkyUFU0Cp6AQ345WsL1c9thxxn1fTHUz7JOW8iBjnta+p2DZ7s53jJ6XqWVnCZ7Z6GTWJZC/zO6w0NJYZO/98A+zYfcBEClPj5avQ6A1rgCvtVmJ5YlDcDy4jqcH/fSwf2nbZjzl0DgDMGybglpD8rHrFVARQ1uO/a6I761wYpBJrc6wh9JRFsQtsdvzeVCLEf06EUILazHAokw2Sks4j6EpPYwf4eQM0TvKWGzo3B6MFMrtMb4a+ti88Mu9yEwpTiwxBaZGU4IpjDjD/Nu0j+AvjpEMYZM1hk9NvaHaHFDTgEpdcD9Ir+Jeob5I0cdWssPT/55C/8LKyON6isDT9iOddrde0q8G 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:(13230031)(4636009)(136003)(396003)(376002)(346002)(39860400002)(230922051799003)(186009)(451199024)(82310400011)(64100799003)(1800799009)(46966006)(36840700001)(4001150100001)(2906002)(55016003)(36860700001)(41300700001)(86362001)(36756003)(5660300002)(8676002)(8936002)(4326008)(2616005)(7636003)(7696005)(478600001)(6666004)(16526019)(6286002)(26005)(1076003)(356005)(82740400003)(70206006)(316002)(70586007)(6916009)(966005)(40480700001)(53546011)(426003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:31:56.7595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98a1811e-a8cb-4c83-f056-08dbd30ba4f9 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: CY4PEPF0000EE32.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5229 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/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=e4649e8d7857f6e9cbd3347b801c7f54246a082c Thanks. Xueming Li --- >From e4649e8d7857f6e9cbd3347b801c7f54246a082c Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 2 Oct 2023 15:11:48 +0000 Subject: [PATCH] fib: fix adding default route overwriting entire table Cc: Xueming Li [ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ] When FIB contains any route covering last IP address (255.255.255.255), upon adding a new default route the entire FIB table will be overwritten with corresponding default route next hop. Previous fix added check for ledge against 0 for case if default route is added as a first route, however this check was also erroneously triggered in case when ledge was wrapped around the address space (this would happen if FIB contains any route covering last possible address - 255.255.255.255). This fix prevents wrap around from happening. Fixes: 880bc2b5f3bd ("fib: fix adding default route") Signed-off-by: Vladimir Medvedkin --- lib/fib/dir24_8.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c index 3efdcb533c..5f73b8a7f0 100644 --- a/lib/fib/dir24_8.c +++ b/lib/fib/dir24_8.c @@ -388,6 +388,12 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, return ret; ledge = redge + (uint32_t)(1ULL << (32 - tmp_depth)); + /* + * we got to the end of address space + * and wrapped around + */ + if (ledge == 0) + break; } else { redge = ip + (uint32_t)(1ULL << (32 - depth)); if (ledge == redge && ledge != 0) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.126017500 +0800 +++ 0103-fib-fix-adding-default-route-overwriting-entire-tabl.patch 2023-10-22 22:17:34.376723700 +0800 @@ -1 +1 @@ -From ab1b927cd73e96643cfe93dc2493d03c737b59ae Mon Sep 17 00:00:00 2001 +From e4649e8d7857f6e9cbd3347b801c7f54246a082c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index a61897667b..c739e92304 100644 +index 3efdcb533c..5f73b8a7f0 100644