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 F22D342D46 for ; Sun, 25 Jun 2023 08:41:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E894A42D2F; Sun, 25 Jun 2023 08:41:53 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2087.outbound.protection.outlook.com [40.107.223.87]) by mails.dpdk.org (Postfix) with ESMTP id EA7EB40A7F for ; Sun, 25 Jun 2023 08:41:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbJ7f1IhLXn9g3nF3AL1dn4Wv9Zv3sfQ89H4ib6LvTG5W8WtPGEGFFiX6hW0XOULzKV7AylN1Uhl5qBsVPOK8FAgo9PYySpbMuF9ZPOkEjTW2gZvDN2G1eklSu/eFXztiUnSymyycaXrKcLdvp1Dqg3Ck/csjF0yt00vN3fxWl/BuK5+9EvKTdxBg/UTvzjbJgHNfoqRokifUomEmTpKiMX2a1yJc2RqLCywyYC4qdJOvxvAYoENsfV4wDObM5LMZ+SGwAq6VAJMCm+pGpG339zRX0aKMzHPuUlNF6UnOoMBNwbU7Xc6EcYhW9WmOrh2zoEDNLAW6LhWw2DuxyYHmg== 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=r8vqXvNZ6DQtVSh050DQDHVHQGBAc9sEswcM3Lj05WM=; b=CPTBPFp/jaD/DBtRA1q5RJS5ma0TJzSkFGWh7HjBH2Zk00GfhtIg+luc+IUGGxvLFOCUry42N/pRc5R9a7H3cydU2wH5sUhYB+VP1csMKRvN6vQfqM/hwYIqA2t6Ip+fObsjb9/rtCj64kCXYIbeU28JjyClioJBdmo58gbzAHIRL1Zfbb/Nnsy4LnHuCBvonZ1SU3ggS4knoOJVCFU4nPTCjdi4Q5JX5JKBl7MAqOfSxGUMHHi+/U95G4fQ5BDBKYY18IAgmNh7rLhJRWn5JmoLCOBkEd/hIRc66Ts6y943K/+VT1oRXywFA2Mt2BWm0hLkK7qpatCxhpj6LKvhOg== 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=r8vqXvNZ6DQtVSh050DQDHVHQGBAc9sEswcM3Lj05WM=; b=E4a2qkNaWrHwgSoP2n1CIhk+Y39L5QZ3gQY+Iuu/4fBxIU8OcOJDic9yxSwqriDshF7uyVqoAAPHsM6qh135vdJA7xiHItjfc8OzqaMbZDB+byt5BO4EoCnlWKrrPQMuoXqQ1VzxVDZ3CZLqfjE8iowX7cbCuGPTGNFwzOlxA4t1QbYKh/Ub4yiHTsOtPN8AyuG0Lq3ST5f49tUa/HPOOMZSgxkXQkcaPj26JqC46zarDkhB90iymmZ87ZqOhlXryqWzF5PhksuSZ6n5BvKWkFD6lEtN/N3nZ/TpeHmzFVoG892j8C32snE7PI+mCXf9tkY6IKiBgPVcpCYOYkNopw== Received: from MW4PR02CA0025.namprd02.prod.outlook.com (2603:10b6:303:16d::11) by DM4PR12MB6663.namprd12.prod.outlook.com (2603:10b6:8:bb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:41:51 +0000 Received: from CO1NAM11FT079.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::b1) by MW4PR02CA0025.outlook.office365.com (2603:10b6:303:16d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:41:51 +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 CO1NAM11FT079.mail.protection.outlook.com (10.13.175.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.44 via Frontend Transport; Sun, 25 Jun 2023 06:41:50 +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; Sat, 24 Jun 2023 23:41:42 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:41:40 -0700 From: Xueming Li To: Long Wu CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix representor creation' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:44 +0800 Message-ID: <20230625063544.11183-67-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] 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: CO1NAM11FT079:EE_|DM4PR12MB6663:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c65bb7b-8f26-454f-dcf4-08db754741a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lJrDIFjtt5DklOZNGpKVCPeE2dYci9+mQE8niKXJQcGeMq4OKzLOdbmVUtYivt1yg+R2Ut2Onx6HrgGfwSyhDtSC4f5i6il0oFnXP21rgql+7F6xFp3J68YW0cNsV5ekmxhatRZTHny8b3RAMO5CB72IXupDa4Rzc/FGAYG3IcZSQjagdsxzP5I6B0flVfVwuRnVQ1ABJ77QdAXQBkvE2riumGiSlZgQOGskcAdL5soFfcn802c22ArqcFSx+D4PKRo/UrY2cFkVfvNRjXuzAnN6fs2VPOIa3K+XpFr0THLtfjB60bqztd58CTPhSjwGKwAjLXsHOc3rusDcN4FnGblay+lZlZE9sGeI/yfP3Lorv8pCvs9T0jt0v775nBwruoUHulQ345GuaSCCxeaVn3u2PZSDL0zlJFfMJ7dWebUd9hyX06ITxSLR93IA4/MbXxySFaueKWtBkJocUfxYd9wvOsRZ87Z12veoffo7mKK3AXjJRgyVhFMphXieVBUYyYS9oXNDssnmQAj+vu44exT7PPZ/wQaMBJu3zFQV24OjUEG9LEFXsnv1ezDPGcMLe6rgTUiOjvEL85/nhrzZ100e9BJMp2FZCTbpZ1Ls0MmpnSNCe1+JiYD4OpfF2hy1hrIQfXffPSv4XiHPNsqNUJ7mn7H3KIN0iXQaH+rHH4uT35Uuc6bla/uX4WS7TNA4ljYy4F6B3cfKmV5f1ugLr7yAzgJywysU7xz1u5zdDU0IwlEf+umx1bu3k/IKJaLvI6FJ8uFya2wxk5nLlyDGNQ== 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)(376002)(39860400002)(396003)(136003)(451199021)(46966006)(40470700004)(36840700001)(36860700001)(82310400005)(66574015)(47076005)(966005)(478600001)(7696005)(2616005)(54906003)(83380400001)(336012)(426003)(26005)(53546011)(1076003)(6286002)(186003)(16526019)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(70586007)(82740400003)(7636003)(40480700001)(316002)(55016003)(8936002)(8676002)(41300700001)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:50.6611 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c65bb7b-8f26-454f-dcf4-08db754741a7 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: CO1NAM11FT079.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6663 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 06/27/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=18493825d11593dcb0550f96074920b353954c38 Thanks. Xueming Li --- >From 18493825d11593dcb0550f96074920b353954c38 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Fri, 9 Jun 2023 14:00:59 +0800 Subject: [PATCH] net/nfp: fix representor creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 2003cb447aa5f3aa29eea853c1c1ac93949be659 ] 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 initialization succeed. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") 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 c77495f348..95e6043a8d 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -730,6 +730,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; @@ -753,7 +754,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, @@ -775,7 +780,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((struct rte_ether_addr *)eth_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 @@ -806,7 +812,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, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.283685200 +0800 +++ 0066-net-nfp-fix-representor-creation.patch 2023-06-25 14:31:58.425773900 +0800 @@ -1 +1 @@ -From 2003cb447aa5f3aa29eea853c1c1ac93949be659 Mon Sep 17 00:00:00 2001 +From 18493825d11593dcb0550f96074920b353954c38 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 2003cb447aa5f3aa29eea853c1c1ac93949be659 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 3225a4b84a..5118c9c57c 100644 +index c77495f348..95e6043a8d 100644 @@ -31 +33 @@ -@@ -723,6 +723,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -730,6 +730,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) @@ -39 +41 @@ -@@ -746,7 +747,11 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -753,7 +754,11 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) @@ -52,2 +54 @@ -@@ -767,7 +772,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) - +@@ -775,7 +780,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) @@ -55 +56,2 @@ - rte_ether_addr_copy(ð_port->mac_addr, &flower_repr.mac_addr); + rte_ether_addr_copy((struct rte_ether_addr *)eth_port->mac_addr, + &flower_repr.mac_addr); @@ -62 +64 @@ -@@ -798,7 +804,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) +@@ -806,7 +812,8 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)