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 C60A742D46 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 BE15D40ED8; Sun, 25 Jun 2023 08:41:53 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 79EC240A7F 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=HTWL1b3VGv/xI1afI5Q7gUC20Hzh9xukBPPXSIBEiVxCs27MI03skQpx6dBD08cBHyoFU7KdHg+V9po7Q7LlX37K6h3g5+afkkXi5dIpwDkXPT3o6wRCaMGcIdz1Se/iTFVE+MvdMdtnjN4t4K7yhlPv7ejZnPLJU8ZIV02rwusG86QNXkgbAJMEmLMGNML792kwxDQ9t+aI3D0HujKnJwd7K0kAxjyi9n2b/nED3/RzbrAfk1A66CiuSdKmyTmJSUN4WNAMTd2nN3vhJUpm12Mnk3S7vuPoE+RpRQX7NCy+dUolLs1VXZcGOWyjcZvIG53ec7acC7PtyTTJM5GkHA== 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=FQwbumKK5eVwfjXY77g5Cy7he/HkXLh70D2SPLNfVO4=; b=iTO5OcOme68sqAkB1MTUmoauaR9eyXGZQm/TMFrHOJskigq7ug24ZH14hGyL5we/76UnZ2kDzSKJBwe/QuT6OlAjXySgLxuCrkf53IRtcJSqQZQJs1MSMbbnMiOJ/Qxf2HoSdKO0EFmbrGWV/4wOgHyBNhQWGn/Q1DmezM1FgK+UiNAhadVnepXLD0kfSPmR6anXUoV1Dj+pElgDLeOeLQfAmYOwgSuRzvvfi0c2ngYBPhSuDa1N7QxnEbZDvfhwEFdo9EydnuGnIYf0ELZJDK5HfWVVAD8bJI1qROCys6QkE//QV48o5n8Mq1K7Qwt6lp1ggz4m+ZxM0GSF7cQETg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=FQwbumKK5eVwfjXY77g5Cy7he/HkXLh70D2SPLNfVO4=; b=YS7GB4wePKK9/CEs3FYbE18bmC5fMziQtktyU9OAneUHjpkp2OG7dm04UJVlV3THjUIKkZBCrTTLtxh+7u/xkDK6aD4hGLu9/E8uSs4OefwrisN8rDdSQgFayhYD8RfCVtt5RigzRjYNf8gGrn7RjHRkW5D4exJ1new7z1BxmPpN7mV61N/ueIcHZKBrhl6p7kgKy7b9GiYmxZGYGLh4NlLB0GKua76InRCLA3ypy8tYAVFZZ/vJzsEp78wHno3ErAbekfbKtQrfZlXVGUQrvM8ZygOdjUqEzHVVtYiAkOVCin6zesb9freftL/Krt9RdITRjkwstnoscPbDJ2O+SQ== Received: from BN9PR03CA0430.namprd03.prod.outlook.com (2603:10b6:408:113::15) by MN0PR12MB6344.namprd12.prod.outlook.com (2603:10b6:208:3d3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:41:50 +0000 Received: from BN8NAM11FT073.eop-nam11.prod.protection.outlook.com (2603:10b6:408:113:cafe::ff) by BN9PR03CA0430.outlook.office365.com (2603:10b6:408:113::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:41:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT073.mail.protection.outlook.com (10.13.177.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 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.67) 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:40 -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:38 -0700 From: Xueming Li To: Long Wu CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix control mempool creation' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:43 +0800 Message-ID: <20230625063544.11183-66-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: BN8NAM11FT073:EE_|MN0PR12MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: c29c5c88-27f2-43b0-271f-08db754741ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zIBeM9lgdnpaw7p9qGgFtxzSXFU2BXxpLTE+q8Hm30FqR6CL7KopoEfPhLiWYIlXHhN5Tz7AERTHBADwOKrrJ+BgQJq0x4kyPaZW2aBmB1U/jCXn7c9PLqSG4TU0+OgGFeUw5DNA9lJb7OJ8keQihpZm33BIYn9Kcm+KbqXrp0PP2Ll8Gr1c28yEEQQcAGcL06RXnwtRqZW4UgDSF6E/peBEOE48KkxyiLZm3BOFZoPEf6tIrkjvk2M4y2U9VsXbMKBjk9C/FQUDoyf+OnBReL5ebyZcNM5yNFDzpU/2Vp0VQxRHgl3liEN7lY5lUUEQGTNV+t1P6rbVQmk+T8Nkkul8Scy5sQoKt3isNwapLWICim3979Ex5E8joBVUy14kHNT2RgHGquqva4fkkOCahiwtpXcB3VZsz0LwaV4Fx2FCFiZNIrucrgyXMl04To+N2mlcDeEmoLZzIVoN5CkhH9nhnZ/4Jj1Xd8FKe1aa196NllEAOmpZwwj0lTaaPjso15zZaf4eP6t2os4iB+7sR1j03Ds4diuh5j3WVGfVSnlxuzs417PcgsB3V4fFnQxpLKLPqBfDfwrNqgqvQoCyOQcFLyAx1Rveyvq2QLgjfpfkafXkLZnD4oOJMZsdb0AdREit4fOHGpHHAq7zqNh0utAdYaJzz9Dv+iNnWdzM+GAFYbzIHqd4NWCvMt2ba8buvRtPD5vVhPMSScc/bAHl01SF4eLNG1YH+ZfitpvL/Nnfr78UJRbOecdoo+cnWEeokkPxFPA0HM0Z6HvJm7za4w== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(136003)(396003)(451199021)(36840700001)(40470700004)(46966006)(82310400005)(2906002)(186003)(26005)(1076003)(426003)(66574015)(47076005)(2616005)(336012)(7636003)(53546011)(356005)(6286002)(16526019)(40480700001)(36860700001)(5660300002)(41300700001)(40460700003)(83380400001)(70206006)(70586007)(8936002)(36756003)(8676002)(55016003)(82740400003)(6666004)(54906003)(7696005)(966005)(86362001)(4326008)(478600001)(6916009)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:50.5955 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c29c5c88-27f2-43b0-271f-08db754741ac 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT073.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6344 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=de78bd45d68934e05d448138902adaeeab525046 Thanks. Xueming Li --- >From de78bd45d68934e05d448138902adaeeab525046 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Fri, 9 Jun 2023 14:00:58 +0800 Subject: [PATCH] net/nfp: fix control mempool creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit d694d4e1f20353a020a5fd04ea6a1dd8a84d29eb ] 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 initialization succeed. Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC") 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 9c237bdb72..0661c38f08 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -698,6 +698,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; @@ -731,7 +732,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"); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.259970000 +0800 +++ 0065-net-nfp-fix-control-mempool-creation.patch 2023-06-25 14:31:58.425773900 +0800 @@ -1 +1 @@ -From d694d4e1f20353a020a5fd04ea6a1dd8a84d29eb Mon Sep 17 00:00:00 2001 +From de78bd45d68934e05d448138902adaeeab525046 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit d694d4e1f20353a020a5fd04ea6a1dd8a84d29eb ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 8e1bc22747..53ee936f4c 100644 +index 9c237bdb72..0661c38f08 100644 @@ -31 +33 @@ -@@ -421,6 +421,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) +@@ -698,6 +698,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) @@ -39 +41 @@ -@@ -454,7 +455,10 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) +@@ -731,7 +732,10 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw)