Skip to contentSkip to conversation

net/iavf: support FDIR TCP/UDP pattern without input set

PATCH Applied Yuying Zhang 3 participants 5 messages Dec 1, 2020 – Jan 7, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/iavf: support FDIR TCP/UDP pattern without input set

This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter.

---
 drivers/net/iavf/iavf_fdir.c | 67 ++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 11 deletions(-)
drivers/net/iavf/iavf_fdir.c +56 -11
index 7054bde0b..2c57313e4 100644
@@ -448,9 +448,56 @@ iavf_fdir_parse_action(struct iavf_adapter *ad,
 	return 0;
 }
 
+static int
+iavf_fdir_refine_input_set(const uint64_t input_set,
+			   const uint64_t input_set_mask,
+			   struct iavf_fdir_conf *filter)
+{
+	struct virtchnl_proto_hdr *hdr, *hdr_last;
+	struct rte_flow_item_ipv4 ipv4_spec;
+	struct rte_flow_item_ipv6 ipv6_spec;
+	int last_layer;
+	uint8_t proto_id;
+
+	if (input_set & ~input_set_mask)
+		return -rte_errno;
+	else if (input_set)
+		return 0;
+
+	last_layer = filter->add_fltr.rule_cfg.proto_hdrs.count - 1;
+	hdr_last = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer];
+	if (hdr_last->type == VIRTCHNL_PROTO_HDR_TCP)
+		proto_id = 6;
+	else if (hdr_last->type == VIRTCHNL_PROTO_HDR_UDP)
+		proto_id = 17;
+	else
+		return -rte_errno;
+
+	hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer - 1];
+	switch (hdr->type) {
+	case VIRTCHNL_PROTO_HDR_IPV4:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT);
+		memset(&ipv4_spec, 0, sizeof(ipv4_spec));
+		ipv4_spec.hdr.next_proto_id = proto_id;
+		rte_memcpy(hdr->buffer, &ipv4_spec.hdr,
+			   sizeof(ipv4_spec.hdr));
+		return 0;
+	case VIRTCHNL_PROTO_HDR_IPV6:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT);
+		memset(&ipv6_spec, 0, sizeof(ipv6_spec));
+		ipv6_spec.hdr.proto = proto_id;
+		rte_memcpy(hdr->buffer, &ipv6_spec.hdr,
+			   sizeof(ipv6_spec.hdr));
+		return 0;
+	default:
+		return -rte_errno;
+	}
+}
+
 static int
 iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 			const struct rte_flow_item pattern[],
+			const uint64_t input_set_mask,
 			struct rte_flow_error *error,
 			struct iavf_fdir_conf *filter)
 {
@@ -924,6 +971,13 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 		return -rte_errno;
 	}
 
+	if (iavf_fdir_refine_input_set(input_set, input_set_mask, filter)) {
+		rte_flow_error_set(error, EINVAL,
+				   RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern,
+				   "Invalid input set");
+		return -rte_errno;
+	}
+
 	filter->input_set = input_set;
 
 	return 0;
