From patchwork Mon Jul 27 05:16:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 74822 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90004A0524; Mon, 27 Jul 2020 07:12:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B581B1C0AD; Mon, 27 Jul 2020 07:12:09 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id D90FE1C0AC for ; Mon, 27 Jul 2020 07:12:07 +0200 (CEST) IronPort-SDR: J4I90Lb4eYP7r7sDNcQikJXZLAq3A1HUjkXs1yEBLDZl9HHkDRN2tj7rFItaaNL8fI3toGuQ2M 1nXmXUsQlTYA== X-IronPort-AV: E=McAfee;i="6000,8403,9694"; a="169069175" X-IronPort-AV: E=Sophos;i="5.75,401,1589266800"; d="scan'208";a="169069175" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jul 2020 22:12:06 -0700 IronPort-SDR: qoUHpKUTZQIO+TIdZzOtg0+4jGJnzO9Jc8cnUcPZ8kQReca9AqWCrruqIW2rtkB0ho+yMc6cqd 92Xakb3Xiy2Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,401,1589266800"; d="scan'208";a="433769380" Received: from dpdk51.sh.intel.com ([10.67.111.82]) by orsmga004.jf.intel.com with ESMTP; 26 Jul 2020 22:12:03 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: simei.su@intel.com, jia.guo@intel.com, dev@dpdk.org, Qi Zhang Date: Mon, 27 Jul 2020 13:16:04 +0800 Message-Id: <20200727051604.39482-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH v2] net/ice: remove RSS for SCTP in PPPoE X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Tested-by: Nannan Lu Acked-by: Jeff Guo --- drivers/net/ice/ice_ethdev.c | 12 ------------ drivers/net/ice/ice_hash.c | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index a4a0390f8..c4c0e638f 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -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 & ETH_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); } } diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index e535e4b95..2845ca0bd 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -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}, };