From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id DCFC25F32 for ; Sun, 25 Mar 2018 21:46:14 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Mar 2018 12:46:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,361,1517904000"; d="scan'208";a="42050009" Received: from irsmsx102.ger.corp.intel.com ([163.33.3.155]) by orsmga001.jf.intel.com with ESMTP; 25 Mar 2018 12:46:12 -0700 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.216]) by IRSMSX102.ger.corp.intel.com ([169.254.2.164]) with mapi id 14.03.0319.002; Sun, 25 Mar 2018 20:46:11 +0100 From: "Ananyev, Konstantin" To: "Zhang, Qi Z" , "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: AQHTwOYuc4gEckJq1Uqm1WIqQuWxV6PhXikQ Date: Sun, 25 Mar 2018 19:46:10 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258A0AB4007@irsmsx105.ger.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> In-Reply-To: <20180321072807.268266-4-qi.z.zhang@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjMyNTY1MzUtNDkzYi00YzZlLThkZjYtMTE2YzhkMTU0ZTA2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IjhydEpQckp5Tyt6cGY1dmwrZENjRnFPaE9xbkJIeXlcLzdpQVwvdjNPeTR2TT0ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [163.33.239.180] 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: Sun, 25 Mar 2018 19:46:15 -0000 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. >=20 > Signed-off-by: Qi Zhang > --- > v3: > - no queue start/stop in setup/release > - return fail when required rx/tx function conflict with > exist setup >=20 > drivers/net/i40e/i40e_ethdev.c | 4 +++ > drivers/net/i40e/i40e_rxtx.c | 64 ++++++++++++++++++++++++++++++++++++= ++++++ > 2 files changed, 68 insertions(+) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.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; >=20 > if (hw->mac.type =3D=3D I40E_MAC_VF || hw->mac.type =3D=3D I40E_MAC_X72= 2_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; > } >=20 > + 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; > + } We probably also have to do here: if (use_def_burst_func !=3D 0 && ad-> rx_bulk_alloc_allowed) {error;} and we have to do that before we assign ad-> rx_bulk_alloc_allowed (inside rx_queue_setup() few lines above). > + /* 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; > } >=20 > @@ -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; >=20 > if (hw->mac.type =3D=3D I40E_MAC_VF || hw->mac.type =3D=3D I40E_MAC_X72= 2_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; > } >=20 > + 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) { 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. > + 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; > + } > + } > + As a nit - probably worth to move functionality under if (dev->data->dev_st= arted) {...} into a separate function for both TX and RX. Konstantin > return 0; > } >=20 > -- > 2.13.6