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 C6DE1457A2 for ; Mon, 12 Aug 2024 14:59:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB84540A73; Mon, 12 Aug 2024 14:59:44 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2060.outbound.protection.outlook.com [40.107.92.60]) by mails.dpdk.org (Postfix) with ESMTP id AFD9040A71 for ; Mon, 12 Aug 2024 14:59:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c/IIubQNCq/GAAeuGC4cs+ZIoFImBTl9IOCUW4nSkj94odUzbQkdZCbO0Obp/NgqGR6+lBQd6Pqu0X1cMxfIXbNiDMD78RddywXPzCCut686c3ZOH9Oz8/rCBSBJvat/dezddjUfBxjC391Ux5ioCQygq2Swe2Qd//tbTFQUdz1tlAlmKPJUW7hGxAnIZKhACIFDEGNZe8mUC4CU+wFG1k/2YR4GO5WnAIRvDVOzCo6P7cvx3Ntldes1vMeXOyPgeSCWtVNSreetKeR+xkI5ncfsK9PQ02foK5TvAi21s6fhPLdEt0ocHD7D45YsQNVNXEwZaxHBN6MhEmANcDcE8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1K6eBReSdIaCwQmSM87oPuzi0WLVed6cdt4XaHJhT1k=; b=HFHnJ7ZsEnUvFzPR3Eq1t1HyMWjm4j9KtLbodXW3ZEGSNRDoOleRcEPimauSu+gx4tUEiJ7QUmNeY1KS5W3q/gaoLyYx3dxJbE77kc5ByBPrX+yp1cZwpWcqd2yIYbclnzkM8TRSZIyphYSp8Y/fjX51OP0gO3FPiVsW8/veuIrgiuC0ERWL613ODORxh2HrAQSNNllTLT5WahK2PYtfF2FIKyT5KZbjtX66rrtX1iU9tb5m4OxpCJtvX1Q3luYjmnErYRWjArrz4FEh2wJGJKrU0wOnXLDEJUO8glEvUEQOq+LwBy8R6yhjpkXLXBbKQ7tWv/+Myd1EGsNfOVCLWA== 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 (0) 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=1K6eBReSdIaCwQmSM87oPuzi0WLVed6cdt4XaHJhT1k=; b=uUNSMUmxcG5dTWvhRiZ0eU7dgWnc+8u9MiVLuFRrWE3A6rnIuLK/CZeUAfCXonLdDh7UmMRE3lUMesR/CGpPYc9l+fHQgT30N6enPRRQd8y/iWKbI9GMj3wEIOtCYmI7S8wXBtycbYlzMhK6njsuVyZCbrdCMYP/zbzFCo9rDs/nOU6f+tcGqGnp9ZfU7xB/SQuvhpdFhJ71sv48Rz8Uzj4FONcG15+pSiId7r6a3K0JqPZCHQEFgItlQA96aGyPECybbNU1TP7wXf50zC5QE+Si6cU/hkwNZXuMNZwmm11Y0VfZzvjmb+uxD7SUVeTTUpUW+f1Rv4VlfCq2I1ddyg== Received: from BL0PR02CA0048.namprd02.prod.outlook.com (2603:10b6:207:3d::25) by BL3PR12MB9050.namprd12.prod.outlook.com (2603:10b6:208:3b9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:59:38 +0000 Received: from BL02EPF0001A0FE.namprd03.prod.outlook.com (2603:10b6:207:3d:cafe::f) by BL0PR02CA0048.outlook.office365.com (2603:10b6:207:3d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:38 +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 BL02EPF0001A0FE.mail.protection.outlook.com (10.167.242.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:38 +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.1544.4; Mon, 12 Aug 2024 05:59:24 -0700 Received: from nvidia.com (10.126.231.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.1544.4; Mon, 12 Aug 2024 05:59:22 -0700 From: Xueming Li To: Peng Zhang CC: , Chaoyong He , Long Wu , dpdk stable Subject: patch 'net/nfp: disable ctrl VNIC queues on close' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:28 +0800 Message-ID: <20240812125035.389667-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FE:EE_|BL3PR12MB9050:EE_ X-MS-Office365-Filtering-Correlation-Id: 774b16a3-801b-490b-b6b0-08dcbace9fc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dVYcmKMGZ/SMgGmXry8syvJGjqhzfWgbUSsgnyOfUopqPG7nqqHabLGE7nOH?= =?us-ascii?Q?t/tk433AbscsjSjjWKotag4ZEzoSTXzBbj/BJgmTOvuNFqCfCPshxqCmL8gk?= =?us-ascii?Q?8DQzbCOz8P6UmFib/OG3+bK9v4LNJwh5j6rngT522lnWlQ21tSbDGNukHmeB?= =?us-ascii?Q?o/0gWOIsedwjsytdzXkji1KtaDpEi9eadDUHSjnwcWWv0odywjkc3rW74lGr?= =?us-ascii?Q?po1PfYMloqngc35rXsGRWSNfsSbKyfJqQgFhkCXTh5dupTgDMctrpaO3giOX?= =?us-ascii?Q?KfE+ibiPsqBZZEBxs3PckJAqKQiIcEG0TE3UBG10nfepSQA4xsVLibt9qQnz?= =?us-ascii?Q?4Q9zShVwadGwNrAYDUjiub8BZLUoE9WMpRGRicQlSzl7FqgyEyAM6QIfUJ7O?= =?us-ascii?Q?pCL3WR0g19NU0VlWKq4dMVqp3cvFSeHG+W+A7WSlbyDEBgB7/+coS1xlv/D4?= =?us-ascii?Q?yqSywZSPw0TXWoLE7e8xrhWFwMeFx1hPSCUcEMNRE7HBxxl35cYLfvs9NBty?= =?us-ascii?Q?vb6IEaqe2mvWsAiQ+boEK3huxNBJz9qqoNIY62881Up8DGw020oTgV7oEYls?= =?us-ascii?Q?nkLuT8AnCnNpcBM+Mn8jxoZUMUSqDbJ33TJv654Fh9v389COuK/QY5ZBd8cx?= =?us-ascii?Q?tHndEsmEzxSm9mndJ4jmhI8lGCoK9c/Jb8J3uOEkfMCvzst9kzZCxvoVxoRa?= =?us-ascii?Q?D5VPuIicXJE6eB/dQSbSFSXY+IG7/v393tImX+s6QJXWK7a9hs2amqPa+EJe?= =?us-ascii?Q?BIXISk603S6BS0t4mIn5gpGKtFgAzHvRVZLgvj8J8vTal14wG7soTGZ6j6RP?= =?us-ascii?Q?8VDAUJZdRjzOd4fqI6a9Vssl44NEUV1f28hsdhUJi19cqbFUcunkzbApF+Yv?= =?us-ascii?Q?sTHr2kiPx628fLUmwjCJjSrodhj4HxmFvNklTPZmzi2NiwSBTo2vsZW7YgWN?= =?us-ascii?Q?OPG99HM3wAujrmpFlO8AtTvJI5wykUxcsDWQnvlQSIMUCJM/yK9VuYuGFdWV?= =?us-ascii?Q?u4lYj7/QVlTi7iO+5x4WQxCRUpprPAoAdVJkSxsCW/uV0GHvvqtRUIoxjZ9G?= =?us-ascii?Q?3Zg/bfR9uMGv8Cl1cAKCuSAWqgxZQD2UCXDSdDSaBM0pH9N8LyDvN5y1C3+K?= =?us-ascii?Q?gqF7OvAys7L0gz3z5bwpabncprVpYPU0rq2lum9Z9SyZS6/H3O4D9w+ILYw9?= =?us-ascii?Q?BROwaIONoc6byM2IqsQm+MXtATJ1HhL8d4ujJz+kvVSKJbwQtrloiZ8NiVIA?= =?us-ascii?Q?nmVCBSD0ExZ3gA8PD19fCifSrfLJ9jkOvmUF4bidas3K4MCA0hb3v0GW6Rnw?= =?us-ascii?Q?TtT8ZxXyZhAu4UZs6tvDamTEZYE+4eOWDfFxxBrKh/gpA4blL8JJr3dPUiWL?= =?us-ascii?Q?padgJbJNkEyK7P0qV5eK7qsoLZ4bp0r+s9pOT5nk2wnsX0Q/creMdy1X2Wy1?= =?us-ascii?Q?s2/2WUVKXcEA1tfMsZXqKXCDlROO7K0T?= 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:(13230040)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:38.4078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 774b16a3-801b-490b-b6b0-08dcbace9fc4 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: BL02EPF0001A0FE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB9050 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 23.11.2 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/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d0d759188e29b63fefd861e04cc14ba254e6e4d2 Thanks. Xueming Li --- >From d0d759188e29b63fefd861e04cc14ba254e6e4d2 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Wed, 19 Jun 2024 17:58:09 +0800 Subject: [PATCH] net/nfp: disable ctrl VNIC queues on close Cc: Xueming Li [ upstream commit 23a04fe2b8b7775aaa694bb1253c9072b74210fc ] The logic forgot to disable the ctrl VNIC queues when representor port close, and this will cause DPDK application restart fail if not force reload the flower firmware. Fix this by adding the missing logic to disable the ctrl VNIC queues. Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/flower/nfp_flower.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index ecf7a1e576..9ecd5f49c7 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -511,6 +511,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw) pci_name = strchr(app_fw_flower->pf_hw->pf_dev->pci_dev->name, ':') + 1; + nfp_net_disable_queues(eth_dev); + snprintf(ctrl_txring_name, sizeof(ctrl_txring_name), "%s_cttx_ring", pci_name); for (i = 0; i < hw->max_tx_queues; i++) { txq = eth_dev->data->tx_queues[i]; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.477753764 +0800 +++ 0091-net-nfp-disable-ctrl-VNIC-queues-on-close.patch 2024-08-12 20:44:02.355069346 +0800 @@ -1 +1 @@ -From 23a04fe2b8b7775aaa694bb1253c9072b74210fc Mon Sep 17 00:00:00 2001 +From d0d759188e29b63fefd861e04cc14ba254e6e4d2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 23a04fe2b8b7775aaa694bb1253c9072b74210fc ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 0edebd574a..5caaf9d745 100644 +index ecf7a1e576..9ecd5f49c7 100644 @@ -27 +29 @@ -@@ -533,6 +533,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, +@@ -511,6 +511,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw) @@ -29 +31 @@ - pci_name = strchr(hw_priv->pf_dev->pci_dev->name, ':') + 1; + pci_name = strchr(app_fw_flower->pf_hw->pf_dev->pci_dev->name, ':') + 1;