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 E729345610 for ; Fri, 12 Jul 2024 12:52:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFDF442EEB; Fri, 12 Jul 2024 12:52:13 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2078.outbound.protection.outlook.com [40.107.236.78]) by mails.dpdk.org (Postfix) with ESMTP id F1F2B40261 for ; Fri, 12 Jul 2024 12:52:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XiomAJtd/RradPFA4bHu7e72Z/TRqje7zVh4qejx55OKTEk3aVdeZnHGsi1U2ITcSn4UrUkPY8kSxYDYC4iXFjb2+X4Rp9BCxivS9ZmUB+RCRjXsEXB+k128F+NM3VmCw1tM6O3lxwrb0fFa+z2MQV/XQHBtPeQsWczn6toCrbqU6Qr1ULQQ/crEU+SNbhTfwZ8iuqN6RYqG19eEp4+oGAVGB9yQzgJQi4odt82RLSN+7Fb0j+vXak9/hnU7gTkKECYmyUg7cJeJ8pOwl6JSvft6Tt7XjZrmn9CaAN8JHEAhs0n/HOOWH+efC8IKhW2TxrffTN1JB23dkBfBnNm4bw== 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=+Kn6WY/JojYQMaYIGX7UPOGWoosDrTNZKVmZqUGmwYI=; b=SUiBNKzbUHPwawTXgr44eGFU2J8cXu1/Zsl798LW01ToO9yUA43gPOA6Xgyss3kqzqTpFBtM6ZJW3JP7Ri9XdYspr99FouGTgnZRn9exMVxajpUDpq4L3yTN94m83B1Rtd3SeEzQO93+MoU/tlcsUxUWait3kOW+T1jMRXM29f/SZilf+mFA60pPiwzHhJxa9lozTSHR6xJfFdNa0BGbjvQ0wpPAp2ed935vVZLRFtzH8SzJm9snVRzR4F2UwygicSZpwWlT6pX4tkGdvDCiyWdNCsafss0/UAqlWwkEIdpqwhESFpBwitZoO9RclC15WsViwS+rHSURzjftO8lPgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=+Kn6WY/JojYQMaYIGX7UPOGWoosDrTNZKVmZqUGmwYI=; b=sSunqxINAKX5XDlesaxZc6XNydjqxITg57JYIPQUY1NfA7JnIFKZQCI95teot5e+s88S8jQUUR7ap5KaExGy//vuRXJAzsRGjgHkwX7Lw3auv9CysiuZL0WVsLLxrZuJZisDuLXfqHvrrVD62pjlT6vun8oKBBUkV2w2Ojf83/l7th65Rse9YUvi5PD6XzwtGe0SIQrjHmFCCDJnF0oTjtMmc2jZ1F59iSwUyww/7kso5UYpgUsairyYLCiw9PD2IDx3lWWYblN/Ro8ce2Eb40VFee7BdcmMT1P5CUOkG1fMMVvlXsXNycIi3D55C/FezciIA+JLG5PIxpAzpSUUVg== Received: from BN0PR02CA0031.namprd02.prod.outlook.com (2603:10b6:408:e5::6) by LV3PR12MB9216.namprd12.prod.outlook.com (2603:10b6:408:1a5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24; Fri, 12 Jul 2024 10:52:08 +0000 Received: from BN2PEPF000055E1.namprd21.prod.outlook.com (2603:10b6:408:e5:cafe::59) by BN0PR02CA0031.outlook.office365.com (2603:10b6:408:e5::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:52:07 +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 BN2PEPF000055E1.mail.protection.outlook.com (10.167.245.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:52:07 +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.1544.4; Fri, 12 Jul 2024 03:51:53 -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; Fri, 12 Jul 2024 03:51:51 -0700 From: Xueming Li To: Kaiwen Deng CC: Hongbo Li , dpdk stable Subject: patch 'net/iavf: fix VF reset when using DCF' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:46 +0800 Message-ID: <20240712104528.308638-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055E1:EE_|LV3PR12MB9216:EE_ X-MS-Office365-Filtering-Correlation-Id: cc0f40b0-88a6-469b-7cad-08dca260acc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?A0559GJu+rs6tId36RiDZ/tiIuT8uk+xQnItF/Fxzg9kU5CkK3xN0OQ5Lr+2?= =?us-ascii?Q?Gsj97aeyg9HfKdhCD+UHHwRd7bYWisIO3bg69N3lhQsXw8kWZSCskLpklU34?= =?us-ascii?Q?pan4NuaExI7edCNYnyCJPdUcFFQ5Oc8JGecNAxs4tLGFpTYrx6KROw6TvKsY?= =?us-ascii?Q?ATRu1tgonbyw6J/TjWqsffHILaLJF7+ojYSrTL9RvZ5a03uFMR6XbPxF1FWk?= =?us-ascii?Q?MMd4Ao0AINibVbBdHWMU2gk0CFjEKBJ5TNP+S+36OWLy04rz2n/DVSlT8kNB?= =?us-ascii?Q?2eYKeWEd29qN42DqG41aQs0hc0GF0fLDfH8gG0kudMxE3gnG34/b2rNcfGW3?= =?us-ascii?Q?2vt7sWX0B6SeLOBgu8NCZ+Z8w/6jblcWP9mGBeggb7uRaqop8vHKreQnptm0?= =?us-ascii?Q?Sd7BTozNh+3YNX5uOG1oevZ/DnUyjWPEWrwzy5SHn8qtM5eiiSnW+LTU2mma?= =?us-ascii?Q?dbhf0LFhqwyId2FZGtOLTN9JGuj8w4Bz3nqDBM/0dWIA4dbr3ze2xvHLs0b4?= =?us-ascii?Q?NUsQ+Mt0MdgyC3iAmYaqaxv89U9uJ/1VA8wjpRgxgEHK4PicHjC2tiBOh3Zq?= =?us-ascii?Q?0mLJPe7S22QPktzROtfp74rVCw9iOSuEWGwaHjDrA3bSPsTQWBR6H578T8Q0?= =?us-ascii?Q?1lkf+qxZMjIi06/BpdLRZbyOZvb1VcbprMk21Q3jfINHcajujwVjkagGgc05?= =?us-ascii?Q?2Tnh4c3vDqgj/9ssOOFueWHdu59wib5xWDM9TwsW9J4Ku5AmOCJ60J4SZ4WL?= =?us-ascii?Q?R3MmzurzTLG4LkhomIWrbJjrc3RugM/YYRCT5ZQ2Z/nb/YyOsZZR505rImrt?= =?us-ascii?Q?/lqAyX7q/xlG8u15ODeVA5zBNqBKnSK33FlvQPIjGQnvSZOi1if7VLKyngpf?= =?us-ascii?Q?052LxhofHSoCYFL0UGqhtbNLKoXv4PybCPZJ1lG2gGVM3a09SHrxqtEKPOZ6?= =?us-ascii?Q?qNIRe4KeDSlI41oSOSvsT4/2jT8nNHjvmni/Yb3qXTwsXDomixHOxrSV/Gu2?= =?us-ascii?Q?4D5/CWj5LIvml/7RtT0v6M/+XRoh5Al28CdjBCLzAX9zcVgM+Xa5Tekv+/Wa?= =?us-ascii?Q?o2ObQ7bmUGYu8m/k1U64plLaceLSx6xwPXktboClB6/y6LhLuOIjoTZZLhD6?= =?us-ascii?Q?2AwyKlNLdCHHXNhZjoYFiQ/yygMdHu4TEC7ZJrpaH/7rLyS2e9JW8eKUMANW?= =?us-ascii?Q?KQIS1OoulrkHKE4ZaMZJnUoLEXIfo4Y5wt+OdVSEly9W6/uMlKKpc0dKiJn6?= =?us-ascii?Q?bZT+pAJwN9db7Nr9mTvB6Yqn5h+L6x3QVjzvsdn90lnywfpaMrcr276q0O2l?= =?us-ascii?Q?tyFFE6sWf1YiGQlPYlpfrs28iQMsiClG8cGORDg7OSsHYD5MiYtoR4McD0/B?= =?us-ascii?Q?QJZXSkNeEM6Gaiin94VYPW7JStFGuZ9/FfxWobBk/YbI3JaUxQ=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:07.6854 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc0f40b0-88a6-469b-7cad-08dca260acc4 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: BN2PEPF000055E1.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9216 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 07/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=fc1912baa712b96bfb0d8cffb722b2d405852632 Thanks. Xueming Li --- >From fc1912baa712b96bfb0d8cffb722b2d405852632 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Thu, 14 Mar 2024 09:00:49 +0800 Subject: [PATCH] net/iavf: fix VF reset when using DCF Cc: Xueming Li [ upstream commit 0f9ec0cbd2a96c2bde3489fbc8f4e254f639905c ] On the latest ice kernel driver, renegotiating VIRTCHNL_OP_GET_VF_RESOURCES will fail when using DCF (Device Config Function) if a hardware reset is not done. Fix this by sending VIRTCHNL_OP_RESET_VF to PF before DPDK resets VF. Fixes: e74e1bb6280d ("net/iavf: enable port reset") Fixes: 7a93cd3575eb ("net/iavf: add VF reset check") Signed-off-by: Kaiwen Deng Tested-by: Hongbo Li --- .mailmap | 1 + drivers/net/iavf/iavf_ethdev.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.mailmap b/.mailmap index b0eda8e8af..6ac0fa9103 100644 --- a/.mailmap +++ b/.mailmap @@ -526,6 +526,7 @@ Hiroki Shirokura Hiroshi Shimamoto Hiroyuki Mikita Holly Nichols +Hongbo Li Hongbo Zheng Hongjun Ni Hongzhi Guo diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 2d85b947f6..54bff05675 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -2954,6 +2954,16 @@ iavf_dev_reset(struct rte_eth_dev *dev) struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + + if (!vf->in_reset_recovery) { + ret = iavf_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF, + IAVF_SUCCESS, NULL, 0, NULL); + if (ret) { + PMD_DRV_LOG(ERR, "fail to send cmd VIRTCHNL_OP_RESET_VF"); + return ret; + } + } /* * Check whether the VF reset has been done and inform application, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.904413691 +0800 +++ 0060-net-iavf-fix-VF-reset-when-using-DCF.patch 2024-07-12 18:40:14.136594223 +0800 @@ -1 +1 @@ -From 0f9ec0cbd2a96c2bde3489fbc8f4e254f639905c Mon Sep 17 00:00:00 2001 +From fc1912baa712b96bfb0d8cffb722b2d405852632 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0f9ec0cbd2a96c2bde3489fbc8f4e254f639905c ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index ccd50c7729..075ea40f17 100644 +index b0eda8e8af..6ac0fa9103 100644 @@ -27 +29 @@ -@@ -533,6 +533,7 @@ Hiroki Shirokura +@@ -526,6 +526,7 @@ Hiroki Shirokura @@ -36 +38 @@ -index bbf915097e..44276dcf38 100644 +index 2d85b947f6..54bff05675 100644 @@ -39 +41 @@ -@@ -3041,6 +3041,16 @@ iavf_dev_reset(struct rte_eth_dev *dev) +@@ -2954,6 +2954,16 @@ iavf_dev_reset(struct rte_eth_dev *dev)