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 AE9B0A034F for ; Wed, 10 Nov 2021 07:50:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1DE440142; Wed, 10 Nov 2021 07:50:06 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2041.outbound.protection.outlook.com [40.107.244.41]) by mails.dpdk.org (Postfix) with ESMTP id B5A2240683 for ; Wed, 10 Nov 2021 07:50:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RXijdIMMacbJx4hKLnNooMSuq6+1AbgLvMd//uka3kSKnN3NTAsAJhksyivxRtCAKyjDfiKDBjyNkh9mI6wTLQL63aVW/GcUeVnauI8kP62jmQjp4965O+ajQI1p+3UNd2GlSAwcyW3ecBK9+dp0a+oiDej6k8vv/xsORULGIAp3hXEeELL40zYA8Rb1r11JSyut7wUH/k7wYL14iedLUBb4LhBghWL3KBpD6ELB6xFYhUOxq15atz166YE6/BwSHSVBMz7p3t8nnHm8Ek4E2loxYZudKP3AEH9JsrOAmkSZj72VSOXqPhXMQ7M4oQ3Pp8HKY2vfbj8L2k8kcmDfJA== 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=DSTfcncOFn7w7ebo6cUkCtsuvn4yAzCST8vHqXSmx5k=; b=mwwshmbys3KKYYpkI2XP/0y+OsiBCJPfvlmTNnQvemOCgT3Z0or5Cpj6I9xaqtSa62FKX6QVBQgKy5jf0CLWG4gkQJu/j6OwnvSFhataPU7NBpbPJSBWKwF+ARdrUxDXyGB8Qu2ymKkyyFNu85vNaH9KgRespLVJqm/XbT/wCiDQmkGcsM5soI2El78SHaPkfT0nHK0XK3ho5wPmy1Ul+EiKvTbA2lzIoF8Gi6ydRJRbVxQpZ6BscxoSzPShBLfUBazpxT2K4UHn0niF7EoqtIxVo2YF2F6Kf2Wthj4EUunHGSGRO8miOJxcDjQju2UB17am1fdiFk0oncgWNSYshw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=DSTfcncOFn7w7ebo6cUkCtsuvn4yAzCST8vHqXSmx5k=; b=GxSfXyYyL8L1eMmkbOhPa1t/AYzP+f2UrUm1g1mdLHUZKtcQZXxj3sWP5ofkGtj+W2wvJIXt4BH7BJErKuV+r1IOMiUzgMEYufu10fASZWm2le9qwQtl4D87kwnFinRxwOEzk/5Z3aCSr24TJM6nh+CMlCtos1qg+8XjloAAkywjQZy9lpCffe75ro/TVfq2uVHVw0X5kSAo8aUY8yjv0Yf5LU4OkO/ETDHcc2U4STlBBdInEfCkRKMVuVP55TBh/NbajaRJKujgzZcW8xaHV4R/TrvJv5l9HDz0gKYKLFiLLJoCo/pM67z5pSWq2CPAUPDn99ZsHq9aVl3uXJgQyg== Received: from BN0PR04CA0087.namprd04.prod.outlook.com (2603:10b6:408:ea::32) by BN8PR12MB3492.namprd12.prod.outlook.com (2603:10b6:408:67::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Wed, 10 Nov 2021 06:50:02 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ea:cafe::98) by BN0PR04CA0087.outlook.office365.com (2603:10b6:408:ea::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13 via Frontend Transport; Wed, 10 Nov 2021 06:50:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:50:01 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:49:52 +0000 From: Xueming Li To: Dapeng Yu CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:30:40 +0800 Message-ID: <20211110063216.2744012-157-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7062502-b43b-4e61-3363-08d9a4165239 X-MS-TrafficTypeDiagnostic: BN8PR12MB3492: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PExREAs28U/luHL9PlOByOyvFAw9HPPDkItpoSjav6uI9Qym49ivh5iFkrsb0H3pmaG4H1jFMNLO0s2ArLkUgji68rTK4f1ZrSON7mOF4bTEzjtJlCcseVi88ULCBW/1oxvS5h54QRx4AcWLiMPm6oe1yXHWkxo+EB9IrIc+iL3YuGJQia5U+I2FTp9YXL0yRqJDbpZe2HZvo8erj/TGOaRn55WNBkpvj/C8b4taiWkdomqqU7s2mIHghhO7J8srIdiR2TGBRrVmXVKkk269wRYw6oHon9UvkFW12vIE0R6/pjq16UYsZdSdbdhZ8D+ynzpOrptMCDfhcQ3uD0S8u67AQjUeGGguq5DJAc/x84sHX/iJlQloCGVnRjzMxW51xNo60ESIFfwsvhzxHnXjRV2NLLhchQPjGajORURZdrxqQhTASCGDrZl70utx3phHzvFHuhPtBw3coPhy+JZ/i+9BRFIFZhKch8bDl5TjJH1uJOs3b2RNPlP6KIbvvSRisar5ksdXaX5Lj94735fyvbAxYvZPdBXYaIfUqadPPDHzL5bA2pjnFpsSQ+z2nF1Sw+pB3SOkaOMv28hmS27fQcQ0TOCQ6kuLLRC8BZLh+9hftyK8nFeZYrpAvXYGkIUW5PuLSfVwqzJFihWgrkxUWXAuGT5R3c7RAhybNPY+W2EkvmF/Hs1MrzivO1wMyJU6Z6RnggQqzCMEYa912Szz4HHuDfvJMbm3zcDXb4arKYRm1koFkDBmptOSN9w3IbQVxazAhyuqaRclfjOc6n+5M4+ON611zK4h6GXZBNq7ZRTO38x5NFyHps/GPaFz8ih/UaFwsB2rx6i5paPJiwReYA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(5660300002)(186003)(426003)(8676002)(966005)(26005)(36756003)(70206006)(316002)(70586007)(16526019)(8936002)(508600001)(336012)(6286002)(4001150100001)(55016002)(4326008)(6916009)(83380400001)(2906002)(356005)(2616005)(7636003)(86362001)(36860700001)(53546011)(7696005)(6666004)(1076003)(54906003)(47076005)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:50:01.7976 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7062502-b43b-4e61-3363-08d9a4165239 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3492 Subject: [dpdk-stable] patch 'net/ice: fix deadlock on flow redirect' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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/12/21. 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/b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1 Thanks. Xueming Li --- >From b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1 Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Mon, 11 Oct 2021 15:38:49 +0800 Subject: [PATCH] net/ice: fix deadlock on flow redirect Cc: Xueming Li [ upstream commit cc2f82b96a64789cc72beeb775a3a3543b5f2064 ] If flow redirect failed, the spinlock will not be unlocked. This patch fixes it. Fixes: bc9201388d56 ("net/ice: support flow redirect") Signed-off-by: Dapeng Yu Acked-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 15667c7252..ca401c7703 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -2380,7 +2380,7 @@ ice_flow_redirect(struct ice_adapter *ad, struct ice_pf *pf = &ad->pf; struct rte_flow *p_flow; void *temp; - int ret; + int ret = 0; rte_spinlock_lock(&pf->flow_ops_lock); @@ -2390,11 +2390,11 @@ ice_flow_redirect(struct ice_adapter *ad, ret = p_flow->engine->redirect(ad, p_flow, rd); if (ret) { PMD_DRV_LOG(ERR, "Failed to redirect flows"); - return ret; + break; } } rte_spinlock_unlock(&pf->flow_ops_lock); - return 0; + return ret; } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.889477538 +0800 +++ 0156-net-ice-fix-deadlock-on-flow-redirect.patch 2021-11-10 14:17:01.964078660 +0800 @@ -1 +1 @@ -From cc2f82b96a64789cc72beeb775a3a3543b5f2064 Mon Sep 17 00:00:00 2001 +From b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cc2f82b96a64789cc72beeb775a3a3543b5f2064 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 3e6ed7005b..02f854666a 100644 +index 15667c7252..ca401c7703 100644 @@ -22 +24 @@ -@@ -2542,7 +2542,7 @@ ice_flow_redirect(struct ice_adapter *ad, +@@ -2380,7 +2380,7 @@ ice_flow_redirect(struct ice_adapter *ad, @@ -31 +33 @@ -@@ -2552,11 +2552,11 @@ ice_flow_redirect(struct ice_adapter *ad, +@@ -2390,11 +2390,11 @@ ice_flow_redirect(struct ice_adapter *ad,