DPDK patches and discussions
 help / color / mirror / Atom feed
From: "wei.zhao1@intel.com" <"Wei Zhao"@dpdk.org>
To: dev@dpdk.org
Cc: qi.z.zhang@intel.com, xiaolong.ye@intel.com, stable@dpdk.org,
	Wei Zhao <wei.zhao1@intel.com>
Subject: [dpdk-dev] [PATCH 6/7] net/ice: add action number check for swicth
Date: Fri, 13 Mar 2020 09:04:06 +0800	[thread overview]
Message-ID: <20200313010407.18286-7-wei.zhao1@intel.com> (raw)
In-Reply-To: <20200313010407.18286-1-wei.zhao1@intel.com>

The action number can only be one for DCF or PF
switch filter, not support large action.

Cc: stable@dpdk.org
Fixes: 47d460d63233 ("net/ice: rework switch filter")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 7ca922602..48d689deb 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1079,6 +1079,46 @@ ice_switch_parse_action(struct ice_pf *pf,
 	return -rte_errno;
 }
 
+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 = 0;
+
+	for (action = actions; action->type !=
+				RTE_FLOW_ACTION_TYPE_END; action++) {
+		action_type = 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,
@@ -1164,6 +1204,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
 		goto error;
 	}
 
+	ret = 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 = ice_switch_parse_dcf_action(actions, error, &rule_info);
 	else
-- 
2.19.1


  parent reply	other threads:[~2020-03-13  1:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-13  1:04 [dpdk-dev] [PATCH 0/7] add switch filter support for intel DCF wei.zhao1@intel.com
2020-03-13  1:04 ` [dpdk-dev] [PATCH 1/7] net/ice: enable switch flow on DCF wei.zhao1@intel.com
2020-03-13  1:04 ` [dpdk-dev] [PATCH 2/7] net/ice: support for more PPPoE input set wei.zhao1@intel.com
2020-03-13  1:04 ` [dpdk-dev] [PATCH 3/7] net/ice: change swicth parser to support flexible mask wei.zhao1@intel.com
2020-03-13  1:04 ` [dpdk-dev] [PATCH 4/7] net/ice: add support for MAC VLAN rule wei.zhao1@intel.com
2020-03-13  1:04 ` [dpdk-dev] [PATCH 5/7] net/ice: change default tunnle type wei.zhao1@intel.com
2020-03-13 16:14   ` Stillwell Jr, Paul M
2020-03-13  1:04 ` wei.zhao1@intel.com [this message]
2020-03-13  1:04 ` [dpdk-dev] [PATCH 7/7] net/ice: fix input set of VLAN item wei.zhao1@intel.com
2020-03-13 16:12 ` [dpdk-dev] [PATCH 0/7] add switch filter support for intel DCF Stillwell Jr, Paul M
2020-03-15  2:19   ` Zhang, Qi Z
2020-03-13  2:07 Wei Zhao
2020-03-13  2:08 ` [dpdk-dev] [PATCH 6/7] net/ice: add action number check for swicth Wei Zhao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200313010407.18286-7-wei.zhao1@intel.com \
    --to="wei zhao"@dpdk.org \
    --cc=dev@dpdk.org \
    --cc=qi.z.zhang@intel.com \
    --cc=stable@dpdk.org \
    --cc=wei.zhao1@intel.com \
    --cc=xiaolong.ye@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).