Skip to contentSkip to conversation

net/i40e: fix hash enable issue in RSS flow

PATCH Applied Shougang Wang 5 participants 8 messages May 7, 2020 – May 14, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type L2-payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS flow")
---
 drivers/net/i40e/i40e_flow.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c +6 -8
index 7e64ae53a..f5f2f0d5d 100644
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 		{ pattern_fdir_ipv6_tcp, ETH_RSS_NONFRAG_IPV6_TCP },
 		{ pattern_fdir_ipv6_udp, ETH_RSS_NONFRAG_IPV6_UDP },
 		{ pattern_fdir_ipv6_sctp, ETH_RSS_NONFRAG_IPV6_SCTP },
+		{ pattern_ethertype, ETH_RSS_L2_PAYLOAD },
 		{ pattern_fdir_ipv6_esp, ETH_RSS_ESP },
 		{ pattern_fdir_ipv6_udp_esp, ETH_RSS_ESP },
 	};
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 		if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
 					items)) {
 			p_info->types = i40e_rss_pctype_patterns[i].type;
-			rte_free(items);
-			return 0;
+			break;
 		}
 	}
 
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 			}
 			break;
 		default:
-			rte_flow_error_set(error, EINVAL,
-					RTE_FLOW_ERROR_TYPE_ITEM,
-					item,
-					"Not support range");
-			return -rte_errno;
+			p_info->action_flag = 0;
+			memset(info, 0, sizeof(struct i40e_queue_regions));
+			return 0;
 		}
 	}
 
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
-	if (p_info.action_flag) {
+	if (p_info.action_flag && rss->queue_num) {
 		for (n = 0; n < 64; n++) {
 			if (rss->types & (hf_bit << n)) {
 				conf_info->region[0].hw_flowtype[0] = n;
Signature · 1 line
2.17.1
#1 lore raw
Quoted 26 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS flow")
---
 drivers/net/i40e/i40e_flow.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c index renamed from drivers/net/i40e/i40e_flow.c +0 -0

7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct
 rte_eth_dev *dev,

<...>

Quoted 37 lines
drivers/net/i40e/i40e_flow.c +1 -2
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct
 rte_eth_dev *dev,
 		if
 (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
 					items)) {
 			p_info->types = i40e_rss_pctype_patterns[i].type;
-			rte_free(items);
-			return 0;
+			break;
 		}
drivers/net/i40e/i40e_flow.c +4 -6
 	}
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
 			}
 			break;
 		default:
-			rte_flow_error_set(error, EINVAL,
-					RTE_FLOW_ERROR_TYPE_ITEM,
-					item,
-					"Not support range");
-			return -rte_errno;
+			p_info->action_flag = 0;
+			memset(info, 0, sizeof(struct i40e_queue_regions));
+			return 0;
 		}
 	}
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
 *dev,
 		return -rte_errno;
 	}
 
-	if (p_info.action_flag) {
+	if (p_info.action_flag && rss->queue_num) {
 		for (n = 0; n < 64; n++) {
 			if (rss->types & (hf_bit << n)) {
Quoted 3 lines

conf_info->region[0].hw_flowtype[0] = n;
--
2.17.1

Are the above changes relating to L2-payload?

#2 lore raw

Hi, Beilei

Quoted 66 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Friday, May 8, 2020 9:04 AM
To: Wang, ShougangX <[email protected]>; [email protected]
Subject: RE: [PATCH] net/i40e: fix hash enable issue in RSS flow

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 24 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS

flow")

---
 drivers/net/i40e/i40e_flow.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_flow.c index 7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
 rte_eth_dev *dev,

<...>

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 27 lines

rte_eth_dev *dev, if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
items)) {
p_info->types = i40e_rss_pctype_patterns[i].type; -rte_free(items);

drivers/net/i40e/i40e_flow.c +3 -6
-return 0;
+break;
 }
 }
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
 }
 break;
 default:
-rte_flow_error_set(error, EINVAL,
-RTE_FLOW_ERROR_TYPE_ITEM,
-item,
-"Not support range");
-return -rte_errno;
+p_info->action_flag = 0;
+memset(info, 0, sizeof(struct i40e_queue_regions)); return 0;
 }
 }
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
 *dev,  return -rte_errno;  }
 
Quoted 10 lines
Quoted 7 lines
drivers/net/i40e/i40e_flow.c +1 -2
-if (p_info.action_flag) {
+if (p_info.action_flag && rss->queue_num) {
 for (n = 0; n < 64; n++) {
 if (rss->types & (hf_bit << n)) {
 conf_info->region[0].hw_flowtype[0] = n;
--

2.17.1

Are the above changes relating to L2-payload?

Yes, in order to resolve the conflict between hash enable and queue region which caused by ether pattern, there are also a little bit changes for queue region.

Thanks.
Shougang

Tested-by
#3 lore raw

Regards,
Xu, Hailin

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Wang, ShougangX
Sent: Friday, May 8, 2020 9:52 AM
To: Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

Hi, Beilei

Quoted 67 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Friday, May 8, 2020 9:04 AM
To: Wang, ShougangX <[email protected]>; [email protected]
Subject: RE: [PATCH] net/i40e: fix hash enable issue in RSS flow

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 25 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type
L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS

flow")

---
 drivers/net/i40e/i40e_flow.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_flow.c index 7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
 rte_eth_dev *dev,

<...>

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 27 lines

rte_eth_dev *dev, if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
items)) {
p_info->types = i40e_rss_pctype_patterns[i].type; -rte_free(items);

drivers/net/i40e/i40e_flow.c +3 -6
-return 0;
+break;
 }
 }
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
 }
 break;
 default:
-rte_flow_error_set(error, EINVAL,
-RTE_FLOW_ERROR_TYPE_ITEM,
-item,
-"Not support range");
-return -rte_errno;
+p_info->action_flag = 0;
+memset(info, 0, sizeof(struct i40e_queue_regions)); return 0;
 }
 }
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev 
 *dev,  return -rte_errno;  }
 
Quoted 10 lines
Quoted 7 lines
drivers/net/i40e/i40e_flow.c +1 -2
-if (p_info.action_flag) {
+if (p_info.action_flag && rss->queue_num) {
 for (n = 0; n < 64; n++) {
 if (rss->types & (hf_bit << n)) {
 conf_info->region[0].hw_flowtype[0] = n;
--

2.17.1

Are the above changes relating to L2-payload?

Yes, in order to resolve the conflict between hash enable and queue region which caused by ether pattern, there are also a little bit changes for queue region.

Thanks.
Shougang

#4 lore raw

hi, hailin

Seems that this patch is fixing a issue about l2-playload but it is related with the priors wrong usage of the pattern.

The rework need further to do and sincerely it it not very easy to review it.  But if consider it for the work around solution, commend as below.

Quoted 61 lines · HailinX

Regards,
Xu, Hailin

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Wang, ShougangX
Sent: Friday, May 8, 2020 9:52 AM
To: Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

Hi, Beilei

Quoted 48 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Friday, May 8, 2020 9:04 AM
To: Wang, ShougangX <[email protected]>; [email protected]
Subject: RE: [PATCH] net/i40e: fix hash enable issue in RSS flow

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 25 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type
L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS

flow")

---
  drivers/net/i40e/i40e_flow.c | 14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_flow.c index 7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
 rte_eth_dev *dev,

<...>

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 9 lines

rte_eth_dev *dev, if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
items)) {
p_info->types = i40e_rss_pctype_patterns[i].type; -rte_free(items);

drivers/net/i40e/i40e_flow.c +1 -1
-return 0;
+break;
  }
  }
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
  }
  break;
Quoted 8 lines

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,

Quoted 8 lines
drivers/net/i40e/i40e_flow.c +2 -5
  default:
-rte_flow_error_set(error, EINVAL,
-RTE_FLOW_ERROR_TYPE_ITEM,
-item,
-"Not support range");
-return -rte_errno;
+p_info->action_flag = 0;
+memset(info, 0, sizeof(struct i40e_queue_regions)); return 0;

Could you check if all case have set

p_info->action_flag such as RTE_FLOW_ITEM_TYPE_VLAN case.

Quoted 19 lines
Quoted 6 lines
Quoted 6 lines
drivers/net/i40e/i40e_flow.c +0 -0
  }
  }
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
 *dev,  return -rte_errno;  }
 
Quoted 9 lines
Quoted 7 lines
drivers/net/i40e/i40e_flow.c +1 -2
-if (p_info.action_flag) {
+if (p_info.action_flag && rss->queue_num) {
  for (n = 0; n < 64; n++) {
  if (rss->types & (hf_bit << n)) {
  conf_info->region[0].hw_flowtype[0] = n;
--

2.17.1

Are the above changes relating to L2-payload?

Yes, in order to resolve the conflict between hash enable and queue region which caused by ether pattern, there are also a little bit changes for queue region.

Thanks.
Shougang

#5 lore raw

Hi, Jeff

Thanks for your review.
This patch can be treated as a work around, the codes about p_info->action_flag will be reconstructed in the future.

Thanks.
Shougang

Quoted 121 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Wednesday, May 13, 2020 4:41 PM
To: Xu, HailinX <[email protected]>; Wang, ShougangX <[email protected]>; Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

hi, hailin

Seems that this patch is fixing a issue about l2-playload but it is related with the priors wrong usage of the pattern.

The rework need further to do and sincerely it it not very easy to review it.  But if consider it for the work around solution, commend as below.

Quoted 62 lines · HailinX

Regards,
Xu, Hailin

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Wang, ShougangX
Sent: Friday, May 8, 2020 9:52 AM
To: Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

Hi, Beilei

Quoted 48 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Friday, May 8, 2020 9:04 AM
To: Wang, ShougangX <[email protected]>; [email protected]
Subject: RE: [PATCH] net/i40e: fix hash enable issue in RSS flow

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 25 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type
L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS

flow")

---
  drivers/net/i40e/i40e_flow.c | 14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_flow.c index 7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
 rte_eth_dev *dev,

<...>

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 9 lines

rte_eth_dev *dev, if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
items)) {
p_info->types = i40e_rss_pctype_patterns[i].type;

drivers/net/i40e/i40e_flow.c +1 -1
-rte_free(items); -return 0;
+break;
  }
  }
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
  }
  break;
Quoted 8 lines

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,

Quoted 8 lines
drivers/net/i40e/i40e_flow.c +2 -5
  default:
-rte_flow_error_set(error, EINVAL,
-RTE_FLOW_ERROR_TYPE_ITEM,
-item,
-"Not support range");
-return -rte_errno;
+p_info->action_flag = 0;
+memset(info, 0, sizeof(struct i40e_queue_regions)); return 0;

Could you check if all case have set

p_info->action_flag such as RTE_FLOW_ITEM_TYPE_VLAN case.

Quoted 4 lines
Quoted 4 lines

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_action(struct

Quoted 4 lines
drivers/net/i40e/i40e_flow.c +0 -0
  }
  }
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct

rte_eth_dev

Quoted 11 lines
Quoted 11 lines
Quoted 9 lines
drivers/net/i40e/i40e_flow.c +1 -2
 *dev,  return -rte_errno;  }
 
-if (p_info.action_flag) {
+if (p_info.action_flag && rss->queue_num) {
  for (n = 0; n < 64; n++) {
  if (rss->types & (hf_bit << n)) {
  conf_info->region[0].hw_flowtype[0] = n;
--

2.17.1

Are the above changes relating to L2-payload?

Quoted 1 line

Yes, in order to resolve the conflict between hash enable and queue region

which caused by ether pattern, there are also a little bit changes for queue region.

Quoted 3 lines

Thanks.
Shougang

Reviewed-by
#6 lore raw
Quoted 127 lines · ShougangX

Hi, Jeff

Thanks for your review.
This patch can be treated as a work around, the codes about p_info->action_flag will be reconstructed in the future.

Thanks.
Shougang

Quoted 119 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Wednesday, May 13, 2020 4:41 PM
To: Xu, HailinX <[email protected]>; Wang, ShougangX <[email protected]>; Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

hi, hailin

Seems that this patch is fixing a issue about l2-playload but it is related with the priors wrong usage of the pattern.

The rework need further to do and sincerely it it not very easy to review it.  But if consider it for the work around solution, commend as below.

Quoted 62 lines · HailinX

Regards,
Xu, Hailin

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Wang, ShougangX
Sent: Friday, May 8, 2020 9:52 AM
To: Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix hash enable issue in RSS flow

Hi, Beilei

Quoted 48 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Friday, May 8, 2020 9:04 AM
To: Wang, ShougangX <[email protected]>; [email protected]
Subject: RE: [PATCH] net/i40e: fix hash enable issue in RSS flow

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 25 lines

-----Original Message-----
From: Wang, ShougangX <[email protected]>
Sent: Thursday, May 7, 2020 5:44 PM
To: [email protected]
Cc: Xing, Beilei <[email protected]>; Wang, ShougangX <[email protected]>
Subject: [PATCH] net/i40e: fix hash enable issue in RSS flow

This patch fixes the issue that failed to create an RSS rule with type
L2- payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS

flow")

---
   drivers/net/i40e/i40e_flow.c | 14 ++++++--------
   1 file changed, 6 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_flow.c index 7e64ae53a..f5f2f0d5d 100644L2-

drivers/net/i40e/i40e_flow.c +0 -0
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
 rte_eth_dev *dev,

<...>

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused

Quoted 1 line
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused

struct

Quoted 9 lines

rte_eth_dev *dev, if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,

   items)) {
   p_info->types = i40e_rss_pctype_patterns[i].type;
drivers/net/i40e/i40e_flow.c +1 -1
-rte_free(items); -return 0;
+break;
   }
   }
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
drivers/net/i40e/i40e_flow.c +0 -0
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused
 struct rte_eth_dev *dev,
   }
   break;
