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 73E3E43B86 for ; Tue, 5 Mar 2024 10:53:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6EED042E1D; Tue, 5 Mar 2024 10:53:59 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2043.outbound.protection.outlook.com [40.107.93.43]) by mails.dpdk.org (Postfix) with ESMTP id 7FD6B42E1B for ; Tue, 5 Mar 2024 10:53:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HDqt1g+nzSzEaIVFdmil8Q1gpODxFCz+fGaUJn9KE02ulzY+CQHBBaFi/olOCsw77jPfRjFlf79jTjOpiHK3dRFe0zC3SdjxF6ozPNfAKMprIgIoebOsRm9J+dyPYBnJDgKnuJ9s4kPnBj8Fdg9MY7bYm2TPrH76so+VQzFHbSDqx9Kkgs4QlGxD9geGc/vpS8dAdUlL3m+hBEAfw+N6zcxpwP+QWEoqQhnUD9CmN0o+I482a6deufnCcMtzqeSLpcqPrPEFvCrKit4gYMsbZj3n3lNDmIGzvu8fRgsi8TslFxrM7TBjS2CjU/dtmiOcQf9hkxUbj7G/Jiwrn3wtWQ== 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=rg8CbDmqObsNKakMTGOqq9Y+zAE/FPqcjtnKgUi9sT8=; b=NqJ+UxXyAQ0WR4VDmG5vCYVfywu9Pv/zZnEn0zY5ncSxyPdCIrOWs1RXTk5Ei1Wtm5CGMEzm8eJupzirxQUuTvSJ7byqPtA2cHDy6PulkhVU+fSTp4wvnTbEKc/vChLX84V04jb30BAmO5zAWKq5bVTvgser37Z727Ry1tcQRnpXrV2Mtu3Vw9Rkdi9itvZwuACFxXJXCkbYGqvxWXss8rDjr9riJbIS60QI01bmWGF2ZbQJZQ9l6uX0MRlaagW2F9GOa/kfC34NLjyPVfyXcB6YdxV/fYhp1JKhIcHsi5UeJg7bvN2xiueF8fzcE8KTzpXAmpLKQ4rucBia39ppTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=rg8CbDmqObsNKakMTGOqq9Y+zAE/FPqcjtnKgUi9sT8=; b=Xko7KOAZ655/SJo+F0HN0I5wtOeux6pA/S+wgXnVL+fiOx17F6ssP9XJRdFJ9Yug5LL8wZKT2dvuPXgP/rcxxV15nxataCuFmgshIn5vxT0gJPD6+pdgKsOUlo9HsdPrCuOO7/4XF7OQNTXFGKLnqbQXTfCRG6azWvrUkwWGMlH4zRRYuspy1GOHYDLlVC9cDHVgKqCKHbHk3ZKMEsngQfyOMpBwO7JxE31IROFcMLEnoLDsQqsp0JbYuuWCegZ1aGRXe/KT6biUa4CticNAZvUpTwmmR9olOM2bUdXBqfL0VNELQcD+JsExI0nFHgZAfphVjdD+IRHrZyGghmxfaQ== Received: from SJ0PR03CA0191.namprd03.prod.outlook.com (2603:10b6:a03:2ef::16) by MN2PR12MB4472.namprd12.prod.outlook.com (2603:10b6:208:267::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:53:56 +0000 Received: from SJ5PEPF000001D6.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::70) by SJ0PR03CA0191.outlook.office365.com (2603:10b6:a03:2ef::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.36 via Frontend Transport; Tue, 5 Mar 2024 09:53:55 +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 SJ5PEPF000001D6.mail.protection.outlook.com (10.167.242.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:55 +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; Tue, 5 Mar 2024 01:53:39 -0800 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.1258.12; Tue, 5 Mar 2024 01:53:37 -0800 From: Xueming Li To: Anoob Joseph CC: Konstantin Ananyev , Akhil Goyal , dpdk stable Subject: patch 'examples/ipsec-secgw: fix width of variables' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:44 +0800 Message-ID: <20240305094757.439387-64-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D6:EE_|MN2PR12MB4472:EE_ X-MS-Office365-Filtering-Correlation-Id: 43fc047f-37ec-408a-412c-08dc3cfa2beb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5sGdIB+/b0h7vqVh6HX1mN0q9bKv2iQR0A0kA5rfL4O5Q71orMyUGcHNT4OR0joz/WM4p/wFnqT412KCOfYv7N/yCCTlAklZIzGVHhfPfUAN9BwlO1JjB8qEhLg/cohfovDe/EboN3Sw7eFx18RKiLqBS5jswESoBELLfo4/GDHcSQIJcTShFRBWCfuSBTCv218qw56BVqMtRb96o+l7ZmCo+xW+0PCEYNzoJ/dXECa0h2pmq8MMKtpw898uq5eEaHN3xcONvdzgaf+yQO7WaXI5STPstY/8YaKd78u7KHMiHopEkPwBuOAGOYOlSkyIxBfsIxQxnOeWLXxvyop8Zft7p1BMa67MhK0Na68N+X/vU0IWIMoAhe1s+mBv0buVfqPcIuV5Z05yH9hEWXhOQjjw4nxisyorqYtkMwn4owR+bY7TDCyJaDMpxsclefQYzDS2ufwMfZarB824vnMSy502z/yt4qpX0RYle9HU6m1EYtmPrN7Coo9aoAS6Fhhww7qylFhh4ov/sHtkwj+/jlmMLz+/DDilJwsiXg9zG9RpOHelmuTanebn1OSn9N+Ljbz/Cd4aIlbkYZ8ADCSxaJ2rdnbnSv8OV/d0cPzxG2V+ikG8Ds5AH8mpFUykTQHUeM/ABFigDMbqjvheMb4JEPTnCSjHd1JCsSEq0ZIlESfS2+4f76qxIpbPjOefsRCbtiXzMPH4fgvAnIn68yLOPQdO9RVaYxqtUHNJsSXhNoYJrgr3+08Vx5zhvOIkYTtA 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)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:55.5783 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43fc047f-37ec-408a-412c-08dc3cfa2beb 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: SJ5PEPF000001D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4472 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=f5d6c54154ea55c29a229683fae42f880980c4f0 Thanks. Xueming Li --- >From f5d6c54154ea55c29a229683fae42f880980c4f0 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Tue, 19 Dec 2023 10:59:22 +0530 Subject: [PATCH] examples/ipsec-secgw: fix width of variables Cc: Xueming Li [ upstream commit 6b9dabfdffee7ff1efa83e9548b4063fab0819c5 ] 'rte_eth_rx_burst' returns uint16_t. The same value need to be passed to 'process_packets' functions which performs further processing. Having this function use 'uint8_t' can result in issues when MAX_PKT_BURST is larger. The route functions (route4_pkts & route6_pkts) take uint8_t as the argument. The caller can pass larger values as the field that is passed is of type uint32_t. And the function can work with uint32_t as it loops through the packets and sends it out. Using uint8_t can result in silent packet drops. Fixes: 4fbfa6c7c921 ("examples/ipsec-secgw: update eth header during route lookup") Signed-off-by: Anoob Joseph Acked-by: Konstantin Ananyev Acked-by: Akhil Goyal --- examples/ipsec-secgw/ipsec-secgw.c | 5 ++--- examples/ipsec-secgw/ipsec_worker.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index bf98d2618b..a61bea400a 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -568,7 +568,7 @@ process_pkts_outbound_nosp(struct ipsec_ctx *ipsec_ctx, static inline void process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts, - uint8_t nb_pkts, uint16_t portid, void *ctx) + uint16_t nb_pkts, uint16_t portid, void *ctx) { struct ipsec_traffic traffic; @@ -695,8 +695,7 @@ ipsec_poll_mode_worker(void) struct rte_mbuf *pkts[MAX_PKT_BURST]; uint32_t lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; - int32_t i, nb_rx; - uint16_t portid; + uint16_t i, nb_rx, portid; uint8_t queueid; struct lcore_conf *qconf; int32_t rc, socket_id; diff --git a/examples/ipsec-secgw/ipsec_worker.h b/examples/ipsec-secgw/ipsec_worker.h index ac980b8bcf..8e937fda3e 100644 --- a/examples/ipsec-secgw/ipsec_worker.h +++ b/examples/ipsec-secgw/ipsec_worker.h @@ -469,7 +469,7 @@ fail: static __rte_always_inline void route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], - uint8_t nb_pkts, uint64_t tx_offloads, bool ip_cksum) + uint32_t nb_pkts, uint64_t tx_offloads, bool ip_cksum) { uint32_t hop[MAX_PKT_BURST * 2]; uint32_t dst_ip[MAX_PKT_BURST * 2]; @@ -557,7 +557,7 @@ route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], } static __rte_always_inline void -route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint8_t nb_pkts) +route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint32_t nb_pkts) { int32_t hop[MAX_PKT_BURST * 2]; uint8_t dst_ip[MAX_PKT_BURST * 2][16]; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.852461062 +0800 +++ 0063-examples-ipsec-secgw-fix-width-of-variables.patch 2024-03-05 17:39:30.783566493 +0800 @@ -1 +1 @@ -From 6b9dabfdffee7ff1efa83e9548b4063fab0819c5 Mon Sep 17 00:00:00 2001 +From f5d6c54154ea55c29a229683fae42f880980c4f0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6b9dabfdffee7ff1efa83e9548b4063fab0819c5 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org