[v8] net/iavf: fix invalid RSS combinations rule can be created

Message ID 20210107091710.84719-1-murphyx.yang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v8] net/iavf: fix invalid RSS combinations rule can be created |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Murphy Yang Jan. 7, 2021, 9:17 a.m. UTC
  Currently, when use 'flow' command to create a rule with following invalid
RSS type combination, it can be created successfully.

Invalid RSS combinations list:
 - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP
 - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP

This patch adds these combinations in 'invalid_rss_comb' array to do
valid check, if the combination check failed, the rule will be created
unsuccessful.

Fixes: 91f27b2e39ab ("net/iavf: refactor RSS")

Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
---
v8:
- Update the comments.
v7:
- Remove unsupported RSS combinations array.
- Restored 'ETH_RSS_GTPU' in input set mask.
v6:
- Add unsupported RSS combinations array.
v5:
- Remove 'ETH_RSS_GTPU' from input set mask.
v4:
- Use 'ETH_RSS_XXX' replace 'IAVF_RSS_TYPE_INNER_XXX'
v3:
- Update the comments.
v2:
- Add invalid RSS combinations.
 drivers/net/iavf/iavf_hash.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Guo, Jia Jan. 7, 2021, 9:33 a.m. UTC | #1
Acked-by: Jeff Guo <jia.guo@intel.com>

