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 7038DA0545 for ; Tue, 21 Jun 2022 10:12:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFBC94281A; Tue, 21 Jun 2022 10:11:40 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2041.outbound.protection.outlook.com [40.107.100.41]) by mails.dpdk.org (Postfix) with ESMTP id 1305F427E9 for ; Tue, 21 Jun 2022 10:11:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nCCbj6JHnuvXABKZ4oqgd+2wxr1F4RzuKJ4UcA/Rn+E1ISO4TLp1GgcIMsAopPgdnnzKKsh/ZzAeQGcIBg89Td3nJw0QlJgK8YZdESkc9olNvobDyRrqNRwiUPZGK5RBCH9hxaDlhiQrF0Rmrarc4dAmiYbEaNoGK5Ih3WQMF+m4KD6Va0RByogF1dRIipgCmmjnSd9rEnOqkwYsuiWYigAf3B6S+sJDeXNmN3W8ust3hWKsnto/pUWj+AJHMVvgVWtuGsZLJ6t+xYsD5qH59bSLyrNJgC8Z3iAg2+XhEWW9q3V3jl+FSni8MW0oVjF2SMG+1PcRbMGJB50cj6+zpQ== 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=wOVuqo5JHJfFq/WMRULoGCfXvJFvqXKYFbYSKcSR9Jg=; b=QISmh8nYKLKppucZ6EOepWg+LkVlRf0U+lfvM/j/UtopIPNaS++lRAV/3YmXOu0KoizCLQJ4xJXda6ILY7d9Y/rBKIPJXK74mTDYjyEoi+1QNvemTwtwUFh0vX7AusFUdds1HKtq8M5tHqq6smZ7krgQZSE2aG6Q2uuWXMV2Fh2Navj4v7dXzUtlmR+3/Y9AGerykWasAfYcdLttV4YgCI41ymlwVhiOYcQ3X8gJsGU22qnNzPRfKRIXKJzUvhFOUd8hF7+O1ExXEYDPVEs6sPgVRYjIXcXS03/4J0kN22Fv/aeUhw3oBN2vS40rv+nN5d7jiLHRnJ+KEo8HwtiT7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.org 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=wOVuqo5JHJfFq/WMRULoGCfXvJFvqXKYFbYSKcSR9Jg=; b=hgKjqcteiSovMAWdNtGNaWhXcvZEL73c1/2/tqb0Tcrs32YY5vd6jhAbEK2nOo3ugFpoNZCLqFQREh859DN0N6Qq/LVG3pkBlMKkVDYt0syO+HjcVngRSNKAteu4WJbVIxEQZavvvyRRygy2/uyFigJVF14H2RfosvZkG/LAC8IV6D2Y1rcp8zJ27of+b+Y4Jm0qqpo3uT5c6riQkw4XxUi2LmTYyBIpcdFjYqcCkPEvK2bh9XEhNoC1d9gPoBwh2TPpXgsRuu6bX6agB4FVteNV6GFOw75VbaQ5/KaVN/iiVM9fkvxFP/POs6nRRp+InGwNX40/UEd/mBKjFFeLpg== Received: from CO2PR04CA0137.namprd04.prod.outlook.com (2603:10b6:104::15) by MW3PR12MB4569.namprd12.prod.outlook.com (2603:10b6:303:57::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:11:37 +0000 Received: from CO1NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:104:0:cafe::40) by CO2PR04CA0137.outlook.office365.com (2603:10b6:104::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT060.mail.protection.outlook.com (10.13.175.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:11:36 +0000 Received: from nvidia.com (10.126.230.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.22; Tue, 21 Jun 2022 01:11:34 -0700 From: Xueming Li To: Wenjun Wu CC: Qi Zhang , dpdk stable Subject: patch 'net/ice/base: fix getting sched node from ID type' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:41 +0300 Message-ID: <20220621080301.2315720-96-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c3375d5-fd27-4fee-a838-08da535da9ce X-MS-TrafficTypeDiagnostic: MW3PR12MB4569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: um+itfX9GMTRBsPGFGrnESrBa9pnBiM4776NpPgUaP+KU4XSfBkGPryjezFTysvSMZ2UIpv4OSuV/yrcfWbo/+fGzjNlsvZmPTp83XrFHsRBrI9bc17Xl2tCuA3X5n1HUeDHvLSrEeTLloe4mDg7j5Tnt0uRladepyGKT/1UOqlmwuxHHb5TQ2k1lyRYo3pm0UOcCdfWx2g6+XlQTq91gYz+GuPGR53L5uzSHBZNRb3DmcSoYcqzVpM690GGvi2HBBLzZIxfN4GyCYmQT57frcknVUC2Fcd8Pbnvi+UtqbwYSB1m8ALzI9134T/bdp/j3mXmrUC9arIwG2ulyEMlnq8uoejll9QM0pR9/g5GTijHBee2dSXyrXBV8QtMBZrc76OH1osHQjROVZQ+RuMPRXza+w3umJGULxxq4xFbSw9pO7Hnc3kBP5NfkuZb6QSmUnKPXXOzDuPIfEGwyfiF4UmSjT+WIqzDmCUYBDlgan4ttqFK5PzpsT7GwN8hyBLEiFEMLYdwOTZTdpF4ozEL7V3w2UFkUQdxFXrZFubzdEVjgJh/+3lWxiY8X0TW2JSOhiqLsUHGtO0tQqwYTnYsQDeNAkbbxSrjVFAOvlGmKCQRPR0WqE1EX9udw9l1z5h4/RC8tA4pEX3y/t3JBQU3Ho0zxLteOZNftXPV8FMPPoIp1LeRh9PO7IOCRsog73rCvUpp3kFB3tAbHHkyF28Wp9tqbEu8eK8YnHnlIxqycRuBFccvrJFvAxXFeY4R/+Ra+2as4qssKE3yP8s8XW/4e4BjOxj0xD3z+WzdmzW/SgQc4l2LP7nQh1FtSYe9c48CkALsJFy77qQJ5E1RyIx/XnAl11SvGC65BSv/5kktH6s= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(136003)(396003)(376002)(46966006)(40470700004)(36840700001)(81166007)(356005)(53546011)(26005)(82740400003)(36860700001)(8936002)(5660300002)(40480700001)(6286002)(1076003)(83380400001)(55016003)(966005)(478600001)(41300700001)(40460700003)(47076005)(2616005)(336012)(2906002)(86362001)(426003)(82310400005)(6666004)(7696005)(186003)(6916009)(16526019)(70206006)(70586007)(8676002)(54906003)(316002)(36756003)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:11:37.1209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c3375d5-fd27-4fee-a838-08da535da9ce X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4569 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/e2660944da20ecb45c1f7d12cc87234f8d30ab69 Thanks. Xueming Li --- >From e2660944da20ecb45c1f7d12cc87234f8d30ab69 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Tue, 17 May 2022 13:09:26 +0800 Subject: [PATCH] net/ice/base: fix getting sched node from ID type Cc: Xueming Li [ upstream commit 8f7a83e19325be26207e4cb2f11856f0fe3dbeca ] The function ice_sched_get_node_by_id_type needs to be called with the scheduler lock held. However, the function ice_sched_get_node also requests the scheduler lock. It will cause the dead lock issue. This patch replaces function ice_sched_get_node with function ice_sched_find_node_by_teid to solve this problem. Fixes: 93e84b1bfc92 ("net/ice/base: add basic Tx scheduler") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/ice/base/ice_sched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index 882448671e..9196628cf1 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -4728,12 +4728,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id, case ICE_AGG_TYPE_Q: /* The current implementation allows single queue to modify */ - node = ice_sched_get_node(pi, id); + node = ice_sched_find_node_by_teid(pi->root, id); break; case ICE_AGG_TYPE_QG: /* The current implementation allows single qg to modify */ - child_node = ice_sched_get_node(pi, id); + child_node = ice_sched_find_node_by_teid(pi->root, id); if (!child_node) break; node = child_node->parent; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:53.493758649 +0800 +++ 0095-net-ice-base-fix-getting-sched-node-from-ID-type.patch 2022-06-21 15:37:49.197785153 +0800 @@ -1 +1 @@ -From 8f7a83e19325be26207e4cb2f11856f0fe3dbeca Mon Sep 17 00:00:00 2001 +From e2660944da20ecb45c1f7d12cc87234f8d30ab69 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8f7a83e19325be26207e4cb2f11856f0fe3dbeca ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 2620892c9e..e697c579be 100644 +index 882448671e..9196628cf1 100644 @@ -27 +29 @@ -@@ -4774,12 +4774,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id, +@@ -4728,12 +4728,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id,