From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (xvm-189-124.dc0.ghst.net [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 555F9A09FF; Thu, 7 Jan 2021 04:14:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3977140E70; Thu, 7 Jan 2021 04:14:24 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id C41E8140E6B for ; Thu, 7 Jan 2021 04:14:22 +0100 (CET) IronPort-SDR: sbwvVfX7zlS2fy+Q7lJZAlrx+tDwTJyJ7WPqDBnMLeuktcCf88Pvu0fq5h1yVDPwRI2D5jayHL yDIoxFYi/F4A== X-IronPort-AV: E=McAfee;i="6000,8403,9856"; a="262137514" X-IronPort-AV: E=Sophos;i="5.79,328,1602572400"; d="scan'208";a="262137514" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2021 19:14:21 -0800 IronPort-SDR: uPvHw1YE32hWw1v552BzZg6oSHuN0p9zMzj2+tWOYrYX4uwSz00EN8tH32AQJeGcku2JBvqNnb R5XkC7v9gRwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,328,1602572400"; d="scan'208";a="398467392" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga002.fm.intel.com with ESMTP; 06 Jan 2021 19:14:21 -0800 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 6 Jan 2021 19:14:20 -0800 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by SHSMSX601.ccr.corp.intel.com (10.109.6.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 7 Jan 2021 11:14:19 +0800 Received: from shsmsx605.ccr.corp.intel.com ([10.109.6.215]) by SHSMSX605.ccr.corp.intel.com ([10.109.6.215]) with mapi id 15.01.1713.004; Thu, 7 Jan 2021 11:14:18 +0800 From: "Yan, Zhirun" To: "Cao, Yahui" , "dev@dpdk.org" , "Zhang, Qi Z" , "Wang, Xiao W" , "Guo, Junfeng" CC: "Su, Simei" , "Xu, Ting" , "Zhang, Yuying" Thread-Topic: [PATCH v1 4/5] net/ice: add outer input set mask check Thread-Index: AQHW12ZitYKrNFQd6Ue86VSk05IDkaoGyMOAgBTOEKA= Date: Thu, 7 Jan 2021 03:14:18 +0000 Message-ID: References: <20201221065150.1600719-1-zhirun.yan@intel.com> <20201221065150.1600719-5-zhirun.yan@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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 v1 4/5] net/ice: add outer input set mask check 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: Cao, Yahui > Sent: Friday, December 25, 2020 1:29 PM > To: Yan, Zhirun ; dev@dpdk.org; Zhang, Qi Z > ; Wang, Xiao W ; Guo, > Junfeng > Cc: Su, Simei ; Xu, Ting ; Zhang, > Yuying > Subject: RE: [PATCH v1 4/5] net/ice: add outer input set mask check >=20 > I suggest that you can merge this commit into the Patch 3/5, since they = are > all about input set mask changes. >=20 Yes. I will meld into previous commit. Thanks. > > -----Original Message----- > > From: Yan, Zhirun > > Sent: Monday, December 21, 2020 2:52 PM > > To: dev@dpdk.org; Zhang, Qi Z ; Cao, Yahui > > ; Wang, Xiao W ; Guo, > > Junfeng > > Cc: Su, Simei ; Xu, Ting ; > > Zhang, Yuying ; Yan, Zhirun > > > > Subject: [PATCH v1 4/5] net/ice: add outer input set mask check > > > > Distinguish input set mask for inner/outer. Add outer input set mask > > check. > > > > Signed-off-by: Zhirun Yan > > --- > > drivers/net/ice/ice_fdir_filter.c | 3 ++- > > drivers/net/ice/ice_generic_flow.c | 2 ++ > > 2 files changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ice/ice_fdir_filter.c > > b/drivers/net/ice/ice_fdir_filter.c > > index 76e0a8df38..2d2b261368 100644 > > --- a/drivers/net/ice/ice_fdir_filter.c > > +++ b/drivers/net/ice/ice_fdir_filter.c > > @@ -2020,7 +2020,8 @@ ice_fdir_parse(struct ice_adapter *ad, > > if (ret) > > goto error; > > input_set =3D filter->input_set | filter->outer_input_set; > > - if (!input_set || input_set & ~item->input_set_mask) { > > + if (!input_set || filter->input_set & ~item->input_set_mask || > > + filter->outer_input_set & ~item->input_set_mask_f) { > > rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ITEM_SPEC, > > pattern, > > diff --git a/drivers/net/ice/ice_generic_flow.c > > b/drivers/net/ice/ice_generic_flow.c > > index 1429cbc3b6..6c20b070c7 100644 > > --- a/drivers/net/ice/ice_generic_flow.c > > +++ b/drivers/net/ice/ice_generic_flow.c > > @@ -2088,6 +2088,8 @@ ice_search_pattern_match_item(const struct > rte_flow_item pattern[], > > items)) { > > pattern_match_item->input_set_mask =3D > > array[i].input_set_mask; > > + pattern_match_item->input_set_mask_f =3D > > + array[i].input_set_mask_f; > > pattern_match_item->pattern_list =3D > > array[i].pattern_list; > > pattern_match_item->meta =3D array[i].meta; > > -- > > 2.25.1