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 4BF72433D8 for ; Mon, 11 Dec 2023 11:14:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 465C340ED2; Mon, 11 Dec 2023 11:14:14 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2085.outbound.protection.outlook.com [40.107.212.85]) by mails.dpdk.org (Postfix) with ESMTP id 9E89040E0F for ; Mon, 11 Dec 2023 11:14:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QGX6IJxHOUrGZhYrju0MLoDLAdxc3SXAP/59hgayhtDAIzH4hhASwtv5fGtRoiI5VCI7MxVAWP/3b8mnUh5lF1u1AxHYAm1C4TFZyj1/6q9vg4v5t73UfCPd2dFRJcjDOm/zcvJgbKlKdMYYEwjdyQCmQFLEO7J+CNIy4Rvc6pEv8mDwGa6OeBeFoN4hQ9XdRPREAnsVYXWJ/eTF4Lt7fZdJ0k0R1rbQGGTKljX6JQKJTsyM2rIjtBprDGcQwdDDHltHAlTEVZj2g4EZ+mbFt2Vq6GG2Z/kmZdLVf3I8yF/w21qFZSTUBuIbT+mOch6jzdz5ACqXUXGsdzrfekCFOg== 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=OPOeZ2Wu3FLKdTqsTcPiLcartznkt6AHTAEKfQXU6BU=; b=kYfP6N+dr1WjgVyoGaRuSEFwbxmcKE63g6f1Tc8K3d6/B0HfC07IuAh3YYbmqsE97ybneh+R5sLOgCfuA//OhKqn92IeSWfOmu90JfsSJGpfYfVUOBqkJYAd/9RifOmyfnux/XbZOPhICb4Io+n0MMm0Vx8DAnrECmJySWRg/XmdWz4E2307PAIdm8FHaACi4geQXWw5//6uroJUtXQGtivx5YmFCvf/GgaF3xkUCF5uiF/+z8+bbfJUaCy4WpkKAM/yJW60G/ObGUjVPQpLP7Ll6RQU5YF4DaSvK2EpMi6R0EpMV/HrkVQC2xxAwJW63yUBCEtYX3Q2FfK6pyPkJA== 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=OPOeZ2Wu3FLKdTqsTcPiLcartznkt6AHTAEKfQXU6BU=; b=jQJGcFaiY64fB9rhV43T7jLLBzJCqsY1oMmRHftE4WkU/jvjfHuhPrU2uJbohUBF8voFMdhpkcwoo+DCuFO50k5PrHR3dkPVgWp1UYr8Fhf1Aq7jNIoTGtPZfClhZ/yex7NyX+RbN3wqX8XPzX6Fuc07ylNSqQxonvWzypVtMLmMnvhGHxg6M3z8d4vwG/Hc9co8CNxnuwhEBlOTb5FJneXeV4Us8HCBvlDXrFrYvWx9vsbGXXdzIURtBEnxZ9DViThLY8nqXdc5x99xI3nTfRiIYizOpApYEKLXoYhmQvBq26H1/99wjbcO4peyOnZYoEHQHmG6iqvCSAoQxX6/+Q== Received: from CH0PR04CA0098.namprd04.prod.outlook.com (2603:10b6:610:75::13) by DM4PR12MB5151.namprd12.prod.outlook.com (2603:10b6:5:392::8) 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:14:10 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:610:75:cafe::7c) by CH0PR04CA0098.outlook.office365.com (2603:10b6:610:75::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:14: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 DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) 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:14:10 +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:13:58 -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:13:57 -0800 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix crash on close' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:40 +0800 Message-ID: <20231211101226.2122-16-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: DS3PEPF000099E2:EE_|DM4PR12MB5151:EE_ X-MS-Office365-Filtering-Correlation-Id: ae485ebc-72aa-4ca6-98e1-08dbfa31ead1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EhlGYff398YhuchFNet8sUgNV3A9Xy/b2jIOijyh9EQHSwxoEH/+C6FdjlA//pnR0m3YtAaSc6aFUPELg+1m4eJqKfC1yL39jEacRMsEenDykmWseTojEDWdfuEpZpubRxe51wM8arwXsFwd3QAku1EcBUMLpcjjr6rGVp1TbBfDEvN6fQM/wEdE6ylRSy8CCQgCnNuDMULg9o0uhYW+zAHQGz4XKzR2ziIOL7k+G83hgkAVhmBuGYxdirzR1x9mHX5QqsMoF9e95LjMFy12CjXdH7aGnAycU+FXeKzNQ7cszCL+3VzITtdO4eoPPKN2tDd4VbimPsMep0/LneiOozNK9k/pJh2QZ9BBZP6nvgHBU9aX/+S6RAG1hFYCRWbhbd32lq1ZbUaFs9ksuNd/ll4LbGw/uCfsmK6ALUmqCSBckKsQsKgAp8yZVs3YNCCrbzPhLG/aXPMtMcRnGXFGVMxEmQhTD4jnjlNcNgTPf468X2mZooYvY9eZ5Eq2vt+UXCx1XWBwU0TaliBu/9kq7vv39YY+QEW9VfhGsd8f/u1m4IOdCIkh97brK5eKF0WRsyFi4tSIM0EIOPM0vBA5GMEGo204YJFjpVgLky4GCONFYBjdt7b0LV2RLDqnZAiiLMgUkzcJ5PiWGNw6N1S+68oH4VJHyVpOUuNGCUOKnDp+PcnSBvvbSgDMXSvC6jbRtdK86EBT/BZJXdcP2dW/JAKhPE1EwRLvc1y8dt34Z9lL/c6ueyws3EjxXPesIm4jCMwPX78XPNt4jzr1Z1kdMoJDw2W/0hjT7uY6uDvOFxY= 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)(396003)(39860400002)(136003)(346002)(376002)(230922051799003)(64100799003)(1800799012)(82310400011)(186009)(451199024)(46966006)(36840700001)(40470700004)(4001150100001)(6666004)(7696005)(2906002)(6916009)(53546011)(70586007)(54906003)(70206006)(356005)(7636003)(36756003)(86362001)(316002)(8676002)(8936002)(4326008)(5660300002)(40480700001)(966005)(478600001)(40460700003)(55016003)(41300700001)(36860700001)(47076005)(82740400003)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:14:10.1597 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae485ebc-72aa-4ca6-98e1-08dbfa31ead1 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5151 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=e671505da168d36e6c001395bf78a574a5a51a68 Thanks. Xueming Li --- >From e671505da168d36e6c001395bf78a574a5a51a68 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 17 Oct 2023 10:37:30 +0800 Subject: [PATCH] net/nfp: fix crash on close Cc: Xueming Li [ upstream commit 3b9dcf252c118705bb17f450318d3495b4608092 ] The ".dev_close" should not call rte_eth_dev_release_port() API directly, the rte_eth_dev_close() API will do it. Fixes: 831c44ab7869 ("net/nfp: add flower PF related routines") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 2 -- drivers/net/nfp/nfp_ethdev.c | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 9872e010d2..5896d208d0 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -224,8 +224,6 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) nn_cfg_writeb(hw, NFP_NET_CFG_LSC, 0xff); - rte_eth_dev_release_port(dev); - /* Now it is safe to free all PF resources */ PMD_DRV_LOG(INFO, "Freeing PF resources"); nfp_cpp_area_free(pf_dev->ctrl_area); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 689e26f1e1..71832bfa23 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -304,7 +304,6 @@ nfp_net_close(struct rte_eth_dev *dev) /* Mark this port as unused and free device priv resources*/ nn_cfg_writeb(hw, NFP_NET_CFG_LSC, 0xff); app_fw_nic->ports[hw->idx] = NULL; - rte_eth_dev_release_port(dev); for (i = 0; i < app_fw_nic->total_phyports; i++) { /* Check to see if ports are still in use */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.699270100 +0800 +++ 0015-net-nfp-fix-crash-on-close.patch 2023-12-11 17:56:22.897652300 +0800 @@ -1 +1 @@ -From 3b9dcf252c118705bb17f450318d3495b4608092 Mon Sep 17 00:00:00 2001 +From e671505da168d36e6c001395bf78a574a5a51a68 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3b9dcf252c118705bb17f450318d3495b4608092 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 0c54d7ed27..60d843451e 100644 +index 9872e010d2..5896d208d0 100644 @@ -24 +26 @@ -@@ -221,8 +221,6 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) +@@ -224,8 +224,6 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) @@ -34 +36 @@ -index 20940072fe..d32a82210c 100644 +index 689e26f1e1..71832bfa23 100644 @@ -37,2 +39,2 @@ -@@ -286,7 +286,6 @@ nfp_net_close(struct rte_eth_dev *dev) - /* Mark this port as unused and free device priv resources */ +@@ -304,7 +304,6 @@ nfp_net_close(struct rte_eth_dev *dev) + /* Mark this port as unused and free device priv resources*/