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 5F0BB45492; Wed, 19 Jun 2024 11:59:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F39F742DB1; Wed, 19 Jun 2024 11:59:06 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2128.outbound.protection.outlook.com [40.107.93.128]) by mails.dpdk.org (Postfix) with ESMTP id 5B96642DB1 for ; Wed, 19 Jun 2024 11:59:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KXMLtSoIRb5LWTzAjrvjgKo+r2Ztd8oEZcMs+KCWl1FlVePBLxQzWLRMLytOxizVidOATJCDgg+Rm4d+vAlS7bYNi/KWe5hgmVmmJNhMZURwgJSUnznCq/1BHsH5w4Rk6X8ZyDPaTO6XmuXjBnOFYZE02F+TwsK91/vhgHZY3V8tSEnbyR6x4jCYvDcl4JMJKdaf+OPG1HVhd4FueAmv/f9loOIeRUyD9fxk+y9MgDszCQwz4CRS6gUW9CC0qwlB2ELoQZCbj6PQzcuCgg9YzprYaU4gp8nt0KYHtour6yTzkAuxCuZQptN+mp+zwgvC7/tPtcDfM+Ig74bQ/EeD8g== 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=kkB0stgY4bgqNwOoxpeAO8cjlp4ACVgk0irOYdm78/c=; b=OixUTePyTpVN2+Clp06t5wmDHZsrr5NkN9UkZpZWVPiTELSK7rAt9+8Z5yWmg6LbYpHTdFx9Cg4caS6R3R1vrUlAjWr4+jpZFuE5O8LMl3+C6Kk0xT13zdP4v0yMNvvrJOe2O8yGjEmJqTFsf3zBpm/m29OxZLeHiC1EqV5yJxULRtCV53yG/CQKexwZwqp24XW2WnNqv2L1r8bxL9eCa+ccjis+jLKl6bEghA7R954Nzh5qSAtWk7F+I3gHYYrtljZWLxrzxWXXBw7EMwJafDDsHF64wFDLGhEcaWGDnVZSTxw7ZkxtR17rofGLtqGJu16PZ0KuoDk3fy3Y5Kn0Xw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kkB0stgY4bgqNwOoxpeAO8cjlp4ACVgk0irOYdm78/c=; b=XTNQ3dXagVb0qxJ2Rk38An8xz65jBjn0n7wsy7+YWLBA+/A6P5z4wYZ4UBHrCc3al+/M3yeSyXtar0H+wmTZn6pJhTNiHeyak6a3I2pWx1entxMlmN4gE3f4dIECpMo3JSN/rbGA/J4t4fJ3Fo1CWi7OAoiA0pXjITaTvS65tDk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by MWHPR13MB7153.namprd13.prod.outlook.com (2603:10b6:303:283::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.19; Wed, 19 Jun 2024 09:59:02 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%4]) with mapi id 15.20.7677.030; Wed, 19 Jun 2024 09:59:02 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , Chaoyong He , Long Wu Subject: [PATCH 07/23] net/nfp: rename the variable name Date: Wed, 19 Jun 2024 17:58:14 +0800 Message-Id: <20240619095830.3479757-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240619095830.3479757-1-chaoyong.he@corigine.com> References: <20240619095830.3479757-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR13CA0057.namprd13.prod.outlook.com (2603:10b6:a03:2c2::32) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MWHPR13MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d002bd4-01ab-4126-0df5-08dc9046727a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|52116011|376011|1800799021|366013|38350700011; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2Si+FCoHw3wlZolSBgQyRVuWBpNb7pj3hvVyVqv8ozRIcsXeR4PneJY17CsK?= =?us-ascii?Q?23BI7NcKK6nFODIicRwN+CxUDyMwWglgQhZdwai0QDB6mlArq8DrrL/d91wp?= =?us-ascii?Q?mJp/+HcLq/LnwSAaJ/GWvEj649xlxMQEcETTlvUT57Jzy72cOEGYWz4An9t4?= =?us-ascii?Q?suVH7NdS/2fto86UywHmpMy0Rj+uSuJkwnk8vSeVoNarvLFB9aOfZ1tSwzAi?= =?us-ascii?Q?gqdIrid9rLe4Dj4oIx7gOCUUch62ZAk2CSk2a1wJ1dhliAW+nR9LUR9HL0XM?= =?us-ascii?Q?tyKVos4KT3V7wTFQ8hetaLuqYa1e8ARc2ftI5Ns8UnDZGfsGw5cuoe+hDA/4?= =?us-ascii?Q?9JNNwU39CQ33QPrqDaldQtqn+3WgnBk8W7tp9B5yslH4vGEke35os7NGy8dZ?= =?us-ascii?Q?HeDujA2haol+208H9/RY8dyimOSSojUKtTUXFFlmlM1W9pMkxTQv6EWiWV0w?= =?us-ascii?Q?qVCX71D4XxdaiVe1FzZAkcc7lir/G376/uHB4fcF+vuuRFgJ+1XIh5ZOHPhw?= =?us-ascii?Q?eZL12WDZREWRJ7LhB5ovI2/nw4uycK0gwAR/J01Q3bk/fls4hxUL71xOZfXP?= =?us-ascii?Q?pQHs7QtpQR25yvBnBH6IzC203TVLaR23a3Xywybg6/3A9ocs9PwxfAG5Xvnc?= =?us-ascii?Q?64I21aDNIhPZhrv9DRfYLTCvPVHf839aS9XnGmhfmpd6nSHa/K56N2Aurk3H?= =?us-ascii?Q?A9VYddqdSKcEsRJVykfS1AGL4JRapZ818MDVdAis0rajqj8A64JmhkdYNtP2?= =?us-ascii?Q?D+Cf7wv1Bx3aHycKqILgGo/nGx+B2m0yi3LbFBjQhWYCA3JXKGhKepNdtbGX?= =?us-ascii?Q?kPJOw/AzaNfTQUcSh7WDHdECSaYfn8QQ9GohrUP6svbtBHn9SikxSqKH9fCM?= =?us-ascii?Q?8MtwKPwrNHsfKTOA7ChBwvnHTsI21p9p8WD1Xt2nOOQY1RzOWJhNQ1AyCFEf?= =?us-ascii?Q?hfsBODcFogA7vwgjeAXQXMnE/nQKD1qqWzACVtZPimVygJdFase/nSRjrPsT?= =?us-ascii?Q?i0YRO09JbtDSEX20DukpXL8O/+E/7CtINJWRElNjkHA2i6puBJEw+qRLsaac?= =?us-ascii?Q?gp5UXvq4CfDYIaouvNPRn8lA+hQZvX7f03DZPbobwArPCYsHeICVVaY5dcou?= =?us-ascii?Q?Z8NfMZol7wmeqKYMHKtGdWiRJhSKy675OtXk3M8Q46vBl1TBtWRPAIZQSOIC?= =?us-ascii?Q?Rl5pdUQEiMZFkClQ7vs1qJRtW83CGOjo7bJDxCWIXOjn5YICcWm32Mn3kj/H?= =?us-ascii?Q?2b/OxIvZ6u+MFXbT1xr0e0W+70VPQ8JBbm5CHsyJA2nv/iNf00yAov4ZMlBc?= =?us-ascii?Q?EFEBstlby0Vgd4PEeKjCNICnf90VHQN24Qg+0c3MB/lTXNb9tXZElUgFOM2w?= =?us-ascii?Q?hcxoixs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(52116011)(376011)(1800799021)(366013)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CS6B2Jzs3+6AxqBowu2Go4+NC+1CaT+l/3eQF2AOzTkBMpMtGd+iV0tDlO+Z?= =?us-ascii?Q?mQ60rbdP2EXxN8Bx7BzA8EZJzBzt0CqREreZ1KAjDzlzJ/q+QQ2+UK0qRsrE?= =?us-ascii?Q?RN7DKxkQFAgdjdpgPCFNouY630GOPyNHhvfovcTL+or24iHAD8EABaAqZwOV?= =?us-ascii?Q?VQwKPkm8ptQm5skEh1GX0vj29BvLIDTabpzx+4rKt5RNIg1pG8Ymdw7rtVOi?= =?us-ascii?Q?mtS7aEqqm2ucrk/4hYh/qS40MzMdSAlf5GvgfVFVdcJsPR3rNluxj4P0TklC?= =?us-ascii?Q?U9TRhzR9m429UjZYjP+lFVv8azII5InQUfJ+kCPrb56aEbDaEGGMXdpfLW7m?= =?us-ascii?Q?VgByTtU9bdKVXwHdNkgIF0igdhaxtIJLUXc1euXO/7/nBTKJT3ZqORSqT0Xw?= =?us-ascii?Q?ibflLNvg+go3Rtbbhjn4BWrjOHtYH7kM9IV7jM40num8slTnMHuXOi49UTnj?= =?us-ascii?Q?/vV3O1gmtOmw4WSn5Kdx/BTjdbD538rD0sjzF5LNZyZeda5CwdUY4+NIKYWz?= =?us-ascii?Q?jiZ9GxDmxLnLDEJkK1PgRJIyZpGUsIr08YusYbeRmCR4I2UKBRrC2VnCsOxi?= =?us-ascii?Q?wuMtVZumS4zlO0GwGOPuP1YxHwF+rVdDXeLO8XwGPs3AgRs2aunXZYPlkdRU?= =?us-ascii?Q?Cw+Kkb2ZNvCbQDLZk9WhiCDQ0uaEdqqjjMXTp3ozRI4hzxWJN3r24/4EFPYi?= =?us-ascii?Q?PlyloacGhAHwBJcnYf0yYIUbuj+XJzdG+vPEMvvhj55lsPd7LGAKmYk0sua4?= =?us-ascii?Q?4xKPYpfsunTvC9Zy4EYm9gpE8tsiPx8lceD994i/GTDavR5mbVu6ktEyVgSV?= =?us-ascii?Q?Tooy6itWvcAFR/r3hgKI5YzJSYWEH0PleO+1FRMiyPoh+tKwx44fvUQcYRa2?= =?us-ascii?Q?Dsz6zmGwzv5pJXUOCOuXWxleQwG1rrbDk56W6UAbF0t6mf9/y0P37Ojk+2MZ?= =?us-ascii?Q?GYfSJbaTY5ZTUiduQI4ED8DdF/l/X9eLrZjVPwS8usvZOtYzZ9aH6prXiiBT?= =?us-ascii?Q?GV/2A6z4Aymvj2qc2JtlDg6C0Thg4rxti9FbcW29a9CbyvbnnmBjQNmTFrLJ?= =?us-ascii?Q?Gx+QGBnSMk2AD6DnMoI6UYE2YziwXOraMUou0rkPDxSiA0iK6UH4yv3GFo/T?= =?us-ascii?Q?2SjYaeAPpOW8yM9m/joDd6TgFJD0bl0dlL5Rvq4riEG6XqU4WMhRWgRZ963q?= =?us-ascii?Q?aK2gjHFGh/8j4M40vBH+RdLXmbutd6/wm522+HM+iAayod/k+twOYXmDcawh?= =?us-ascii?Q?VBVZkfeV8xLlirTEuT1p7aF8tH2dr9/g8LUC4oDleluM+kjZQqqvdpXt/FKf?= =?us-ascii?Q?1dt9cd934aAxxdqvq18yT0xkBPOAfzrBGXmi5p6XOcqjz3fGLSYqSPD2HDb3?= =?us-ascii?Q?+rb5bguq4XRyEg964Fk+oQUknyonLfGlHRa9mAqPBbN9tfTAAAb1/207eG6/?= =?us-ascii?Q?Sn/nU2YN8K0yT4El+V6cs1i9RXw1xadw1n0rLw84YdVKJzuTaG2bihFn43x0?= =?us-ascii?Q?AqSGfHGJrkH5Scs8/q2k6XuzJwhJMeCeckyGanbJhSzwvueZ5UqrLb2YVU5+?= =?us-ascii?Q?LFc17Xvb/EW+EFZUOPqwZmDNwu+EMk2X7Tg6xRq+X4+jqQ9X2EkrLrDMTpmY?= =?us-ascii?Q?VQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d002bd4-01ab-4126-0df5-08dc9046727a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2024 09:59:02.5063 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XOc1yxfhGC6zbfy6tSG1fOmz411NAhnBCmTqcrG8smqIagfmUplHLTTxYTq22lUVw+d/Li2if2gHUYUmPiy1mIjyfi4vvnPVwuxhChbF8fA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR13MB7153 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Peng Zhang In multiple PF case, add 'pci_name' as part of the variable name to distinguish different PFs. Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/flower/nfp_flower_flow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index fad65c1785..d8feff634a 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -5138,11 +5138,15 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) char flow_name[RTE_HASH_NAMESIZE]; char pretun_name[RTE_HASH_NAMESIZE]; struct nfp_app_fw_flower *app_fw_flower; + char ct_map_table_name[RTE_HASH_NAMESIZE]; + char ct_zone_table_name[RTE_HASH_NAMESIZE]; const char *pci_name = strchr(pf_dev->pci_dev->name, ':') + 1; snprintf(mask_name, sizeof(mask_name), "%s_mask", pci_name); snprintf(flow_name, sizeof(flow_name), "%s_flow", pci_name); snprintf(pretun_name, sizeof(pretun_name), "%s_pretun", pci_name); + snprintf(ct_map_table_name, sizeof(ct_map_table_name), "%s_ct_map_table", pci_name); + snprintf(ct_zone_table_name, sizeof(ct_zone_table_name), "%s_ct_zone_table", pci_name); struct rte_hash_parameters mask_hash_params = { .name = mask_name, @@ -5171,7 +5175,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) }; struct rte_hash_parameters ct_zone_hash_params = { - .name = "ct_zone_table", + .name = ct_zone_table_name, .entries = 65536, .hash_func = rte_jhash, .socket_id = rte_socket_id(), @@ -5180,7 +5184,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) }; struct rte_hash_parameters ct_map_hash_params = { - .name = "ct_map_table", + .name = ct_map_table_name, .hash_func = rte_jhash, .socket_id = rte_socket_id(), .key_len = sizeof(uint32_t), -- 2.39.1