> -----Original Message-----
> From: Murphy Yang <murphyx.yang@intel.com>
> Sent: Thursday, January 7, 2021 5:17 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia <jia.guo@intel.com>;
> Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, SteveX <stevex.yang@intel.com>;
> Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Yang, MurphyX <murphyx.yang@intel.com>
> Subject: [PATCH v8] net/iavf: fix invalid RSS combinations rule can be created
> 
> Currently, when use 'flow' command to create a rule with following invalid
> RSS type combination, it can be created successfully.
> 
> Invalid RSS combinations list:
>  - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP
>  - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP
> 
> This patch adds these combinations in 'invalid_rss_comb' array to do valid
> check, if the combination check failed, the rule will be created unsuccessful.
> 
> Fixes: 91f27b2e39ab ("net/iavf: refactor RSS")
> 
> Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> ---
> v8:
> - Update the comments.
> v7:
> - Remove unsupported RSS combinations array.
> - Restored 'ETH_RSS_GTPU' in input set mask.
> v6:
> - Add unsupported RSS combinations array.
> v5:
> - Remove 'ETH_RSS_GTPU' from input set mask.
> v4:
> - Use 'ETH_RSS_XXX' replace 'IAVF_RSS_TYPE_INNER_XXX'
> v3:
> - Update the comments.
> v2:
> - Add invalid RSS combinations.
>  drivers/net/iavf/iavf_hash.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index
> 7620876b58..ebaac58254 100644
> --- a/drivers/net/iavf/iavf_hash.c
> +++ b/drivers/net/iavf/iavf_hash.c
> @@ -863,7 +863,9 @@ static void iavf_refine_proto_hdrs(struct
> virtchnl_proto_hdrs *proto_hdrs,
> 
>  static uint64_t invalid_rss_comb[] = {
>  	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP,
> +	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP,
>  	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP,
> +	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP,
>  	RTE_ETH_RSS_L3_PRE32 | RTE_ETH_RSS_L3_PRE40 |
>  	RTE_ETH_RSS_L3_PRE48 | RTE_ETH_RSS_L3_PRE56 |
>  	RTE_ETH_RSS_L3_PRE96
> --
> 2.17.1
  
Qi Zhang Jan. 12, 2021, 4:52 a.m. UTC | #2
> -----Original Message-----
> From: Guo, Jia <jia.guo@intel.com>
> Sent: Thursday, January 7, 2021 5:33 PM
> To: Yang, MurphyX <murphyx.yang@intel.com>; dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>; Yang, MurphyX
> <murphyx.yang@intel.com>
> Subject: RE: [PATCH v8] net/iavf: fix invalid RSS combinations rule can be
> created
> 
> Acked-by: Jeff Guo <jia.guo@intel.com>
> 
> > -----Original Message-----
> > From: Murphy Yang <murphyx.yang@intel.com>
> > Sent: Thursday, January 7, 2021 5:17 PM
> > To: dev@dpdk.org
> > Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia
> > <jia.guo@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, SteveX
> > <stevex.yang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> > Beilei <beilei.xing@intel.com>; Yang, MurphyX <murphyx.yang@intel.com>
> > Subject: [PATCH v8] net/iavf: fix invalid RSS combinations rule can be
> > created
> >
> > Currently, when use 'flow' command to create a rule with following
> > invalid RSS type combination, it can be created successfully.
> >
> > Invalid RSS combinations list:
> >  - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP
> >  - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP
> >
> > This patch adds these combinations in 'invalid_rss_comb' array to do
> > valid check, if the combination check failed, the rule will be created
> unsuccessful.
> >
> > Fixes: 91f27b2e39ab ("net/iavf: refactor RSS")
> >
> > Signed-off-by: Murphy Yang <murphyx.yang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  
Huang, ZhiminX Jan. 13, 2021, 5:13 a.m. UTC | #3
Tested-by: Huang, ZhiminX <zhiminx.huang@intel.com>

Regards,
HuangZhiMin

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Murphy Yang
> Sent: Thursday, January 7, 2021 5:17 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia <jia.guo@intel.com>;
> Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, SteveX <stevex.yang@intel.com>;
> Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Yang, MurphyX <murphyx.yang@intel.com>
> Subject: [dpdk-dev] [PATCH v8] net/iavf: fix invalid RSS combinations rule can be
> created
> 
> Currently, when use 'flow' command to create a rule with following invalid RSS
> type combination, it can be created successfully.
> 
> Invalid RSS combinations list:
>  - ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP
>  - ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP
> 
> This patch adds these combinations in 'invalid_rss_comb' array to do valid
> check, if the combination check failed, the rule will be created unsuccessful.
> 
> Fixes: 91f27b2e39ab ("net/iavf: refactor RSS")
> 
> Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> ---
> v8:
> - Update the comments.
> v7:
> - Remove unsupported RSS combinations array.
> - Restored 'ETH_RSS_GTPU' in input set mask.
> v6:
> - Add unsupported RSS combinations array.
> v5:
> - Remove 'ETH_RSS_GTPU' from input set mask.
> v4:
> - Use 'ETH_RSS_XXX' replace 'IAVF_RSS_TYPE_INNER_XXX'
> v3:
> - Update the comments.
> v2:
> - Add invalid RSS combinations.
>  drivers/net/iavf/iavf_hash.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index
> 7620876b58..ebaac58254 100644
> --- a/drivers/net/iavf/iavf_hash.c
> +++ b/drivers/net/iavf/iavf_hash.c
> @@ -863,7 +863,9 @@ static void iavf_refine_proto_hdrs(struct
> virtchnl_proto_hdrs *proto_hdrs,
> 
>  static uint64_t invalid_rss_comb[] = {
>  	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP,
> +	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP,
>  	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP,
> +	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP,
>  	RTE_ETH_RSS_L3_PRE32 | RTE_ETH_RSS_L3_PRE40 |
>  	RTE_ETH_RSS_L3_PRE48 | RTE_ETH_RSS_L3_PRE56 |
>  	RTE_ETH_RSS_L3_PRE96
> --
> 2.17.1
  

Patch

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 7620876b58..ebaac58254 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -863,7 +863,9 @@  static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,
 
 static uint64_t invalid_rss_comb[] = {
 	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP,
+	ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP,
 	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP,
+	ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP,
 	RTE_ETH_RSS_L3_PRE32 | RTE_ETH_RSS_L3_PRE40 |
 	RTE_ETH_RSS_L3_PRE48 | RTE_ETH_RSS_L3_PRE56 |
 	RTE_ETH_RSS_L3_PRE96