From patchwork Mon Mar 12 08:42:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 35966 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E64D25F1B; Mon, 12 Mar 2018 09:42:34 +0100 (CET) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by dpdk.org (Postfix) with ESMTP id 5E5AD5B3E for ; Mon, 12 Mar 2018 09:42:33 +0100 (CET) Received: by mail-lf0-f66.google.com with SMTP id 37-v6so21873065lfs.7 for ; Mon, 12 Mar 2018 01:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+sk8M+oIj7zzf/E/ZxyYGlcnykjpiJ2RrcFsIq/Rvds=; b=YTPLAOzY4MM0ZbX0QPGrTbkVEStiisjtPmhSXhNnK2XpuInczPMcuf31hYgIi6ra6i kOGGV8x2Q5gAFKOKQObls8ZTujOH+bJ3amKhJ5+BQdw1dMeQY317vfRwiWTRj3z6yWAT ycd0OUy7qoeMi5TcFgrUfl+9ZJAFWN6G7iKxeN9wtK7OgSBGFXpgOTkU5Xo5oI/xh9Vx m1gOLphgOCP76m/MH2E7wMxRTk54Tw+8HY52jWZBDsubMZCTB6IrJNURDQPKptPCmc+u UYMiPZdlSFyFfHuwMarfflRoB3tGeRtutsEeOmnihB1Q/IGwFKCbAZ4p37gfNOUME5zR ZGmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+sk8M+oIj7zzf/E/ZxyYGlcnykjpiJ2RrcFsIq/Rvds=; b=AQ0Kvh5DyiTYMWSB8G/Ee+fqtDKrA73ufKmeU+/0Awfal9uCgdk0bWA/MLKTvADCh6 qSDtS9ZmcfnkKSFelghRPVlIOkwnatB6gGAhHwTsRPuPpJkZZmIe87GcLfgPzLy1lUv9 vIRkpkkIZmKOAjpo3zRYbSa28k+TVm5CYDybPZvZ0mm0dpTdEa6bBm58yXs19Og7iLLQ 67gwIJ6eFZgnVjVLBcBwvVZA3ElPCAh2Hp+UN4GLjL23WWpf41D0FPfVmU3Kt9BBq7VX V7UQ/qmg2SVOS/BJ+wJDMJhNYX+Yl66uFQ1RE8laidmIcKe1sqS6uw8vvNNXZv1TNaAy mE0g== X-Gm-Message-State: AElRT7FwjpcL+AEBfABVLqq34PdJU7gb8alf+t2VGr8UTVZqmnGip3Rt iWhfxJwmBchMX0UzLl19LUN85EdoVYU= X-Google-Smtp-Source: AG47ELuqGU+6Ee1EiW1rTB4J0c0PBct1vE60BteLMRvJ+MbA1UvQe4xNBGsxGJaqPvbZhpD6C4QWww== X-Received: by 10.46.2.202 with SMTP id y71mr4343118lje.39.1520844152798; Mon, 12 Mar 2018 01:42:32 -0700 (PDT) Received: from sh.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id t21sm1549933ljd.55.2018.03.12.01.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 01:42:32 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: mw@semihalf.com, dima@marvell.com, nsamsono@marvell.com, jck@semihalf.com, jianbo.liu@arm.com, Tomasz Duszynski Date: Mon, 12 Mar 2018 09:42:12 +0100 Message-Id: <1520844132-29969-9-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520844132-29969-1-git-send-email-tdu@semihalf.com> References: <1519222460-14605-1-git-send-email-tdu@semihalf.com> <1520844132-29969-1-git-send-email-tdu@semihalf.com> Subject: [dpdk-dev] [PATCH v2 8/8] net/mrvl: add Tx queue start/stop 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" Add Tx queue start/stop feature. Signed-off-by: Natalie Samsonov Signed-off-by: Tomasz Duszynski --- doc/guides/nics/mrvl.rst | 1 + drivers/net/mrvl/mrvl_ethdev.c | 92 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/mrvl.rst b/doc/guides/nics/mrvl.rst index 550bd79..f9ec9d6 100644 --- a/doc/guides/nics/mrvl.rst +++ b/doc/guides/nics/mrvl.rst @@ -73,6 +73,7 @@ Features of the MRVL PMD are: - Extended stats - QoS - RX flow control +- TX queue start/stop Limitations diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.c index 21a83c9..a6b77a2 100644 --- a/drivers/net/mrvl/mrvl_ethdev.c +++ b/drivers/net/mrvl/mrvl_ethdev.c @@ -134,6 +134,7 @@ struct mrvl_txq { int port_id; uint64_t bytes_sent; struct mrvl_shadow_txq shadow_txqs[RTE_MAX_LCORE]; + int tx_deferred_start; }; static int mrvl_lcore_first; @@ -459,6 +460,70 @@ mrvl_dev_set_link_down(struct rte_eth_dev *dev) } /** + * DPDK callback to start tx queue. + * + * @param dev + * Pointer to Ethernet device structure. + * @param queue_id + * Transmit queue index. + * + * @return + * 0 on success, negative error value otherwise. + */ +static int +mrvl_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id) +{ + struct mrvl_priv *priv = dev->data->dev_private; + int ret; + + if (!priv) + return -EPERM; + + /* passing 1 enables given tx queue */ + ret = pp2_ppio_set_outq_state(priv->ppio, queue_id, 1); + if (ret) { + RTE_LOG(ERR, PMD, "Failed to start txq %d\n", queue_id); + return ret; + } + + dev->data->tx_queue_state[queue_id] = RTE_ETH_QUEUE_STATE_STARTED; + + return 0; +} + +/** + * DPDK callback to stop tx queue. + * + * @param dev + * Pointer to Ethernet device structure. + * @param queue_id + * Transmit queue index. + * + * @return + * 0 on success, negative error value otherwise. + */ +static int +mrvl_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id) +{ + struct mrvl_priv *priv = dev->data->dev_private; + int ret; + + if (!priv->ppio) + return -EPERM; + + /* passing 0 disables given tx queue */ + ret = pp2_ppio_set_outq_state(priv->ppio, queue_id, 0); + if (ret) { + RTE_LOG(ERR, PMD, "Failed to stop txq %d\n", queue_id); + return ret; + } + + dev->data->tx_queue_state[queue_id] = RTE_ETH_QUEUE_STATE_STOPPED; + + return 0; +} + +/** * DPDK callback to start the device. * * @param dev @@ -472,7 +537,7 @@ mrvl_dev_start(struct rte_eth_dev *dev) { struct mrvl_priv *priv = dev->data->dev_private; char match[MRVL_MATCH_LEN]; - int ret = 0, def_init_size; + int ret = 0, i, def_init_size; snprintf(match, sizeof(match), "ppio-%d:%d", priv->pp_id, priv->ppio_id); @@ -559,6 +624,24 @@ mrvl_dev_start(struct rte_eth_dev *dev) goto out; } + /* start tx queues */ + for (i = 0; i < dev->data->nb_tx_queues; i++) { + struct mrvl_txq *txq = dev->data->tx_queues[i]; + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + + if (!txq->tx_deferred_start) + continue; + + /* + * All txqs are started by default. Stop them + * so that tx_deferred_start works as expected. + */ + ret = mrvl_tx_queue_stop(dev, i); + if (ret) + goto out; + } + return 0; out: RTE_LOG(ERR, PMD, "Failed to start device\n"); @@ -1330,9 +1413,11 @@ static void mrvl_txq_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id, struct rte_eth_txq_info *qinfo) { struct mrvl_priv *priv = dev->data->dev_private; + struct mrvl_txq *txq = dev->data->tx_queues[tx_queue_id]; qinfo->nb_desc = priv->ppio_params.outqs_params.outqs_params[tx_queue_id].size; + qinfo->conf.tx_deferred_start = txq->tx_deferred_start; } /** @@ -1643,7 +1728,7 @@ mrvl_tx_queue_offloads_okay(struct rte_eth_dev *dev, uint64_t requested) * @param socket * NUMA socket on which memory must be allocated. * @param conf - * Thresholds parameters. + * Tx queue configuration parameters. * * @return * 0 on success, negative error value otherwise. @@ -1671,6 +1756,7 @@ mrvl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, txq->priv = priv; txq->queue_id = idx; txq->port_id = dev->data->port_id; + txq->tx_deferred_start = conf->tx_deferred_start; dev->data->tx_queues[idx] = txq; priv->ppio_params.outqs_params.outqs_params[idx].size = desc; @@ -1974,6 +2060,8 @@ static const struct eth_dev_ops mrvl_ops = { .rxq_info_get = mrvl_rxq_info_get, .txq_info_get = mrvl_txq_info_get, .vlan_filter_set = mrvl_vlan_filter_set, + .tx_queue_start = mrvl_tx_queue_start, + .tx_queue_stop = mrvl_tx_queue_stop, .rx_queue_setup = mrvl_rx_queue_setup, .rx_queue_release = mrvl_rx_queue_release, .tx_queue_setup = mrvl_tx_queue_setup,