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 BA969A057B; Thu, 2 Apr 2020 10:29:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AF8A11BECC; Thu, 2 Apr 2020 10:29:58 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 224E21BEA6; Thu, 2 Apr 2020 10:29:55 +0200 (CEST) IronPort-SDR: kN4Ttu11lX6lHnhy9MJugEVPzFWCeBYpuFWFd44zRKiPz140OeR8GEqBfTPnw6oPJFEj4ugZwG gERZ1II5bVow== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 01:29:53 -0700 IronPort-SDR: e+Nc31G5tdyS93V/3piQiP6eld300AzEc80Z5dWcQ4MK4EkrvcmxXnEmCg2q79zuryENJMs0Zl AjLPYfWF7hFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,335,1580803200"; d="scan'208";a="328746671" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 02 Apr 2020 01:29:52 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 2 Apr 2020 01:29:52 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 2 Apr 2020 01:29:51 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.146]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.22]) with mapi id 14.03.0439.000; Thu, 2 Apr 2020 16:29:48 +0800 From: "Zhang, Qi Z" To: "Zhao1, Wei" , "dev@dpdk.org" CC: "Peng, Yuan" , "Lu, Nannan" , "Fu, Qi" , "Wang, Haiyue" , "stable@dpdk.org" Thread-Topic: [PATCH v2 06/13] net/ice: add action number check for swicth Thread-Index: AQHWCL1qFNjKPMpPpUauuLj9a9/zF6hlfzuw Date: Thu, 2 Apr 2020 08:29:48 +0000 Message-ID: <039ED4275CED7440929022BC67E70611547F1D03@SHSMSX103.ccr.corp.intel.com> References: <20200313020806.21654-1-wei.zhao1@intel.com> <20200402064620.47668-1-wei.zhao1@intel.com> <20200402064620.47668-7-wei.zhao1@intel.com> In-Reply-To: <20200402064620.47668-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-dev] [PATCH v2 06/13] net/ice: add action number check for swicth 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" > -----Original Message----- > From: Zhao1, Wei > Sent: Thursday, April 2, 2020 2:46 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Peng, Yuan ; > Lu, Nannan ; Fu, Qi ; Wang, Haiyue > ; stable@dpdk.org; Zhao1, Wei > > Subject: [PATCH v2 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 > large action. There is no "large action" in rte_flow, maybe just "not support multiple ac= tions"? >=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