net/ice: remove RSS for SCTP in PPPoE
PATCH v2 1/1 net/ice: remove RSS for SCTP in PPPoE
We don't support SCTP in PPPoE RSS, remove it.
Fixes d117de460035 ("net/ice: fix GTPU/PPPoE packets with no hash value")
Fixes 0b952714e9c1 ("net/ice: refactor PF hash flow")
Signed-off-by Qi Zhang <[email protected]>
Tested-by Nannan Lu <[email protected]>
--- drivers/net/ice/ice_ethdev.c | 12 ------------ drivers/net/ice/ice_hash.c | 12 ------------ 2 files changed, 24 deletions(-)
drivers/net/ice/ice_ethdev.c +0 -12
@@ -2666,12 +2666,6 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)if (ret)PMD_DRV_LOG (ERR ,"%s GTPU_EH_IPV4_SCTP rss flow fail %d" , __func__, ret); - - ret =ice_add_rss_cfg (hw, vsi->idx,ICE_HASH_SCTP_IPV4 , -ICE_FLOW_SEG_HDR_PPPOE ,0 ); -if (ret) -PMD_DRV_LOG (ERR ,"%s PPPoE_IPV4_SCTP rss flow fail %d" , - __func__, ret); }if (rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) {
@@ -2686,12 +2680,6 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)if (ret)PMD_DRV_LOG (ERR ,"%s GTPU_EH_IPV6_SCTP rss flow fail %d" , __func__, ret); - - ret =ice_add_rss_cfg (hw, vsi->idx,ICE_HASH_SCTP_IPV6 , -ICE_FLOW_SEG_HDR_PPPOE ,0 ); -if (ret) -PMD_DRV_LOG (ERR ,"%s PPPoE_IPV6_SCTP rss flow fail %d" , - __func__, ret); } }
drivers/net/ice/ice_hash.c +0 -12
@@ -204,10 +204,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = { -ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV4 | -ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , -ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP };struct rss_type_match_hdr hint_eth_ipv4_esp = {ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_ESP,
@@ -313,10 +309,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = { -ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV6 | -ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , -ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_SCTP };struct rss_type_match_hdr hint_eth_pppoes = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE };
@@ -400,8 +392,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv4_udp}, {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_eth_pppoes_ipv4_tcp}, - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv4_sctp}, {pattern_eth_ipv4_esp, ICE_INSET_NONE, &hint_eth_ipv4_esp}, {pattern_eth_ipv4_udp_esp, ICE_INSET_NONE,
@@ -452,8 +442,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv6_udp}, {pattern_eth_pppoes_ipv6_tcp,ICE_INSET_NONE , &hint_eth_pppoes_ipv6_tcp}, - {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv6_sctp}, {pattern_eth_pppoes, ICE_INSET_NONE, &hint_eth_pppoes}, };
Signature · 1 line
2.13.6
Acked-by Jeff Guo <[email protected]>
Quoted 86 lines · Qi Zhang
We don't support SCTP in PPPoE RSS, remove it.
Fixes d117de460035 ("net/ice: fix GTPU/PPPoE packets with no hash value")Fixes 0b952714e9c1 ("net/ice: refactor PF hash flow")Signed-off-by Qi Zhang <[email protected]>Tested-by Nannan Lu <[email protected]>--- drivers/net/ice/ice_ethdev.c | 12 ------------ drivers/net/ice/ice_hash.c | 12 ------------ 2 files changed, 24 deletions(-)drivers/net/ice/ice_ethdev.c +0
-12@@ -2666,12 +2666,6 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)if (ret)PMD_DRV_LOG (ERR ,"%s GTPU_EH_IPV4_SCTP rss flow fail %d" , __func__, ret); - - ret =ice_add_rss_cfg (hw, vsi->idx,ICE_HASH_SCTP_IPV4 , -ICE_FLOW_SEG_HDR_PPPOE ,0 ); -if (ret) -PMD_DRV_LOG (ERR ,"%s PPPoE_IPV4_SCTP rss flow fail %d" , - __func__, ret); }if (rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) {@@ -2686,12 +2680,6 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)if (ret)PMD_DRV_LOG (ERR ,"%s GTPU_EH_IPV6_SCTP rss flow fail %d" , __func__, ret); - - ret =ice_add_rss_cfg (hw, vsi->idx,ICE_HASH_SCTP_IPV6 , -ICE_FLOW_SEG_HDR_PPPOE ,0 ); -if (ret) -PMD_DRV_LOG (ERR ,"%s PPPoE_IPV6_SCTP rss flow fail %d" , - __func__, ret); } }drivers/net/ice/ice_hash.c +0
-12@@ -204,10 +204,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = { -ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV4 | -ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , -ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP };struct rss_type_match_hdr hint_eth_ipv4_esp = {ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_ESP,@@ -313,10 +309,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = { -ICE_FLOW_SEG_HDR_PPPOE |ICE_FLOW_SEG_HDR_IPV6 | -ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , -ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_SCTP };struct rss_type_match_hdr hint_eth_pppoes = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE };@@ -400,8 +392,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv4_udp}, {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_eth_pppoes_ipv4_tcp}, - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv4_sctp}, {pattern_eth_ipv4_esp, ICE_INSET_NONE, &hint_eth_ipv4_esp}, {pattern_eth_ipv4_udp_esp, ICE_INSET_NONE,@@ -452,8 +442,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv6_udp}, {pattern_eth_pppoes_ipv6_tcp,ICE_INSET_NONE , &hint_eth_pppoes_ipv6_tcp}, - {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv6_sctp}, {pattern_eth_pppoes, ICE_INSET_NONE, &hint_eth_pppoes}, };
Zhang, Qi Z
AppliedQuoted 9 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Monday, July 27, 2020 1:20 PM
To: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Cc: Su, Simei <[email protected]>; [email protected]
Subject: Re: [PATCH v2] net/ice: remove RSS for SCTP in PPPoE
Quoted 11 lines
Acked-by Jeff Guo <[email protected]>Quoted 8 lines · Qi Zhang
We don't support SCTP in PPPoE RSS, remove it.
Fixes d117de460035 ("net/ice: fix GTPU/PPPoE packets with no hashvalue")
Fixes 0b952714e9c1 ("net/ice: refactor PF hash flow")Signed-off-by Qi Zhang <[email protected]>Tested-by Nannan Lu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi