From patchwork Fri Jun 9 06:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128447 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49FD142C69; Fri, 9 Jun 2023 08:01:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A98F241153; Fri, 9 Jun 2023 08:01:31 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 13A6540EDB; Fri, 9 Jun 2023 08:01:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SBL9DPTIXSN2gfTufYekJoSXjRrdQzOyn80LZ3RLgQ/Yb3JtggKshOIxCYhVOgTcvPjekpYFiOAt/pGoRcig/y3TQfk/3LLnGlup9LhFCqw4NGg4PwV+p57dZP3F4RqXC5tH40KEI3JIk7PDe5lcsIQkchBM/5yg0ZQndRV4+kGGoqPLI+ATk6KwXKsxdI1GT4XwzyWEVzcEnR15+ho6RnVM4nE/5gJRK9k89eAHM55YWHfQC+tavYTeN6lTvuNtFCNOCmJF+qQDZx783KTVTHMT/qYP5p6/6NXpQkSzcuNmgod7BDGLKxvtE16MkOg8DL4e78EgO7yf8KOGQizy3g== 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=HCaOtTtT0hTnlGkIBAhqFT31hzzAs4KwZ5bdHw+1dS0=; b=PPrwAVnaGUftgE50VpUK4nnwD0hD4UqDAVhXBgwkm7yqEdMIQAHYyIYJKtsP9huXawNCpxhQqWwbaiH5j/QNcrXKnaC1ZNDnHgF0pGscAHIqoEG2d4oWpGTUbqnWKXRA1ufk9I87x1ip9FWG33rez+XF52ny0EWgIZPwsWNZJYaV1TuTz1qcqfRWEe8rUMnngzUjxe/Ok44N93CFyfhrYKEpQUvEojQxMFt48pY2BjNza0hg1pjqayWoHOemvemha/cW7wBpqt083BWZ60dpxz08A4PiRNXg0KUAJXPIigjo9HWa7AU/9LUoa2LRW6ZDOIYvff349/ZKxQ0SJwLDsg== 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=HCaOtTtT0hTnlGkIBAhqFT31hzzAs4KwZ5bdHw+1dS0=; b=PQkdw9C5UtSf6UrNa2mdlLbbxcY/ry48Kd7jj5whzeFUtFhr/oIVDg/CC3mwoBbwmWzocNPJYyex/UbgmGBLIOziHpmxFgAyY+iAgFNbwRrhLHZNEy3ll07QLLmn9VpvOPCjS0ncj+DdR7Z1zoOOSOWv03awdZZRhtZxvrPMrOk= 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 CO1PR13MB5046.namprd13.prod.outlook.com (2603:10b6:303:f4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Fri, 9 Jun 2023 06:01:27 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 06:01:26 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org Subject: [PATCH 1/3] net/nfp: fix control mempool creation failed Date: Fri, 9 Jun 2023 14:00:58 +0800 Message-Id: <20230609060100.1306648-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230609060100.1306648-1-chaoyong.he@corigine.com> References: <20230609060100.1306648-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0035.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB5046:EE_ X-MS-Office365-Filtering-Correlation-Id: ce698a9f-01dd-4250-f163-08db68aef620 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u6kOtANFwr+2jMGl/qSG0nF9vc17foDfNPmw/+BY7VaEYbZrpSHXNiTLfik4YFNHIuOE+qv9tSVPFzPWrYTZ4po8S5Lq834vNgESmBkcRaQEKlSlkdfb21oPyP+vlpkg1fNvtuDKSwr2jOWmF/B4diOObUhi6lrVawJTrh7iXwPZ4b0eyZiSVJ9R7rnod64fKDA007Kil1a39g6zk7tZ0ZUC2xFYoeAM0mueLRS2T241vOby1CtpoBN0+OYuNzS6b5gOQ5p/bB5DKbMOXxaHkN3NcylPge7s1kV4xTZjSb/YVHmgUv9Llr1UIxO4tbsADdpU45rSucs9doJF3YiLw9VRVj7jKR0UjXhVMKvuNrkhKoOtbOzLQfjjX3LE3Rm9iyYB9AXSPXQa4dqDOyn9AUJKdQOMyAcpXspc5tIk/dcgbaghR2AxzV/X0GU6lRF9Py/JTVK9GcVu4Z9BjLYw0bXxsNpNw4RKSXCCyimIMXVjF/UW7IQ2MLvzT+39szXO/0Gck02Cv0LVXqpQkYmo4LNLUuzzt73rKxAATza4lfe3VcZ2sSuGxeIufhmdG5tC0w5DY9r/jarahFJc8LWK1mI4bZKEKB6DmgQWNLUA9AItFbbkDKHrqKcvzF5cpo6H X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39840400004)(136003)(346002)(376002)(366004)(451199021)(41300700001)(4326008)(66946007)(450100002)(66556008)(8676002)(478600001)(8936002)(6916009)(66476007)(2906002)(316002)(6666004)(44832011)(5660300002)(6486002)(52116002)(6506007)(6512007)(1076003)(26005)(186003)(2616005)(83380400001)(66574015)(36756003)(38100700002)(38350700002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HvRN3omzv77W7J3K2XlnzfOceo8A?= =?utf-8?q?aymlrgHzsSs0UUpg3x+WkrYvMbYQwTJlNAle271izK8mmsvQxwzHJJO43Hws6jCdi?= =?utf-8?q?GzEdqRB45uL3r4p5RCVcFZDClPKQ7oKThNJMaDZjwAwjh+vxXMFzf0hLCbjHHdqRH?= =?utf-8?q?+Cv5caVL007OWaVcX3eQSDGsm7fN1kuQVr5+NEPCkOvtuh+1SZX5VwQJZjjKobqv3?= =?utf-8?q?AaYJ3i1RH2s7IuXnzsTWU5Hmv1u8ySRoFzJptQ5mQ+B3v939ZxYXdD9WV779oF/+R?= =?utf-8?q?BJuteKNeIM8lAb4AC/Mc6nlujNZkAbCDeZ1RIq0hPRVQorSiXkbN1oI/bIEu2Ruqm?= =?utf-8?q?3Vw626VOW5UpbxqI2rL5FVRXecEwLHjwkYhLBZE/lhWW+XQalDoRuSNEseDsPo6W+?= =?utf-8?q?wXwcLGMxeRleteD991csOGvGiy3+gf7Rj1eQIr0l9D6vwZp0TuRHhrdEUmv5fxm00?= =?utf-8?q?Tu7kensXZemRbejRgFuvfkhL9D5VSG6Lvi0yQOFpvjLM+QivOky4aSS0IjNUiPC0h?= =?utf-8?q?pBJCl5zBE/KX13BQLigs0Wxg2DGJVP+qPjSudBKj47Or6IVp/Asf7FkKFRLtFfvzQ?= =?utf-8?q?Z+pWyQb5el7KzK2sdIS6I811CAXzo0Cs5iRQAVM3wDqUvE4gGRMEjY7N6VRF5pzwE?= =?utf-8?q?ecADtHMkxvwrW74y03P+8XPm57jZXGuDw+kILaSDdzHeRZdw6N4YpL4so7aWrZsZU?= =?utf-8?q?LU9PbaJw2oVIcaov6Dd0RsXOr4V0FV89UQc0S+djDxWczrYoBohcuqdcUbLqzS9jb?= =?utf-8?q?ytkTvbSIss/SliEAFxLZTqQ9tIB9LaUeFvDgZ2Vop3pj2+Q3tN+UF21JCBcyGTpwB?= =?utf-8?q?bs4VuO5X3dXoLeFKrs8quDAlks4SXUwijjgsal+BA09iAXXhQU4Va+iPI6AQJkPmU?= =?utf-8?q?RfrPT2dzAlleU454kyVzAaltsLdmSx7wDHYSTVOg/2Rs5isp2sd+kTU55Jspt/dxz?= =?utf-8?q?xyQMkAw94ejy0W87sErze1ajkfyyUGoDCtprGwDtd+jCbQYaM48mR66EL7oSzxP2r?= =?utf-8?q?znuRSxgxh+W4HlVf/5rTto3PJjNmpjlB0R/mENgK5S9n2r3Dz1xHjTFAFR9tdrywL?= =?utf-8?q?7tIB8mLkEW1rN53GkoAi452nxfojAUZOa9rJ47SMGjZEXjMtyqHEoVrTOMWmunpWK?= =?utf-8?q?YcPAiVBSFWfg46vpUrl9/luJZUufc+GsZ2IQE93qFP+Nd5SEJaCjwEDVLj7OS7p89?= =?utf-8?q?ydkM+5dlfsCi6owNM36N21jz4QBeR9Bg0H5JIOBIfMUiNez3Ne+K8O+7jJrf4qbVJ?= =?utf-8?q?gH7A0Ez8HhjE5hzENLuvVFrAtSM1XtcFAo31UBNcwKpBBLs1yskqF6MMOVE1rM/9a?= =?utf-8?q?tbQHp31oWxEy3ckg/RTgKGmR393wM/XhOadkdQYbSiYU6Ywsht0g3CydRYnCb9ZdW?= =?utf-8?q?Z9YhJJNIoCk0qcIMZs5fSvk7mqUwphdO1lD7428mPBYvygUty9bbVo08lAxK9UwgT?= =?utf-8?q?33eUqcxzUplwurzO9wMENDWVAPE3OhZZUTH/FY9CUBeHViksOf1PdUpKnzBiEZgzk?= =?utf-8?q?RlIcjIvBFHGhPIwYr0GgfrLia1s3E5ngHA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce698a9f-01dd-4250-f163-08db68aef620 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 06:01:26.8552 (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: 3mVKqQsRwgZWYszN4e+vxoDmxjKzIt3YJ45YCUZws9F76c45V4qRIbPyRmPav2x1SXcZRb51+c310IYPi9JEhYwEL0VdLQmFydBfCPS7LFM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB5046 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: Long Wu The former logic does not consider the simultaneous initialization of several NICs using flower firmware. The reason the initialization failed was because several NICs use the same name parameter when we call rte_pktmbuf_pool_create(). We use the PCI address to give each NIC a unique name parameter and let the initializtion succeed. Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 8e1bc22747..53ee936f4c 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -421,6 +421,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) struct rte_eth_dev *eth_dev; const struct rte_memzone *tz; struct nfp_app_fw_flower *app_fw_flower; + char ctrl_pktmbuf_pool_name[RTE_MEMZONE_NAMESIZE]; /* Set up some pointers here for ease of use */ pf_dev = hw->pf_dev; @@ -454,7 +455,10 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) /* Create a mbuf pool for the ctrl vNIC */ numa_node = rte_socket_id(); - app_fw_flower->ctrl_pktmbuf_pool = rte_pktmbuf_pool_create("ctrl_mbuf_pool", + snprintf(ctrl_pktmbuf_pool_name, sizeof(ctrl_pktmbuf_pool_name), + "%s_ctrlmp", pf_dev->pci_dev->device.name); + app_fw_flower->ctrl_pktmbuf_pool = + rte_pktmbuf_pool_create(ctrl_pktmbuf_pool_name, 4 * CTRL_VNIC_NB_DESC, 64, 0, 9216, numa_node); if (app_fw_flower->ctrl_pktmbuf_pool == NULL) { PMD_INIT_LOG(ERR, "Create mbuf pool for ctrl vnic failed"); From patchwork Fri Jun 9 06:00:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128448 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D801642C69; Fri, 9 Jun 2023 08:01:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E110442D12; Fri, 9 Jun 2023 08:01:32 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id F2AC041148; Fri, 9 Jun 2023 08:01:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q7Ja4DKGxm+V/zfB+vAy/8SacvgygGAZaEvzL00mlXyFPdbKJNqHzXozu+5tXu1wKtiAGg+JqQqj+tf1RG3uQoM7VDryhcJSBtCBIkxK6qVsMRn1SO8NUqssEvnmD6f9D4h6YwLQK07ZidAyfFstaERkt/3i+017gLMnYsUZRlMIFvMQAFtlA6zW0POIrpSpH9xZoBVERz3F7oSg7mpmp5Wn1tVxOv4JF/yO/Ws3KyLhdg4h7rxuSa0cvZ1bqNgkx1Y5vYlX+Oj0pROdw8zrQl6x9cWrORm/ylqvyLxDVo6vufY1SXIooswpX+WFC3GaAG5wcz51rmeqNrCv4/N8Bw== 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=lP487A+N934sP2MWkJW2LzQUQ+xouiNrNa+TXcQzqj8=; b=hwCc7ZvNCRwIm1QbnfiF7R411KGE+4I0CYscBtK17AlU+ruRFiYvl4xgQiBFyA8jZ4Nz6u22UGeXKectmlDJ7KDw9NNPBGGMIz81oH1b2QUfz1kBx34Yg2SgiN3O03mLaruCLXFIx+LpoiaKOQyU1WslnZc4QA1MX4sD3pjDDKbXwZYlcIVPJv50dcpzcOjnwqpqJY/h1vcqDKDbrG1apIEYSGX+aAIYq9nm3fwEeet0tU54Sye8KmOBaFARxE6g3Zqlbdr9p2gx4CLPgWnY6RdOMM0gYLyo+dSOTd1724o7R5vGBRU8Z4lRtu6JtzrB5IrxBe3JiFEyEDMuml9kkw== 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=lP487A+N934sP2MWkJW2LzQUQ+xouiNrNa+TXcQzqj8=; b=fOeg/8cL1uzvCuwvVTcoLrYiydtTj1ST6KNomoeqg9Oscn0CwYbS59dKJ6NaYEDOrOqSzrk20hgNOlvdYNzWZ45xYLgyRSlsUQvYTd5KXByNrOMUIxyCIk1y+xzoX8Th69kyfQpBI8LzoLyweuFlzy5dBDr2OccZm/VQSqGacQg= 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 CO1PR13MB5046.namprd13.prod.outlook.com (2603:10b6:303:f4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Fri, 9 Jun 2023 06:01:29 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 06:01:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org Subject: [PATCH 2/3] net/nfp: fix representor creation failed Date: Fri, 9 Jun 2023 14:00:59 +0800 Message-Id: <20230609060100.1306648-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230609060100.1306648-1-chaoyong.he@corigine.com> References: <20230609060100.1306648-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0035.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB5046:EE_ X-MS-Office365-Filtering-Correlation-Id: dd33d3f3-0f31-4f43-2cba-08db68aef7b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L7bhrr8eHVQ1Yl9X8bXRd4a3lZ0DBtkWXSjQky8bwXYQtMgDObrUqMnpPBkKqIqvkikWOurzPUpdCmnOOaB65IVjQefTgBON0l/PjETmfZFxbkF9RuT2cLZ5P5reXllxJALqpUYGfKkasP/Vkfa5xOf2La59TCld+RIJpX1FV9Y4STiRU2QhdK6GMvwDRuEPQtaG9D2c2HEAA/1x6A3Rn2WZEfxq29kIRz+lxVHegL8ydefwcWVKrqBk45/U6HjYJ+zvx7PC11Y7PUze33aGeRPxBVtrfw1yHPee8n/ZEwsglxbV7avkXkkaU32BcEwCwjIn8wh9YZw2ri3pJQY5mCCzFMVbAGV1Tjn6Cik5MUo/CccQeh1NRYeAmm/d0UH3Mu6OhHnURfZXpesrhn8Kcn2sQLLIhy1lwkoEztl/5O8WA16TNd9K91AHGt6aSsKyTrf4Rhfq36oJprTjJCD46rMMi8XgqQL/s/l2eTyCS1lKSQxFCEEoXpPor35pBqT/i2MkeCbaB7HlJyq/oqPQxk7iGlYTGi/46q8SReM3A28QM7TFOfQWT3TGsFvpJacRwPaX1oSvgZvYb1dO4djGU8lgojsQuplyQJwxpTMDZRdPaw8ISiemY0C2Cy7zDrA3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39840400004)(136003)(346002)(376002)(366004)(451199021)(41300700001)(4326008)(66946007)(450100002)(66556008)(8676002)(478600001)(8936002)(6916009)(66476007)(2906002)(316002)(6666004)(44832011)(5660300002)(6486002)(52116002)(6506007)(6512007)(1076003)(26005)(186003)(2616005)(83380400001)(36756003)(38100700002)(38350700002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?VQ+pbLfDk+uP6yYDaaYZeX4Ik6ZA?= =?utf-8?q?rSQj0+IclBrfCaiOs8Wml+vy9DYixGkXP8HP6HE3sqXeBMfaxlYE8iQhlS+wd9LHx?= =?utf-8?q?R0zDYaHZqHphrVPsgxVd41+ucPVctN5lv/gpmEBLhIfyQyVUbnBSVpMsPGtfQGkAv?= =?utf-8?q?9MoBXP2vc/jNFP22pVKE3aoO4I37JsARsi+uVgHlaBV/qR/TfkQOZz3uZgD5PX9op?= =?utf-8?q?GN1Br9JFMwOjqZRxoby2su7II1OIKvSsl8yRGHONVyuFPL1NMS+xtRagS25iArlIK?= =?utf-8?q?x5c5XGtrECtVj+N6TrBMSMVepGNjoSRZLvcHrKHRbWlAM/UHzf8FWx3HbcHbElWMn?= =?utf-8?q?1bcYxiLVrxrikoc+tZeh/FpRqfpLyf2TEcGPGbo8RTnVXeg9Npul4QKLwNNp3U5d5?= =?utf-8?q?X8venjr6dNgotD0hZ0XDhEH1U7slicEN4vzf825r0id3Fp2Q+2hWsB6PTxHxGj4rf?= =?utf-8?q?PiyGdpCM15xw8LynICAWxUKJ1/rCKm5NOPa8PDH3uIQBU0c+1mWnuw/hZEIepN2M2?= =?utf-8?q?fAfpiBVHN9uvcHECcctw6zqWfDRZVOXueXJe6L/5u0q6BUlH8oaAvX+qgbDAtqDhQ?= =?utf-8?q?Sss6ta4gTbdm/MKMLU67VDEdUX55C46eQnIytCvJZ20a1R7dC/TIEyROn7Yiu+h5Q?= =?utf-8?q?q4HkZlAZabndKwl+mBgx+kQWiHHKsRsWVwC0/+/85YMms6gzQCHFbiYQVP4PjgSFL?= =?utf-8?q?k4h0x08/a38bBEqJT3phJz6IuBFhrYKyDpX2ZitYSETrKfZ4Q5uJVHg5MQWO8BKgN?= =?utf-8?q?F1HIVBJtbewuQl/cmNGyqlALA4dQpYmAmTkGgY4JwnktD+3AW9jw3rgWnewLhpVbm?= =?utf-8?q?oFF6iGlG9iE+AdoS7gmx8U4hjZBaRwvza0L39kg2fP9w4xOhq08GcWX+hcqhK78gc?= =?utf-8?q?MPmgEqrKtZtN8Pn4Up++SYa3hQ6qtFvMj3HUQHgn5bVXyNBSLE89lIfDK7Jqyuob3?= =?utf-8?q?vX9xvXzXOGB3zXlJyAKKRJNlXIJqQXnACbD01yYZL4yMWKBoF/cdOL3plVzYIuJAr?= =?utf-8?q?QOE8jZMq1O4kHA3WqjuM5Tuhb7tssZC7JCuRsuNILMNxBWUbT1Q+piIpWEwUtwms1?= =?utf-8?q?f/j2WwLuXUlQsVh+BUQkD2FcDLZxtsT08NctYNcqjfIKCDUE1SyZ4zAL5CvhsXMbp?= =?utf-8?q?AyZ6goIwfTCEaZ/HPuPlqVyzYRuNJ0TfMEFm7S9Ecs1GNsQP8BHVF9rT479kssrEW?= =?utf-8?q?hKZAd5V86GoU84qIBiy59zWIzwA9hsN0ZX1Vy8OtpG6gGLe0pfprXqmXvXtAgcS10?= =?utf-8?q?ylS2htbP9FTh9JvAq07H+opLE/NAYKcEYlf6JNF0iSpKZC/B1D1CpaMlP9eW9O76c?= =?utf-8?q?ySN9qrjLfpng/xgLtFw9xLIgsl9AedD1ntZNlvUCuoH35OoAIlDGV8sG4SDprXsNp?= =?utf-8?q?wOqZlqHiIHA7Rf5jj3VpHWtUYN3KYtnwGuujdQ5nSi6wFWiWeik0GbzBs415QYiAG?= =?utf-8?q?Ka0ASiz60QlTa6q17Er6de18ph7pDsVhcKQrR/ymn4AilsHhrESYTeXc5T7ZRAh69?= =?utf-8?q?9ueExP/PGdB5nutTyKM/6BFUC7gfFG2F9g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd33d3f3-0f31-4f43-2cba-08db68aef7b6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 06:01:29.4715 (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: qvO3O/j9imNncQIZus90YkMJyiHHinD7B+NGKRH5bTq3+zTIWhlDfwU71Lh28j1SWO+QycK6TVCMgenVCpUhsffTlopG3XxvYxss4f9csTw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB5046 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: Long Wu The former logic does not consider the simultaneous initialization of several NICs using flower firmware. The reason the initialization failed was because several NICs use the same name parameter when we call rte_eth_dev_create(). We use the PCI address to give each NIC a unique name parameter and let the initializtion succeed. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower_representor.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 3225a4b84a..5118c9c57c 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -723,6 +723,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) { int i; int ret; + struct rte_device *device; struct rte_eth_dev *eth_dev; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; @@ -746,7 +747,11 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) /* PF vNIC reprs get a random MAC address */ rte_eth_random_addr(flower_repr.mac_addr.addr_bytes); - sprintf(flower_repr.name, "flower_repr_pf"); + + device = &app_fw_flower->pf_hw->pf_dev->pci_dev->device; + + snprintf(flower_repr.name, sizeof(flower_repr.name), + "%s_flower_repr_pf", device->name); /* Create a eth_dev for this representor */ ret = rte_eth_dev_create(eth_dev->device, flower_repr.name, @@ -767,7 +772,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) /* Copy the real mac of the interface to the representor struct */ rte_ether_addr_copy(ð_port->mac_addr, &flower_repr.mac_addr); - sprintf(flower_repr.name, "flower_repr_p%d", i); + snprintf(flower_repr.name, sizeof(flower_repr.name), + "%s_fl_repr_p%d", device->name, i); /* * Create a eth_dev for this representor @@ -798,7 +804,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) /* VF reprs get a random MAC address */ rte_eth_random_addr(flower_repr.mac_addr.addr_bytes); - sprintf(flower_repr.name, "flower_repr_vf%d", i); + snprintf(flower_repr.name, sizeof(flower_repr.name), + "%s_fl_repr_vf%d", device->name, i); /* This will also allocate private memory for the device*/ ret = rte_eth_dev_create(eth_dev->device, flower_repr.name, From patchwork Fri Jun 9 06:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128449 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D1D3042C69; Fri, 9 Jun 2023 08:01:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8656542D38; Fri, 9 Jun 2023 08:01:38 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 93B9D40A84; Fri, 9 Jun 2023 08:01:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHdjpEhh4+dc1RMEgvzRBxd8SMXmgyv8fSk+24LKcd+eg3TU4IflKdunfszBIPKEMlT8FJSjAZfHgRNF+BVFkMw912vpN2mv+sF3uY+q9m5tjSsecXrMx+5o11e49nKcqiL5b2+vxI6AGqdfjoesSnxCJNxpYtR7VoA3+ISiTy/BefbIfRN09xV0xWbhLWR0B9PzFRwTYOuNztMIJEPvwmshCL0hNYAW+EPExsfdvfWQgfyIz+LDGosK3fgsvA7000yfL+AgY6k63/XivD9hioedUxH0CuH58CAOBS+g+k3HF4XIBthUbzO1xZJMgM/U44slKsArND/mwCaAakGyiA== 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=cYMHJtrF/r6qD0GfIDmmzqZZNpoIfY3WxDF7fybqL70=; b=CzdNdgAZTbDlVydfYjen3iOnkdrhkMyoTlKDOtoaNKP3qju7fqLlcKDD9lU0Js3Oy6vF0SjDk4j9r0QvsB7syhPqxKcOA2y6U1TeJUMliHsP/HsqC5ZO7R4B/Buwt7Tk9J/Dpp2UWe2mlpxKao8oR8pcaPI/Rarfanuf9weO2dBfWXrnFhJIuyzpghiLO0CnRnQ0rOpJPDOwquJJu4Z4p5tNbvQfRp/ACNCZmYT1Ak9E9m5LlBwl9moT8rvtbgX1LpM2EBJJMBwkJ6IKhFwskapkrigDW+CsjvqycRApuvaROwgiN6isRPMFjCcK67CvQsnieghA0Eu1QYlrQPav/A== 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=cYMHJtrF/r6qD0GfIDmmzqZZNpoIfY3WxDF7fybqL70=; b=Zr0291PXGxgT/ZXkuNHpmaBWNOroXyzL/f6nHT59kUa049H6ReEb04kLmipmQ2Zr69h2/1n1dKbyRvT8R2Kr5QmsbCP1llrKRcvZHvdOsOzbjslYPzB5nUnJI8FsOA7Y7X/R2b01MBufHmVTrx7PxTyVT6ZeVhVrwBfCvOkW2IA= 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 CO1PR13MB5046.namprd13.prod.outlook.com (2603:10b6:303:f4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Fri, 9 Jun 2023 06:01:32 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 06:01:32 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org Subject: [PATCH 3/3] net/nfp: fix flow hash table creation failed Date: Fri, 9 Jun 2023 14:01:00 +0800 Message-Id: <20230609060100.1306648-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230609060100.1306648-1-chaoyong.he@corigine.com> References: <20230609060100.1306648-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0035.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB5046:EE_ X-MS-Office365-Filtering-Correlation-Id: 3394cd2c-d2a8-4718-4370-08db68aef944 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JFnILvS5tv/i2+FmlV92RDWW4YHqOdjddkFa3UFLjPPzMp7wRo+Jp+LLle7rasvtfqpSz72zQDtwuU7xgbi5vCJI4czp21zUhqSEDIz/Sn1HAdaeKj5TIdAm+hyCtgArkZWSS68h/nJ7+CrSDGGi2qpKwaX5L5+W0borTB57vJRgdz8qY3aPgwJ3WICcec58Uf7vZCVpkn7jfogcKzyfOTZYad6sgtF2amTNBnIJsjMW/edyvrF13ZP4hQ6TyNnKPBw0M+ZnNaCpXpZH/HGhO0hzBGq9pshvebJekxd95sPGLmUfSvo0de9SUaD6atdUAawYCZOUyLXqoojmUqB1rlwa8CnfQq2IiPDXH4oQ4JJJOi/qpphYLJjtzvO861h7TM9XoQ+9OBRhWDq0Gsc+kJ2Df1Bx/Gw+L4uM1K2lzHd3+cph+feAAZSrkl3/lIHiI+lOut7WEjMGndyaGQ7eaGQBWfE/XHx/SXsapuA2l6kjCGuMu93gIk86j8kYtvRQmLeOP2D5Oo/vCG/nWDwXUZf+2DglZglK/RLzAPhCRftine16YN7qC3zhjjeYY3nIfPDTTjTPmSqntlh6I/kyX/Ad6v+hwfW4IW16MEhfuz/QMVqn80iGM5V6Z1YNj5d3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39840400004)(136003)(346002)(376002)(366004)(451199021)(41300700001)(4326008)(66946007)(450100002)(66556008)(8676002)(478600001)(8936002)(6916009)(66476007)(2906002)(316002)(6666004)(44832011)(5660300002)(6486002)(52116002)(6506007)(6512007)(1076003)(26005)(186003)(2616005)(83380400001)(36756003)(38100700002)(38350700002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?N0VMtm5QrW26FcBK/TcFhOJ8uZGe?= =?utf-8?q?6MFbYvaLoTpUpL07mWPzZlKbShqijoBOu8Q6aCche9Y2MFmvQcmkTMzr/Iw8IWiX7?= =?utf-8?q?KsEX66zkfGyBEGOcIcvOa+cUOWiXtG5oDPw0dgA0kPS16fgYVzp8Qn5CNyaTco7m1?= =?utf-8?q?35QzNKQNsHDFiDjc8hX/SI+jw4OKFTtqqiTRo2FgGEdvP2/wHF0tKy4p2xJzTmPoW?= =?utf-8?q?4MrZw6NO8AnYJY70h/7iIZZ1D9bm2ntvVW7w+w2U/hhCze+rw8E98jZUZmYgsrr/d?= =?utf-8?q?va/wOUNvW91ott/AympjI5opeVDAdZz06NLfUf6tzTxS3RN+baCS4fZm5zI2D2OgW?= =?utf-8?q?okLdRpCFmDVAp7G909xeWUS188ATksYyzeajZp9tq+tzxzbqcHoIR//sUhucN63T6?= =?utf-8?q?kPI8T7lcT8Hcfb7uCyzZQegPzYBjlzJItH36y5kr77kMuLfOt4Zo34uvnqYjKiR/F?= =?utf-8?q?CrCnGJ1GbZeUQYqZ0XEnnNbOd8mYtBYOgEULJwRUCXZLf83DD/ScbqTwH1HAiTiyN?= =?utf-8?q?BGHSaJaktEGNrlYEznGIUHj0sSnuzTgiseaXCv516sp64jIiwU4XqeCAv7i/zKgNw?= =?utf-8?q?V0DSEHwTqeOLptZbxeCDkII+6yfog80lUlf1+aJ3Zp+ZtQHrMyLbEwmNOS2GDwLiX?= =?utf-8?q?Ne5ecUpgnDw5jx6CcPrbPAtsmbDTUtKDx2q8tXEqsfWebMNxHICz0u3e+yv0P/GT5?= =?utf-8?q?WJVATAbiORrYdxnvEQCR9Y6VyDWTfqL6Lpci1vwJkjgkBsTA5/CxaUjBtNTGSNXBm?= =?utf-8?q?7JfwCT2Oj94Jr61VNDG/eqjj4F8rWhu9mA4zy3Kh/BSw4gvw377RY/mLn2OqlMlIz?= =?utf-8?q?evKUqRiqJ1wiInKiTbZ82wBK4c8cAYvSG7m32dkwrlPYgiAfpnQown65kq6kCztBl?= =?utf-8?q?YqVXu+i4kPimSnKTiFse2aT4h/97jpZ7ysPTcig+0/4cCJH8/XfJVBWkutM9fL4ys?= =?utf-8?q?6NvCmTwmeYjS01MXtlJtKCMOSdWLfYvrg3t8vmvGkD8MmGvELCOBp9WXFZw8kaO81?= =?utf-8?q?b5d1vDVEZKhLvMLCvlDj4DgNNj/Zxeyr1T4cQOzFl1X7xyf8yEOm33omFfrN6PhvF?= =?utf-8?q?UaRWMfs1COIGjlibFPLMUPU7jcZV+0Z5HhgGmbBLR/63vSfledcYlRIo7RQ7rv4ZP?= =?utf-8?q?o/TMoXQOrElY7ssLfH6CgldjtYUvYLs/0ZNInu3id33oRgjNjBZCrrSHPL5jPFyhO?= =?utf-8?q?TmfU7yxMy2zPN/w4cSuxy73oqLZGmlI8lsZ5qghl0OksQ4zWAI7rucCWvX5wEGmXJ?= =?utf-8?q?Iz9vifmPzHF2+OV+aOMQg3Heq8EyAA4VZgWpknAfsWSg/yLvsqmvbYAg2B8IMc9Uy?= =?utf-8?q?4VQut53/oxpYu0Ym8SLXgkbgiG9ZD7+pQQIMEjay3LS+U3sAWzwX5pP7Jci9O7gCn?= =?utf-8?q?pW3olH1ShxctQoj3PfSVaT6ldIKnThO92U67jtNZ5E4AfAx4meQcWlfHwy9g0enR9?= =?utf-8?q?U98lX3QOpFuq6hFXDQ/4304lSX+Sz6g/AX1NTqlAtCBmNWIdK41Jlw8ZZ1SIClNlI?= =?utf-8?q?wuol5EA8ajeCZL/N1+VkStEZUA0nXjLb2g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3394cd2c-d2a8-4718-4370-08db68aef944 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 06:01:32.0757 (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: mWAk5Kd8yQKMwvhLUWkkp1uOlX63QzrRJ+zzaUZ0TRehdeyocCzj4pEcag9JIye3WpBoznOYqe5ceFnDsV1rWRwvhOYBKxfnHWOh8gsL01s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB5046 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: Long Wu The former logic does not consider the simultaneous initialization of several NICs using flower firmware. The reason the initialization failed was because several NICs use the same name parameter when we call rte_hash_create(). We use the PCI address to give each NIC a unique name parameter and let the initializtion succeed. Fixes: ac09376096d8 ("net/nfp: add structures and functions for flow offload") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_flow.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index cb7073f361..d392f9c77b 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -4105,11 +4105,21 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) size_t stats_size; uint64_t ctx_count; uint64_t ctx_split; + char mask_name[RTE_HASH_NAMESIZE]; + char flow_name[RTE_HASH_NAMESIZE]; + char pretun_name[RTE_HASH_NAMESIZE]; struct nfp_flow_priv *priv; struct nfp_app_fw_flower *app_fw_flower; + snprintf(mask_name, sizeof(mask_name), "%s_mask", + pf_dev->pci_dev->device.name); + snprintf(flow_name, sizeof(flow_name), "%s_flow", + pf_dev->pci_dev->device.name); + snprintf(pretun_name, sizeof(pretun_name), "%s_pretun", + pf_dev->pci_dev->device.name); + struct rte_hash_parameters mask_hash_params = { - .name = "mask_hash_table", + .name = mask_name, .entries = NFP_MASK_TABLE_ENTRIES, .hash_func = rte_jhash, .socket_id = rte_socket_id(), @@ -4118,7 +4128,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) }; struct rte_hash_parameters flow_hash_params = { - .name = "flow_hash_table", + .name = flow_name, .hash_func = rte_jhash, .socket_id = rte_socket_id(), .key_len = sizeof(uint32_t), @@ -4126,7 +4136,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) }; struct rte_hash_parameters pre_tun_hash_params = { - .name = "pre_tunnel_table", + .name = pretun_name, .entries = 32, .hash_func = rte_jhash, .socket_id = rte_socket_id(),