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 97BB84301E for ; Thu, 10 Aug 2023 01:53:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BA5C40DD8; Thu, 10 Aug 2023 01:53:03 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2051.outbound.protection.outlook.com [40.107.94.51]) by mails.dpdk.org (Postfix) with ESMTP id D692A406B6 for ; Thu, 10 Aug 2023 01:53:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bNyD+hl0HIYq8sUfUZEhVqpmwFYS7PKXVdYSH7gs+Ec4NBx2Xh78zWG6jlpMp7Ax4xWpvn2Zw6Sj7dRHrbPtVU17UWBv/dNand1RayqApmdfxX6U3A3gvH+rZOSUtSGbtgIZIFmHDDRO7G6RHUQBvG0RZdVnMbWC9gi7D46OawC0QNx5SIkPqL5yAfFpX46aCxNgwFBgo2uE7XxiUsNt9xHMAS3Nw31fAI3QRF6wXNxd1pw+YLg9SPTFEPo2xQGEj2CK+1fuknazgxpw5v0EreQezjZbZTm1Iektm8pZY0bFDi7WgWCuw02cEuFIjEh9qer7XWlJNy+RROd+wTWhmw== 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=P/8lAyUjKp47HIY+nCmlRFmSWoHaQn67H9gjU7ZTUMs=; b=clAquEs2k1iPbtcBKlECBtXL1J3sIeuQLhOFwe0s/RE+tChlGP8QQFLGunVjwZnipAr+rM5hCUuoCkUtJOn1XUTJnKodHoklc9LvGwOnC+STyoueD9lfakrR+5CLxt23gnkk4anrVfTXVu4yhT2TpkeC9yJi5HS7JYE96RvTmZgLYl1vbNRnPboT75gFXydRyJCBX96dKOvBDTx9S4S2Z3EEALqcQZzohy3I9VdDhhyAne8J7UzuUJbyawjlU1FCEIUON5EBuUZ2KlTzSizN4///4sBJom9kunP+1I2Acx2VXZ6WhsuPw9teV1pB8rJ/V5ft67IQFVy6Gne1CuLb3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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 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=P/8lAyUjKp47HIY+nCmlRFmSWoHaQn67H9gjU7ZTUMs=; b=Dm6vqieyk0mit66eaJmn90aesL6o63oKVvXzr842/SZMGyvKSABphjaS49HpIeIhCpwM41p/CpZOvyuqrceS+RWouD6B2tudVE3YOn0wpBNoJ6eCCKkluDeVjiPJKoJEvn1i84GCT31FLpIU90RqepIK2O1i17xxjc2tSMBvmdkkvWBiRBwPpTzukjySGTBXf9PF+F0dx91m9Us1LJamfDs2Io/Fu5LXNDAxBb1VQbKDcXwlmg6ATFI2osFqbcERr85pg/fU94lEFNLp4irWVH3ce8+GasdyzSU2ZJfyMlyOh+i4WY9/HGLweDazmvaZJBtKLytwO/ScF51bdQcU0Q== Received: from CYZPR14CA0012.namprd14.prod.outlook.com (2603:10b6:930:8f::7) by BY5PR12MB5510.namprd12.prod.outlook.com (2603:10b6:a03:1d2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:52:56 +0000 Received: from CY4PEPF0000E9DB.namprd05.prod.outlook.com (2603:10b6:930:8f:cafe::97) by CYZPR14CA0012.outlook.office365.com (2603:10b6:930:8f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:52:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9DB.mail.protection.outlook.com (10.167.241.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:52:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:52:47 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Wed, 9 Aug 2023 16:52:45 -0700 From: Xueming Li To: Long Wu CC: Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix representor name too long' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:54 +0800 Message-ID: <20230809234930.32424-33-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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: CY4PEPF0000E9DB:EE_|BY5PR12MB5510:EE_ X-MS-Office365-Filtering-Correlation-Id: 04275e81-6697-4f79-8d17-08db9933c123 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bc9XicjmZMcZ/eIFTzBWIrX4Wrzia5z8dNYMBox5kTZr9LXiz0aK1Ko5AKoO5s3NPUb41N7lm7lxJrw4JSfKJKiKYGwmPUJhwQ2kubrwmD0PTSk/eVfhpfPLuzGo+7F8GeaAQgZzQ2b3TssxdfHLco5gkuXquv8wehaVfgys34GN+zHB/wCOpjjYdz4+PN6qUz5WK4y90ywUi/56eA6m1BwZ2JH5pG4W0zW9Yax8V/9hbO5itC/f3gsmE8wzQNwpTiiAfcLw6h0mniqw0W2KHetLDKfJXUC5uv2SOtb+ioDXTJ3OBMkfzt8OYxToffBNgq9rve3h14AAC5T40QV3z4mEyYvoIa7bWyGpGYtZDkQj+N/Ojf2ayG6tj37wbTDa2JALvGNBdR3vqljTlkp+hsWY6jvNkXPWtb4aMzBfubT9bjd8aUBfksOaAwnV390HBncfDHSYui/1WrmtPs8tKpsAFkZ0CbH/VjWByXa+qmRhu9KaIm855jWj4D35NACU3EIZGpMC266Z4rOsqWAv2Aukfp3LNbiJiar49KJ8potu/Am3Y8GrYkEnXU5s4TGy61JqC4yf+TXrxm/0DEXt+11wBIL4LoK2tMmmAAd/piihMmGWDSS/vpEtoePLtghwS1wZ44wNzJtK6n9tU/ITt6yVLEyJcP39HDWd7LIqTaOaLNTA6Uu+aKzqDKXaEi/zEtNl6NxKy2oOqkkDE3gCnk6G633VAsAuGBHZUrObu/1JJd2pcojUki8Dtr1GYKor+SAN3fLSInuizODRZvYeQA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(186006)(451199021)(82310400008)(1800799006)(36840700001)(46966006)(40470700004)(83380400001)(54906003)(47076005)(8676002)(8936002)(426003)(36860700001)(4326008)(6916009)(316002)(41300700001)(40480700001)(55016003)(70206006)(40460700003)(70586007)(16526019)(6286002)(336012)(82740400003)(7696005)(7636003)(356005)(6666004)(966005)(1076003)(26005)(86362001)(53546011)(2616005)(478600001)(5660300002)(36756003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:52:56.4677 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04275e81-6697-4f79-8d17-08db9933c123 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5510 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=715143b51e7b02fc854a26be0c03df26329789b2 Thanks. Xueming Li --- >From 715143b51e7b02fc854a26be0c03df26329789b2 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Thu, 15 Jun 2023 14:51:30 +0800 Subject: [PATCH] net/nfp: fix representor name too long Cc: Xueming Li [ upstream commit 7347341c4815eef11b39ade1e0115d8310ce3b9a ] 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") 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 95e6043a8d..d319aefb08 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -730,8 +730,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 = { @@ -755,10 +756,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, @@ -781,7 +784,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) rte_ether_addr_copy((struct rte_ether_addr *)eth_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 @@ -813,7 +816,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, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.088276900 +0800 +++ 0032-net-nfp-fix-representor-name-too-long.patch 2023-08-09 21:51:18.164352000 +0800 @@ -1 +1 @@ -From 7347341c4815eef11b39ade1e0115d8310ce3b9a Mon Sep 17 00:00:00 2001 +From 715143b51e7b02fc854a26be0c03df26329789b2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7347341c4815eef11b39ade1e0115d8310ce3b9a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 7669ab6dae..5f94d20f1b 100644 +index 95e6043a8d..d319aefb08 100644 @@ -26 +28 @@ -@@ -732,8 +732,9 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -730,8 +730,9 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) @@ -37 +39 @@ -@@ -757,10 +758,12 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -755,10 +756,12 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) @@ -52,3 +54,3 @@ -@@ -782,7 +785,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); +@@ -781,7 +784,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) + rte_ether_addr_copy((struct rte_ether_addr *)eth_port->mac_addr, + &flower_repr.mac_addr); @@ -61 +63 @@ -@@ -814,7 +817,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -813,7 +816,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)