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 50906A0C46; Sun, 29 Aug 2021 15:06:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C814F40142; Sun, 29 Aug 2021 15:06:10 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 184CF40042; Sun, 29 Aug 2021 15:06:08 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10090"; a="303733981" X-IronPort-AV: E=Sophos;i="5.84,361,1620716400"; d="scan'208";a="303733981" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2021 06:06:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,361,1620716400"; d="scan'208";a="445458581" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga002.jf.intel.com with ESMTP; 29 Aug 2021 06:06:07 -0700 Received: from shsmsx602.ccr.corp.intel.com (10.109.6.142) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Sun, 29 Aug 2021 06:06:07 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX602.ccr.corp.intel.com (10.109.6.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Sun, 29 Aug 2021 21:06:05 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.2242.010; Sun, 29 Aug 2021 21:06:04 +0800 From: "Zhang, Qi Z" To: Yu Wenjun , "Yang, Qiming" CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] net/ice: fix deadlock in ice_flow_query() Thread-Index: AQHXlPNM7+D0UBB9+kuxGtCsUenshKuKgyBw Date: Sun, 29 Aug 2021 13:06:04 +0000 Message-ID: <051f8891567d42f78c3c042d776eb22c@intel.com> References: <20210819121002.1433-1-yuwenjun0x@163.com> In-Reply-To: <20210819121002.1433-1-yuwenjun0x@163.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] net/ice: fix deadlock in ice_flow_query() X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Yu Wenjun > Sent: Thursday, August 19, 2021 8:10 PM > To: Yang, Qiming ; Zhang, Qi Z > > Cc: dev@dpdk.org; stable@dpdk.org; Yu Wenjun > Subject: [PATCH] net/ice: fix deadlock in ice_flow_query() >=20 > It will cause deadlock when use switch-default, so fix it >=20 > Signed-off-by: Yu Wenjun Fixes: 0d6ef740e411 ("net/ice: support flow ops thread safe") Cc: stable@dpdk.org Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi > --- > drivers/net/ice/ice_generic_flow.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/net/ice/ice_generic_flow.c > b/drivers/net/ice/ice_generic_flow.c > index 66b5743abf..c2fa75f165 100644 > --- a/drivers/net/ice/ice_generic_flow.c > +++ b/drivers/net/ice/ice_generic_flow.c > @@ -2518,15 +2518,16 @@ ice_flow_query(struct rte_eth_dev *dev, > ret =3D flow->engine->query_count(ad, flow, count, error); > break; > default: > - return rte_flow_error_set(error, ENOTSUP, > + ret =3D rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > actions, > "action not supported"); > + goto out; > } > } >=20 > +out: > rte_spinlock_unlock(&pf->flow_ops_lock); > - > return ret; > } >=20 > -- > 2.32.0.windows.1 >=20