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 6E6B1A034F for ; Wed, 10 Nov 2021 07:58:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64BB440142; Wed, 10 Nov 2021 07:58:10 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2074.outbound.protection.outlook.com [40.107.236.74]) by mails.dpdk.org (Postfix) with ESMTP id 3C7BA41102 for ; Wed, 10 Nov 2021 07:58:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvXeVB/7n2dznkmH+0m2Q4QLgsNB1H3QEiUFjustdhsE0j0PdSkC/BRWrfttPeVmumEKYABFxS7WoFhGnyWe9P/JeBx7xPcPMxq6pVokJ2X7dd7p3qDZdNQMJmD/mDuszY9r7u0U+tfxvqL28VQJbGoq4FIOaFaXJYK4jXtyhJMxycKYG8N/rK2OJ7RSPGIfrncVfPEEmhCETbxaajmOUgkVV/mTRABnaqk7lHoccSjoJQi9itnPV6+Jd58HL8QMoZ5uoEIYMiq4ImaAkcRQ3DXjriNgxKv2Zs6X1ikcnTlWaxM5z69fMWcObtNXvzu9UIbxwEqESF1Mfkw74gGrig== 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=fH/4MW0Z472KOkPq4sX6Y9c6iZBDgmKCXauhN7Tjw3M=; b=DJ6mQ78ZFSCBwB7+E3xy6QBn5L+J7ucEvZXvoHycxgqZFMJ8zNnmm1Pcgf78u5NehOd0CCWsgFBton0d3SM0RJNDnm5PdN6rqmvcdFs86TXUGIPDLwSsdb83b+06moddd5Cj4IXjp9Di0fV7SzqlpbubUUgPqqJEMqDMlXmhgF6ULddUeujMmZ9FEEquVTryFKCk3nSZt5Sg6Y0uN8mag6OiiZynT8kMDbew/rs+eMuRQtl2/lhErf1lBAfWHmOzwUO3d9ACyxzqb1ekjiOct0oe+qZ5YKxdlCcvjjOVMcvcBVKaf7R2o0SJGVQDV+yot2eIgDJzLou/q6F6+B5arg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=fH/4MW0Z472KOkPq4sX6Y9c6iZBDgmKCXauhN7Tjw3M=; b=mfu3JR9ir8GIJ4ee9iefo1EC5aQ4s7QBH2JU7Db1ktTTNRM+99WdiI3E2vC5lMbulwxQTsJqOtm6PVXhayWOJP4lZBu370nMyP1PB08S7vCPuAvjcYkxiG9KVV4ygCkdd3hcDCfHzz22CpGdwognWCKmsqlaCSkeYXZXLK6gPLfmoXv//vYTt3USTYdR31de40hNt/9Nu8Sxah7XqdO2KU98zuGYPe4TDxRrkl7O8oE7z8JiWKFH0le51Yj2yWpO0JezR8cOev6/zqUvQi2+077oF9spJGMdynymMRcjY8W+wlbHA5hXB0XmacYcUhCAB62qB5PkUPjRPMip5vxmEw== Received: from DM6PR11CA0004.namprd11.prod.outlook.com (2603:10b6:5:190::17) by DM4PR12MB5390.namprd12.prod.outlook.com (2603:10b6:5:39a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 06:58:07 +0000 Received: from DM6NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::d) by DM6PR11CA0004.outlook.office365.com (2603:10b6:5:190::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.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 DM6NAM11FT054.mail.protection.outlook.com (10.13.173.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:06 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:58:04 +0000 From: Xueming Li To: Radu Nicolau CC: Luca Boccassi , Akhil Goyal , dpdk stable Date: Wed, 10 Nov 2021 14:31:57 +0800 Message-ID: <20211110063216.2744012-234-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65133f37-d441-4a2a-143f-08d9a41772d9 X-MS-TrafficTypeDiagnostic: DM4PR12MB5390: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6K5iKkt4QSVCXqa3mWv2RDQ1i72qjWKqFoQPHrbg/GT7nSkgFz89/SJhERNW6UXJPwdHFkLXlVdcZqFxwFCrPSC9B4dvLNE/Wnh1efGXI1dfGxvUZ/sbzwKk8PcWltZFSWiABy6hYreMRt76Vfl+10Z9eSk39Gy7TNxCpJvH9EJ5kJlwm+U7SGbv1PiaCP9PhHtQO47NTds6OT7o2D/WWZeJeiGVeTVkzlpL7ExC7hcPEkDQuXMT9VUQiCwFLOAX6gHXle7vLG3xMIigQOVDFJMIPBSAsZCxfisKr8jMtGClhsa5y1zlxgVIWFw0CPHjL8x3NOcjDj2jI1+axREK8Q7pV4tn0qVwaLxqwCJ7LmpLIhcH+q7gJX4wcl9cCO/lpLgTLAUM7BV4pBdNd1IxRPOHmf2p/5CWOtEzKtGSPTd1Wu+kX3zszI7s3q0fEpolgK/Cm+iqDTDeISc+22cJMr6yO+DnoK5dDrUQSquhZBB5uG1gWiCyiXy/CHxAsyjPKDgRO4CprSWM4dmEobrqMuP2A90YZoi0fgOLaDG4lTOEjqIZtLWO1uAEME+NmsWIewmbcQDqxzwbUph/nbWmfRbO7hY2M2DqBGKtCu/uDaX9ArdSf8U6AsauMd0BAbDmvPQMVS/+kh7EKyDu3Uz9vAUswJmi1qWR7xKTKeRrcVQ//qOQQ4BZdDeWk2EuBH6/bacFfIojV3yN/cqh03F5nfoS/47QyGP+sfCMdWASvLUBMA7YOP3b3qV2idHC58AlpX3lnhtgfO/GrN4ZT44YNYryxkVAw6Jd40R/WLX2+lgo7A09KTe2EYdZHKKFBabdvOQrFedKA7l6Dj5BEG1vsQ== 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)(46966006)(36840700001)(54906003)(8936002)(4001150100001)(26005)(7696005)(4326008)(82310400003)(6286002)(7636003)(55016002)(1076003)(70586007)(36756003)(966005)(6916009)(70206006)(2906002)(83380400001)(426003)(53546011)(186003)(356005)(16526019)(86362001)(2616005)(8676002)(336012)(6666004)(47076005)(316002)(5660300002)(508600001)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:58:06.6438 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65133f37-d441-4a2a-143f-08d9a41772d9 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: DM6NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5390 Subject: [dpdk-stable] patch 'examples/ipsec-secgw: move global array from header' has been queued to stable release 20.11.4 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.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/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/eb0d669844b89a68f81af34c1f04def4f2e210d0 Thanks. Xueming Li --- >From eb0d669844b89a68f81af34c1f04def4f2e210d0 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Wed, 3 Nov 2021 11:56:18 +0000 Subject: [PATCH] examples/ipsec-secgw: move global array from header Cc: Xueming Li [ upstream commit 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 ] When STATS_INTERVAL is set to a non-zero value the core_statistics array will be defined in multiple compilation units and this can trigger a linker error on particular environments. In order to fix this the core_statistics definition was moved out of the header file. Fixes: 1329602b6c8f ("examples/ipsec-secgw: add per-core packet statistics") Signed-off-by: Radu Nicolau Acked-by: Akhil Goyal --- examples/ipsec-secgw/ipsec-secgw.c | 2 ++ examples/ipsec-secgw/ipsec-secgw.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 1efcb5e635..4cd3ecb99d 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -292,6 +292,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph, #if (STATS_INTERVAL > 0) +struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE]; + /* Print out statistics on packet distribution */ static void print_stats_cb(__rte_unused void *param) diff --git a/examples/ipsec-secgw/ipsec-secgw.h b/examples/ipsec-secgw/ipsec-secgw.h index f2281e73cf..7e094ed495 100644 --- a/examples/ipsec-secgw/ipsec-secgw.h +++ b/examples/ipsec-secgw/ipsec-secgw.h @@ -90,7 +90,7 @@ struct ipsec_core_statistics { uint64_t burst_rx; } __rte_cache_aligned; -struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE]; +extern struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE]; #endif /* STATS_INTERVAL */ extern struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS]; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.166802192 +0800 +++ 0233-examples-ipsec-secgw-move-global-array-from-header.patch 2021-11-10 14:17:02.064077842 +0800 @@ -1 +1 @@ -From 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 Mon Sep 17 00:00:00 2001 +From eb0d669844b89a68f81af34c1f04def4f2e210d0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 5fcf424efe..ea8e3bcb87 100644 +index 1efcb5e635..4cd3ecb99d 100644 @@ -26 +28 @@ -@@ -291,6 +291,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph, +@@ -292,6 +292,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph, @@ -36 +38 @@ -index 96e22de45e..f9be303c28 100644 +index f2281e73cf..7e094ed495 100644 @@ -39 +41 @@ -@@ -93,7 +93,7 @@ struct ipsec_core_statistics { +@@ -90,7 +90,7 @@ struct ipsec_core_statistics {