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 69C3DA057B for ; Fri, 3 Apr 2020 05:15:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 438481C045; Fri, 3 Apr 2020 05:15:50 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id EFD931BE8D; Fri, 3 Apr 2020 05:15:46 +0200 (CEST) IronPort-SDR: w0fiW7kVg0Z/zSHJL12ABXKwHbDq+6jgUYjN8plO2zQgvpiC4xbEP9VQV5cy75QWuYVdPsvo1u V7aJlqCMys1Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 20:15:45 -0700 IronPort-SDR: CuFfdGACh0TpAvHOkAir0/2iE9VSD2QSwosIhEhCvu/1RCJQTV2fNmEvFi0VYEGh9mkDw1zIQp xJ3RAFmgCi8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,338,1580803200"; d="scan'208";a="360401950" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 02 Apr 2020 20:15:46 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 2 Apr 2020 20:15:45 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 2 Apr 2020 20:15:45 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.146]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.129]) with mapi id 14.03.0439.000; Fri, 3 Apr 2020 11:15:42 +0800 From: "Zhang, Qi Z" To: "Zhao1, Wei" , "dev@dpdk.org" CC: "Lu, Nannan" , "Fu, Qi" , "Peng, Yuan" , "stable@dpdk.org" Thread-Topic: [PATCH v3 06/13] net/ice: add action number check for swicth Thread-Index: AQHWCWS3JaHQYq2fF0SNFWp4uL+c16hmuWOw Date: Fri, 3 Apr 2020 03:15:41 +0000 Message-ID: <039ED4275CED7440929022BC67E70611547F2722@SHSMSX103.ccr.corp.intel.com> References: <20200402064620.47668-1-wei.zhao1@intel.com> <20200403024353.24681-1-wei.zhao1@intel.com> <20200403024353.24681-7-wei.zhao1@intel.com> In-Reply-To: <20200403024353.24681-7-wei.zhao1@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" > -----Original Message----- > From: Zhao1, Wei > Sent: Friday, April 3, 2020 10:44 AM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Lu, Nannan ; > Fu, Qi ; Peng, Yuan ; > stable@dpdk.org; Zhao1, Wei > Subject: [PATCH v3 06/13] net/ice: add action number check for swicth >=20 > The action number can only be one for DCF or PF switch filter, not suppor= t > not support multiple actions. Not support multiple actions >=20 > Cc: stable@dpdk.org > Fixes: 47d460d63233 ("net/ice: rework switch filter") >=20 > Signed-off-by: Wei Zhao > --- > drivers/net/ice/ice_switch_filter.c | 48 > +++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) >=20 > diff --git a/drivers/net/ice/ice_switch_filter.c > b/drivers/net/ice/ice_switch_filter.c > index d9bdf9637..cc48f22dd 100644 > --- a/drivers/net/ice/ice_switch_filter.c > +++ b/drivers/net/ice/ice_switch_filter.c > @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, > return -rte_errno; > } >=20 > +static int > +ice_switch_check_action(const struct rte_flow_action *actions, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action *action; > + enum rte_flow_action_type action_type; > + uint16_t actions_num =3D 0; > + > + for (action =3D actions; action->type !=3D > + RTE_FLOW_ACTION_TYPE_END; action++) { > + action_type =3D action->type; > + switch (action_type) { > + case RTE_FLOW_ACTION_TYPE_VF: > + case RTE_FLOW_ACTION_TYPE_RSS: > + case RTE_FLOW_ACTION_TYPE_QUEUE: > + case RTE_FLOW_ACTION_TYPE_DROP: > + actions_num++; > + break; > + case RTE_FLOW_ACTION_TYPE_VOID: > + continue; > + default: > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action type"); > + return -rte_errno; > + } > + } > + > + if (actions_num > 1) { > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action number"); > + return -rte_errno; > + } > + > + return 0; > +} > + > static int > ice_switch_parse_pattern_action(struct ice_adapter *ad, > struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ > ice_switch_parse_pattern_action(struct ice_adapter *ad, > goto error; > } >=20 > + ret =3D ice_switch_check_action(actions, error); > + if (ret) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > + "Invalid input action number"); > + goto error; > + } > + > if (ad->hw.dcf_enabled) > ret =3D ice_switch_parse_dcf_action(actions, error, &rule_info); > else > -- > 2.19.1