From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E840BA0471 for ; Mon, 9 Sep 2019 08:34:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EE0591EB2E; Mon, 9 Sep 2019 08:34:37 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 97B301BF04 for ; Mon, 9 Sep 2019 08:34:35 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Sep 2019 23:34:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,483,1559545200"; d="scan'208";a="384858207" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 08 Sep 2019 23:34:34 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 8 Sep 2019 23:34:34 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 8 Sep 2019 23:34:33 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.146]) with mapi id 14.03.0439.000; Mon, 9 Sep 2019 14:34:32 +0800 From: "Su, Simei" To: "Ye, Xiaolong" CC: "Zhang, Qi Z" , "dev@dpdk.org" Thread-Topic: [PATCH v1] net/ice: enable advanced RSS Thread-Index: AQHVZee5wJXOjEjCVEmNQOTMSVj+I6cg/QkAgAHmTnA= Date: Mon, 9 Sep 2019 06:34:31 +0000 Message-ID: <65F28F834D25B54B9EC1999B623071B30C446A1F@SHSMSX104.ccr.corp.intel.com> References: <1567907360-287625-1-git-send-email-simei.su@intel.com> <20190908092622.GB6732@intel.com> In-Reply-To: <20190908092622.GB6732@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjIwMjRlZmYtMDU0OS00YjQ0LWFkZWUtNDE1MTk4YTAzNzBhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiM2IwZ2dwc1l6UUQ3TFdKVWxRRXRWRHYydGRlclwvakpSUGFUU0JxQTZYVEt5OTBZaksrSWtxb05pVURJZlU5emcifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v1] net/ice: enable advanced RSS 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" > -----Original Message----- > From: Ye, Xiaolong > Sent: Sunday, September 8, 2019 5:26 PM > To: Su, Simei > Cc: Zhang, Qi Z ; dev@dpdk.org > Subject: Re: [PATCH v1] net/ice: enable advanced RSS >=20 > On 09/08, Simei Su wrote: > >This patch supports the following features: > > (1)inner header hash for tunnel packets, including comms package. > > (2)symmetric hash by rte_flow RSS action. > > (3)input set change by rte_flow RSS action. > > > >This patch depends on the following patches on patchwork: > > (1)https://patchwork.dpdk.org/patch/58546/ > > [2/4] net/ice: rework for generic flow enabling > > (2)https://patchwork.dpdk.org/patch/57137/ > > [v2,1/2] ethdev: add symmetric toeplitz hash support > > (3)https://patchwork.dpdk.org/patch/57138/ > > [v2,2/2] app/testpmd: add symmetric toeplitz hash support > > (4)https://patchwork.dpdk.org/patch/57601/ > > [1/2] ethdev: extend RSS offload types > > (5)https://patchwork.dpdk.org/patch/57602/ > > [2/2] app/testpmd: add RSS offload types extending support > > > >Signed-off-by: Simei Su > >--- > > drivers/net/ice/ice_ethdev.c | 7 + > > drivers/net/ice/ice_hash.c | 540 > +++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 547 insertions(+) > > create mode 100644 drivers/net/ice/ice_hash.c > > > >diff --git a/drivers/net/ice/ice_ethdev.c > >b/drivers/net/ice/ice_ethdev.c index f5cc647..3766a32 100644 > >--- a/drivers/net/ice/ice_ethdev.c > >+++ b/drivers/net/ice/ice_ethdev.c > >@@ -1874,6 +1874,7 @@ static int ice_init_rss(struct ice_pf *pf) > > uint16_t i, nb_q; > > int ret =3D 0; > > bool is_safe_mode =3D pf->adapter->is_safe_mode; > >+ uint32_t reg; > > > > rss_conf =3D &dev->data->dev_conf.rx_adv_conf.rss_conf; > > nb_q =3D dev->data->nb_rx_queues; > >@@ -1917,6 +1918,12 @@ static int ice_init_rss(struct ice_pf *pf) > > if (ret) > > return -EINVAL; > > > >+ /* Enable registers for symmetric_toeplitz function. */ > >+ reg =3D ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id)); > >+ reg =3D (reg & (~VSIQF_HASH_CTL_HASH_SCHEME_M)) | > >+ (1 << VSIQF_HASH_CTL_HASH_SCHEME_S); > >+ ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); > >+ > > /* configure RSS for IPv4 with input set IPv4 src/dst */ > > ret =3D ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4, > > ICE_FLOW_SEG_HDR_IPV4, 0); > >diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c > >new file mode 100644 index 0000000..f8b7087 > >--- /dev/null > >+++ b/drivers/net/ice/ice_hash.c > >@@ -0,0 +1,540 @@ > >+/* SPDX-License-Identifier: BSD-3-Clause > >+ * Copyright(c) 2019 Intel Corporation */ > >+ > >+#include > >+#include > >+#include > >+#include > >+#include > >+#include > >+#include > >+ > >+#include > >+#include > >+#include > >+#include > >+#include > >+#include > >+#include > >+#include > >+ > >+#include "ice_logs.h" > >+#include "base/ice_type.h" > >+#include "base/ice_flow.h" > >+#include "ice_ethdev.h" > >+#include "ice_generic_flow.h" > >+ > >+#define ICE_ACTION_RSS_MAX_QUEUE_NUM 32 > >+ > >+static struct ice_pattern_match_item ice_hash_pattern_list_os[]; > >+static struct ice_pattern_match_item ice_hash_pattern_list_comms[]; > >+ > >+struct rss_type_match_hdr { > >+ uint32_t hdr_mask; > >+ uint64_t eth_rss_hint; > >+}; > >+ > >+struct ice_hash_match_type { > >+ uint64_t hash_type; > >+ uint64_t hash_flds; > >+}; > >+ > >+struct rss_meta { > >+ uint32_t pkt_hdr; > >+ uint64_t hash_flds; > >+ uint8_t hash_function; > >+}; > >+ > >+static int > >+ice_hash_init(struct ice_adapter *ad); > >+ > >+static int > >+ice_hash_create(struct ice_adapter *ad, > >+ struct rte_flow *flow, > >+ void *meta, > >+ struct rte_flow_error *error); > >+ > >+static int > >+ice_hash_destroy(struct ice_adapter *ad, > >+ struct rte_flow *flow, > >+ struct rte_flow_error *error); > >+ > >+static void > >+ice_hash_uninit(struct ice_adapter *ad); > >+ > >+static void > >+ice_hash_free(struct rte_flow *flow); > >+ > >+static int > >+ice_hash_parse_pattern_action(struct ice_adapter *ad, > >+ struct ice_pattern_match_item *array, > >+ uint32_t array_len, > >+ const struct rte_flow_item pattern[], > >+ const struct rte_flow_action actions[], > >+ void **meta, > >+ struct rte_flow_error *error); > >+ > >+/* The first member is protocol header, the second member is > >+ETH_RSS_*. */ const struct rss_type_match_hdr hint_0 =3D { > >+ ICE_FLOW_SEG_HDR_NONE, 0}; > >+const struct rss_type_match_hdr hint_1 =3D { > >+ ICE_FLOW_SEG_HDR_IPV4, ETH_RSS_IPV4}; > >+const struct rss_type_match_hdr hint_2 =3D { > >+ ICE_FLOW_SEG_HDR_IPV4|ICE_FLOW_SEG_HDR_UDP, > >+ETH_RSS_NONFRAG_IPV4_UDP}; const struct rss_type_match_hdr hint_3 =3D { > >+ ICE_FLOW_SEG_HDR_IPV4|ICE_FLOW_SEG_HDR_TCP, > >+ETH_RSS_NONFRAG_IPV4_TCP}; const struct rss_type_match_hdr hint_4 =3D { > >+ ICE_FLOW_SEG_HDR_IPV4|ICE_FLOW_SEG_HDR_SCTP, > >+ETH_RSS_NONFRAG_IPV4_SCTP}; const struct rss_type_match_hdr hint_5 =3D = { > >+ ICE_FLOW_SEG_HDR_IPV6, ETH_RSS_IPV6}; > >+const struct rss_type_match_hdr hint_6 =3D { > >+ ICE_FLOW_SEG_HDR_IPV6|ICE_FLOW_SEG_HDR_UDP, > >+ETH_RSS_NONFRAG_IPV6_UDP}; const struct rss_type_match_hdr hint_7 =3D { > >+ ICE_FLOW_SEG_HDR_IPV6|ICE_FLOW_SEG_HDR_TCP, > >+ETH_RSS_NONFRAG_IPV6_TCP}; const struct rss_type_match_hdr hint_8 =3D { > >+ ICE_FLOW_SEG_HDR_IPV6|ICE_FLOW_SEG_HDR_SCTP, > >+ETH_RSS_NONFRAG_IPV6_SCTP}; const struct rss_type_match_hdr hint_9 =3D = { > >+ ICE_FLOW_SEG_HDR_GTPU_IP, ETH_RSS_IPV4}; > >+const struct rss_type_match_hdr hint_10 =3D { > >+ ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_IPV4}; > >+const struct rss_type_match_hdr hint_11 =3D { > >+ ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_UDP}; > >+const struct rss_type_match_hdr hint_12 =3D { > >+ ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_TCP}; > >+const struct rss_type_match_hdr hint_13 =3D { > >+ ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_SCTP}; > >+ > >+/* Supported pattern for os default package. */ static struct > >+ice_pattern_match_item ice_hash_pattern_list_os[] =3D { > >+ {pattern_eth_ipv4, ICE_INSET_NONE, (uint64_t)(&hint_1)}, > >+ {pattern_eth_ipv4_udp, ICE_INSET_NONE, (uint64_t)(&hint_2)}, > >+ {pattern_eth_ipv4_tcp, ICE_INSET_NONE, (uint64_t)(&hint_3)}, > >+ {pattern_eth_ipv4_sctp, ICE_INSET_NONE, (uint64_t)(&hint_4)}, > >+ {pattern_eth_ipv6, ICE_INSET_NONE, (uint64_t)(&hint_5)}, > >+ {pattern_eth_ipv6_udp, ICE_INSET_NONE, (uint64_t)(&hint_6)}, > >+ {pattern_eth_ipv6_tcp, ICE_INSET_NONE, (uint64_t)(&hint_7)}, > >+ {pattern_eth_ipv6_sctp, ICE_INSET_NONE, (uint64_t)(&hint_8)}, > >+ {pattern_empty, ICE_INSET_NONE, (uint64_t)(&hint_0)}, > >+}; > >+ > >+/* Supported pattern for comms package. */ static struct > >+ice_pattern_match_item ice_hash_pattern_list_comms[] =3D { > >+ {pattern_eth_ipv4, ICE_INSET_NONE, (uint64_t)(&hint_1)}, > >+ {pattern_eth_ipv4_udp, ICE_INSET_NONE, (uint64_t)(&hint_2)}, > >+ {pattern_eth_ipv4_tcp, ICE_INSET_NONE, (uint64_t)(&hint_3)}, > >+ {pattern_eth_ipv4_sctp, ICE_INSET_NONE, (uint64_t)(&hint_4)}, > >+ {pattern_eth_ipv6, ICE_INSET_NONE, (uint64_t)(&hint_5)}, > >+ {pattern_eth_ipv6_udp, ICE_INSET_NONE, (uint64_t)(&hint_6)}, > >+ {pattern_eth_ipv6_tcp, ICE_INSET_NONE, (uint64_t)(&hint_7)}, > >+ {pattern_eth_ipv6_sctp, ICE_INSET_NONE, (uint64_t)(&hint_8)}, > >+ {pattern_empty, ICE_INSET_NONE, (uint64_t)(&hint_0)}, > >+ {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, > (uint64_t)(&hint_9)}, > >+ {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE, > (uint64_t)(&hint_9)}, > >+ {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE, > (uint64_t)(&hint_9)}, > >+ {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, (uint64_t)(&hint_10)}, > >+ {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, > (uint64_t)(&hint_11)}, > >+ {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, > (uint64_t)(&hint_12)}, > >+ {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, > (uint64_t)(&hint_13)}, > >+}; > >+ >=20 > Multi-line comments format is like: >=20 > /* > * The first member is input set combination, > * the second member is hash fields. > */ Ok, I will fix it in v2. >=20 > >+/* The first member is input set combination, > >+ * the second member is hash fields. > >+ */ > >+struct ice_hash_match_type ice_hash_type_list[] =3D { > >+ {ETH_RSS_IPV4|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, > >+ {ETH_RSS_IPV4|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, >=20 > I bet checkpatches.sh script would complain about the length of these lin= es. Yes, the checkpatches.sh shows "WARNING: line over 80 characters". It's = a complete table, I ignore the warning for these. >=20 > >+ {ETH_RSS_IPV4, > ICE_FLOW_HASH_IPV4}, > >+ > {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|ICE_FLOW_HASH_UDP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|ICE_FLOW_HASH_UDP_PORT}, > >+ {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)} > , > >+ {ETH_RSS_NONFRAG_IPV4_UDP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)} > , > >+ {ETH_RSS_NONFRAG_IPV4_UDP, > ICE_HASH_UDP_IPV4}, > >+ > {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_SR > C_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_DS > T_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|ICE_FLOW_HASH_TCP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_SR > C_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|ICE_FLOW_HASH_TCP_PORT}, > >+ {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_TCP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_TCP, > ICE_HASH_TCP_IPV4}, > >+ > {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|ICE_FLOW_HASH_SCTP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_ > DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|ICE_FLOW_HASH_SCTP_PORT} > , > >+ {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) > }, > >+ {ETH_RSS_NONFRAG_IPV4_SCTP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV4|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) > }, > >+ {ETH_RSS_NONFRAG_IPV4_SCTP, > ICE_HASH_SCTP_IPV4}, > >+ {ETH_RSS_IPV6|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, > >+ {ETH_RSS_IPV6|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, > >+ {ETH_RSS_IPV6, > ICE_FLOW_HASH_IPV6}, > >+ > {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|ICE_FLOW_HASH_UDP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _UDP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|ICE_FLOW_HASH_UDP_PORT}, > >+ {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)} > , > >+ {ETH_RSS_NONFRAG_IPV6_UDP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)} > , > >+ {ETH_RSS_NONFRAG_IPV6_UDP, > ICE_HASH_UDP_IPV6}, > >+ > {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_SR > C_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_DS > T_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|ICE_FLOW_HASH_TCP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_SR > C_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|ICE_FLOW_HASH_TCP_PORT}, > >+ {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_TCP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_TCP, > ICE_HASH_TCP_IPV6}, > >+ > {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_SRC_ONLY|ETH_RSS_L4_D > ST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_SRC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|ICE_FLOW_HASH_SCTP_PORT}, > >+ > {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_S > RC_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_SRC_PORT)}, > >+ > {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_DST_ONLY|ETH_RSS_L4_ > DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX > _SCTP_DST_PORT)}, > >+ {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L3_DST_ONLY, > BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|ICE_FLOW_HASH_SCTP_PORT} > , > >+ {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L4_SRC_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) > }, > >+ {ETH_RSS_NONFRAG_IPV6_SCTP|ETH_RSS_L4_DST_ONLY, > ICE_FLOW_HASH_IPV6|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) > }, > >+ {ETH_RSS_NONFRAG_IPV6_SCTP, > ICE_HASH_SCTP_IPV6}, > >+}; > >+ > >+static struct > >+ice_flow_engine ice_hash_engine =3D { >=20 > You don't need to put the variable type in a separate line. Ok, I will modify it in v2. >=20 > >+ .init =3D ice_hash_init, > >+ .create =3D ice_hash_create, > >+ .destroy =3D ice_hash_destroy, > >+ .uninit =3D ice_hash_uninit, > >+ .free =3D ice_hash_free, > >+ .type =3D ICE_FLOW_ENGINE_HASH, > >+}; > >+ > >+/* Register parser for os package. */ > >+static struct > >+ice_flow_parser ice_hash_parser_os =3D { > >+ .engine =3D &ice_hash_engine, > >+ .array =3D ice_hash_pattern_list_os, > >+ .array_len =3D RTE_DIM(ice_hash_pattern_list_os), > >+ .parse_pattern_action =3D ice_hash_parse_pattern_action, > >+ .stage =3D ICE_FLOW_STAGE_RSS, > >+}; > >+ > >+/* Register parser for comms package. */ static struct ice_flow_parser > >+ice_hash_parser_comms =3D { > >+ .engine =3D &ice_hash_engine, > >+ .array =3D ice_hash_pattern_list_comms, > >+ .array_len =3D RTE_DIM(ice_hash_pattern_list_comms), > >+ .parse_pattern_action =3D ice_hash_parse_pattern_action, > >+ .stage =3D ICE_FLOW_STAGE_RSS, > >+}; > >+ > >+RTE_INIT(ice_init_log) >=20 > ice_init_log is not a good name here, and it has been used by ice log mod= ule, > seems a copy/paste issue. Yes, it should be "ice_hash_init_log". Thanks! >=20 > >+{ > >+ struct ice_flow_engine *engine =3D &ice_hash_engine; > >+ ice_register_flow_engine(engine); > >+} > >+ > >+static int > >+ice_hash_init(struct ice_adapter *ad) > >+{ > >+ int ret =3D 0; > >+ > >+ if (ad->active_pkg_type =3D=3D ICE_PKG_TYPE_OS_DEFAULT) { > >+ struct ice_flow_parser *parser =3D &ice_hash_parser_os; > >+ ret =3D ice_register_parser(parser, ad); > >+ } else if (ad->active_pkg_type =3D=3D ICE_PKG_TYPE_COMMS) { > >+ struct ice_flow_parser *parser =3D &ice_hash_parser_comms; > >+ ret =3D ice_register_parser(parser, ad); > >+ } > >+ > >+ return ret; > >+} > >+ > >+static int > >+ice_hash_check_inset(const struct rte_flow_item pattern[], > >+ struct rte_flow_error *error) > >+{ > >+ const struct rte_flow_item *item =3D pattern; > >+ > >+ for (item =3D pattern; item->type !=3D RTE_FLOW_ITEM_TYPE_END; item++)= { > >+ if (item->last) { > >+ rte_flow_error_set(error, EINVAL, > >+ RTE_FLOW_ERROR_TYPE_ITEM, item, > >+ "Not support range"); > >+ return -rte_errno; > >+ } > >+ > >+ /* Ignore spec and mask. */ > >+ if (item->spec || item->mask) { > >+ rte_flow_error_set(error, EINVAL, > >+ RTE_FLOW_ERROR_TYPE_ITEM, item, > >+ "Invalid mask."); > >+ return -rte_errno; > >+ } > >+ } > >+ > >+ return 0; > >+} > >+ > >+static int > >+ice_hash_parse_action(struct ice_pattern_match_item > *pattern_match_item, > >+ const struct rte_flow_action actions[], > >+ void **meta, > >+ struct rte_flow_error *error) > >+{ > >+ const struct rte_flow_action *action; > >+ enum rte_flow_action_type action_type; > >+ const struct rte_flow_action_rss *rss; > >+ struct rss_type_match_hdr *m =3D (struct rss_type_match_hdr *) > >+ (pattern_match_item->meta); > >+ uint32_t type_list_len =3D RTE_DIM(ice_hash_type_list); > >+ > >+ /* Supported action is RSS. */ > >+ for (action =3D actions; action->type !=3D > >+ RTE_FLOW_ACTION_TYPE_END; action++) { > >+ action_type =3D action->type; > >+ switch (action_type) { > >+ case RTE_FLOW_ACTION_TYPE_RSS: > >+ rss =3D action->conf; > >+ uint16_t i; > >+ > >+ /* Check if pattern is empty. */ > >+ if (((pattern_match_item->pattern_list) !=3D > >+ pattern_empty) && (rss->func =3D=3D > >+ RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)) > >+ return rte_flow_error_set(error, ENOTSUP, > >+ RTE_FLOW_ERROR_TYPE_ACTION, action, > >+ "Not supported flow"); > >+ > >+ /* Check if rss types match pattern. */ > >+ if (rss->func !=3D RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) { > >+ if (((rss->types & ETH_RSS_IPV4) !=3D m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV4_UDP) !=3D > m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV4_TCP) !=3D > m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV4_SCTP) !=3D > m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_IPV6) !=3D m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV6_UDP) !=3D > m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV6_TCP) !=3D > m->eth_rss_hint) || > >+ ((rss->types & ETH_RSS_NONFRAG_IPV6_SCTP) !=3D > m->eth_rss_hint)) > >+ return rte_flow_error_set(error, > >+ ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, > >+ action, "Not supported RSS types"); > >+ } > >+ > >+ if (rss->level) > >+ return rte_flow_error_set(error, ENOTSUP, > >+ RTE_FLOW_ERROR_TYPE_ACTION, action, > >+ "a nonzero RSS encapsulation level is not supported"); > >+ > >+ if (rss->key_len =3D=3D 0) > >+ return rte_flow_error_set(error, ENOTSUP, > >+ RTE_FLOW_ERROR_TYPE_ACTION, action, > >+ "RSS hash key_len mustn't be 0"); > >+ > >+ if ((rss->queue_num) > ICE_ACTION_RSS_MAX_QUEUE_NUM) > >+ return rte_flow_error_set(error, ENOTSUP, > >+ RTE_FLOW_ERROR_TYPE_ACTION, action, > >+ "too many queues for RSS context"); > >+ > >+ /* Check hash function and save it to rss_meta. */ > >+ if (rss->func =3D=3D > >+ RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) > >+ ((struct rss_meta *)*meta)->hash_function =3D > >+ RTE_ETH_HASH_FUNCTION_SIMPLE_XOR; > >+ > >+ if (rss->func =3D=3D > >+ RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) > >+ ((struct rss_meta *)*meta)->hash_function =3D > >+ RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ; > >+ > >+ struct ice_hash_match_type *type_match_item; > >+ type_match_item =3D rte_zmalloc("ice_type_match_item", > >+ sizeof(struct ice_hash_match_type), 0); > >+ if (!type_match_item) > >+ PMD_DRV_LOG(ERR, > >+ "Failed to allocate memory for type_match_item"); > >+ > >+ /* Find matched hash fields according to hash type. */ > >+ for (i =3D 0; i < type_list_len; i++) { > >+ if (rss->types =3D=3D > >+ ice_hash_type_list[i].hash_type) { > >+ type_match_item->hash_type =3D > >+ ice_hash_type_list[i].hash_type; > >+ type_match_item->hash_flds =3D > >+ ice_hash_type_list[i].hash_flds; > >+ } > >+ } > >+ > >+ /* Save hash fileds to rss_meta. */ > >+ ((struct rss_meta *)*meta)->hash_flds =3D > >+ type_match_item->hash_flds; > >+ > >+ rte_free(type_match_item); > >+ break; > >+ > >+ case RTE_FLOW_ACTION_TYPE_END: > >+ return 0; > >+ break; > >+ > >+ default: > >+ rte_flow_error_set(error, EINVAL, > >+ RTE_FLOW_ERROR_TYPE_ACTION, action, > >+ "Invalid action."); > >+ return -rte_errno; > >+ } > >+ } > >+ > >+ return 0; > >+} > >+ > >+static int > >+ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, > >+ struct ice_pattern_match_item *array, > >+ uint32_t array_len, > >+ const struct rte_flow_item pattern[], > >+ const struct rte_flow_action actions[], > >+ void **meta, > >+ struct rte_flow_error *error) > >+{ > >+ int ret =3D 0; > >+ > >+ struct rss_meta *rss_meta_ptr =3D NULL; > >+ rss_meta_ptr =3D rte_zmalloc(NULL, sizeof(*rss_meta_ptr), 0); > >+ if (!rss_meta_ptr) { > >+ rte_flow_error_set(error, EINVAL, > >+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > >+ "No memory for rss_meta_ptr"); > >+ return -rte_errno; > >+ } > >+ > >+ struct ice_pattern_match_item *pattern_match_item =3D NULL; >=20 > I think this introduces decl-after-statement. Ok, I will modify it in v2. >=20 > >+ /* Check rss supported pattern and find matched pattern. */ > >+ pattern_match_item =3D ice_search_pattern_match_item(pattern, > >+ array, array_len, error); > >+ if (!pattern_match_item) > >+ return -rte_errno; > >+ > >+ ret =3D ice_hash_check_inset(pattern, error); > >+ if (ret) > >+ return -rte_errno; > >+ > >+ /* Save protocol header to rss_meta. */ > >+ *meta =3D rss_meta_ptr; > >+ ((struct rss_meta *)*meta)->pkt_hdr =3D ((struct rss_type_match_hdr *) > >+ (pattern_match_item->meta))->hdr_mask; > >+ > >+ /* Check rss action. */ > >+ ret =3D ice_hash_parse_action(pattern_match_item, actions, meta, error= ); > >+ if (ret) > >+ return -rte_errno; > >+ > >+ rte_free(pattern_match_item); > >+ > >+ return 0; > >+} > >+ > >+static int > >+ice_hash_create(struct ice_adapter *ad, > >+ struct rte_flow *flow, > >+ void *meta, > >+ __rte_unused struct rte_flow_error *error) { > >+ struct ice_pf *pf =3D &ad->pf; > >+ struct ice_hw *hw =3D ICE_PF_TO_HW(pf); > >+ struct ice_vsi *vsi =3D pf->main_vsi; > >+ int ret =3D 0; > >+ uint32_t reg; > >+ struct ice_rss_cfg *filter_ptr; > >+ > >+ uint32_t headermask =3D ((struct rss_meta *)meta)->pkt_hdr; > >+ uint64_t hash_field =3D ((struct rss_meta *)meta)->hash_flds; > >+ uint8_t hash_function =3D ((struct rss_meta *)meta)->hash_function; > >+ > >+ filter_ptr =3D rte_zmalloc("ice_rss_filter", > >+ sizeof(struct ice_rss_cfg), 0); > >+ if (!filter_ptr) { > >+ PMD_DRV_LOG(ERR, "failed to allocate memory"); >=20 > Use rte_flow_error_set instead of PMD_DRV_LOG in flow ops. >=20 > >+ return -EINVAL; >=20 > should return -ENOMEM for memory allocation failure case. As to PMD_DRV_LOG in flow ops, I will fix all in v2. Thanks for your remi= nder. >=20 > >+ } > >+ > >+ if (hash_function =3D=3D RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) { > >+ /* Enable registers for simple_xor hash function. */ > >+ reg =3D ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id)); > >+ reg =3D (reg & (~VSIQF_HASH_CTL_HASH_SCHEME_M)) | > >+ (2 << VSIQF_HASH_CTL_HASH_SCHEME_S); > >+ ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); > >+ > >+ filter_ptr->symm =3D hash_function; > >+ > >+ goto out; > >+ } else if (hash_function =3D=3D > RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) { > >+ ret =3D ice_add_rss_cfg(hw, vsi->idx, hash_field, headermask, 1); > >+ if (ret) > >+ PMD_DRV_LOG(ERR, "%s rss flow fail %d", __func__, ret); >=20 > Use rte_flow_error_set instead of PMD_DRV_LOG, and is it intentional we k= eep > proceeding other than return error when this failure happens. Yes, I will change it to rte_flow_error_set. >=20 >=20 > >+ } else { > >+ ret =3D ice_add_rss_cfg(hw, vsi->idx, hash_field, headermask, 0); > >+ if (ret) > >+ PMD_DRV_LOG(ERR, "%s rss flow fail %d", __func__, ret); >=20 > Ditto. >=20 > >+ } > >+ > >+ filter_ptr->packet_hdr =3D headermask; > >+ filter_ptr->hashed_flds =3D hash_field; > >+ > >+out: > >+ flow->rule =3D filter_ptr; > >+ rte_free(meta); > >+ return 0; > >+} > >+ > >+static int > >+ice_hash_destroy(struct ice_adapter *ad, > >+ struct rte_flow *flow, > >+ __rte_unused struct rte_flow_error *error) { > >+ struct ice_pf *pf =3D ICE_DEV_PRIVATE_TO_PF(ad); > >+ struct ice_hw *hw =3D ICE_PF_TO_HW(pf); > >+ struct ice_vsi *vsi =3D pf->main_vsi; > >+ int ret =3D 0; > >+ uint32_t reg; > >+ struct ice_rss_cfg *filter_ptr; > >+ > >+ filter_ptr =3D (struct ice_rss_cfg *)flow->rule; > >+ > >+ if (filter_ptr->symm =3D=3D RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) { > >+ /* Return to symmetric_toeplitz state. */ > >+ reg =3D ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id)); > >+ reg =3D (reg & (~VSIQF_HASH_CTL_HASH_SCHEME_M)) | > >+ (1 << VSIQF_HASH_CTL_HASH_SCHEME_S); > >+ ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); > >+ } else { > >+ ret =3D ice_rem_vsi_rss_cfg(hw, vsi->idx); > >+ if (ret) > >+ PMD_DRV_LOG(ERR, "%s rss flow destroy fail %d", > >+ __func__, ret); >=20 > Ditto. >=20 > >+ } > >+ > >+ rte_free(filter_ptr); > >+ > >+ return 0; > >+} > >+ > >+static void > >+ice_hash_uninit(struct ice_adapter *ad) { > >+ if (ad->active_pkg_type =3D=3D ICE_PKG_TYPE_OS_DEFAULT) > >+ ice_unregister_parser(&ice_hash_parser_os, ad); > >+ else if (ad->active_pkg_type =3D=3D ICE_PKG_TYPE_COMMS) > >+ ice_unregister_parser(&ice_hash_parser_comms, ad); } > >+ > >+static void > >+ice_hash_free(struct rte_flow *flow) > >+{ > >+ rte_free(flow->rule); > >+} > >-- > >1.8.3.1 > > Br Simei