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 7F04CA0353; Wed, 13 Nov 2019 02:12:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 89A4A2BC7; Wed, 13 Nov 2019 02:12:18 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 407D02B8B for ; Wed, 13 Nov 2019 02:12:16 +0100 (CET) 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; 12 Nov 2019 17:12:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,298,1569308400"; d="scan'208";a="405797083" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga006.fm.intel.com with ESMTP; 12 Nov 2019 17:12:14 -0800 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 12 Nov 2019 17:12:14 -0800 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 12 Nov 2019 17:12:14 -0800 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 12 Nov 2019 17:12:13 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.127]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.225]) with mapi id 14.03.0439.000; Wed, 13 Nov 2019 09:12:12 +0800 From: "Su, Simei" To: "Zhang, Qi Z" , "Ye, Xiaolong" , "Yang, Qiming" CC: "dev@dpdk.org" Thread-Topic: [PATCH] net/ice: add a structure for RSS Thread-Index: AQHVmTEIKnpajjTHa0auCnul2YtJJqeHBEQAgAFHv3A= Date: Wed, 13 Nov 2019 01:12:11 +0000 Message-ID: <65F28F834D25B54B9EC1999B623071B30C482DB9@SHSMSX104.ccr.corp.intel.com> References: <1573546349-341486-1-git-send-email-simei.su@intel.com> <039ED4275CED7440929022BC67E7061153DC84E0@SHSMSX105.ccr.corp.intel.com> In-Reply-To: <039ED4275CED7440929022BC67E7061153DC84E0@SHSMSX105.ccr.corp.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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTkyZmU5YmMtMThmNi00NjBjLWEyODktMzc4NGZjNWUxNDcyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTWNPamVPcWFoQjJSN05tYnRnWUtWdEhRa1pBeXlFWkhKWHJUQk5oZlNadXFnb2ZYalpLVDNFTWxzUGxXb2V2OSJ9 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] net/ice: add a structure for 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" Hi, Qi > -----Original Message----- > From: Zhang, Qi Z > Sent: Tuesday, November 12, 2019 9:38 PM > To: Su, Simei ; Ye, Xiaolong ; > Yang, Qiming > Cc: dev@dpdk.org > Subject: RE: [PATCH] net/ice: add a structure for RSS >=20 >=20 >=20 > > -----Original Message----- > > From: Su, Simei > > Sent: Tuesday, November 12, 2019 4:12 PM > > To: Zhang, Qi Z ; Ye, Xiaolong > > ; Yang, Qiming > > Cc: dev@dpdk.org; Su, Simei > > Subject: [PATCH] net/ice: add a structure for RSS >=20 >=20 > Add a structure is not the patch's purpose, we want to fix the flow destr= oy > issue, and we need to add a new flag (new structure) for this fix. > So please change the title to "fix ...." >=20 Ok, I will change it in v2. > > > > This patch adds a structure to include a flag to indicate if it is a > > simple_xor flow so that it's easier to remove the config when > > destroying the flow. The patch also simplifies code implementation logi= c in > ice_hash_create(). > > > > In ice_hash_create(), whatever the hash_function is, the > > filter_ptr->symm is always 0 and when we destroy the flow, the > > ice_rem_rss_cfg() is never carried out. So the destroy function never > > works well. The patch fixes this issue and at the same time > > distinguishes semanteme between simple_xor and symmetric_toeplitz. >=20 > Please put above segment at first in the commit log. >=20 Ok, Thanks! Br Simei > > > > Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS") > > > > Signed-off-by: Simei Su > > --- > > drivers/net/ice/ice_hash.c | 42 > > +++++++++++++++++++++++------------------- > > 1 file changed, 23 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c > > index > > 57e7d55..d884343 100644 > > --- a/drivers/net/ice/ice_hash.c > > +++ b/drivers/net/ice/ice_hash.c > > @@ -41,6 +41,11 @@ struct rss_meta { > > uint8_t hash_function; > > }; > > > > +struct ice_hash_flow_cfg { > > + bool simple_xor; > > + struct ice_rss_cfg rss_cfg; > > +}; > > + > > static int > > ice_hash_init(struct ice_adapter *ad); > > > > @@ -452,14 +457,14 @@ struct ice_hash_match_type ice_hash_type_list[] > =3D { > > struct ice_vsi *vsi =3D pf->main_vsi; > > int ret; > > uint32_t reg; > > - struct ice_rss_cfg *filter_ptr; > > + struct ice_hash_flow_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); > > + sizeof(struct ice_hash_flow_cfg), 0); > > if (!filter_ptr) { > > rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_HANDLE, NULL, @@ -474,19 > +479,20 @@ struct > > ice_hash_match_type ice_hash_type_list[] =3D { > > (2 << VSIQF_HASH_CTL_HASH_SCHEME_S); > > ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); > > > > - filter_ptr->symm =3D 0; > > + filter_ptr->simple_xor =3D 1; > > > > 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) { > > - rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > > - "rss flow create fail"); > > - goto error; > > - } > > } else { > > - ret =3D ice_add_rss_cfg(hw, vsi->idx, hash_field, headermask, 0); > > + filter_ptr->rss_cfg.packet_hdr =3D headermask; > > + filter_ptr->rss_cfg.hashed_flds =3D hash_field; > > + filter_ptr->rss_cfg.symm =3D > > + (hash_function =3D=3D > > + RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ); > > + > > + ret =3D ice_add_rss_cfg(hw, vsi->idx, > > + filter_ptr->rss_cfg.hashed_flds, > > + filter_ptr->rss_cfg.packet_hdr, > > + filter_ptr->rss_cfg.symm); > > if (ret) { > > rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_HANDLE, NULL, @@ > -495,9 +501,6 @@ struct > > ice_hash_match_type ice_hash_type_list[] =3D { > > } > > } > > > > - filter_ptr->packet_hdr =3D headermask; > > - filter_ptr->hashed_flds =3D hash_field; > > - > > out: > > flow->rule =3D filter_ptr; > > rte_free(meta); > > @@ -519,11 +522,11 @@ struct ice_hash_match_type ice_hash_type_list[] > =3D { > > struct ice_vsi *vsi =3D pf->main_vsi; > > int ret; > > uint32_t reg; > > - struct ice_rss_cfg *filter_ptr; > > + struct ice_hash_flow_cfg *filter_ptr; > > > > - filter_ptr =3D (struct ice_rss_cfg *)flow->rule; > > + filter_ptr =3D (struct ice_hash_flow_cfg *)flow->rule; > > > > - if (filter_ptr->symm =3D=3D 0) { > > + if (filter_ptr->simple_xor =3D=3D 1) { > > /* 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)) | @@ -531,7 > > +534,8 @@ struct ice_hash_match_type ice_hash_type_list[] =3D { > > ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); > > } else { > > ret =3D ice_rem_rss_cfg(hw, vsi->idx, > > - filter_ptr->hashed_flds, filter_ptr->packet_hdr); > > + filter_ptr->rss_cfg.hashed_flds, > > + filter_ptr->rss_cfg.packet_hdr); > > if (ret) { > > rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > > -- > > 1.8.3.1