From: "Ananyev, Konstantin" <konstantin.ananyev@intel.com>
To: "Zhang, Qi Z" <qi.z.zhang@intel.com>,
"thomas@monjalon.net" <thomas@monjalon.net>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"Xing, Beilei" <beilei.xing@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>,
"Lu, Wenzhuo" <wenzhuo.lu@intel.com>
Subject: Re: [dpdk-dev] [PATCH v3 3/3] net/i40e: enable runtime queue setup
Date: Sun, 25 Mar 2018 19:46:10 +0000 [thread overview]
Message-ID: <2601191342CEEE43887BDE71AB977258A0AB4007@irsmsx105.ger.corp.intel.com> (raw)
In-Reply-To: <20180321072807.268266-4-qi.z.zhang@intel.com>
Hi Qi,
>
> 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 <qi.z.zhang@intel.com>
> ---
> 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 =
> + DEV_RUNTIME_RX_QUEUE_SETUP |
> + DEV_RUNTIME_TX_QUEUE_SETUP;
> +
> dev_info->hash_key_size = (I40E_PFQF_HKEY_MAX_INDEX + 1) *
> sizeof(uint32_t);
> dev_info->reta_size = 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 = 1;
> + int ret = 0;
>
> if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {
> vf = 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 = i;
> }
>
> + if (dev->data->dev_started) {
> + ret = i40e_rx_queue_init(rxq);
> + if (ret != 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 != 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 =
> + (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 = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + struct i40e_adapter *ad =
> + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> struct i40e_vsi *vsi;
> struct i40e_pf *pf = NULL;
> struct i40e_vf *vf = 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 = 0;
>
> if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {
> vf = 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 = i;
> }
>
> + if (dev->data->dev_started) {
> + ret = i40e_tx_queue_init(txq);
> + if (ret != 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) !=
> + 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_started) {...}
into a separate function for both TX and RX.
Konstantin
> return 0;
> }
>
> --
> 2.13.6
next prev parent reply other threads:[~2018-03-25 19:46 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 4:53 [dpdk-dev] [PATCH 0/4] deferred " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 1/4] ether: support " Qi Zhang
2018-02-12 13:55 ` Thomas Monjalon
2018-02-12 4:53 ` [dpdk-dev] [PATCH 2/4] app/testpmd: add parameters for " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 3/4] app/testpmd: add command for " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 4/4] net/i40e: enable deferred " Qi Zhang
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 0/4] " Qi Zhang
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 1/4] ether: support " Qi Zhang
2018-03-14 12:31 ` Ananyev, Konstantin
2018-03-15 3:13 ` Zhang, Qi Z
2018-03-15 13:16 ` Ananyev, Konstantin
2018-03-15 15:08 ` Zhang, Qi Z
2018-03-15 15:38 ` Ananyev, Konstantin
2018-03-16 0:42 ` Zhang, Qi Z
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 2/4] app/testpmd: add parameters for " Qi Zhang
2018-03-14 17:38 ` Ananyev, Konstantin
2018-03-15 3:58 ` Zhang, Qi Z
2018-03-15 13:42 ` Ananyev, Konstantin
2018-03-15 14:31 ` Zhang, Qi Z
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 3/4] app/testpmd: add command for " Qi Zhang
2018-03-14 17:36 ` Ananyev, Konstantin
2018-03-14 17:41 ` Ananyev, Konstantin
2018-03-15 3:59 ` Zhang, Qi Z
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 4/4] net/i40e: enable deferred " Qi Zhang
2018-03-14 12:35 ` Ananyev, Konstantin
2018-03-15 3:22 ` Zhang, Qi Z
2018-03-15 3:50 ` Zhang, Qi Z
2018-03-15 13:22 ` Ananyev, Konstantin
2018-03-15 14:30 ` Zhang, Qi Z
2018-03-15 15:22 ` Ananyev, Konstantin
2018-03-16 0:52 ` Zhang, Qi Z
2018-03-16 9:54 ` Ananyev, Konstantin
2018-03-16 11:00 ` Bruce Richardson
2018-03-16 13:18 ` Zhang, Qi Z
2018-03-16 14:15 ` Zhang, Qi Z
2018-03-16 18:47 ` Ananyev, Konstantin
2018-03-18 7:55 ` Zhang, Qi Z
2018-03-20 13:18 ` Ananyev, Konstantin
2018-03-21 1:53 ` Zhang, Qi Z
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 0/3] runtime " Qi Zhang
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 1/3] ether: support " Qi Zhang
2018-03-25 19:47 ` Ananyev, Konstantin
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 2/3] app/testpmd: add command for " Qi Zhang
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 3/3] net/i40e: enable runtime " Qi Zhang
2018-03-25 19:46 ` Ananyev, Konstantin [this message]
2018-03-26 8:49 ` Zhang, Qi Z
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 0/3] " Qi Zhang
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 1/3] ether: support " Qi Zhang
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 2/3] app/testpmd: add command for " Qi Zhang
2018-04-01 12:21 ` Ananyev, Konstantin
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-01 12:18 ` Ananyev, Konstantin
2018-04-02 2:20 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 0/3] " Qi Zhang
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 1/3] ether: support " Qi Zhang
2018-04-06 19:42 ` Rosen, Rami
2018-04-08 2:20 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for " Qi Zhang
2018-04-07 15:49 ` Rosen, Rami
2018-04-08 2:22 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-02 23:36 ` [dpdk-dev] [PATCH v5 0/3] " Ananyev, Konstantin
2018-04-08 2:42 ` Qi Zhang
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 1/3] ether: support " Qi Zhang
2018-04-10 13:59 ` Thomas Monjalon
2018-04-20 11:14 ` Ferruh Yigit
2018-04-24 19:36 ` Thomas Monjalon
2018-04-25 5:33 ` Zhang, Qi Z
2018-04-25 7:54 ` Thomas Monjalon
2018-04-20 11:16 ` Ferruh Yigit
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 2/3] app/testpmd: add command for " Qi Zhang
2018-04-20 11:29 ` Ferruh Yigit
2018-04-22 11:57 ` Zhang, Qi Z
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-20 11:17 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 0/5] " Qi Zhang
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 1/5] ethdev: support " Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 2/5] app/testpmd: add command for " Qi Zhang
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 3/5] app/testpmd: enable per queue configure Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 4/5] app/testpmd: enable queue ring size configure Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-24 3:16 ` Zhang, Qi Z
2018-04-24 11:05 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 5/5] net/i40e: enable runtime queue setup Qi Zhang
2018-04-23 17:45 ` [dpdk-dev] [PATCH v7 0/5] " Ferruh Yigit
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 " Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 1/5] ethdev: support " Qi Zhang
2018-04-24 14:01 ` Thomas Monjalon
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 2/5] app/testpmd: add command for " Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 3/5] app/testpmd: enable per queue configure Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 4/5] app/testpmd: enable queue ring size configure Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 5/5] net/i40e: enable runtime queue setup Qi Zhang
2018-04-24 14:50 ` [dpdk-dev] [PATCH v8 0/5] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2601191342CEEE43887BDE71AB977258A0AB4007@irsmsx105.ger.corp.intel.com \
--to=konstantin.ananyev@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).