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 B5B82A0526 for ; Thu, 23 Jul 2020 03:57:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E51C1BFEC; Thu, 23 Jul 2020 03:57:12 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id D8AAE1BE9A; Thu, 23 Jul 2020 03:57:08 +0200 (CEST) IronPort-SDR: +34kZ8HcO4t89wOmqTFl+bpzyqg9RHF3XjIkuWBo32p3zlLA8zriWFS4DhVfDp2pGRpD67++Lj 5YlDtcSGui4g== X-IronPort-AV: E=McAfee;i="6000,8403,9690"; a="151762504" X-IronPort-AV: E=Sophos;i="5.75,385,1589266800"; d="scan'208";a="151762504" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2020 18:57:07 -0700 IronPort-SDR: dbwvhckSSLuk4Llt2IzzMs0q2+GUA1mTW58koMr2igJZuKFFbRxBQwHlGxd703B1H5dHNJ/o0d bOcOyRcNwGug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,385,1589266800"; d="scan'208";a="318841039" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP; 22 Jul 2020 18:57:07 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 22 Jul 2020 18:57:07 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 22 Jul 2020 18:57:07 -0700 Received: from NAM04-CO1-obe.outbound.protection.outlook.com (104.47.45.59) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jul 2020 18:57:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YmyF7GNxpX4rcdANNBuDxR4EesTMjfHeulLdqylgLmXUJkeuJDn8uWlg6//XQZhFJiN9J2t/izbOPBmkW3H9PIgofKIXiXVjtWsA6d5G6yxr9rx004Jqks7KSC1ByFG6pKxkp89hoOdtf9iz94+sEJqMBh8ddVlv34wz5VOHGxjz5KXNei74KWOiwH9Su3z3WDI48h3Xa3ugux3TqAwkoDruEs0MPg4wJPqB0ZEey5QMfBU+dAo7vvV+5TYC5lK82sNvH0KuM2u23KjWSXAVp3K3qccnbspZpm6ENjneJfmeKzk7+E/qKODNeDBQY/tuuksTv07w3I5+cevRULm2xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lwoeOWsOD3Hbc56p2OX0PAj/a8rct3KwRtoZkRHuWY4=; b=TroVlUgC5Po4YHeguRrQyCgNj857KNQDBqrzhLaBYbrpTg3+ETnFc1l2bEV3ED1/iXqKzTqszAX1gU9Pc1MaiDMUodwUDE+E+hqoDm9a0q5PN8fEU9i0D9Lkralk7L+2FGEhzBLyFvUTJHDSykv1C4i/DBrrokyGvIeDgNoaUC/02BemLh9Ip/0ieLT9p8bJ2kSjK0YeDSbt5Ol0grMrnjZzepDgCMDA4oRxc0pB3ZkCrC6ugcTm/6gY+mP+3e9EPZkJHhAFAN2VqamuLMBoAc2lhocS/XOg9Mwnde8ewQMx/cv9j9WCIsnNqUP+NX0wEmSYakf+VrUkQlH4H7Haiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lwoeOWsOD3Hbc56p2OX0PAj/a8rct3KwRtoZkRHuWY4=; b=w6xHC/kjqcYiby5B4m/0huQXLS7C2sriBR2joDJ6gI8RaNYYHuDZ+fJgABChM3y7AxsuY4J49csnu+QP9jM4ACZ2JA9PCD/UgtrPqIp7Wdc86jgBo8eNw6qK8hLQqWCw07opED3f+JhApviBCjlRZ9CJP1JtKnvLC9XwsNGGGbo= Received: from BN6PR11MB0017.namprd11.prod.outlook.com (2603:10b6:405:6c::34) by BN6PR11MB1313.namprd11.prod.outlook.com (2603:10b6:404:48::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.20; Thu, 23 Jul 2020 01:57:03 +0000 Received: from BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120]) by BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120%6]) with mapi id 15.20.3195.023; Thu, 23 Jul 2020 01:57:03 +0000 From: "Yang, Qiming" To: "Wang, ShougangX" , "dev@dpdk.org" CC: "Xing, Beilei" , "Guo, Jia" , "Wang, ShougangX" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v3] net/i40e: fix incorrect hash look up table Thread-Index: AQHWYALZy2sRjXuV50ilSElK4Ihay6kUaNbg Date: Thu, 23 Jul 2020 01:57:03 +0000 Message-ID: References: <20200715063515.9262-1-shougangx.wang@intel.com> <20200722081543.52396-1-shougangx.wang@intel.com> In-Reply-To: <20200722081543.52396-1-shougangx.wang@intel.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 33524859-13d4-41a1-4900-08d82eabb239 x-ms-traffictypediagnostic: BN6PR11MB1313: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hqwK9mO2TlhzaGhpAO49Q27pf6h55WaBdxmUma6dq35RTIDswD0aYBZATswIsACnk43dcbB+hxodTNOE+jp1bx+k4L3ULLsp+M5gT7OJD2Co/RA89lbazaA9i3zagZ8YWeH4mZzEKfLgy5WGQLZ3n3Th9ycng+YLLR8jIJCgMa/ZyQCrMtU8Ej81OxPLi0lZmdVzOPz5kq7JbBMz14bC4j8A2OKYjvOKaT7gSXn7fwm0eS24JvW10ibLM9Jpq49JAdhKqGeTNPXVOnTVd/rlC3eNNIJdA70ISuyhTfT2l6tYCAFdkJ4TbP7VuQJGY7Dg x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR11MB0017.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(136003)(366004)(396003)(39860400002)(71200400001)(4326008)(450100002)(8676002)(33656002)(64756008)(66476007)(66946007)(66556008)(76116006)(86362001)(66446008)(8936002)(55016002)(52536014)(53546011)(7696005)(186003)(26005)(83380400001)(9686003)(5660300002)(6506007)(54906003)(478600001)(2906002)(316002)(110136005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: aPecAli6zeohdEvgBaC2UFgZYpTkeyWQW4cWKR2i48KmF03ovAv4iFVveZgzogUG+LbglB9x9NUtuc7VpPiY5c9LnTLVBxvToIjrA9TprTfuGeHi6MPSDjuGmrfSO0i5Ifb68XRBC8l6o3bnLHkPffXm/oFsUY5ZuAUuw/oHjyOSaZN0AuHmIli2ZSah604iHlAYV5ZSG8N3V7i4iqd8JO5ygMR9e8McTyYYs1ANK0yQZ+mPs/KLFPiLQLScaCoCJVGuwuzDBCM1L8QboQwD25647WbdvWjCFJfJk6UwZ/YfCR6KuArDmMefghFdbNGFX3nwi++oZMvbfaDl4dRdocNCRO6QbuZtZDjUqU7LM9UICAa+Gms9xG6iZdcp8NVLHR8gfZj3a8CCbqKNaRLqXKPOqlGK6Fttay73rNM07iP6kyCkKlCaXWEiA2dAoAE5assKIsKz/zPQ5BPjqc0VCxvaVQrkAIBIlbhr/IEhkZbhplnOZFG89Ah8+IaVjbnj Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0017.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33524859-13d4-41a1-4900-08d82eabb239 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jul 2020 01:57:03.5380 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cWpAdmWxNz45xSyeBUYm4dOOkTtRf1cbbH62ywf4HyOgUIMii1NzyFZQYy7tjCMrdQguh+ggCg5n5mx/Rlf/dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1313 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v3] net/i40e: fix incorrect hash look up table X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" I don't understand why you add new function and new function mostly do the = same thing. Why don't add fix in original code. > -----Original Message----- > From: dev On Behalf Of Shougang Wang > Sent: Wednesday, July 22, 2020 16:16 > To: dev@dpdk.org > Cc: Xing, Beilei ; Guo, Jia ; W= ang, > ShougangX ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH v3] net/i40e: fix incorrect hash look up table >=20 > The hash look up table (LUT) is managed by global register but it is not > initialized when RSS is disabled. Once user wants to enable RSS during > runtime, the LUT will not be initialized. > This patch fixes the issue by initializing the LUT whether RSS enabled or= not. >=20 > Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow") > Cc: stable@dpdk.org >=20 > Signed-off-by: Shougang Wang > --- > v3: > -Updated the time of initializing the look up table > --- > drivers/net/i40e/i40e_ethdev.c | 85 ++++++++++++++++++++-------------- > 1 file changed, 49 insertions(+), 36 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 05d5f2861..e35590d96 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -8984,42 +8984,7 @@ i40e_pf_calc_configured_queues_num(struct > i40e_pf *pf) static int i40e_pf_config_rss(struct i40e_pf *pf) { > - struct i40e_hw *hw =3D I40E_PF_TO_HW(pf); > struct rte_eth_rss_conf rss_conf; > - uint32_t i, lut =3D 0; > - uint16_t j, num; > - > - /* > - * If both VMDQ and RSS enabled, not all of PF queues are > configured. > - * It's necessary to calculate the actual PF queues that are configured= . > - */ > - if (pf->dev_data->dev_conf.rxmode.mq_mode & > ETH_MQ_RX_VMDQ_FLAG) > - num =3D i40e_pf_calc_configured_queues_num(pf); > - else > - num =3D pf->dev_data->nb_rx_queues; > - > - num =3D RTE_MIN(num, I40E_MAX_Q_PER_TC); > - PMD_INIT_LOG(INFO, "Max of contiguous %u PF queues are > configured", > - num); > - > - if (num =3D=3D 0) { > - PMD_INIT_LOG(ERR, > - "No PF queues are configured to enable RSS for port > %u", > - pf->dev_data->port_id); > - return -ENOTSUP; > - } > - > - if (pf->adapter->rss_reta_updated =3D=3D 0) { > - for (i =3D 0, j =3D 0; i < hw->func_caps.rss_table_size; i++, j++) { > - if (j =3D=3D num) > - j =3D 0; > - lut =3D (lut << 8) | (j & ((0x1 << > - hw->func_caps.rss_table_entry_width) - 1)); > - if ((i & 3) =3D=3D 3) > - I40E_WRITE_REG(hw, I40E_PFQF_HLUT(i >> > 2), > - rte_bswap32(lut)); > - } > - } >=20 > rss_conf =3D pf->dev_data->dev_conf.rx_adv_conf.rss_conf; > if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) =3D=3D 0) { @@ - > 9195,12 +9160,60 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev, > return ret; > } >=20 > +/* Initialize the hash look up table */ static int > +i40e_pf_init_rss_lut(struct i40e_pf *pf) { > + struct i40e_hw *hw =3D I40E_PF_TO_HW(pf); > + uint32_t lut =3D 0; > + uint16_t j, num; > + uint32_t i; > + > + /* If both VMDQ and RSS enabled, not all of PF queues are > configured. > + * It's necessary to calculate the actual PF queues that are configured= . > + */ > + if (pf->dev_data->dev_conf.rxmode.mq_mode & > ETH_MQ_RX_VMDQ_FLAG) > + num =3D i40e_pf_calc_configured_queues_num(pf); > + else > + num =3D pf->dev_data->nb_rx_queues; > + > + num =3D RTE_MIN(num, I40E_MAX_Q_PER_TC); > + PMD_INIT_LOG(INFO, "Max of contiguous %u PF queues are > configured", > + num); > + > + if (num =3D=3D 0) { > + PMD_INIT_LOG(ERR, > + "No PF queues are configured to enable RSS for port > %u", > + pf->dev_data->port_id); > + return -ENOTSUP; > + } > + > + if (pf->adapter->rss_reta_updated =3D=3D 0) { > + for (i =3D 0, j =3D 0; i < hw->func_caps.rss_table_size; i++, j++) { > + if (j =3D=3D num) > + j =3D 0; > + lut =3D (lut << 8) | (j & ((0x1 << > + hw->func_caps.rss_table_entry_width) - 1)); > + if ((i & 3) =3D=3D 3) > + I40E_WRITE_REG(hw, I40E_PFQF_HLUT(i >> > 2), > + rte_bswap32(lut)); > + } > + } > + > + return 0; > +} > + > static int > i40e_pf_config_mq_rx(struct i40e_pf *pf) { > - int ret =3D 0; > + int ret; > enum rte_eth_rx_mq_mode mq_mode =3D pf->dev_data- > >dev_conf.rxmode.mq_mode; >=20 > + /* Initialize hash look up table */ > + ret =3D i40e_pf_init_rss_lut(pf); > + if (ret) > + return ret; > + > /* RSS setup */ > if (mq_mode & ETH_MQ_RX_RSS_FLAG) > ret =3D i40e_pf_config_rss(pf); > -- > 2.17.1