From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5512DA052A; Fri, 25 Dec 2020 06:29:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2BF86CA1A; Fri, 25 Dec 2020 06:29:02 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id A6AD2CA16 for ; Fri, 25 Dec 2020 06:29:00 +0100 (CET) IronPort-SDR: 6RR9EXKd8kUuXmHQ/iFdPuI1Qc7TMZhelD/XCtcgPrrM38wvhw0bDYGzTSDqj9oAOvUAlO2pgF KyLX97hucHQw== X-IronPort-AV: E=McAfee;i="6000,8403,9845"; a="176296418" X-IronPort-AV: E=Sophos;i="5.78,447,1599548400"; d="scan'208";a="176296418" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Dec 2020 21:28:58 -0800 IronPort-SDR: elQDDsvR4lER2RCUyACGyoiG2UJK9+2YrxCuSQuBp17cyEzF6/tMEUxy0M/NNZsB5QDTyzMoNI ccwHOuIbUb6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,447,1599548400"; d="scan'208";a="391810256" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga004.fm.intel.com with ESMTP; 24 Dec 2020 21:28:58 -0800 Received: from shsmsx604.ccr.corp.intel.com (10.109.6.214) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 24 Dec 2020 21:28:57 -0800 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by SHSMSX604.ccr.corp.intel.com (10.109.6.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 25 Dec 2020 13:28:55 +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; Fri, 25 Dec 2020 13:28:55 +0800 From: "Cao, Yahui" To: "Yan, Zhirun" , "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: AQHW12Ziw8lERVTaHE215aS34//3bKoHTp9A Date: Fri, 25 Dec 2020 05:28:55 +0000 Message-ID: References: <20201221065150.1600719-1-zhirun.yan@intel.com> <20201221065150.1600719-5-zhirun.yan@intel.com> In-Reply-To: <20201221065150.1600719-5-zhirun.yan@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 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.15 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" I suggest that you can merge this commit into the Patch 3/5, since they ar= e all about input set mask changes. > -----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 >=20 > Distinguish input set mask for inner/outer. Add outer input set > mask check. >=20 > 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(-) >=20 > 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_gen= eric_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