@@ -941,7 +995,6 @@ iavf_fdir_parse(struct iavf_adapter *ad,
 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
 	struct iavf_fdir_conf *filter = &vf->fdir.conf;
 	struct iavf_pattern_match_item *item = NULL;
-	uint64_t input_set;
 	int ret;
 
 	memset(filter, 0, sizeof(*filter));
@@ -950,19 +1003,11 @@ iavf_fdir_parse(struct iavf_adapter *ad,
 	if (!item)
 		return -rte_errno;
 
-	ret = iavf_fdir_parse_pattern(ad, pattern, error, filter);
+	ret = iavf_fdir_parse_pattern(ad, pattern, item->input_set_mask,
+				      error, filter);
 	if (ret)
 		goto error;
 
-	input_set = filter->input_set;
-	if (!input_set || input_set & ~item->input_set_mask) {
-		rte_flow_error_set(error, EINVAL,
-				RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern,
-				"Invalid input set");
-		ret = -rte_errno;
-		goto error;
-	}
-
 	ret = iavf_fdir_parse_action(ad, actions, error, filter);
 	if (ret)
 		goto error;
Signature · 1 line
2.25.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Zhang, Yuying <[email protected]>
Sent: Tuesday, December 1, 2020 4:32 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Zhang, Yuying <[email protected]>
Subject: [PATCH v1] net/iavf: support FDIR TCP/UDP pattern without input set

Quoted 4 lines

This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter.

Applied to dpdk-next-net-intel.

Thanks
Qi

#2 lore raw
In reply to Yuying Zhang
Quoted 3 lines · Yuying Zhang

This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter.

Can you please describe more what is supported now, it can be even better to give same samples which patter is supported now, which was not supported before?

Quoted 16 lines
---
  drivers/net/iavf/iavf_fdir.c | 67 ++++++++++++++++++++++++++++++------
  1 file changed, 56 insertions(+), 11 deletions(-)
drivers/net/iavf/iavf_fdir.c +3 -0
index 7054bde0b..2c57313e4 100644
@@ -448,9 +448,56 @@ iavf_fdir_parse_action(struct iavf_adapter *ad,
  	return 0;
  }
 
+static int
+iavf_fdir_refine_input_set(const uint64_t input_set,
+			   const uint64_t input_set_mask,

drivers/net/iavf/iavf_fdir.c iavf_fdir_parse_action(struct iavf_adapter *ad, · line 463

Quoted 10 lines
drivers/net/iavf/iavf_fdir.c +10 -0
+			   struct iavf_fdir_conf *filter)
+{
+	struct virtchnl_proto_hdr *hdr, *hdr_last;
+	struct rte_flow_item_ipv4 ipv4_spec;
+	struct rte_flow_item_ipv6 ipv6_spec;
+	int last_layer;
+	uint8_t proto_id;
+
+	if (input_set & ~input_set_mask)
+		return -rte_errno;

What is the value of the 'rte_errno' at this stage, why returning it instead of setting it?

drivers/net/iavf/iavf_fdir.c iavf_fdir_parse_action(struct iavf_adapter *ad, · line 476

Quoted 13 lines
drivers/net/iavf/iavf_fdir.c +13 -0
+	else if (input_set)
+		return 0;
+
+	last_layer = filter->add_fltr.rule_cfg.proto_hdrs.count - 1;
+	hdr_last = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer];
+	if (hdr_last->type == VIRTCHNL_PROTO_HDR_TCP)
+		proto_id = 6;
+	else if (hdr_last->type == VIRTCHNL_PROTO_HDR_UDP)
+		proto_id = 17;
+	else
+		return -rte_errno;
+
+	hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer - 1];

Do we know here that 'last_layer' > 0 ?

Quoted 20 lines
drivers/net/iavf/iavf_fdir.c +20 -0
+	switch (hdr->type) {
+	case VIRTCHNL_PROTO_HDR_IPV4:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT);
+		memset(&ipv4_spec, 0, sizeof(ipv4_spec));
+		ipv4_spec.hdr.next_proto_id = proto_id;
+		rte_memcpy(hdr->buffer, &ipv4_spec.hdr,
+			   sizeof(ipv4_spec.hdr));
+		return 0;
+	case VIRTCHNL_PROTO_HDR_IPV6:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT);
+		memset(&ipv6_spec, 0, sizeof(ipv6_spec));
+		ipv6_spec.hdr.proto = proto_id;
+		rte_memcpy(hdr->buffer, &ipv6_spec.hdr,
+			   sizeof(ipv6_spec.hdr));
+		return 0;
+	default:
+		return -rte_errno;
+	}
+}
+

<...>

#3 lore raw

PATCH v2 1/1 net/iavf: support FDIR TCP/UDP pattern without input set

In reply to Yuying Zhang

This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter.

1. flow create 0 ingress pattern eth / ipv4 / udp / end actions rss queues 0 1 2 3 end / end
2. flow create 0 ingress pattern eth / ipv6 / tcp / end actions queue index 3 / end
This patch supports above patterns which can't be created currently.

---
 drivers/net/iavf/iavf_fdir.c | 70 ++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 11 deletions(-)
drivers/net/iavf/iavf_fdir.c +59 -11
index d683a468c..c8d53ccab 100644
@@ -448,9 +448,59 @@ iavf_fdir_parse_action(struct iavf_adapter *ad,
 	return 0;
 }
 