Quoted 8 lines

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,

Quoted 8 lines
drivers/net/i40e/i40e_flow.c +2 -5
   default:
-rte_flow_error_set(error, EINVAL,
-RTE_FLOW_ERROR_TYPE_ITEM,
-item,
-"Not support range");
-return -rte_errno;
+p_info->action_flag = 0;
+memset(info, 0, sizeof(struct i40e_queue_regions)); return 0;

Could you check if all case have set

p_info->action_flag such as RTE_FLOW_ITEM_TYPE_VLAN case.

Quoted 4 lines
Quoted 4 lines

drivers/net/i40e/i40e_flow.c i40e_flow_parse_rss_action(struct

Quoted 4 lines
drivers/net/i40e/i40e_flow.c +0 -0
   }
   }
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct

rte_eth_dev

Quoted 11 lines
Quoted 11 lines
Quoted 9 lines
drivers/net/i40e/i40e_flow.c +1 -2
 *dev,  return -rte_errno;  }
 
-if (p_info.action_flag) {
+if (p_info.action_flag && rss->queue_num) {
   for (n = 0; n < 64; n++) {
   if (rss->types & (hf_bit << n)) {
   conf_info->region[0].hw_flowtype[0] = n;
--

2.17.1

Are the above changes relating to L2-payload?

Quoted 1 line

Yes, in order to resolve the conflict between hash enable and queue region

which caused by ether pattern, there are also a little bit changes for queue region.

Quoted 2 lines

Thanks.
Shougang

Reviewed-by Jeff Guo <[email protected] <mailto:[email protected]>>
Applied
#7 lore raw
In reply to Shougang Wang
Quoted 59 lines · Shougang Wang

This patch fixes the issue that failed to create an RSS rule with type L2-payload.

Fixes feaae285b342 ("net/i40e: support hash configuration in RSS flow")

---
drivers/net/i40e/i40e_flow.c | 14 ++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c +6 -8
index 7e64ae53a..f5f2f0d5d 100644
@@ -4511,6 +4511,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 		{ pattern_fdir_ipv6_tcp, ETH_RSS_NONFRAG_IPV6_TCP },
 		{ pattern_fdir_ipv6_udp, ETH_RSS_NONFRAG_IPV6_UDP },
 		{ pattern_fdir_ipv6_sctp, ETH_RSS_NONFRAG_IPV6_SCTP },
+		{ pattern_ethertype, ETH_RSS_L2_PAYLOAD },
 		{ pattern_fdir_ipv6_esp, ETH_RSS_ESP },
 		{ pattern_fdir_ipv6_udp_esp, ETH_RSS_ESP },
 	};
@@ -4544,8 +4545,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 		if (i40e_match_pattern(i40e_rss_pctype_patterns[i].item_array,
 					items)) {
 			p_info->types = i40e_rss_pctype_patterns[i].type;
-			rte_free(items);
-			return 0;
+			break;
 		}
 	}
 
@@ -4580,11 +4580,9 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,
 			}
 			break;
 		default:
-			rte_flow_error_set(error, EINVAL,
-					RTE_FLOW_ERROR_TYPE_ITEM,
-					item,
-					"Not support range");
-			return -rte_errno;
+			p_info->action_flag = 0;
+			memset(info, 0, sizeof(struct i40e_queue_regions));
+			return 0;
 		}
 	}
 
@@ -4640,7 +4638,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
-	if (p_info.action_flag) {
+	if (p_info.action_flag && rss->queue_num) {
 		for (n = 0; n < 64; n++) {
 			if (rss->types & (hf_bit << n)) {
 				conf_info->region[0].hw_flowtype[0] = n;
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel, Thanks.