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 0F07B457A1 for ; Mon, 12 Aug 2024 15:05:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B17D40DD2; Mon, 12 Aug 2024 15:05:55 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2066.outbound.protection.outlook.com [40.107.93.66]) by mails.dpdk.org (Postfix) with ESMTP id BF7F24065A for ; Mon, 12 Aug 2024 15:05:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LzhE2eawjCtBvGt4KgQHpXws+vRBGPDzwsmtppejF5N+SgG+TqrJYMcj+JZWNP/poqXzwJP1ZveMSKxnk2C6KnFe7jFgdRTf9ywjt8Up7zpiasyGR3pqD7oX0ezB6mhvFGujpyTqrPRxfTz+0RAweuleNR1csb5lWEEEpwYiulCQSsVlezaA5vX4GJnOiGsI159+uMlgmmKGnlZ+0SMIPxooJ7o+EcSHV3dLoL+SVTX3ttrbvvL0KQ1amDjnkf1aTvfDX8CwtYKQ/r73jCa3ixzkZ5LRcnErQzHBy12aQ+n5yggS+jcRnXeZNlKfEGFvlTSDcR/kKWJFhJdqp5TjEA== 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=FYXl6Lr0t/bCriptjttkT6/Kkx1gNy2toFzYS84gEAk=; b=tdzj1NBazAr7IwboicExWqucU63wl3Ao5tdBVwBLknfWzy3RPCS+2pkALg+HEnqNqMDUm2AKFMPaqJ2wwOBJl401RO53uNPGeMGo2x4JPOM1mduc8xqUCMJiRz4It/oYGIhV1GCw4T3PDiW+UvQdvryyW57cwPPc3TZCfheO7A9DuPG51neQTlFymKlZ0hCDhUaNJlRSGdPBRcVAuIv2ZroE8whhBp+vcLKEVsnIIaC1C14CklmA47ENuPAk/5p8zMFnqynmh4+u4QDOdfhY9ALR2F3r3OZGXaD4aQnCUHKC1tXW3Dk6Ipypy/JXbm/CFyTYwRpF/K49l9Mf19l2hQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.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=FYXl6Lr0t/bCriptjttkT6/Kkx1gNy2toFzYS84gEAk=; b=tfy/DHe7zMuBQW/5cK/sr9m53yBKs3zbLUEujG6w/37TLoXxXdkLOkq8GbU+5QdixX95/Qn1mYj4cQqAk4d9MLcir2HWnXRcjj8t1YP2Wi+xAGJnkI7wCDdZlo+X8eKlwkRN3ph/3KlAnXmAmikNUe2hhema8njLfFtmor640F9/+k0WhQVyzrkJFfUZ/mA7kcAcF06dR9Ggy+UGKCEwvhwxOMwFsg7op0x8uRZg1hglyFevlvyEty6Y6d8cENHpp30EzNe0tkQOoHotBNd/E3aljv8n0NEqd/EMc10t6N5VWBTPHl6lOL0y8GBGFSMIwHvmoBoSEQi4ytQeFOR0Ag== Received: from SJ0PR03CA0229.namprd03.prod.outlook.com (2603:10b6:a03:39f::24) by DS7PR12MB9041.namprd12.prod.outlook.com (2603:10b6:8:ea::19) 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:05:49 +0000 Received: from SJ5PEPF00000208.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::fa) by SJ0PR03CA0229.outlook.office365.com (2603:10b6:a03:39f::24) 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:05:49 +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 SJ5PEPF00000208.mail.protection.outlook.com (10.167.244.41) 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:05:49 +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:05:33 -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:05:31 -0700 From: Xueming Li To: Sivaprasad Tummala CC: , Konstantin Ananyev , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ferruh Yigit , dpdk stable Subject: patch 'examples: fix port ID restriction' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:35 +0800 Message-ID: <20240812125035.389667-159-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: SJ5PEPF00000208:EE_|DS7PR12MB9041:EE_ X-MS-Office365-Filtering-Correlation-Id: 89c6975d-f3bf-4036-8d5b-08dcbacf7c9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VGZrMFNteU5FTVhXWWc5V1c5a1FUd2tNT2Q4bisxUUN0bk5LckRlenhLOXo3?= =?utf-8?B?QjRFOFZTejgxb2QvZVJJbnpXSThWYSt1MFM2Tlp4djl3Um1rc2FJeG9GOCtp?= =?utf-8?B?dUMxRFFTK2VQWmdHTlNSd05ZR2IxbjJHVExkTUVPOTR4TGVqU3NuR0JYQU5R?= =?utf-8?B?WE5VY25QTG13cmFlZHlQYmpjQ0JaZUl0SGdvVVFsQmRiQXUzUEVzckwwWXda?= =?utf-8?B?bXJ4UFF5Q2ZSWUtVd0gycTc5ckwrd2Y1UzNBNVRRQmtZRXlqaVpYcHhZclYw?= =?utf-8?B?d1Nnb0p0TmN3akpsMmVTa0FqTFpTLzArQmtBbUdBbkV1YWlraHVFMUdJMFRt?= =?utf-8?B?NmxkeVhDUHJGZnkybFVSMHpqUEtxUDc0U2ZzZUNGVHE2bVZ4VWZOWEZaT1FH?= =?utf-8?B?d3pUN1cyMUNFU0FvV1hFaS9XUWM2QUN2SFZhcEtuTmliZy9YRHBERkwyQnBF?= =?utf-8?B?MXFMNk1hWkc5S1FhS28yVmZac3o1d293bnZ1d21KMGJGNzMvNytkR1dtTSsx?= =?utf-8?B?dGowOFpmNGhpQjNBR3paTU5mdzd6OGFuVkdmODhIalRQdHV3cllsUFAvMW1r?= =?utf-8?B?cWhhL3BYWTg4Yk9rMXJveWZEMFUrOTIwblc2enhSdHgvaHJKdlV1Z2gxcWZM?= =?utf-8?B?R1JDSVZpd3hKRnA5dEtXaFB4VCs5Q1Vxb0dyTENjYTJZQUFJeE5ldGFuL3gv?= =?utf-8?B?ZmwyRldaZ0NmbkxSMkorUUlkcGVOVWhVZlFncjAvM2RNU1JKUU9pWXdYczh3?= =?utf-8?B?R1NCRGhudWtPMjliQmZCZ1BzUkNhRmVsT1JXRG9KaGo3NXkrYnVwbERoWDlT?= =?utf-8?B?MmdNYVRJUTZJMFVLaVl2U091d3ZuK0l5SkVWaEx2MnhYSVZJSzh0bUlMR2dM?= =?utf-8?B?OFlyemFRbkp1ZGVHOWkvbFJ2RVFuNnZ4cmhGeU4vUTJ1Q3UyejJsTlBqR2JP?= =?utf-8?B?MXlJYzRBUTQ0Rk9kckMrTTFnRWhOZXhWdjdWZ0ZLeHBnSXZLRUkvQVVERWk0?= =?utf-8?B?YW9sdUdidnlVbXRqR0h4bXhsOGU4UE9UKy9udmpKbzd2ZmNMVzdwRWZPMzVV?= =?utf-8?B?V2pNejdEVXJsOTRsYlFaNjhCVGMxSXR1Ym1RVkJmRitPZ25lQ1dGKzFUSmk0?= =?utf-8?B?YitpMllmc2htSFZvRzJ6RU9zM20vWWFZdDZSb3hBOThzNVd4MnIxcXAvYy9L?= =?utf-8?B?NG1NR05DL0xxclpHeC9KNWxCenVHVFpMRFNDZ29STUFMU3pKY0pUcDRYV25k?= =?utf-8?B?dTV0YmhnMExSK1ZWNjg2dWFoVUo2K1JSTWc4REEvSXNESHl2Q0p6ZVdPUTBi?= =?utf-8?B?TXB6WWREejREV2dER1JRSUFaMU1YSk1hcmFxRTU2UTROeUtxcFVOMUtTd240?= =?utf-8?B?emw4cUxTMFdRSFYrV2dDeXBPanBJS2txWlNGaDd5b2hUZS9IdFV1SHNSS0or?= =?utf-8?B?MlN1clBkT25yZGoxMnVyMnJlSURjOUsxRWRoaWhYSE9rTGVUM3NiUlBIV1Qr?= =?utf-8?B?NlkwSURDRnA1bjM2cGVzMkNXRjZWeG5mQmVSdmFnVGZvZjZSL0E3RVZEa1ZC?= =?utf-8?B?eXQwOVl5RnF4YlZlbkh3SVZUMm8wMzJFU3pLcGU5L080RThhVGpXb0thVHhm?= =?utf-8?B?WWtocExDUm9iQUNRNVhjTzlpSFk1VG00bjNxTVlOdUJ3SGhSaHUvT2M1MmVI?= =?utf-8?B?dE9RWERSVGZacFFVcVN4VklVYmdONmJSdFdGK1NqTHMvSlM2emUwdlpkK21j?= =?utf-8?B?SmxGOW1YNnc3d242bTMwd3R4R042Uzg1RlFLZ05sa0xnd2RGMzJ3M1phamxx?= =?utf-8?B?dlB1VFpZMUhFeDNvcytwWFJQNUlTNWxUaVovbHdwalB1azUreS9ET0VBWEhL?= =?utf-8?B?OEZTSVFZSEZ1Y1EvVGNDL08rRUZvMTVJRThEbHJzMXdTdnlNZ0RqbUlRMk1F?= =?utf-8?Q?8ot2q45yfZbimEumc0aY4D8Y8/1nIV0C?= 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)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:05:49.1086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89c6975d-f3bf-4036-8d5b-08dcbacf7c9c 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: SJ5PEPF00000208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB9041 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=729e0848b79b9f119d33066a915e34439d7f8597 Thanks. Xueming Li --- >From 729e0848b79b9f119d33066a915e34439d7f8597 Mon Sep 17 00:00:00 2001 From: Sivaprasad Tummala Date: Tue, 26 Mar 2024 13:55:50 +0100 Subject: [PATCH] examples: fix port ID restriction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 548de9091c85467bd8f05cecf6d32315869d1461 ] Currently application supports port IDs up to 255 irrespective of RTE_MAX_ETHPORTS. The patch fixes these constraints by allowing port IDs up to RTE_MAX_ETHPORTS. Fixes: af75078fece3 ("first public release") Fixes: f88e7c175a68 ("examples/l3fwd-power: add high/regular perf cores options") Fixes: 08bd1a174461 ("examples/l3fwd-graph: add graph-based l3fwd skeleton") Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application") Cc: stable@dpdk.org Signed-off-by: Sivaprasad Tummala Acked-by: Konstantin Ananyev Acked-by: Morten Brørup Acked-by: Ferruh Yigit --- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- examples/l3fwd-graph/main.c | 2 +- examples/l3fwd-power/main.c | 4 ++-- examples/l3fwd-power/perf_core.c | 4 ++-- examples/l3fwd/main.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 2d004d82fd..761b9cf396 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -1049,7 +1049,7 @@ parse_config(const char *q_arg) int32_t i; uint32_t size; uint32_t max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -1082,7 +1082,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index dbc36362c3..4ded69b4a0 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -448,7 +448,7 @@ parse_config(const char *q_arg) } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index baf2bf64b2..996ac6dc56 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1658,7 +1658,7 @@ parse_config(const char *q_arg) int i; unsigned size; unsigned int max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -1690,7 +1690,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c index fbd7864cb9..e4bdb62121 100644 --- a/examples/l3fwd-power/perf_core.c +++ b/examples/l3fwd-power/perf_core.c @@ -133,7 +133,7 @@ parse_perf_config(const char *q_arg) int i; unsigned int size; unsigned int max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, 255, RTE_MAX_LCORE @@ -168,7 +168,7 @@ parse_perf_config(const char *q_arg) return -1; } prf_lc_prms[nb_prf_lc_prms].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; prf_lc_prms[nb_prf_lc_prms].queue_id = (uint16_t)int_fld[FLD_QUEUE]; prf_lc_prms[nb_prf_lc_prms].high_perf = diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 47baf464e2..a239869ada 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -501,7 +501,7 @@ parse_config(const char *q_arg) int i; unsigned size; uint16_t max_fld[_NUM_FLD] = { - 255, + RTE_MAX_ETHPORTS, RTE_MAX_QUEUES_PER_PORT, RTE_MAX_LCORE }; @@ -532,7 +532,7 @@ parse_config(const char *q_arg) return -1; } lcore_params_array[nb_lcore_params].port_id = - (uint8_t)int_fld[FLD_PORT]; + (uint16_t)int_fld[FLD_PORT]; lcore_params_array[nb_lcore_params].queue_id = (uint16_t)int_fld[FLD_QUEUE]; lcore_params_array[nb_lcore_params].lcore_id = -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.443026207 +0800 +++ 0158-examples-fix-port-ID-restriction.patch 2024-08-12 20:44:02.615069397 +0800 @@ -1 +1 @@ -From 548de9091c85467bd8f05cecf6d32315869d1461 Mon Sep 17 00:00:00 2001 +From 729e0848b79b9f119d33066a915e34439d7f8597 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 548de9091c85467bd8f05cecf6d32315869d1461 ] @@ -34 +37 @@ -index 5a7e1b220f..e98ad2572e 100644 +index 2d004d82fd..761b9cf396 100644 @@ -56 +59 @@ -index 4396e2bb3c..a13dc01138 100644 +index dbc36362c3..4ded69b4a0 100644 @@ -69 +72 @@ -index 2976058425..2bb6b092c3 100644 +index baf2bf64b2..996ac6dc56 100644 @@ -72 +75 @@ -@@ -1659,7 +1659,7 @@ parse_config(const char *q_arg) +@@ -1658,7 +1658,7 @@ parse_config(const char *q_arg) @@ -81 +84 @@ -@@ -1691,7 +1691,7 @@ parse_config(const char *q_arg) +@@ -1690,7 +1690,7 @@ parse_config(const char *q_arg) @@ -91 +94 @@ -index a0112b57ff..6c0f7ea213 100644 +index fbd7864cb9..e4bdb62121 100644 @@ -113 +116 @@ -index ba7083d4f3..01b763e5ba 100644 +index 47baf464e2..a239869ada 100644