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 C80EFA0A0E for ; Mon, 10 May 2021 18:23:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C22134003E; Mon, 10 May 2021 18:23:28 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2087.outbound.protection.outlook.com [40.107.243.87]) by mails.dpdk.org (Postfix) with ESMTP id 45ADC40F35 for ; Mon, 10 May 2021 18:23:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ehxXB+wva3J2nDHTCh8MwADcN7jfbaoxJdKJWFVfY0glWUD2Y7q8I3UHx+SKZIcDQWVE6Tu3mNrFbdH0wG2KXAKzHNToXuKANpCkEE3zdr0u5ynPS7gLSsNgGVSpD/xTQ+E8QXsIqTgL73Ug3ce9t3rlOTsQ6s/BBVAUfIdKNadjuD05kLybnCLTVpXeNZMIbVGm95QVCRcJxjXjjgIVhOHJazNg4MJrrvUKitfXr6oV7XVp1Od1dpb2TCytQrbV3ZJGoO7RrwJ1YzugLTSXtzV+n1Z/9ZGw8JaheVVlbM0PP+SbDkhemoKEvghidu0D09EMVllZtHTLpTMxYOm62Q== 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-SenderADCheck; bh=V/p5jT4bjtYXoOrRD+dQ0iltESEHvZobSNBmXfIhp84=; b=B9zDHGhotm8XMjK8HnYbgiWydmctms0u2Z0abf2L3M8x2QiarT3oUMhIaaZ89fXHHhWmsoQlChi5uiq4xPyXx6wacDqQT0ISA8rm1wauiQr1qY/tLam7wRY99F252sr8GuIqAr5L1NK7livIk7Euv+qsFkrhN6icb29MyzqWZfCYLmKVj/nIgoo0mcoM6IGSvL2GOGV/WDjVYSm0RrgsNItkh2AGUeW8FOOGP+4ehd9j861PGIc8WXcgGUcplqhCX0VnDm44Mbh046/F4Hmow5xaGGRQ+xUCzAHtGA6AI/Rx6uCRny4G3PxkqnzaVUHys/1CoVO8hhU8/tNGj3JJ/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=V/p5jT4bjtYXoOrRD+dQ0iltESEHvZobSNBmXfIhp84=; b=V+bzymK0WWE5yvvD4VZWWyULfGgBCqAb8RRhJ8uzbP5QtvSz7CsFcGs9nsIslgutO5DrxpPUiD4MRp9S+ic4a6kULMoXzzE/1h3O/6wnOtslQA3OJoc9Pz113GdtwM1CKR0aV62Ddz4K0yM3+WMv9o+Bt8uH5IaMJHqmwfAO+BLxFpQSuPAl5bCyrwUubg0E8LCwtjFMoTBmZlnQEXfv6e/TnDEZZ+A/scMLSVe7px4EyoxCp8uIYzUt/MRFO0lFmExVFptsziYFGm2H/ZUfdbvf1TOgzUYjQoxrw9bxA+D1aa/BwPR0ioDzrI+I7JRanO4cmG6cEvuOFHf9bcSkig== Received: from BN7PR02CA0011.namprd02.prod.outlook.com (2603:10b6:408:20::24) by MWHPR12MB1294.namprd12.prod.outlook.com (2603:10b6:300:10::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:23:25 +0000 Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::5d) by BN7PR02CA0011.outlook.office365.com (2603:10b6:408:20::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:23:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:23:25 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:23:22 +0000 From: Xueming Li To: Conor Walsh CC: Luca Boccassi , Vladimir Medvedkin , dpdk stable Date: Tue, 11 May 2021 00:02:32 +0800 Message-ID: <20210510160258.30982-203-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c586a86c-d58f-4143-f712-08d913cfeff0 X-MS-TrafficTypeDiagnostic: MWHPR12MB1294: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aLiDOtQhOYNV6koPeQXNfsDGfhgsz9vfxy4lPg45XGYejNBClm2gv/KffY5AR46SRFsGy6/VbQm2HRwsQ03jJksRQT2b0Dp6xW8OcS+ZfIatWiMA89i2S7fSG5SQQ5efOO1LNXeJqi7HE76oZx6ijJJdjzlc0jz1NZj2F9B6CDEZNS8FKpURUy3p0Y9gValA+8x/NFraDZ5FLTCtcEmzTCeMCUefW5QFZk9c71rKbClnKTGRQ6/CgwpE+d6CGxSNa0Fcqn/hC3s/uz1wYo++EmQRvDZ/V8jWzNAip//W92ee/LgZxADfUEl7arc7n6OuS/sxg8LXxm9gMOfJ4T6xEslmfcxbWUFA9s7yz77EbhSCe1bYDKNF4B8VE+IDwVA+afItGHd/DszIqFt4sKqhE2Q3Vl8kmstB2IeGYWZvVCyBfnqchhPTBMm6EemnTp8FJ4c0xJynm/ytI3Tg6S6ieOsm6V/bk+ltwRWZ5pPzi5Jba4hLx8JKPgYDEYJZgpFZzcVYf7GXkCY4f/eBlQOnpAAiibLLbVpHoxJQTVJ81kJccIjY9Pq4q1rHJVi8C/O0sbGtXy5N7Dg0mXursD14JAEvu0zCpg5jQtetCWFxahv+7ZJv8O7G64GQlm/I8Ko8Qp6ZmrJ5f90dvglUJmD/vLgCQunyj/C6oRDSxRyjXdB8jejsp33Gw2zrdz6NjhIAPUjZefpx9GK/lRmEgIL4BXg7RL2LBV9t+0PIvxAifpJtZ9zF97DIw7sba1azoHIaB+7OdEtgEGxZeXjKXixpjg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(136003)(346002)(376002)(396003)(46966006)(36840700001)(54906003)(6666004)(47076005)(55016002)(53546011)(70586007)(2906002)(83380400001)(16526019)(70206006)(4326008)(1076003)(316002)(8936002)(82310400003)(8676002)(186003)(7696005)(86362001)(5660300002)(36756003)(26005)(82740400003)(2616005)(426003)(6916009)(7636003)(36860700001)(966005)(6286002)(36906005)(478600001)(356005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:23:25.2551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c586a86c-d58f-4143-f712-08d913cfeff0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1294 Subject: [dpdk-stable] patch 'examples/l3fwd: fix LPM IPv6 subnets' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/c62ae18b64d06da73397b46d68fd4ad662021cbb Thanks. Xueming Li --- >From c62ae18b64d06da73397b46d68fd4ad662021cbb Mon Sep 17 00:00:00 2001 From: Conor Walsh Date: Fri, 16 Apr 2021 17:19:37 +0000 Subject: [PATCH] examples/l3fwd: fix LPM IPv6 subnets Cc: Luca Boccassi [ upstream commit 0c74a91ad6eb016cbc7bfd92d5aa414d04aa31ef ] Any IP within the 2001:200::/48 subnet will match all the routes given instead of 1 individual route and the application cannot differentiate between them. The change in this patch allows the ports to be individually matched using smaller /64 ranges for each port. These smaller subnet ranges are still within the 2001:200::/48 subnet range set aside for benchmarking in RFC5180. l3fwd will now use 2001:200:0:{0-7}::/64 where 0-7 is the port ID for IPv6. Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses") Signed-off-by: Conor Walsh Acked-by: Vladimir Medvedkin --- examples/l3fwd/l3fwd_lpm.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 3dcf1fef18..1cfaf36572 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -42,7 +42,10 @@ struct ipv6_l3fwd_lpm_route { uint8_t if_out; }; -/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). */ +/* + * 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). + * 198.18.{0-7}.0/24 = Port {0-7} + */ static const struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = { {RTE_IPV4(198, 18, 0, 0), 24, 0}, {RTE_IPV4(198, 18, 1, 0), 24, 1}, @@ -54,16 +57,19 @@ static const struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = { {RTE_IPV4(198, 18, 7, 0), 24, 7}, }; -/* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */ +/* + * 2001:200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180). + * 2001:200:0:{0-7}::/64 = Port {0-7} + */ static const struct ipv6_l3fwd_lpm_route ipv6_l3fwd_lpm_route_array[] = { - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 48, 0}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, 48, 1}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0}, 48, 2}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0}, 48, 3}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0}, 48, 4}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0}, 48, 5}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0}, 48, 6}, - {{32, 1, 2, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0}, 48, 7}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 0}, + {{32, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 1}, + {{32, 1, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 2}, + {{32, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 3}, + {{32, 1, 2, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 4}, + {{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 5}, + {{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 6}, + {{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 7}, }; #define IPV4_L3FWD_LPM_MAX_RULES 1024 -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.829346800 +0800 +++ 0204-examples-l3fwd-fix-LPM-IPv6-subnets.patch 2021-05-10 23:59:26.670000000 +0800 @@ -1 +1 @@ -From 0c74a91ad6eb016cbc7bfd92d5aa414d04aa31ef Mon Sep 17 00:00:00 2001 +From c62ae18b64d06da73397b46d68fd4ad662021cbb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 0c74a91ad6eb016cbc7bfd92d5aa414d04aa31ef ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 375746fef0..5af87dbd69 100644 +index 3dcf1fef18..1cfaf36572 100644