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 A55BBA0548 for ; Wed, 10 Nov 2021 07:34:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90449410EF; Wed, 10 Nov 2021 07:34:56 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id 9054140E28 for ; Wed, 10 Nov 2021 07:34:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjuitz/uId0kxdo4X1iEfyEcTGGpsOWWX0xjeNBsilf1+zyQGp35zSMy7qh5nWdehriS5lCfc1HUK57J370+FgKBQnUGnl78Ih0jfERkbQGoisfOersONAEGvKXhCoIqNutPRHy7vW0q1xrOY5aVH5aUwLSFIszM0MgJrXIXf3mRF+oRjG6Bd7QNUbtpUFetEvVk8fNT2eT21EDjsCnXGMcT8UJl+Pk0zdG16ffzPOynRnoNBdQEx2vqrJ9HN0DExcRcnhXRPQdRJXBBPfRT5uoEbLYpBbpMgo3N+CyFuq6B+l+m2/e/h+3yFY0jY9AmUigJ/YIrdGc7imcizF/CcA== 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=f8KOqtVpfcFdBLo5eDJB8vQC4XIrfugM0kBivqdLNNU=; b=cxS1DU+zegMDBs/LLKmwEtEbZ/DXNpCgaXvJ3ASwe/HC+QYyP3C4IY1WrIRBXet0uhzDQ1GFogrYewOO2N0luXOwvvFERWbZh0nYBH6gMV+YdRdZyIPxh7+p0A41z7w3t6SwiiKwKqMhcq4HM/fIaW/Cpi9G0lFbZe9lY8uqgjoaaeUwwQH+0FBQRqIv84tclzk5sZRi15x0KVz10Oy39XMjUHXaIrLaHNQywH1CezNeAavkIGWq4badHDmcxs3FwzUkYLOZrPgDevJnobW6NeJdrDI92Dgvx2msNrGcT8OSNk0ilzdSr9GB50qLcKb2/7wOU6K0kFMyGZ4usNnw7A== 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=f8KOqtVpfcFdBLo5eDJB8vQC4XIrfugM0kBivqdLNNU=; b=H6JFGY3UiCBYYNcNyfMlOuHkEvMTslHOS6vVy2HrUelxuiUJMdgLGTetiCduCZuzfS8chSQtcHv5XKcosimPqgfnlz6Lmch+n3S2AOHc8NLqKTv4JZx0e8HdWQt7t/lydFppB2LPDHjYAbgxPlrIqJNyCxpW2hWfJHRRX34inJMyMMAM66D+XqT83uV34qFVra9ZiI9brzT1VcyrJPGYObO5BESEQH7K5dvuezAgGM5kUSKHS8a746jg+C+hMSp4aQRjawNGOz8b6mzF6/IcBffcpnCRzKtY6EO0nOMLRK5J5bsEdqHcN0zOrv1++toE0Zs41+wvO+QcfINZf7W0rw== Received: from DM5PR07CA0052.namprd07.prod.outlook.com (2603:10b6:4:ad::17) by DM6PR12MB4076.namprd12.prod.outlook.com (2603:10b6:5:213::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov 2021 06:34:54 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ad:cafe::25) by DM5PR07CA0052.outlook.office365.com (2603:10b6:4:ad::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:34:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.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 DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) 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:34:53 +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:34:52 +0000 From: Xueming Li To: Yu Wenjun CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:28:27 +0800 Message-ID: <20211110063216.2744012-24-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: 5d985ea1-c432-4f01-363b-08d9a414349e X-MS-TrafficTypeDiagnostic: DM6PR12MB4076: 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: KCPm8LhnhSRq4TaYt0d30EfgVmQN+iepAma7LRzSA24CcvJ+aEObf8rPCEU9p3Npiqq2vcObCcGK9neZ65Id6u8m/paFLDnteO5OItaerUxELYfgVdV5PfdBmazk+zn3l0x1Wm9ljteuLqbAQFBv3UYDT57pl5HnK4zvdB4JLlHmhF7stFDBFVzY53efbypEq/dXiw5RW3i9zxgJv8HUi23E7dND8nULbNnI3w3Wr3hkVyeo+ZZDhjUU6PH3CS0zgRamowtErA/hNV86SrWixGCqVD0+Exl5pYNhqLDv82bHJyj6Shu6hYrsMWaHsSL3kciy3YXpxe3LTeaqDZjO6SgKmFNOVKKxjJULiuxC2LfThfmMIxsGxg6qsODC+RGCYClP4z1Eq5oPlOFzWo9aM2uLWi5ECGZKnYt0SU3Z5WOpTUkth1rLqZNaQ6WxxtkGg7QuX4DkVNu/qd5nheuK0TlGmrEXKXG5S4qH6kJYEWeZiyqZI0NSUdyjLCejxQ9wjXUdF8A6RP76j5LsrEszKJ0Ewad3dVCCEA9p7TO+dtDygxnfyPPRPwp7pXfPJ+dQn7/JgJ34NGMgarm6E+rhESS2iCUnhkpk+W7R8ynyzOHg4sNXh11Xlxt0XnAcLBIrgw41ymQygqSP2v8xFaNtffYCi4h5jLU30c2Ie371xNd0Z5rzlfffdZ4mVZ/rTtQX5Gi3d/2obG8OyYdENziiCsJD/dRZhsqN3unxRzd4CoLDq+ti27WgnpNkNdWnaJbdCX30k7RM63xR9IoSMSm+fFUbyb3izXLx95vVh/OscyaCCCQNFU0sVuJ05RFZbvIPaFgM0hkXnbIvr7+7vDHNzQ== 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)(4001150100001)(966005)(2616005)(6666004)(186003)(1076003)(86362001)(356005)(8676002)(8936002)(4326008)(16526019)(55016002)(36860700001)(47076005)(5660300002)(2906002)(70206006)(53546011)(70586007)(26005)(83380400001)(336012)(36756003)(426003)(6286002)(316002)(82310400003)(508600001)(7696005)(54906003)(6916009)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:34:53.7761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d985ea1-c432-4f01-363b-08d9a414349e 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: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4076 Subject: [dpdk-stable] patch 'net/ice: fix deadlock on flow query' 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/7722837b520249b1374fa6f30b34db09b34f6ed7 Thanks. Xueming Li --- >From 7722837b520249b1374fa6f30b34db09b34f6ed7 Mon Sep 17 00:00:00 2001 From: Yu Wenjun Date: Thu, 19 Aug 2021 20:10:02 +0800 Subject: [PATCH] net/ice: fix deadlock on flow query Cc: Xueming Li [ upstream commit 22db014997c68928711e5b9e948ac3986ec1ed58 ] Default case of the switch statement causes deadlock because it returns without unlocking the 'flow_ops_lock' lock. Fixing it. Fixes: 0d6ef740e411 ("net/ice: support flow ops thread safe") Signed-off-by: Yu Wenjun Acked-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 1429cbc3b6..15667c7252 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -2360,15 +2360,16 @@ ice_flow_query(struct rte_eth_dev *dev, ret = flow->engine->query_count(ad, flow, count, error); break; default: - return rte_flow_error_set(error, ENOTSUP, + ret = rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, actions, "action not supported"); + goto out; } } +out: rte_spinlock_unlock(&pf->flow_ops_lock); - return ret; } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.145274924 +0800 +++ 0023-net-ice-fix-deadlock-on-flow-query.patch 2021-11-10 14:17:01.764080297 +0800 @@ -1 +1 @@ -From 22db014997c68928711e5b9e948ac3986ec1ed58 Mon Sep 17 00:00:00 2001 +From 7722837b520249b1374fa6f30b34db09b34f6ed7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 22db014997c68928711e5b9e948ac3986ec1ed58 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 66b5743abf..c2fa75f165 100644 +index 1429cbc3b6..15667c7252 100644 @@ -22 +24 @@ -@@ -2518,15 +2518,16 @@ ice_flow_query(struct rte_eth_dev *dev, +@@ -2360,15 +2360,16 @@ ice_flow_query(struct rte_eth_dev *dev,