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 0C50B431D5 for ; Sun, 22 Oct 2023 16:30:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0664840284; Sun, 22 Oct 2023 16:30:50 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2064.outbound.protection.outlook.com [40.107.223.64]) by mails.dpdk.org (Postfix) with ESMTP id AB03440E68 for ; Sun, 22 Oct 2023 16:30:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mbbflD/Z/gi4zUWrFK8oc6UL2XRtDo8c1nJsVpHSTRGU2x+mzTGMxikUAN1ed/kupvvfiZxXJx95CqUIaRJZbaSdys3mmoJTEoYP7j2cteWo1ChsAO+qUA3Rz7KdE+fYmmZ1NiKN3IY0no2/F6fivGbJgBR2QvMwdA2n92ekHgQ3tHX3/jp5xWD1lxNjjNhIiMsu/qMWDYk4rAL/AFD14zhe8558/xw+z86ZLk/nkHT7OEvsATT5Uzz6kDmO5TKA7SuZCSqN0srkosd8PVTYcrLQUG8sqhu5u6+7cUOK/oXk5GTV2mbEpDhzJc/ENQl8eicjeR8Kv24FGxxSzTRjxg== 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=5oE2PzyjnbgY2ueOJQNR/HA0MixL6XrkdrsCTsu8PFY=; b=Ub69AyxPx0g+xBFIpdRec/1rhi9ldn8HY80Va49J5bpyAxfAUclYb4jq7i86lpw2C7UDTWKTpPPRcPrxa4BK29QnD8j/XW3bK3/P/VOr6KLK9saQDRJGDSUJwXyR1eAgiDHf9tPaH5kMF0u553zfWJs/9idmcvVOWO3tG8EHAaRYOr2t9fic0tr6xYYvsC6zF4KEa7MWS9auAR5lbMe2UBiPuAHse04x49o85uhKqn/GWPiFT9oaspDoWylhbLp9vLNejxSMVWc5J2X+aSftUtwefqss926ek+roZn7vU9pxZeFgYJoGnx0lUggFFl0b/qcYUZ5DR5DbYxAUkvvIWw== 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 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=5oE2PzyjnbgY2ueOJQNR/HA0MixL6XrkdrsCTsu8PFY=; b=iGcKTxg7qHW1JopSSuehRLcDVcmuRp0GgRfJkoh8ESvAb14xN3rSpCRUPopwYYBzr9v5Vo//jh3ebyJK5zP/b02wAuW4nC3arYT7692NWQsO/yTgZ2I6cXVMqz4C8RakKQ/HVKqpr1pK1Atpgh8V3CilWZ3xXNqs8zmdD5o5R+aSkvLQ7RKBpd7r5A2Wb4+1GkOkTSePaSgW5zlBwCHUuxY5iFYd7VWtRFF4nTK/5Dj9UNiNRVbfhngeG8FXCrLu7zR1Bb4ED36o6mPIt4IQYG4f1c3z+wIr6vqhASQt+Rv5EBUtgPkcahvneuafb0Y14075p5CM5BNZBFkMVMZ1tg== Received: from CY5PR15CA0232.namprd15.prod.outlook.com (2603:10b6:930:88::23) by IA0PR12MB8374.namprd12.prod.outlook.com (2603:10b6:208:40e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Sun, 22 Oct 2023 14:30:46 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:930:88:cafe::fe) by CY5PR15CA0232.outlook.office365.com (2603:10b6:930:88::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:30:46 +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 CY4PEPF0000EE36.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:30:45 +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; Sun, 22 Oct 2023 07:30:31 -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.986.41; Sun, 22 Oct 2023 07:30:30 -0700 From: Xueming Li To: Kaiwen Deng CC: Wenjun Wu , dpdk stable Subject: patch 'net/ice: fix TM configuration clearing' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:55 +0800 Message-ID: <20231022142250.10324-87-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: CY4PEPF0000EE36:EE_|IA0PR12MB8374:EE_ X-MS-Office365-Filtering-Correlation-Id: 71a09246-3e43-48dd-8adb-08dbd30b7ac4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7gOX5/BnV/WZV+OW/0Rs1dUk9S82aJ2hJewaiwGGazITEPni9mHRwVK30i6zScROWvrSbqjVLxC0vbSoNVTQWoFDKVsahb3LmomKXWhWpJsZ604S2tNvw/OmZ/ebbr0Uy14+Q7oB9cbllwUy5XI9n7320o9emeAru8p1CSYSvPVBAYmn8/qiAbnz8flhnNAn96GpvdsUdljxJ9Eb+bPmDR2nvV/iIMY100RmJ+DzsuWuIY1rAY/YlUrs8a8S4dyyYJyqpD0yGKeEMuEWIdJqtej+odGpt75/b7WL4aEBDHEFmm8Xc6qixwP+MsmNvqBh//1K3WgWrw2y6+M5gvXoh1Y7kcA9XOT9WRjUIUh2CxxNS/t6gr9I+ZbRVjDyDaaseLi4wSJM5ziGxFeVWd7aDF0mO5C6+K3wsLZ/sSm7fEQWZV2LmPNsrz0qfT/jIHOWgylcxcT5V98ibFkDu0LCVlr5D5z4mgWvAvchf1NAal1YcRvcF8YEU2A8mc7kdE4/pdoeTzhkMJxRDd6ZaZaG7cGrrq7Mn2v41myTpDHQkxrYSj5T8Iu+Ues4SwapfnfTRpTBLp7g37UzfGoLpGLjf5QN/wvq4NZ7OR3P4/omZcjcFNuwobUJjP4rffJAz7tWcr7OXWZNpbG9kHuDHaAEcYaP27FDUSPZVMECa8JolgdVY1OK5ViUsjTWm4RHspLDLt0wWV1jmlf5TGDeHNNMqkI2g+k5aFZz1hWN0C7mz138puI34X8qaGyLykrHFSUJ8vht1zJkY854fb7l99UQutW5iAvlcGpjDW0B263SFD8= 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)(39860400002)(376002)(136003)(346002)(396003)(230922051799003)(64100799003)(82310400011)(451199024)(186009)(1800799009)(36840700001)(46966006)(40470700004)(83380400001)(426003)(16526019)(336012)(26005)(6286002)(1076003)(2616005)(2906002)(8936002)(4326008)(36756003)(40460700003)(5660300002)(86362001)(8676002)(7636003)(40480700001)(55016003)(82740400003)(36860700001)(47076005)(7696005)(53546011)(4001150100001)(966005)(356005)(70206006)(70586007)(6666004)(54906003)(41300700001)(6916009)(316002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:30:45.9296 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71a09246-3e43-48dd-8adb-08dbd30b7ac4 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8374 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 11/15/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=4467e32db96de11e97d01bc0e7cfb34e7d4db791 Thanks. Xueming Li --- >From 4467e32db96de11e97d01bc0e7cfb34e7d4db791 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Wed, 6 Sep 2023 15:49:30 +0800 Subject: [PATCH] net/ice: fix TM configuration clearing Cc: Xueming Li [ upstream commit c21a6a3ff6c49965d4373677255058d041dafe96 ] When the device is stopped, the PMD resets the commit flag so that we can update the hierarchy configuration. The commit flag is also used to determine if the hierarchy configuration needs to be cleared. When the PMD exits, it always stops the device first and also resets the commit flag result in the hierarchy configuration is not cleared. This commit changes the PMD to not reset the commit flag when the device is stopped. And we prevent additional commit when device is running by only checking the stop flag. Fixes: f5ec6a3a1987 ("net/ice: fix TM hierarchy commit flag reset") Signed-off-by: Kaiwen Deng Acked-by: Wenjun Wu --- drivers/net/ice/ice_dcf_ethdev.c | 2 -- drivers/net/ice/ice_dcf_sched.c | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index 7304ea721c..a7d90f46dc 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -671,7 +671,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) struct ice_dcf_adapter *dcf_ad = dev->data->dev_private; struct rte_intr_handle *intr_handle = dev->intr_handle; struct ice_adapter *ad = &dcf_ad->parent; - struct ice_dcf_hw *hw = &dcf_ad->real_hw; if (ad->pf.adapter_stopped == 1) { PMD_DRV_LOG(DEBUG, "Port is already stopped"); @@ -698,7 +697,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; ad->pf.adapter_stopped = 1; - hw->tm_conf.committed = false; return 0; } diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/ice/ice_dcf_sched.c index a231c1e60b..b08bc5f1de 100644 --- a/drivers/net/ice/ice_dcf_sched.c +++ b/drivers/net/ice/ice_dcf_sched.c @@ -237,6 +237,7 @@ ice_dcf_node_add(struct rte_eth_dev *dev, uint32_t node_id, enum ice_dcf_tm_node_type node_type = ICE_DCF_TM_NODE_TYPE_MAX; struct ice_dcf_tm_shaper_profile *shaper_profile = NULL; struct ice_dcf_adapter *adapter = dev->data->dev_private; + struct ice_adapter *ad = &adapter->parent; struct ice_dcf_hw *hw = &adapter->real_hw; struct ice_dcf_tm_node *parent_node; struct ice_dcf_tm_node *tm_node; @@ -246,10 +247,10 @@ ice_dcf_node_add(struct rte_eth_dev *dev, uint32_t node_id, if (!params || !error) return -EINVAL; - /* if already committed */ - if (hw->tm_conf.committed) { + /* if port is running */ + if (!ad->pf.adapter_stopped) { error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED; - error->message = "already committed"; + error->message = "port is running"; return -EINVAL; } @@ -400,16 +401,17 @@ ice_dcf_node_delete(struct rte_eth_dev *dev, uint32_t node_id, { enum ice_dcf_tm_node_type node_type = ICE_DCF_TM_NODE_TYPE_MAX; struct ice_dcf_adapter *adapter = dev->data->dev_private; + struct ice_adapter *ad = &adapter->parent; struct ice_dcf_hw *hw = &adapter->real_hw; struct ice_dcf_tm_node *tm_node; if (!error) return -EINVAL; - /* if already committed */ - if (hw->tm_conf.committed) { + /* if port is running */ + if (!ad->pf.adapter_stopped) { error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED; - error->message = "already committed"; + error->message = "port is running"; return -EINVAL; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.507796100 +0800 +++ 0086-net-ice-fix-TM-configuration-clearing.patch 2023-10-22 22:17:34.326723700 +0800 @@ -1 +1 @@ -From c21a6a3ff6c49965d4373677255058d041dafe96 Mon Sep 17 00:00:00 2001 +From 4467e32db96de11e97d01bc0e7cfb34e7d4db791 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c21a6a3ff6c49965d4373677255058d041dafe96 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 30ad18d8fc..065ec728c2 100644 +index 7304ea721c..a7d90f46dc 100644 @@ -30 +32 @@ -@@ -670,7 +670,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) +@@ -671,7 +671,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) @@ -38 +40 @@ -@@ -697,7 +696,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) +@@ -698,7 +697,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)