From patchwork Thu Jun 15 06:51:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128730 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 98D3D42CC2; Thu, 15 Jun 2023 08:52:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4825A427F5; Thu, 15 Jun 2023 08:52:02 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2133.outbound.protection.outlook.com [40.107.223.133]) by mails.dpdk.org (Postfix) with ESMTP id C3BDB40DDA; Thu, 15 Jun 2023 08:51:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hxaxDe6gxP19Qeb8M5so0t3nGan3uTOIbZGN89UogiXjOaH7sSyoCkioyIxgkTtTMyooT2yc2T+d4/nQmdAAn+wPcg5ruIHxpjpwbu3Ikrt8vUWaSlJsWO5DQMF6Lha1dHtihbTSRE5PZsJ2pCdTJ0zI30Ahg3gWTvQUQi2ap33GQbkI8AsTSAK+tL2ARkBt8tE0zvl2mLa+wjb9qOMGNUTEeTpGHTkI9XYUP+gaS1NqOIdW0Fo5xLa8EZbj3IMBMUe2w5Afa9KNR5o0Cv+8sSwmBdAdOYialSWtSa5JJ2/GFjqpSFU794P7Aupd3FRA3bJHnYV2PFullaMaxDyjew== 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=g/+5FfXkkR0RK2KFiQbqJvEllWO6AmFT2dhUghE948c=; b=BPl8tZPaU1esKd3NniK5b8fVqo+JmBbVW8BRtjpHVLHr4FCVmiXIFNgLjSTYJuQO7wi2vnmBkHbAKy3lXx4frwgTHdyMSeD2zG3n4bm3VJFksEeS3Vs4aTvijAJOU+EXdvxiNdR/40K4Ru8+ElSlNOo6n4y/kfUnIkwYhEcnXT06j7G3p0xfisXWpI7R+NQJL6046dyii/GArwt2+9bi3d2sR3DEsBhnzLK3w5W6npqG5PhOd5Fbm4zCAiKjafX2CUh8foDUqENhrZaw5hnrQNa5zGd7hGMlAbu1MdmQLBObVeRWTCmE/Uz8lN4us/MLLxnZxxBPXuHwjuAarlJlbA== 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=g/+5FfXkkR0RK2KFiQbqJvEllWO6AmFT2dhUghE948c=; b=N6lmD/S0xPQ4oTWOc8Fu0WzlikkFmyNOGmE/fO4nJoGDrzYMk+B9Kqm6vGH11kfpqeWJ91xrS084ytexqrmyseZlAthxv6qxf9zssEzTtgp6yJ29PVGTC8Ez6j41T8s+C+3//CqkULJi/hCwwo0WlN9lo0h0D/LxFmw6Te0Ajk0= 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 PH0PR13MB5422.namprd13.prod.outlook.com (2603:10b6:510:128::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Thu, 15 Jun 2023 06:51:58 +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.045; Thu, 15 Jun 2023 06:51:58 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , stable@dpdk.org, Chaoyong He Subject: [PATCH 1/2] net/nfp: fix representor name too long Date: Thu, 15 Jun 2023 14:51:30 +0800 Message-Id: <20230615065131.1267711-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230615065131.1267711-1-chaoyong.he@corigine.com> References: <20230615065131.1267711-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR01CA0145.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5422:EE_ X-MS-Office365-Filtering-Correlation-Id: b1f4d943-5b8e-4ca7-456e-08db6d6d03c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uIvyV2Kv9ok+UDfHyZ53x/RogbKhUn107//GEqvYRDU7DBafL+ayTPKSrCdnUK9tyactPnA/KS/pnmTlfntOzRgZI9VBVU8Ff0dWVmr3k/lom8rPOs9tAptrySjS4TCUn6VxIwFRn+/zHaM1+xcUsjJRV7dv+i9jHg3u/QNUH4rfxTJiS3C9aYN1E4b8qEEueb4g+ICIahLZo0/USMHOfRBVSho1K0eI5ypaaMHs1l4NGwQD6Gq2x3LdvrjLL8AkWN8IPUp+CvUKPEUkD32kGA7AgEDrfe+SoTdhZt5MCb4fVxpcZsCWgjbFG2SlOOn3KkxkklU6nvLBdXETnHjTGRGwX9rO8ZJVpdEuRHirl1e+hn8IV/5+i7nG+Xy9xR+3067YmcPPFcpVuLWoTePKFhVKAZ8IU4oLfRuU0bktqm69bdDA4NGeeiMmlIqmG2yDVaKnesgxr508VqE55CSjm9qevnnl/5loSPiqc7oKi2Tphbt61O9trjIuXp3/UZZBcZFkF+wCOlqFjGtD8VkGZBRkooyVrQE3H7w/B3ps1PRnPX+sFCaAZqdMOUgRpxUsNoE/RNLV4cPg8+3lPu0yp915xkGsLqcfORsq9xIgI+B2Tpp+5/uQrgFxcwGMJS55 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)(376002)(366004)(39840400004)(346002)(136003)(451199021)(66476007)(316002)(38100700002)(66556008)(2616005)(66946007)(26005)(6916009)(6512007)(6506007)(6486002)(478600001)(52116002)(36756003)(6666004)(86362001)(54906003)(1076003)(107886003)(4326008)(38350700002)(450100002)(186003)(41300700001)(8936002)(2906002)(5660300002)(44832011)(83380400001)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C7gRo2r1iRGvUo0zrXXGPmHeDjD06S79N6nw4UPPwhUq0UgHonZf+NoGatxk64ZT/RYDWwW4na0JgaBuX7PFXtQvYALe9DazAPOd9JDEmg6xzaLx5LdnYgSe2EIdwODZx/hQogs/zUJ/JHLbg7nSJu5QDBiUuVO9CPVwPHFreegx2+e2ZjN57iuNjk2c5H+G+ynoTBswUwAU99P1TzQJUufcnEmbVDHOe8fEF9DTKDtlhnqz7qLcQPqxqjQnk14HquK/z2VCx/IYG2br2czH4AjVEdxP1GSTEG2qXfNriAnHTNT8py0w8jSTaxrEmUklt/c1esIYBdIA2RsZTOwBS6VUqzoo9Jtle0M+37N2e3fgE7qX4ageoakyw29G6gfKVs57QTlUMri0w2+QTlVNcUBJ3YIuS8M8uLFhB+oEJUOj/V2HAXcDV/V+RPl9VFexyXhYqeCCknjL4j8/g8DRtYcgpi3jOXsIJPbbxfI1jtH7nZ2yh8u/0CuLDKjAT9rJbMOGYrH0AKU2RvkMqT7sx+atsQUWjQR2hoGLxpLLd2DIwTM7aYwIJipSnn1G+VjLM0VajUoyvIpKeQApIVarmzNAaReoqfaZyg+ToeUOKlpo2iujnrOqPNPG/9yAVg/6FFe2mO0Qv36zeH3H8veqPPKc3SXgmKRuXx9vge9vuQbXPjirylqQ+7LeAqnmYeDNS+/3QNHo6ei8LGdkc/PKhz+UYa7pOX26m6L1VDLQowvwAlTj9QUYSN483+uxmsKyd0aYF2Ui4ZDALwzQcfj5lhJ8UJaWWNV+k0uIJ6FowekBFKxlL77j6ps3ng/hsg1DY40Y7NZ8AfU3U6x7fQhOhAWt+uSBcOYwwjUoeo5xhmfrNKEy+Ih4v+ac3lylKHB6s3PcHVz4Ha3n9WYtYTa6G6K/bm9jlxdSFxH6bg1HZ2R5RUgBzWDmaqpJMA0dz0/gq8ZDPaFlqYBEQ8/TZewIR+7ETgncb1rAdTfKbe+UmD1Vi5+msePb7BRItmmzP4lZLnnFCoDzsgqF06QTl1a2uyH/kvwNhPESOmbXOpCCau4SkET29TLxHaCLP5I9fw+qBUz+lbo8eiHkCzo3BkNiT8HHRXwMAp54nK8hOd5SlaHEKe/4SNATkgQaVIfpv3FBMaV6zcr/2j5RN1OgX7/5HPXtU9+wrfSKGmg/iakd/U+vIy4Fo87SAS1PzV0ajqOPG+CHf46bJKohOViDZqmgOEuI3kd7JTjlIFlKyKMCsKVLx8F8pC5k6J718nZ6CURZbLZ0FLKhsWcIFpaZ6Tsquy382YM/ayBtt5tJj3ke6JX8zIA9x9qmsC914OKBzHnxMkTHliJQNmB7NYfR4pSBLgtsECZ6ZjtWuwvOYC21TiMZ/+w2yjka0RLxC4W35+LzAT3kNafZO4KITt2oOqljPRT18ECSt18Job60dXLgJlLfIvD+4PESwh4tdsb5sLoJ9DqBB5DrdPVDRc86O/uWqNY00MMRVLrl6gtY2QJYPW0lstghozWwpKgMjuVwgsHH5iIPI7BuQkRF7Jao+yJlAMEWDu0FSRYHw6eM0APAGD8smDGXYzF4Fl0vePY4rf7BklIaMijBiZ3+K4A6EYBw+w== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1f4d943-5b8e-4ca7-456e-08db6d6d03c3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 06:51:58.7656 (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: 1MR7lRBSK9c6BTe9SQPULQ5mkME2pCEFSk08fsrNQT0Fc2kakij05vfABmzdTvPPqQja1eyXltM+2dEUc9BDBFNvrwXNfIhBGXBeRWCMV64= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5422 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 length of representor name may exceed the limit when we use it to create rte_ring, so we reduce the length of its name. For example: old: 0000:af:00.0_fl_repr_p1 new: af:00.0_repr_p1 Fixes: 2003cb447aa5 ("net/nfp: fix representor creation") Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower_representor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 5118c9c57c..5585e1ed9e 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -723,8 +723,9 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) { int i; int ret; - struct rte_device *device; + const char *pci_name; struct rte_eth_dev *eth_dev; + struct rte_pci_device *pci_dev; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; struct nfp_flower_representor flower_repr = { @@ -748,10 +749,12 @@ 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); - device = &app_fw_flower->pf_hw->pf_dev->pci_dev->device; + pci_dev = app_fw_flower->pf_hw->pf_dev->pci_dev; + + pci_name = strchr(pci_dev->name, ':') + 1; snprintf(flower_repr.name, sizeof(flower_repr.name), - "%s_flower_repr_pf", device->name); + "%s_repr_pf", pci_name); /* Create a eth_dev for this representor */ ret = rte_eth_dev_create(eth_dev->device, flower_repr.name, @@ -773,7 +776,7 @@ 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); snprintf(flower_repr.name, sizeof(flower_repr.name), - "%s_fl_repr_p%d", device->name, i); + "%s_repr_p%d", pci_name, i); /* * Create a eth_dev for this representor @@ -805,7 +808,7 @@ 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); snprintf(flower_repr.name, sizeof(flower_repr.name), - "%s_fl_repr_vf%d", device->name, i); + "%s_repr_vf%d", pci_name, i); /* This will also allocate private memory for the device*/ ret = rte_eth_dev_create(eth_dev->device, flower_repr.name, From patchwork Thu Jun 15 06:51:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128731 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 99CFB42CC2; Thu, 15 Jun 2023 08:52:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E83C842D2D; Thu, 15 Jun 2023 08:52:03 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2134.outbound.protection.outlook.com [40.107.223.134]) by mails.dpdk.org (Postfix) with ESMTP id B6EAA42C24 for ; Thu, 15 Jun 2023 08:52:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkmizHJ1hQARLDcNee1MEGPTxaank4gwvotMeoY/So5QZDaiKXWVEJkVFpsDp/1iHmYVKOFw5FcD/uK8Wu9ORILrYe9UrHcL7CVmXs3AJaZMiwZPuih8d1tn5MwO8x7QzhcSnIIMzeerqdOSsNCEKzs5AAjMMFp3C9vohyTFUUsZAF0kUX0CzjolTm+tiYFHNZZAoCR344doDlt4TDs1W1No0eYdhEKOdiOhQ/ZgzOFOrxg6XktZhbYcAJgn7SfD25tnu6Oc2oEslMvshdCHNsGNrAzExsAZKrKG6C/5CI0UGzFWF/z6Yiee4L5Zj+gRGibyv+5dyxhbK6ca4ROR+A== 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=ZzrUXKmlOG0I3GNcQb8uFt1I+BtPAdoAv1wTVpgqprI=; b=T2LVBf5Iy9BVopMOPgnzZRk/N5Acm1ve1qbvYNjD4wUfqkNtlTjavKJNY/2TRmFwMItGgGCZPmEFV6M/HNk65e3F7WP2IKUaIIMurz1WLxB31Y7dYDx0o1mG+9wxT+9DpRvs3tbBLfJUWAVhq+eBAILts8QZ7awyjpnXmnlbDZgu0eQsVqJj5LxvOHphYvtA1evSYWo+6O2qChLsbwCHbkPYVHM6GaIQKZqQEW8WHaMC+roZP16WvCxH0Hfz1A4sa/KO1fxJeqzwikaVC7s5ariobK4EEagBPnQZfGKShRaIalEQNT3C+18Vj4wYElbxEwe8gz4gV7W4T4wYdWv1AA== 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=ZzrUXKmlOG0I3GNcQb8uFt1I+BtPAdoAv1wTVpgqprI=; b=GgQ/tNzZhqj6gS1CbXA7yyw5R3DBhyAA3bMj2TLss+WyQ8j9VrTKBYzFBP/mCwhnFXQuHTLc5TddYLBDZUGZJTKmN6a4mdP5ZXvBDO5Cmqvd/Pj38UIIxn18gA61ImlBRwF0SYWTxqeoIcgm72SSIFNqKzEFErCpeKZkC2i9qD4= 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 PH0PR13MB5422.namprd13.prod.outlook.com (2603:10b6:510:128::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Thu, 15 Jun 2023 06:52:01 +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.045; Thu, 15 Jun 2023 06:52:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 2/2] net/nfp: reduce the length of PCI name Date: Thu, 15 Jun 2023 14:51:31 +0800 Message-Id: <20230615065131.1267711-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230615065131.1267711-1-chaoyong.he@corigine.com> References: <20230615065131.1267711-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR01CA0145.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5422:EE_ X-MS-Office365-Filtering-Correlation-Id: dbb7c384-aba2-4ab6-fb07-08db6d6d052f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1wYY0ciHSCzBna3VUU0a41bH1I7HKtGDtkRhEDY7ArTAmtjFPCLe4bZBzX4mifsqKt22dOQkRfnN8WuUsZX30qRDsV1o18SemmGpeJ0nDThltWOFmdbF3rWN8sNB9GSIqdCZ0pTuRElUBdol1fsoNRPm4RJ0pf9o4sQQD2gMOpCLbTWo97T3ZS1+4hWekJ0hlU0Kkwm/baTxVRklMW0XnmiSatl1Wu6hd3wWq74ZAYNCKZkYVKRbl78LKAztlTDmKuzr8DrsHxnipJsff1gxAbJYmwIp9Ucv4tVl67jEpxLoiYTOPqi3PLKz5DpORy8G6JrYJBpV95lEf5xBq2QZdYWOtAKexj8/UfNs1AxfIbJCIUDRGhGq9keS83yOvVws+oshe+1CgN7zzWbw9o2xnJ/6P+8W0fP0wF14voN9IlbDNBVF9JZDtj8G956LN+Jg1T3lXvTOXMQ+46hSUHMd+B7TvEuoK8940JlYBPrdyjtQXu2w7+issQiewU/UK3znJrGnrMyxKsFnl2LM/xjIhy6Dj9FuTWs69uTZjn72q/IEuggYQq4FstgHxIAL9nAFx5cHxATZ5SfP9OGOBEmcjz+mP+NqgI/IdF35oy4A6ZMRhJiTHDphRSVfDlmWFLcY 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)(376002)(366004)(39840400004)(346002)(136003)(451199021)(66476007)(316002)(38100700002)(66556008)(2616005)(66946007)(26005)(6916009)(6512007)(6506007)(6486002)(478600001)(52116002)(36756003)(6666004)(86362001)(54906003)(1076003)(107886003)(4326008)(38350700002)(186003)(41300700001)(8936002)(2906002)(5660300002)(44832011)(83380400001)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PBfNef8C5qF6musGvzAVb+ytCMy0MKJ7Kzdygb/ATLV27IXDFkMwpHzPoXe7WlfE72TNwvK/cVpFd33kkCfpQVJsMGATUFtiNqQEoazN/orZrRLlayFFvYPk+/Krsu73FiuGPuo7LZTNXCtkOJnGnQLDqrbw6huw1yx3ZJbnnjAFN6Goy8H/b3oSeODpYSPZPW4FveGUXQXUJ1WuWHKVuuFzzSl+JvZBAx59IxO51iQD7/NFankIuTCXJO9jrRnsSoD7/AyAzyXhIRl8T6onI79njEiKehsqbE8Q3c1TdNk6pp8YDmkhI7OTOAy5w9EVY6W6jliVgWFErrMhTmfSx62up3E8fXSn4JQuyHI6K1Bgq4CQH13/4Ll1HgYL+6St1iAq+Z+ywzTvJwp5xfe6YY6Sxv/2ZKs8nRXaC9pw/a3NHckj+Fe/0wxizR3jacOidV14pDmXD0FB46DkJFW9UXGC2s531fJ5v0crb8V+CmPhzz41R4DzPUlHE2jKRwy1q5qYOb1hNCanIOZPxsbK/ofUoyfIlR7zhLPVBRrm+Xfo21sNk3tnJWESzSoPMfBEjDr2WyqyilaTRfBzaKdNbfGrr8mgU0/JbODIXq/i28ljqqLc39BY/iK1vHMhzLP8uazBBd2l2yG/agh5L6Aq7vc2Qi2tB5kuWOhRZ0PqSGZ62P1ncy3ivDs1bMoG8J1qyIVmkH4EI2WtkxHkyYB6KO4LcsBAHC+K5EqEz31zw56vogKSVmzQUopU6f/BorPOa7NXGua2d3E0irbsLdKnKEQJsjQDidX0zpQkxK8B+bg+6pN9bB4mYd7azA0ijQVezUvt7HzkGswXFSlKyE1Fx2M2HgZBIxiHKsuYYTlo8VIgbaN4hqKmvE6as8vAaqRqquWNAkiHoA7VKVob+5fuTatzfK+YHFIxgC83aPU8oXf1rQCgzuic1MaeJIZ0bPRQcz792AsS2mH7G0Tw6sd0N5G2MY5sLZNA2qrmDv2bnSr6mF5xS5ztI5pVAUTg5/ICqX20xBqiTBEu0Aideef/Gfqxd1v4/YxMo3qGK+8ScLLAiXhdPjEs+AWfX2STQokAWZqMmDLDSdSicMI8wP5v/ohM7PYYVcx31VvkloItDQ5ljIZ0Bc1rz0p3e3VUE7XLzw17JGxiSADcMtq+jBknicbI+wLolr9Ppg+SPFTWUz0GokVWjOa9YxN1APFxOsubBBqSIv+d75p9QzCaTSumJvTMhvII8ZRoKut5Z/i/His7XusKf3fDdBT6NXRWPWy/ntB6uNSC6fCs+e1VCYndUfcwjlSxZw8jrKKdDxs2KFGCdAAOSLGaSiBPFpFoAeUCumdZSRm0KFf0EyVT8/66s3cvymSZF2G1iYj5qViPPim3gdVeGRYe1SMb5UpCNWRJQqn81nmiTkG7CeVrsXQ+8JX1AIOcX4h/jN8sbhyLyZIjHGGHzsTTqzBQ8BOi5jTzhtXTuyqTH9tvBfJR/QWSyw1JQYWITHbxq77/VihfXCBxgri6P+ekzN9EkNJdk1qbQrqSHBApCkBAw+91w7B1Ax8cO+qeYnNTujdLs+BHe3BcoOKX5rWYvtaZ+H+x7Kkwjp14S1NTBcqDHL6MCUzX+A== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbb7c384-aba2-4ab6-fb07-08db6d6d052f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 06:52:01.0990 (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: owOrN3a1krhflqVdoGaCkNG0hYByWOD/uHHoD2e6V4SYHXwh+9NKsPyqvAvzxgG1A8GwpC9hIAsjUZobNAgDTzawCziHghDAeA/8Vd7pgTY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5422 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 whole PCI name is too long and we remove the part before the first colon. For example: old: 0000:af:00.0_ctrlmp new: af:00.0_ctrlmp Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/nfp_flow.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 53ee936f4c..6a4d3c7dae 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -456,7 +456,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) /* Create a mbuf pool for the ctrl vNIC */ numa_node = rte_socket_id(); snprintf(ctrl_pktmbuf_pool_name, sizeof(ctrl_pktmbuf_pool_name), - "%s_ctrlmp", pf_dev->pci_dev->device.name); + "%s_ctrlmp", (strchr(pf_dev->pci_dev->name, ':') + 1)); app_fw_flower->ctrl_pktmbuf_pool = rte_pktmbuf_pool_create(ctrl_pktmbuf_pool_name, 4 * CTRL_VNIC_NB_DESC, 64, 0, 9216, numa_node); diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 5acb7f6ff3..3446adb766 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -4135,13 +4135,11 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) char pretun_name[RTE_HASH_NAMESIZE]; struct nfp_flow_priv *priv; struct nfp_app_fw_flower *app_fw_flower; + const char *pci_name = strchr(pf_dev->pci_dev->name, ':') + 1; - 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); + 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); struct rte_hash_parameters mask_hash_params = { .name = mask_name,