From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id F3E5C7D19 for ; Mon, 26 Mar 2018 10:50:36 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Mar 2018 01:50:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,364,1517904000"; d="scan'208";a="31295348" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 26 Mar 2018 01:50:34 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 26 Mar 2018 01:50:32 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.235]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.129]) with mapi id 14.03.0319.002; Mon, 26 Mar 2018 16:49:55 +0800 From: "Zhang, Qi Z" To: "Ananyev, Konstantin" , "thomas@monjalon.net" CC: "dev@dpdk.org" , "Xing, Beilei" , "Wu, Jingjing" , "Lu, Wenzhuo" Thread-Topic: [PATCH v3 3/3] net/i40e: enable runtime queue setup Thread-Index: AQHTwOYugzCJeOMpEEu6mRv27IWEnKPg2/AAgAFgx+A= Date: Mon, 26 Mar 2018 08:49:55 +0000 Message-ID: <039ED4275CED7440929022BC67E706115317419A@SHSMSX103.ccr.corp.intel.com> References: <20180212045314.171616-1-qi.z.zhang@intel.com> <20180321072807.268266-1-qi.z.zhang@intel.com> <20180321072807.268266-4-qi.z.zhang@intel.com> <2601191342CEEE43887BDE71AB977258A0AB4007@irsmsx105.ger.corp.intel.com> In-Reply-To: <2601191342CEEE43887BDE71AB977258A0AB4007@irsmsx105.ger.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.0.0.116 dlp-reaction: no-action 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 v3 3/3] net/i40e: enable runtime queue setup 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: , X-List-Received-Date: Mon, 26 Mar 2018 08:50:37 -0000 > -----Original Message----- > From: Ananyev, Konstantin > Sent: Monday, March 26, 2018 3:46 AM > To: Zhang, Qi Z ; thomas@monjalon.net > Cc: dev@dpdk.org; Xing, Beilei ; Wu, Jingjing > ; Lu, Wenzhuo > Subject: RE: [PATCH v3 3/3] net/i40e: enable runtime queue setup >=20 > Hi Qi, >=20 > > > > Expose the runtime queue configuration capability and enhance > > i40e_dev_[rx|tx]_queue_setup to handle the situation when device > > already started. > > > > Signed-off-by: Qi Zhang > > --- > > v3: > > - no queue start/stop in setup/release > > - return fail when required rx/tx function conflict with > > exist setup > > > > drivers/net/i40e/i40e_ethdev.c | 4 +++ > > drivers/net/i40e/i40e_rxtx.c | 64 > ++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 68 insertions(+) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > b/drivers/net/i40e/i40e_ethdev.c index 508b4171c..68960dcaa 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -3197,6 +3197,10 @@ i40e_dev_info_get(struct rte_eth_dev *dev, > struct rte_eth_dev_info *dev_info) > > DEV_TX_OFFLOAD_GRE_TNL_TSO | > > DEV_TX_OFFLOAD_IPIP_TNL_TSO | > > DEV_TX_OFFLOAD_GENEVE_TNL_TSO; > > + dev_info->runtime_queue_setup_capa =3D > > + DEV_RUNTIME_RX_QUEUE_SETUP | > > + DEV_RUNTIME_TX_QUEUE_SETUP; > > + > > dev_info->hash_key_size =3D (I40E_PFQF_HKEY_MAX_INDEX + 1) * > > sizeof(uint32_t); > > dev_info->reta_size =3D pf->hash_lut_size; diff --git > > a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index > > 1217e5a61..9eb009d63 100644 > > --- a/drivers/net/i40e/i40e_rxtx.c > > +++ b/drivers/net/i40e/i40e_rxtx.c > > @@ -1712,6 +1712,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev > *dev, > > uint16_t len, i; > > uint16_t reg_idx, base, bsf, tc_mapping; > > int q_offset, use_def_burst_func =3D 1; > > + int ret =3D 0; > > > > if (hw->mac.type =3D=3D I40E_MAC_VF || hw->mac.type =3D=3D > I40E_MAC_X722_VF) { > > vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > > @@ -1841,6 +1842,36 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev > *dev, > > rxq->dcb_tc =3D i; > > } > > > > + if (dev->data->dev_started) { > > + ret =3D i40e_rx_queue_init(rxq); > > + if (ret !=3D I40E_SUCCESS) { > > + PMD_DRV_LOG(ERR, > > + "Failed to do RX queue initialization"); > > + return ret; > > + } >=20 > We probably also have to do here: >=20 > if (use_def_burst_func !=3D 0 && ad-> rx_bulk_alloc_allowed) {error;} >=20 > and we have to do that before we assign ad-> rx_bulk_alloc_allowed (insid= e > rx_queue_setup() few lines above). Got your point and agree with all following comments. Thanks Qi=20 >=20 >=20 > > + /* check vector conflict */ > > + if (ad->rx_vec_allowed) { > > + if (i40e_rxq_vec_setup(rxq)) { > > + PMD_DRV_LOG(ERR, "Failed vector rx setup"); > > + i40e_dev_rx_queue_release(rxq); > > + return -EINVAL; > > + } > > + } > > + /* check scatterred conflict */ > > + if (!dev->data->scattered_rx) { > > + uint16_t buf_size =3D > > + (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) - > > + RTE_PKTMBUF_HEADROOM); > > + > > + if ((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > > > + buf_size) { > > + PMD_DRV_LOG(ERR, "Scattered rx is required"); > > + i40e_dev_rx_queue_release(rxq); > > + return -EINVAL; > > + } > > + } > > + } > > + > > return 0; > > } > > > > @@ -1980,6 +2011,8 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev > *dev, > > const struct rte_eth_txconf *tx_conf) { > > struct i40e_hw *hw =3D > I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); > > + struct i40e_adapter *ad =3D > > + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > > struct i40e_vsi *vsi; > > struct i40e_pf *pf =3D NULL; > > struct i40e_vf *vf =3D NULL; > > @@ -1989,6 +2022,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev > *dev, > > uint16_t tx_rs_thresh, tx_free_thresh; > > uint16_t reg_idx, i, base, bsf, tc_mapping; > > int q_offset; > > + int ret =3D 0; > > > > if (hw->mac.type =3D=3D I40E_MAC_VF || hw->mac.type =3D=3D > I40E_MAC_X722_VF) { > > vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > > @@ -2162,6 +2196,36 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev > *dev, > > txq->dcb_tc =3D i; > > } > > > > + if (dev->data->dev_started) { > > + ret =3D i40e_tx_queue_init(txq); > > + if (ret !=3D I40E_SUCCESS) { > > + PMD_DRV_LOG(ERR, > > + "Failed to do TX queue initialization"); > > + return ret; > > + } > > + > > + /* check vector conflict */ > > + if (ad->tx_vec_allowed) { >=20 > Same thing here: > i40e_dev_tx_queue_setup()->i40e_set_tx_function_flag() > can change both ad->tx_vec_allowed and tx_simple_allowed. > I think we have to do that check before device settings are affected. >=20 > > + if (txq->tx_rs_thresh > RTE_I40E_TX_MAX_FREE_BUF_SZ || > > + i40e_txq_vec_setup(txq)) { > > + PMD_DRV_LOG(ERR, "Failed vector tx setup"); > > + i40e_dev_tx_queue_release(txq); > > + return -EINVAL; > > + } > > + } > > + > > + /* check simple tx conflict */ > > + if (ad->tx_simple_allowed) { > > + if (((txq->txq_flags & I40E_SIMPLE_FLAGS) !=3D > > + I40E_SIMPLE_FLAGS) || > > + (txq->tx_rs_thresh < RTE_PMD_I40E_TX_MAX_BURST)) { > > + } > > + PMD_DRV_LOG(ERR, "No-simple tx is required"); > > + i40e_dev_tx_queue_release(txq); > > + return -EINVAL; > > + } > > + } > > + >=20 > As a nit - probably worth to move functionality under if > (dev->data->dev_started) {...} into a separate function for both TX and R= X. > Konstantin >=20 >=20 > > return 0; > > } > > > > -- > > 2.13.6