net/ice: fix eth rss type checking
PATCH 1/1 net/ice: fix eth rss type checking
For pattern MAC_PPPOE_IPV4/6, add ETH_RSS_ETH into insput_set_mask to fix rss rule cannot be created when set eth as rss type.
--- drivers/net/ice/ice_hash.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ice/ice_hash.c +9 -9
@@ -424,24 +424,24 @@ struct ice_rss_hash_cfg empty_tmplt = {#define ICE_RSS_TYPE_GTPU_IPV6_TCP (ICE_RSS_TYPE_INNER_IPV6_TCP | \ ETH_RSS_GTPU) +/* PPPOE*/ +#define ICE_RSS_TYPE_PPPOE (ETH_RSS_ETH | ETH_RSS_PPPOE) +/* PPPOE IPv4 */ #define ICE_RSS_TYPE_PPPOE_IPV4 (ICE_RSS_TYPE_INNER_IPV4 | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV4_UDP (ICE_RSS_TYPE_INNER_IPV4_UDP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV4_TCP (ICE_RSS_TYPE_INNER_IPV4_TCP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)/* PPPOE IPv6 */ #define ICE_RSS_TYPE_PPPOE_IPV6 (ICE_RSS_TYPE_INNER_IPV6 | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV6_UDP (ICE_RSS_TYPE_INNER_IPV6_UDP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV6_TCP (ICE_RSS_TYPE_INNER_IPV6_TCP | \ - ETH_RSS_PPPOE) - -/* PPPOE*/ -#define ICE_RSS_TYPE_PPPOE (ETH_RSS_ETH | ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)/* ESP, AH, L2TPV3 and PFCP */ #define ICE_RSS_TYPE_IPV4_ESP (ETH_RSS_ESP | ETH_RSS_IPV4)
Signature · 1 line
2.17.1
PATCH v2 1/1 net/ice: fix rss type checking
For pattern MAC_PPPOE_IPV4/6, add ETH_RSS_ETH into insput_set_mask to fix rss rule cannot be created when set eth as rss type.
---
v2:
* Refine the commit title.
* Adjust the indentation by adding a space.
--- drivers/net/ice/ice_hash.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ice/ice_hash.c +9 -9
@@ -424,24 +424,24 @@ struct ice_rss_hash_cfg empty_tmplt = {#define ICE_RSS_TYPE_GTPU_IPV6_TCP (ICE_RSS_TYPE_INNER_IPV6_TCP | \ ETH_RSS_GTPU) +/* PPPOE */ +#define ICE_RSS_TYPE_PPPOE (ETH_RSS_ETH | ETH_RSS_PPPOE) +/* PPPOE IPv4 */ #define ICE_RSS_TYPE_PPPOE_IPV4 (ICE_RSS_TYPE_INNER_IPV4 | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV4_UDP (ICE_RSS_TYPE_INNER_IPV4_UDP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV4_TCP (ICE_RSS_TYPE_INNER_IPV4_TCP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)/* PPPOE IPv6 */ #define ICE_RSS_TYPE_PPPOE_IPV6 (ICE_RSS_TYPE_INNER_IPV6 | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV6_UDP (ICE_RSS_TYPE_INNER_IPV6_UDP | \ - ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)#define ICE_RSS_TYPE_PPPOE_IPV6_TCP (ICE_RSS_TYPE_INNER_IPV6_TCP | \ - ETH_RSS_PPPOE) - -/* PPPOE*/ -#define ICE_RSS_TYPE_PPPOE (ETH_RSS_ETH | ETH_RSS_PPPOE) + ICE_RSS_TYPE_PPPOE)/* ESP, AH, L2TPV3 and PFCP */ #define ICE_RSS_TYPE_IPV4_ESP (ETH_RSS_ESP | ETH_RSS_IPV4)
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2] net/ice: fix rss type checking
Quoted 10 lines
-----Original Message-----
From: Ding, Xuan <[email protected]>
Sent: Monday, February 1, 2021 1:17 PM
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Ding, Xuan <[email protected]>
Subject: [PATCH v2] net/ice: fix rss type checking
Quoted 6 lines
For pattern MAC_PPPOE_IPV4/6, add
ETH_RSS_ETHintoinsput_set_maskto fix rss rule cannot be created when set eth as rss type.Fixes 0d84f86c3022("net/ice: fix GTPU header parsing")Signed-off-by Xuan Ding <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi