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 61F44433D8 for ; Mon, 11 Dec 2023 11:15:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C7EC427D7; Mon, 11 Dec 2023 11:15:15 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id E560740E0F for ; Mon, 11 Dec 2023 11:15:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C32dUNU2KiDr96iR+jDw0kJoRhdswokHfaD9CEa5s0bOuEQITIK2IC6Hh9d7w7QkDQim7TH2RuYFVZB0piT8lLVns58f4wxJMLkHX32z7Aajb3WwvYzXbG3fhcSkSZ9OkkhbnkByLfmb1Of2VQJB9TjWbT8IcvrDy3tjqidrzdX0z4Ww3SvlTKQUbcb/fTSi+GpXA+1XQBCVabW8SdwpyAn+HATOdiZu/wSLijWNZB1J3b6AW8ASa8tDzbUxlFYr6fzZQkhHoXrxBHaULpS6lqCoI+fHu1ob04LHMOY6ccvtWGJEEGJTEK1VTvWRccLwkVTiiClsRkkzU7E4LepZtA== 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=VmCsduRN9EPgxI+qvzZOt3/TWVIoOS8bH3zvOr3jmZk=; b=UyuZLHKWg5fX4yd29JzP7pZyc2YSGy+/RjZBvdilNu11nGNl+wws8VjT0+wZDcVl24ODSK+Ws1h4MvHfPZVi8b6sj0GNCqJKpZ8GwHuyOv3jK1QBep5E+5Baad9YqIWyTIkMcSFPLbfxRA/IlPeeiMhKTKGkr25zvu7Ayaw86yxQeEMrLfUqpeVCJB9lGAUxs4IsvNyAnjTsPxBwwQRYUwU/t6ErN/7mIlSrUTKs1LNnsT2oRWtUdMMzwgvPESBeVb5a+5/pNag1SYAvKNULAifZ78q/f9ERUxxebN3ECOgbJ3DFOasVSolyRtWB3E7O2Q9icsaJYYMbW+BI4QF2hQ== 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 (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=VmCsduRN9EPgxI+qvzZOt3/TWVIoOS8bH3zvOr3jmZk=; b=syYw6HBnF4bhP98HPeiUGail80PJHklJOXXgIBpo6q+3QkKhmGH7uq7eAM2MAsQe0cfsJaT9DxANU0KEUoG+lgJnMzrTX4NKzUUZuUuJCU5FWdCCgJxoAP/RXKwzW8i0livybPGr7eZglX6S4FStW1RRJupT9D9GXRryoaKTuHu6OyJigWF9FivIcttcXjKXmSLe8FgIX/hFhitIZV12mpSmjnd+v0+VUfgFQHWHO8iD890oYu4RXDl4G8l1/ShE7Kdb6LPRgjaGIY5aSiNbT3catknCcHaDpld+S4mXF2z+AxfNGnQlv82ygp1vokLTS5fwCsUE65NEQ8zFWugMug== Received: from DS7PR07CA0023.namprd07.prod.outlook.com (2603:10b6:5:3af::28) by PH7PR12MB8106.namprd12.prod.outlook.com (2603:10b6:510:2ba::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:15:10 +0000 Received: from DS3PEPF000099DF.namprd04.prod.outlook.com (2603:10b6:5:3af:cafe::a8) by DS7PR07CA0023.outlook.office365.com (2603:10b6:5:3af::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:15:10 +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 DS3PEPF000099DF.mail.protection.outlook.com (10.167.17.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:15:09 +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.41; Mon, 11 Dec 2023 02:14:55 -0800 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.986.41; Mon, 11 Dec 2023 02:14:53 -0800 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix reconfigure logic in VF initialization' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:52 +0800 Message-ID: <20231211101226.2122-28-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: DS3PEPF000099DF:EE_|PH7PR12MB8106:EE_ X-MS-Office365-Filtering-Correlation-Id: 4091f16c-d8e6-42d1-80b4-08dbfa320e6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AUiRWKRbCFv5wpu0aX+zXTHiiP5f3w9vkGuhOzhfZ5AMxaAoRElgAwIXiwLssDY7MUAFPKtzE/YSOej3Cy1hl7Z+uJm97IPQVkgF0PWw8/xHLJlEXk5TDsbJ3bYL/gaaFwEctjRe/QkVi1J0F5t1rbJl5rsn9tpzNe71ITVMQUivKkyWNQk/w+Vw4sX2hgZarMJ1cF3ObhJ/QMqZxoRcOtcB1M25DkUN/kgRxtCCOGA04ln1AFWw1Jb7tkBt3uS3rY0Bs5RyqfvK2zgI0Ma/9gSYSRMrmzxkpLiwIfKficRKU5uQ23NXSBA7wZ+dsSgj4E1MrjY0LQUpUQoJBHpsyMApk38MAlZuP9Co3/SC6PbbPshC5fNlwZvY2C7VWiUzzIwDjfgb9Y00RcgHQJwTHVT0x0HwB5TZjdFTQBQPDl1k9J3TI8br2Wi/XmSzoUikKZyR2lmjqFld0hwFzzTL7Sd3qZDlKrwsZSYDgVa7ku6uYJV+l+rVsiYkREElTKwwdu5MDWhujaRwelzR0k4KPmvLLeHiGJiKX/fDx8dvL1w1+9iObXX9S4BOKbCq/qs1KbxaDm5Lv4V4k1L9fVcJS02WZS/sdwDYtUFqr/xOaAJRqvCl55pomrGrkOdHemmf1JnqKZJCApXpYFmj9A66uRsLm7Q41rEpl5KHAk02ma6QnlaJbH/IOtLPV/1MEZe3oib1ahGiBjdvckGIEAAb+aYGHRpqeDPohCxpHIs2jvYcaVQ23fk/yCFebTCGmcw+st62yTniu/7ix7pSQ9+nvW6dXjGqJvtfUp58+8zifbA= 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:(13230031)(4636009)(346002)(376002)(396003)(39860400002)(136003)(230922051799003)(186009)(82310400011)(451199024)(1800799012)(64100799003)(46966006)(36840700001)(40470700004)(40480700001)(1076003)(336012)(426003)(16526019)(6286002)(26005)(2616005)(40460700003)(82740400003)(55016003)(86362001)(356005)(7636003)(36756003)(316002)(47076005)(83380400001)(5660300002)(53546011)(7696005)(36860700001)(70206006)(70586007)(966005)(8936002)(8676002)(54906003)(6916009)(4001150100001)(2906002)(41300700001)(4326008)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:15:09.9148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4091f16c-d8e6-42d1-80b4-08dbfa320e6f 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: DS3PEPF000099DF.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8106 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=8d45a7ecacdfa22d32aa47c93561ac74e305aba8 Thanks. Xueming Li --- >From 8d45a7ecacdfa22d32aa47c93561ac74e305aba8 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Sat, 28 Oct 2023 14:23:14 +0800 Subject: [PATCH] net/nfp: fix reconfigure logic in VF initialization Cc: Xueming Li [ upstream commit 61847adc98057c0e500c65110a83181b7db4ebc9 ] There exists exit point between the reconfigure logic and the store logic of the VF initialization, this may lead one situation that value in the config bar is not same with the value stored in the data structure. Fix this by move up the store statement. Fixes: 7f8e73201dae ("net/nfp: move VF functions into its own file") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev_vf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 268820cbea..6a70daca90 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -114,6 +114,8 @@ nfp_netvf_start(struct rte_eth_dev *dev) if (nfp_net_reconfig(hw, new_ctrl, update) < 0) return -EIO; + hw->ctrl = new_ctrl; + /* * Allocating rte mbufs for configured rx queues. * This requires queues being enabled before @@ -123,8 +125,6 @@ nfp_netvf_start(struct rte_eth_dev *dev) goto error; } - hw->ctrl = new_ctrl; - for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; for (i = 0; i < dev->data->nb_tx_queues; i++) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.061159400 +0800 +++ 0027-net-nfp-fix-reconfigure-logic-in-VF-initialization.patch 2023-12-11 17:56:22.927652300 +0800 @@ -1 +1 @@ -From 61847adc98057c0e500c65110a83181b7db4ebc9 Mon Sep 17 00:00:00 2001 +From 8d45a7ecacdfa22d32aa47c93561ac74e305aba8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 61847adc98057c0e500c65110a83181b7db4ebc9 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index b9cfb48021..2d08a07913 100644 +index 268820cbea..6a70daca90 100644 @@ -27,2 +29,2 @@ -@@ -91,6 +91,8 @@ nfp_netvf_start(struct rte_eth_dev *dev) - if (nfp_reconfig(hw, new_ctrl, update) != 0) +@@ -114,6 +114,8 @@ nfp_netvf_start(struct rte_eth_dev *dev) + if (nfp_net_reconfig(hw, new_ctrl, update) < 0) @@ -35,2 +37,2 @@ - * This requires queues being enabled before. -@@ -100,8 +102,6 @@ nfp_netvf_start(struct rte_eth_dev *dev) + * This requires queues being enabled before +@@ -123,8 +125,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)