+static bool
+iavf_fdir_refine_input_set(const uint64_t input_set,
+			   const uint64_t input_set_mask,
+			   struct iavf_fdir_conf *filter)
+{
+	struct virtchnl_proto_hdr *hdr, *hdr_last;
+	struct rte_flow_item_ipv4 ipv4_spec;
+	struct rte_flow_item_ipv6 ipv6_spec;
+	int last_layer;
+	uint8_t proto_id;
+
+	if (input_set & ~input_set_mask)
+		return false;
+	else if (input_set)
+		return true;
+
+	last_layer = filter->add_fltr.rule_cfg.proto_hdrs.count - 1;
+	/* Last layer of TCP/UDP pattern isn't less than 2. */
+	if (last_layer < 2)
+		return false;
+	hdr_last = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer];
+	if (hdr_last->type == VIRTCHNL_PROTO_HDR_TCP)
+		proto_id = 6;
+	else if (hdr_last->type == VIRTCHNL_PROTO_HDR_UDP)
+		proto_id = 17;
+	else
+		return false;
+
+	hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer - 1];
+	switch (hdr->type) {
+	case VIRTCHNL_PROTO_HDR_IPV4:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT);
+		memset(&ipv4_spec, 0, sizeof(ipv4_spec));
+		ipv4_spec.hdr.next_proto_id = proto_id;
+		rte_memcpy(hdr->buffer, &ipv4_spec.hdr,
+			   sizeof(ipv4_spec.hdr));
+		return true;
+	case VIRTCHNL_PROTO_HDR_IPV6:
+		VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT);
+		memset(&ipv6_spec, 0, sizeof(ipv6_spec));
+		ipv6_spec.hdr.proto = proto_id;
+		rte_memcpy(hdr->buffer, &ipv6_spec.hdr,
+			   sizeof(ipv6_spec.hdr));
+		return true;
+	default:
+		return false;
+	}
+}
+
 static int
 iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 			const struct rte_flow_item pattern[],
+			const uint64_t input_set_mask,
 			struct rte_flow_error *error,
 			struct iavf_fdir_conf *filter)
 {
@@ -924,6 +974,13 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 		return -rte_errno;
 	}
 
+	if (!iavf_fdir_refine_input_set(input_set, input_set_mask, filter)) {
+		rte_flow_error_set(error, EINVAL,
+				   RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern,
+				   "Invalid input set");
+		return -rte_errno;
+	}
+
 	filter->input_set = input_set;
 
 	return 0;
@@ -941,7 +998,6 @@ iavf_fdir_parse(struct iavf_adapter *ad,
 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
 	struct iavf_fdir_conf *filter = &vf->fdir.conf;
 	struct iavf_pattern_match_item *item = NULL;
-	uint64_t input_set;
 	int ret;
 
 	memset(filter, 0, sizeof(*filter));
@@ -950,19 +1006,11 @@ iavf_fdir_parse(struct iavf_adapter *ad,
 	if (!item)
 		return -rte_errno;
 
-	ret = iavf_fdir_parse_pattern(ad, pattern, error, filter);
+	ret = iavf_fdir_parse_pattern(ad, pattern, item->input_set_mask,
+				      error, filter);
 	if (ret)
 		goto error;
 
-	input_set = filter->input_set;
-	if (!input_set || input_set & ~item->input_set_mask) {
-		rte_flow_error_set(error, EINVAL,
-				RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern,
-				"Invalid input set");
-		ret = -rte_errno;
-		goto error;
-	}
-
 	ret = iavf_fdir_parse_action(ad, actions, error, filter);
 	if (ret)
 		goto error;
Signature · 1 line
2.25.1
Acked-by on v2 1/1 Applied
#4 lore raw
Quoted 10 lines

-----Original Message-----
From: Zhang, Yuying <[email protected]>
Sent: Wednesday, January 6, 2021 6:49 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Yigit, Ferruh <[email protected]>
Cc: Zhang, Yuying <[email protected]>
Subject: [PATCH v2] net/iavf: support FDIR TCP/UDP pattern without input set

Quoted 8 lines

This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter.

1. flow create 0 ingress pattern eth / ipv4 / udp / end actions rss queues 0 1 2 3 end / end
2. flow create 0 ingress pattern eth / ipv6 / tcp / end actions queue index 3 / end
This patch supports above patterns which can't be created currently.

Refine the commit a little bit as below:

This patch will refine the inputset when it is empty and generate a dummy proto type as inputset in l3 header which is required by the hardware.

Quoted 2 lines

Applied to dpdk-next-net-intel after reverted v1.

Thanks
Qi