Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94487/?format=api
{ "id": 94487, "url": "http://patches.dpdk.org/api/patches/94487/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210618134032.1922012-7-andrew.rybchenko@oktetlabs.ru/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210618134032.1922012-7-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210618134032.1922012-7-andrew.rybchenko@oktetlabs.ru", "date": "2021-06-18T13:40:18", "name": "[v3,06/20] net/sfc: introduce ethdev Tx queue ID", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c58d182bc8bb3be1f2db308c6aa7cc3b9162d042", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210618134032.1922012-7-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 17397, "url": "http://patches.dpdk.org/api/series/17397/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17397", "date": "2021-06-18T13:40:12", "name": "net/sfc: support flow API COUNT action", "version": 3, "mbox": "http://patches.dpdk.org/series/17397/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/94487/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/94487/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 060A9A0C46;\n\tFri, 18 Jun 2021 15:41:32 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5D4CD41139;\n\tFri, 18 Jun 2021 15:40:58 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 231C6410E5\n for <dev@dpdk.org>; Fri, 18 Jun 2021 15:40:57 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id F36BC7F691; Fri, 18 Jun 2021 16:40:56 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id B20737F694;\n Fri, 18 Jun 2021 16:40:34 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru B20737F694", "Authentication-Results": "shelob.oktetlabs.ru/B20737F694; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "David Marchand <david.marchand@redhat.com>,\n Igor Romanov <igor.romanov@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>, Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Fri, 18 Jun 2021 16:40:18 +0300", "Message-Id": "<20210618134032.1922012-7-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210618134032.1922012-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210527152510.1551026-1-andrew.rybchenko@oktetlabs.ru>\n <20210618134032.1922012-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 06/20] net/sfc: introduce ethdev Tx queue ID", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nMake software index of a Tx queue and ethdev index separate.\nWhen an ethdev TxQ is accessed in ethdev callbacks, an explicit ethdev\nqueue index is used.\n\nThis is a preparation to introducing non-ethdev Tx queues.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\nReviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>\n---\n drivers/net/sfc/sfc.h | 1 +\n drivers/net/sfc/sfc_ethdev.c | 46 ++++++----\n drivers/net/sfc/sfc_ev.c | 2 +-\n drivers/net/sfc/sfc_ev.h | 21 ++++-\n drivers/net/sfc/sfc_tx.c | 164 ++++++++++++++++++++++++-----------\n drivers/net/sfc/sfc_tx.h | 11 +--\n 6 files changed, 171 insertions(+), 74 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex ebe705020d..00fc26cf0e 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -173,6 +173,7 @@ struct sfc_adapter_shared {\n \n \tunsigned int\t\t\ttxq_count;\n \tstruct sfc_txq_info\t\t*txq_info;\n+\tunsigned int\t\t\tethdev_txq_count;\n \n \tstruct sfc_rss\t\t\trss;\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 2651c41288..88896db1f8 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -524,24 +524,28 @@ sfc_rx_queue_release(void *queue)\n }\n \n static int\n-sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n+sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,\n \t\t uint16_t nb_tx_desc, unsigned int socket_id,\n \t\t const struct rte_eth_txconf *tx_conf)\n {\n \tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tstruct sfc_txq_info *txq_info;\n+\tsfc_sw_index_t sw_index;\n \tint rc;\n \n \tsfc_log_init(sa, \"TxQ = %u, nb_tx_desc = %u, socket_id = %u\",\n-\t\t tx_queue_id, nb_tx_desc, socket_id);\n+\t\t ethdev_qid, nb_tx_desc, socket_id);\n \n \tsfc_adapter_lock(sa);\n \n-\trc = sfc_tx_qinit(sa, tx_queue_id, nb_tx_desc, socket_id, tx_conf);\n+\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);\n+\trc = sfc_tx_qinit(sa, sw_index, nb_tx_desc, socket_id, tx_conf);\n \tif (rc != 0)\n \t\tgoto fail_tx_qinit;\n \n-\tdev->data->tx_queues[tx_queue_id] = sas->txq_info[tx_queue_id].dp;\n+\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);\n+\tdev->data->tx_queues[ethdev_qid] = txq_info->dp;\n \n \tsfc_adapter_unlock(sa);\n \treturn 0;\n@@ -557,7 +561,7 @@ sfc_tx_queue_release(void *queue)\n {\n \tstruct sfc_dp_txq *dp_txq = queue;\n \tstruct sfc_txq *txq;\n-\tunsigned int sw_index;\n+\tsfc_sw_index_t sw_index;\n \tstruct sfc_adapter *sa;\n \n \tif (dp_txq == NULL)\n@@ -1213,15 +1217,15 @@ sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t ethdev_qid,\n * use any process-local pointers from the adapter data.\n */\n static void\n-sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n+sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t ethdev_qid,\n \t\t struct rte_eth_txq_info *qinfo)\n {\n \tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_txq_info *txq_info;\n \n-\tSFC_ASSERT(tx_queue_id < sas->txq_count);\n+\tSFC_ASSERT(ethdev_qid < sas->ethdev_txq_count);\n \n-\ttxq_info = &sas->txq_info[tx_queue_id];\n+\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);\n \n \tmemset(qinfo, 0, sizeof(*qinfo));\n \n@@ -1362,13 +1366,15 @@ sfc_rx_queue_stop(struct rte_eth_dev *dev, uint16_t ethdev_qid)\n }\n \n static int\n-sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n+sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t ethdev_qid)\n {\n \tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tstruct sfc_txq_info *txq_info;\n+\tsfc_sw_index_t sw_index;\n \tint rc;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", tx_queue_id);\n+\tsfc_log_init(sa, \"TxQ = %u\", ethdev_qid);\n \n \tsfc_adapter_lock(sa);\n \n@@ -1376,14 +1382,16 @@ sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n \tif (sa->state != SFC_ADAPTER_STARTED)\n \t\tgoto fail_not_started;\n \n-\tif (sas->txq_info[tx_queue_id].state != SFC_TXQ_INITIALIZED)\n+\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);\n+\tif (txq_info->state != SFC_TXQ_INITIALIZED)\n \t\tgoto fail_not_setup;\n \n-\trc = sfc_tx_qstart(sa, tx_queue_id);\n+\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);\n+\trc = sfc_tx_qstart(sa, sw_index);\n \tif (rc != 0)\n \t\tgoto fail_tx_qstart;\n \n-\tsas->txq_info[tx_queue_id].deferred_started = B_TRUE;\n+\ttxq_info->deferred_started = B_TRUE;\n \n \tsfc_adapter_unlock(sa);\n \treturn 0;\n@@ -1398,18 +1406,22 @@ sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n }\n \n static int\n-sfc_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n+sfc_tx_queue_stop(struct rte_eth_dev *dev, uint16_t ethdev_qid)\n {\n \tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tstruct sfc_txq_info *txq_info;\n+\tsfc_sw_index_t sw_index;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", tx_queue_id);\n+\tsfc_log_init(sa, \"TxQ = %u\", ethdev_qid);\n \n \tsfc_adapter_lock(sa);\n \n-\tsfc_tx_qstop(sa, tx_queue_id);\n+\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);\n+\tsfc_tx_qstop(sa, sw_index);\n \n-\tsas->txq_info[tx_queue_id].deferred_started = B_FALSE;\n+\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);\n+\ttxq_info->deferred_started = B_FALSE;\n \n \tsfc_adapter_unlock(sa);\n \treturn 0;\ndiff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c\nindex 71f706e403..ed28d51e12 100644\n--- a/drivers/net/sfc/sfc_ev.c\n+++ b/drivers/net/sfc/sfc_ev.c\n@@ -598,7 +598,7 @@ sfc_ev_qpoll(struct sfc_evq *evq)\n \t\t}\n \n \t\tif (evq->dp_txq != NULL) {\n-\t\t\tunsigned int txq_sw_index;\n+\t\t\tsfc_sw_index_t txq_sw_index;\n \n \t\t\ttxq_sw_index = evq->dp_txq->dpq.queue_id;\n \ndiff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h\nindex 5a9f85c2d9..75b9dcdebd 100644\n--- a/drivers/net/sfc/sfc_ev.h\n+++ b/drivers/net/sfc/sfc_ev.h\n@@ -92,8 +92,25 @@ sfc_evq_sw_index_by_rxq_sw_index(__rte_unused struct sfc_adapter *sa,\n \treturn 1 + rxq_sw_index;\n }\n \n-static inline unsigned int\n-sfc_evq_index_by_txq_sw_index(struct sfc_adapter *sa, unsigned int txq_sw_index)\n+static inline sfc_ethdev_qid_t\n+sfc_ethdev_tx_qid_by_txq_sw_index(__rte_unused struct sfc_adapter_shared *sas,\n+\t\t\t\t sfc_sw_index_t txq_sw_index)\n+{\n+\t/* Only ethdev queues are present for now */\n+\treturn txq_sw_index;\n+}\n+\n+static inline sfc_sw_index_t\n+sfc_txq_sw_index_by_ethdev_tx_qid(__rte_unused struct sfc_adapter_shared *sas,\n+\t\t\t\t sfc_ethdev_qid_t ethdev_qid)\n+{\n+\t/* Only ethdev queues are present for now */\n+\treturn ethdev_qid;\n+}\n+\n+static inline sfc_sw_index_t\n+sfc_evq_sw_index_by_txq_sw_index(struct sfc_adapter *sa,\n+\t\t\t\t sfc_sw_index_t txq_sw_index)\n {\n \treturn 1 + sa->eth_dev->data->nb_rx_queues + txq_sw_index;\n }\ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex 28d696de61..ce2a9a6a4f 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -34,6 +34,19 @@\n */\n #define SFC_TX_QFLUSH_POLL_ATTEMPTS\t(2000)\n \n+struct sfc_txq_info *\n+sfc_txq_info_by_ethdev_qid(struct sfc_adapter_shared *sas,\n+\t\t\t sfc_ethdev_qid_t ethdev_qid)\n+{\n+\tsfc_sw_index_t sw_index;\n+\n+\tSFC_ASSERT((unsigned int)ethdev_qid < sas->ethdev_txq_count);\n+\tSFC_ASSERT(ethdev_qid != SFC_ETHDEV_QID_INVALID);\n+\n+\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);\n+\treturn &sas->txq_info[sw_index];\n+}\n+\n static uint64_t\n sfc_tx_get_offload_mask(struct sfc_adapter *sa)\n {\n@@ -118,10 +131,12 @@ sfc_tx_qflush_done(struct sfc_txq_info *txq_info)\n }\n \n int\n-sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n+sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,\n \t uint16_t nb_tx_desc, unsigned int socket_id,\n \t const struct rte_eth_txconf *tx_conf)\n {\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tsfc_ethdev_qid_t ethdev_qid;\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n \tunsigned int txq_entries;\n \tunsigned int evq_entries;\n@@ -134,7 +149,9 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tuint64_t offloads;\n \tstruct sfc_dp_tx_hw_limits hw_limits;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", sw_index);\n+\tethdev_qid = sfc_ethdev_tx_qid_by_txq_sw_index(sas, sw_index);\n+\n+\tsfc_log_init(sa, \"TxQ = %d (internal %u)\", ethdev_qid, sw_index);\n \n \tmemset(&hw_limits, 0, sizeof(hw_limits));\n \thw_limits.txq_max_entries = sa->txq_max_entries;\n@@ -150,8 +167,11 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tSFC_ASSERT(txq_entries >= nb_tx_desc);\n \tSFC_ASSERT(txq_max_fill_level <= nb_tx_desc);\n \n-\toffloads = tx_conf->offloads |\n-\t\tsa->eth_dev->data->dev_conf.txmode.offloads;\n+\toffloads = tx_conf->offloads;\n+\t/* Add device level Tx offloads if the queue is an ethdev Tx queue */\n+\tif (ethdev_qid != SFC_ETHDEV_QID_INVALID)\n+\t\toffloads |= sa->eth_dev->data->dev_conf.txmode.offloads;\n+\n \trc = sfc_tx_qcheck_conf(sa, txq_max_fill_level, tx_conf, offloads);\n \tif (rc != 0)\n \t\tgoto fail_bad_conf;\n@@ -231,20 +251,26 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \n fail_bad_conf:\n fail_size_up_rings:\n-\tsfc_log_init(sa, \"failed (TxQ = %u, rc = %d)\", sw_index, rc);\n+\tsfc_log_init(sa, \"failed (TxQ = %d (internal %u), rc = %d)\", ethdev_qid,\n+\t\t sw_index, rc);\n \treturn rc;\n }\n \n void\n-sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)\n+sfc_tx_qfini(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n {\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tsfc_ethdev_qid_t ethdev_qid;\n \tstruct sfc_txq_info *txq_info;\n \tstruct sfc_txq *txq;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", sw_index);\n+\tethdev_qid = sfc_ethdev_tx_qid_by_txq_sw_index(sas, sw_index);\n+\n+\tsfc_log_init(sa, \"TxQ = %d (internal %u)\", ethdev_qid, sw_index);\n \n \tSFC_ASSERT(sw_index < sfc_sa2shared(sa)->txq_count);\n-\tsa->eth_dev->data->tx_queues[sw_index] = NULL;\n+\tif (ethdev_qid != SFC_ETHDEV_QID_INVALID)\n+\t\tsa->eth_dev->data->tx_queues[ethdev_qid] = NULL;\n \n \ttxq_info = &sfc_sa2shared(sa)->txq_info[sw_index];\n \n@@ -265,9 +291,14 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)\n }\n \n static int\n-sfc_tx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)\n+sfc_tx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n {\n-\tsfc_log_init(sa, \"TxQ = %u\", sw_index);\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tsfc_ethdev_qid_t ethdev_qid;\n+\n+\tethdev_qid = sfc_ethdev_tx_qid_by_txq_sw_index(sas, sw_index);\n+\n+\tsfc_log_init(sa, \"TxQ = %d (internal %u)\", ethdev_qid, sw_index);\n \n \treturn 0;\n }\n@@ -316,17 +347,26 @@ static void\n sfc_tx_fini_queues(struct sfc_adapter *sa, unsigned int nb_tx_queues)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n-\tint sw_index;\n+\tsfc_sw_index_t sw_index;\n+\tsfc_ethdev_qid_t ethdev_qid;\n \n-\tSFC_ASSERT(nb_tx_queues <= sas->txq_count);\n+\tSFC_ASSERT(nb_tx_queues <= sas->ethdev_txq_count);\n \n-\tsw_index = sas->txq_count;\n-\twhile (--sw_index >= (int)nb_tx_queues) {\n-\t\tif (sas->txq_info[sw_index].state & SFC_TXQ_INITIALIZED)\n+\t/*\n+\t * Finalize only ethdev queues since other ones are finalized only\n+\t * on device close and they may require additional deinitializaton.\n+\t */\n+\tethdev_qid = sas->ethdev_txq_count;\n+\twhile (--ethdev_qid >= (int)nb_tx_queues) {\n+\t\tstruct sfc_txq_info *txq_info;\n+\n+\t\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);\n+\t\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);\n+\t\tif (txq_info->state & SFC_TXQ_INITIALIZED)\n \t\t\tsfc_tx_qfini(sa, sw_index);\n \t}\n \n-\tsas->txq_count = nb_tx_queues;\n+\tsas->ethdev_txq_count = nb_tx_queues;\n }\n \n int\n@@ -339,7 +379,7 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \tint rc = 0;\n \n \tsfc_log_init(sa, \"nb_tx_queues=%u (old %u)\",\n-\t\t nb_tx_queues, sas->txq_count);\n+\t\t nb_tx_queues, sas->ethdev_txq_count);\n \n \t/*\n \t * The datapath implementation assumes absence of boundary\n@@ -377,7 +417,7 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \t\tstruct sfc_txq_info *new_txq_info;\n \t\tstruct sfc_txq *new_txq_ctrl;\n \n-\t\tif (nb_tx_queues < sas->txq_count)\n+\t\tif (nb_tx_queues < sas->ethdev_txq_count)\n \t\t\tsfc_tx_fini_queues(sa, nb_tx_queues);\n \n \t\tnew_txq_info =\n@@ -393,24 +433,30 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \n \t\tsas->txq_info = new_txq_info;\n \t\tsa->txq_ctrl = new_txq_ctrl;\n-\t\tif (nb_tx_queues > sas->txq_count) {\n-\t\t\tmemset(&sas->txq_info[sas->txq_count], 0,\n-\t\t\t (nb_tx_queues - sas->txq_count) *\n+\t\tif (nb_tx_queues > sas->ethdev_txq_count) {\n+\t\t\tmemset(&sas->txq_info[sas->ethdev_txq_count], 0,\n+\t\t\t (nb_tx_queues - sas->ethdev_txq_count) *\n \t\t\t sizeof(sas->txq_info[0]));\n-\t\t\tmemset(&sa->txq_ctrl[sas->txq_count], 0,\n-\t\t\t (nb_tx_queues - sas->txq_count) *\n+\t\t\tmemset(&sa->txq_ctrl[sas->ethdev_txq_count], 0,\n+\t\t\t (nb_tx_queues - sas->ethdev_txq_count) *\n \t\t\t sizeof(sa->txq_ctrl[0]));\n \t\t}\n \t}\n \n-\twhile (sas->txq_count < nb_tx_queues) {\n-\t\trc = sfc_tx_qinit_info(sa, sas->txq_count);\n+\twhile (sas->ethdev_txq_count < nb_tx_queues) {\n+\t\tsfc_sw_index_t sw_index;\n+\n+\t\tsw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas,\n+\t\t\t\tsas->ethdev_txq_count);\n+\t\trc = sfc_tx_qinit_info(sa, sw_index);\n \t\tif (rc != 0)\n \t\t\tgoto fail_tx_qinit_info;\n \n-\t\tsas->txq_count++;\n+\t\tsas->ethdev_txq_count++;\n \t}\n \n+\tsas->txq_count = sas->ethdev_txq_count;\n+\n done:\n \treturn 0;\n \n@@ -440,12 +486,12 @@ sfc_tx_close(struct sfc_adapter *sa)\n }\n \n int\n-sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n+sfc_tx_qstart(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tsfc_ethdev_qid_t ethdev_qid;\n \tuint64_t offloads_supported = sfc_tx_get_dev_offload_caps(sa) |\n \t\t\t\t sfc_tx_get_queue_offload_caps(sa);\n-\tstruct rte_eth_dev_data *dev_data;\n \tstruct sfc_txq_info *txq_info;\n \tstruct sfc_txq *txq;\n \tstruct sfc_evq *evq;\n@@ -453,7 +499,9 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \tunsigned int desc_index;\n \tint rc = 0;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", sw_index);\n+\tethdev_qid = sfc_ethdev_tx_qid_by_txq_sw_index(sas, sw_index);\n+\n+\tsfc_log_init(sa, \"TxQ = %d (internal %u)\", ethdev_qid, sw_index);\n \n \tSFC_ASSERT(sw_index < sas->txq_count);\n \ttxq_info = &sas->txq_info[sw_index];\n@@ -463,7 +511,7 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \ttxq = &sa->txq_ctrl[sw_index];\n \tevq = txq->evq;\n \n-\trc = sfc_ev_qstart(evq, sfc_evq_index_by_txq_sw_index(sa, sw_index));\n+\trc = sfc_ev_qstart(evq, sfc_evq_sw_index_by_txq_sw_index(sa, sw_index));\n \tif (rc != 0)\n \t\tgoto fail_ev_qstart;\n \n@@ -505,11 +553,17 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \tif (rc != 0)\n \t\tgoto fail_dp_qstart;\n \n-\t/*\n-\t * It seems to be used by DPDK for debug purposes only ('rte_ether')\n-\t */\n-\tdev_data = sa->eth_dev->data;\n-\tdev_data->tx_queue_state[sw_index] = RTE_ETH_QUEUE_STATE_STARTED;\n+\tif (ethdev_qid != SFC_ETHDEV_QID_INVALID) {\n+\t\tstruct rte_eth_dev_data *dev_data;\n+\n+\t\t/*\n+\t\t * It sems to be used by DPDK for debug purposes only\n+\t\t * ('rte_ether').\n+\t\t */\n+\t\tdev_data = sa->eth_dev->data;\n+\t\tdev_data->tx_queue_state[ethdev_qid] =\n+\t\t\tRTE_ETH_QUEUE_STATE_STARTED;\n+\t}\n \n \treturn 0;\n \n@@ -525,17 +579,19 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n }\n \n void\n-sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n+sfc_tx_qstop(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n-\tstruct rte_eth_dev_data *dev_data;\n+\tsfc_ethdev_qid_t ethdev_qid;\n \tstruct sfc_txq_info *txq_info;\n \tstruct sfc_txq *txq;\n \tunsigned int retry_count;\n \tunsigned int wait_count;\n \tint rc;\n \n-\tsfc_log_init(sa, \"TxQ = %u\", sw_index);\n+\tethdev_qid = sfc_ethdev_tx_qid_by_txq_sw_index(sas, sw_index);\n+\n+\tsfc_log_init(sa, \"TxQ = %d (internal %u)\", ethdev_qid, sw_index);\n \n \tSFC_ASSERT(sw_index < sas->txq_count);\n \ttxq_info = &sas->txq_info[sw_index];\n@@ -577,10 +633,12 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \t\t\t wait_count++ < SFC_TX_QFLUSH_POLL_ATTEMPTS);\n \n \t\tif (txq_info->state & SFC_TXQ_FLUSHING)\n-\t\t\tsfc_err(sa, \"TxQ %u flush timed out\", sw_index);\n+\t\t\tsfc_err(sa, \"TxQ %d (internal %u) flush timed out\",\n+\t\t\t\tethdev_qid, sw_index);\n \n \t\tif (txq_info->state & SFC_TXQ_FLUSHED)\n-\t\t\tsfc_notice(sa, \"TxQ %u flushed\", sw_index);\n+\t\t\tsfc_notice(sa, \"TxQ %d (internal %u) flushed\",\n+\t\t\t\t ethdev_qid, sw_index);\n \t}\n \n \tsa->priv.dp_tx->qreap(txq_info->dp);\n@@ -591,11 +649,17 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \n \tsfc_ev_qstop(txq->evq);\n \n-\t/*\n-\t * It seems to be used by DPDK for debug purposes only ('rte_ether')\n-\t */\n-\tdev_data = sa->eth_dev->data;\n-\tdev_data->tx_queue_state[sw_index] = RTE_ETH_QUEUE_STATE_STOPPED;\n+\tif (ethdev_qid != SFC_ETHDEV_QID_INVALID) {\n+\t\tstruct rte_eth_dev_data *dev_data;\n+\n+\t\t/*\n+\t\t * It seems to be used by DPDK for debug purposes only\n+\t\t * ('rte_ether')\n+\t\t */\n+\t\tdev_data = sa->eth_dev->data;\n+\t\tdev_data->tx_queue_state[ethdev_qid] =\n+\t\t\tRTE_ETH_QUEUE_STATE_STOPPED;\n+\t}\n }\n \n int\n@@ -603,10 +667,11 @@ sfc_tx_start(struct sfc_adapter *sa)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n-\tunsigned int sw_index;\n+\tsfc_sw_index_t sw_index;\n \tint rc = 0;\n \n-\tsfc_log_init(sa, \"txq_count = %u\", sas->txq_count);\n+\tsfc_log_init(sa, \"txq_count = %u (internal %u)\",\n+\t\t sas->ethdev_txq_count, sas->txq_count);\n \n \tif (sa->tso) {\n \t\tif (!encp->enc_fw_assisted_tso_v2_enabled &&\n@@ -654,9 +719,10 @@ void\n sfc_tx_stop(struct sfc_adapter *sa)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n-\tunsigned int sw_index;\n+\tsfc_sw_index_t sw_index;\n \n-\tsfc_log_init(sa, \"txq_count = %u\", sas->txq_count);\n+\tsfc_log_init(sa, \"txq_count = %u (internal %u)\",\n+\t\t sas->ethdev_txq_count, sas->txq_count);\n \n \tsw_index = sas->txq_count;\n \twhile (sw_index-- > 0) {\ndiff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h\nindex 5ed678703e..f1700b13ca 100644\n--- a/drivers/net/sfc/sfc_tx.h\n+++ b/drivers/net/sfc/sfc_tx.h\n@@ -58,7 +58,8 @@ struct sfc_txq {\n };\n \n struct sfc_txq *sfc_txq_by_dp_txq(const struct sfc_dp_txq *dp_txq);\n-\n+struct sfc_txq_info *sfc_txq_info_by_ethdev_qid(struct sfc_adapter_shared *sas,\n+\t\t\t\t\t\tsfc_ethdev_qid_t ethdev_qid);\n /**\n * Transmit queue information used on libefx-based data path.\n * Allocated on the socket specified on the queue setup.\n@@ -107,14 +108,14 @@ struct sfc_txq_info *sfc_txq_info_by_dp_txq(const struct sfc_dp_txq *dp_txq);\n int sfc_tx_configure(struct sfc_adapter *sa);\n void sfc_tx_close(struct sfc_adapter *sa);\n \n-int sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n+int sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,\n \t\t uint16_t nb_tx_desc, unsigned int socket_id,\n \t\t const struct rte_eth_txconf *tx_conf);\n-void sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index);\n+void sfc_tx_qfini(struct sfc_adapter *sa, sfc_sw_index_t sw_index);\n \n void sfc_tx_qflush_done(struct sfc_txq_info *txq_info);\n-int sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index);\n-void sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index);\n+int sfc_tx_qstart(struct sfc_adapter *sa, sfc_sw_index_t sw_index);\n+void sfc_tx_qstop(struct sfc_adapter *sa, sfc_sw_index_t sw_index);\n int sfc_tx_start(struct sfc_adapter *sa);\n void sfc_tx_stop(struct sfc_adapter *sa);\n \n", "prefixes": [ "v3", "06/20" ] }