Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/97436/?format=api
{ "id": 97436, "url": "http://patches.dpdk.org/api/patches/97436/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210827065717.1838258-19-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": "<20210827065717.1838258-19-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210827065717.1838258-19-andrew.rybchenko@oktetlabs.ru", "date": "2021-08-27T06:56:57", "name": "[18/38] net/sfc: implement representor TxQ start/stop", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ab8ea08a076ab0449de3e5fc4a6eb1549f141c4a", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210827065717.1838258-19-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 18492, "url": "http://patches.dpdk.org/api/series/18492/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18492", "date": "2021-08-27T06:56:39", "name": "net/sfc: support port representors", "version": 1, "mbox": "http://patches.dpdk.org/series/18492/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/97436/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/97436/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 26BD3A0C43;\n\tFri, 27 Aug 2021 08:59:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 59B9C412A4;\n\tFri, 27 Aug 2021 08:58:42 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id EC996411DF\n for <dev@dpdk.org>; Fri, 27 Aug 2021 08:58:36 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 6FD787F6E0; Fri, 27 Aug 2021 09:58:36 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id C2A7A7F6E3;\n Fri, 27 Aug 2021 09:57: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 C2A7A7F6E3", "Authentication-Results": "shelob.oktetlabs.ru/C2A7A7F6E3; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Igor Romanov <igor.romanov@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>, Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Fri, 27 Aug 2021 09:56:57 +0300", "Message-Id": "<20210827065717.1838258-19-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210827065717.1838258-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210827065717.1838258-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 18/38] net/sfc: implement representor TxQ\n start/stop", "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\nImplement Tx queue start and stop in port representor proxy.\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_ev.h | 8 ++\n drivers/net/sfc/sfc_repr_proxy.c | 166 +++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_repr_proxy.h | 11 ++\n drivers/net/sfc/sfc_tx.c | 15 ++-\n drivers/net/sfc/sfc_tx.h | 1 +\n 5 files changed, 199 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h\nindex bcb7fbe466..a4ababc2bc 100644\n--- a/drivers/net/sfc/sfc_ev.h\n+++ b/drivers/net/sfc/sfc_ev.h\n@@ -118,6 +118,14 @@ sfc_repr_rxq_sw_index(const struct sfc_adapter_shared *sas,\n \t\trepr_queue_id;\n }\n \n+static inline sfc_sw_index_t\n+sfc_repr_txq_sw_index(const struct sfc_adapter_shared *sas,\n+\t\t unsigned int repr_queue_id)\n+{\n+\t/* Reserved TxQ for representors is the first reserved TxQ */\n+\treturn sfc_repr_available(sas) ? repr_queue_id : SFC_SW_INDEX_INVALID;\n+}\n+\n /*\n * Functions below define event queue to transmit/receive queue and vice\n * versa mapping.\ndiff --git a/drivers/net/sfc/sfc_repr_proxy.c b/drivers/net/sfc/sfc_repr_proxy.c\nindex 03b6421b04..a5be8fa270 100644\n--- a/drivers/net/sfc/sfc_repr_proxy.c\n+++ b/drivers/net/sfc/sfc_repr_proxy.c\n@@ -17,6 +17,7 @@\n #include \"sfc.h\"\n #include \"sfc_ev.h\"\n #include \"sfc_rx.h\"\n+#include \"sfc_tx.h\"\n \n /**\n * Amount of time to wait for the representor proxy routine (which is\n@@ -138,6 +139,155 @@ sfc_repr_proxy_routine(void *arg)\n \treturn 0;\n }\n \n+static int\n+sfc_repr_proxy_txq_attach(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_repr_proxy *rp = &sa->repr_proxy;\n+\tunsigned int i;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tfor (i = 0; i < sfc_repr_nb_txq(sas); i++) {\n+\t\tsfc_sw_index_t sw_index = sfc_repr_txq_sw_index(sas, i);\n+\n+\t\trp->dp_txq[i].sw_index = sw_index;\n+\t}\n+\n+\tsfc_log_init(sa, \"done\");\n+\n+\treturn 0;\n+}\n+\n+static void\n+sfc_repr_proxy_txq_detach(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_repr_proxy *rp = &sa->repr_proxy;\n+\tunsigned int i;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tfor (i = 0; i < sfc_repr_nb_txq(sas); i++)\n+\t\trp->dp_txq[i].sw_index = 0;\n+\n+\tsfc_log_init(sa, \"done\");\n+}\n+\n+int\n+sfc_repr_proxy_txq_init(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_repr_proxy *rp = &sa->repr_proxy;\n+\tconst struct rte_eth_txconf tx_conf = {\n+\t\t.tx_free_thresh = SFC_REPR_PROXY_TXQ_FREE_THRESH,\n+\t};\n+\tstruct sfc_txq_info *txq_info;\n+\tunsigned int init_i;\n+\tunsigned int i;\n+\tint rc;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tif (!sfc_repr_available(sas)) {\n+\t\tsfc_log_init(sa, \"representors not supported - skip\");\n+\t\treturn 0;\n+\t}\n+\n+\tfor (init_i = 0; init_i < sfc_repr_nb_txq(sas); init_i++) {\n+\t\tstruct sfc_repr_proxy_dp_txq *txq = &rp->dp_txq[init_i];\n+\n+\t\ttxq_info = &sfc_sa2shared(sa)->txq_info[txq->sw_index];\n+\t\tif (txq_info->state == SFC_TXQ_INITIALIZED) {\n+\t\t\tsfc_log_init(sa,\n+\t\t\t\t\"representor proxy TxQ %u is already initialized - skip\",\n+\t\t\t\tinit_i);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tsfc_tx_qinit_info(sa, txq->sw_index);\n+\n+\t\trc = sfc_tx_qinit(sa, txq->sw_index,\n+\t\t\t\t SFC_REPR_PROXY_TX_DESC_COUNT, sa->socket_id,\n+\t\t\t\t &tx_conf);\n+\n+\t\tif (rc != 0) {\n+\t\t\tsfc_err(sa, \"failed to init representor proxy TxQ %u\",\n+\t\t\t\tinit_i);\n+\t\t\tgoto fail_init;\n+\t\t}\n+\t}\n+\n+\tsfc_log_init(sa, \"done\");\n+\n+\treturn 0;\n+\n+fail_init:\n+\tfor (i = 0; i < init_i; i++) {\n+\t\tstruct sfc_repr_proxy_dp_txq *txq = &rp->dp_txq[i];\n+\n+\t\ttxq_info = &sfc_sa2shared(sa)->txq_info[txq->sw_index];\n+\t\tif (txq_info->state == SFC_TXQ_INITIALIZED)\n+\t\t\tsfc_tx_qfini(sa, txq->sw_index);\n+\t}\n+\tsfc_log_init(sa, \"failed: %s\", rte_strerror(rc));\n+\n+\treturn rc;\n+}\n+\n+void\n+sfc_repr_proxy_txq_fini(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_repr_proxy *rp = &sa->repr_proxy;\n+\tstruct sfc_txq_info *txq_info;\n+\tunsigned int i;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tif (!sfc_repr_available(sas)) {\n+\t\tsfc_log_init(sa, \"representors not supported - skip\");\n+\t\treturn;\n+\t}\n+\n+\tfor (i = 0; i < sfc_repr_nb_txq(sas); i++) {\n+\t\tstruct sfc_repr_proxy_dp_txq *txq = &rp->dp_txq[i];\n+\n+\t\ttxq_info = &sfc_sa2shared(sa)->txq_info[txq->sw_index];\n+\t\tif (txq_info->state != SFC_TXQ_INITIALIZED) {\n+\t\t\tsfc_log_init(sa,\n+\t\t\t\t\"representor proxy TxQ %u is already finalized - skip\",\n+\t\t\t\ti);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tsfc_tx_qfini(sa, txq->sw_index);\n+\t}\n+\n+\tsfc_log_init(sa, \"done\");\n+}\n+\n+static int\n+sfc_repr_proxy_txq_start(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_repr_proxy *rp = &sa->repr_proxy;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tRTE_SET_USED(rp);\n+\n+\tsfc_log_init(sa, \"done\");\n+\n+\treturn 0;\n+}\n+\n+static void\n+sfc_repr_proxy_txq_stop(struct sfc_adapter *sa)\n+{\n+\tsfc_log_init(sa, \"entry\");\n+\tsfc_log_init(sa, \"done\");\n+}\n+\n static int\n sfc_repr_proxy_rxq_attach(struct sfc_adapter *sa)\n {\n@@ -398,6 +548,10 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_rxq_attach;\n \n+\trc = sfc_repr_proxy_txq_attach(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_txq_attach;\n+\n \trc = sfc_repr_proxy_ports_init(sa);\n \tif (rc != 0)\n \t\tgoto fail_ports_init;\n@@ -458,6 +612,9 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)\n \tsfc_repr_proxy_ports_fini(sa);\n \n fail_ports_init:\n+\tsfc_repr_proxy_txq_detach(sa);\n+\n+fail_txq_attach:\n \tsfc_repr_proxy_rxq_detach(sa);\n \n fail_rxq_attach:\n@@ -482,6 +639,7 @@ sfc_repr_proxy_detach(struct sfc_adapter *sa)\n \trte_service_component_unregister(rp->service_id);\n \tsfc_repr_proxy_ports_fini(sa);\n \tsfc_repr_proxy_rxq_detach(sa);\n+\tsfc_repr_proxy_txq_detach(sa);\n \n \tsfc_log_init(sa, \"done\");\n }\n@@ -508,6 +666,10 @@ sfc_repr_proxy_start(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_rxq_start;\n \n+\trc = sfc_repr_proxy_txq_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_txq_start;\n+\n \t/* Service core may be in \"stopped\" state, start it */\n \trc = rte_service_lcore_start(rp->service_core_id);\n \tif (rc != 0 && rc != -EALREADY) {\n@@ -549,6 +711,9 @@ sfc_repr_proxy_start(struct sfc_adapter *sa)\n \t/* Service lcore may be shared and we never stop it */\n \n fail_start_core:\n+\tsfc_repr_proxy_txq_stop(sa);\n+\n+fail_txq_start:\n \tsfc_repr_proxy_rxq_stop(sa);\n \n fail_rxq_start:\n@@ -587,6 +752,7 @@ sfc_repr_proxy_stop(struct sfc_adapter *sa)\n \t/* Service lcore may be shared and we never stop it */\n \n \tsfc_repr_proxy_rxq_stop(sa);\n+\tsfc_repr_proxy_txq_stop(sa);\n \n \trp->started = false;\n \ndiff --git a/drivers/net/sfc/sfc_repr_proxy.h b/drivers/net/sfc/sfc_repr_proxy.h\nindex dca3fca2b9..1fe7ff3695 100644\n--- a/drivers/net/sfc/sfc_repr_proxy.h\n+++ b/drivers/net/sfc/sfc_repr_proxy.h\n@@ -36,6 +36,10 @@ extern \"C\" {\n #define SFC_REPR_PROXY_RXQ_REFILL_LEVEL\t(SFC_REPR_PROXY_RX_DESC_COUNT / 4)\n #define SFC_REPR_PROXY_RX_BURST\t\t32\n \n+#define SFC_REPR_PROXY_TX_DESC_COUNT\t256\n+#define SFC_REPR_PROXY_TXQ_FREE_THRESH\t(SFC_REPR_PROXY_TX_DESC_COUNT / 4)\n+#define SFC_REPR_PROXY_TX_BURST\t\t32\n+\n struct sfc_repr_proxy_rxq {\n \tstruct rte_ring\t\t\t*ring;\n \tstruct rte_mempool\t\t*mb_pool;\n@@ -61,6 +65,10 @@ struct sfc_repr_proxy_dp_rxq {\n \tsfc_sw_index_t\t\t\tsw_index;\n };\n \n+struct sfc_repr_proxy_dp_txq {\n+\tsfc_sw_index_t\t\t\tsw_index;\n+};\n+\n enum sfc_repr_proxy_mbox_op {\n \tSFC_REPR_PROXY_MBOX_ADD_PORT,\n \tSFC_REPR_PROXY_MBOX_DEL_PORT,\n@@ -83,6 +91,7 @@ struct sfc_repr_proxy {\n \tstruct sfc_repr_proxy_ports\tports;\n \tbool\t\t\t\tstarted;\n \tstruct sfc_repr_proxy_dp_rxq\tdp_rxq[SFC_REPR_PROXY_NB_RXQ_MAX];\n+\tstruct sfc_repr_proxy_dp_txq\tdp_txq[SFC_REPR_PROXY_NB_TXQ_MAX];\n \n \tstruct sfc_repr_proxy_mbox\tmbox;\n };\n@@ -92,6 +101,8 @@ struct sfc_adapter;\n int sfc_repr_proxy_attach(struct sfc_adapter *sa);\n void sfc_repr_proxy_pre_detach(struct sfc_adapter *sa);\n void sfc_repr_proxy_detach(struct sfc_adapter *sa);\n+int sfc_repr_proxy_txq_init(struct sfc_adapter *sa);\n+void sfc_repr_proxy_txq_fini(struct sfc_adapter *sa);\n int sfc_repr_proxy_start(struct sfc_adapter *sa);\n void sfc_repr_proxy_stop(struct sfc_adapter *sa);\n \ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex c1b2e964f8..13392cdd5a 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -290,7 +290,7 @@ sfc_tx_qfini(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n \ttxq->evq = NULL;\n }\n \n-static int\n+int\n sfc_tx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n@@ -378,6 +378,7 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \tconst unsigned int nb_tx_queues = sa->eth_dev->data->nb_tx_queues;\n \tconst unsigned int nb_rsvd_tx_queues = sfc_nb_txq_reserved(sas);\n \tconst unsigned int nb_txq_total = nb_tx_queues + nb_rsvd_tx_queues;\n+\tbool reconfigure;\n \tint rc = 0;\n \n \tsfc_log_init(sa, \"nb_tx_queues=%u (old %u)\",\n@@ -401,6 +402,7 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \t\tgoto done;\n \n \tif (sas->txq_info == NULL) {\n+\t\treconfigure = false;\n \t\tsas->txq_info = rte_calloc_socket(\"sfc-txqs\", nb_txq_total,\n \t\t\t\t\t\t sizeof(sas->txq_info[0]), 0,\n \t\t\t\t\t\t sa->socket_id);\n@@ -419,6 +421,8 @@ 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\treconfigure = true;\n+\n \t\tif (nb_tx_queues < sas->ethdev_txq_count)\n \t\t\tsfc_tx_fini_queues(sa, nb_tx_queues);\n \n@@ -457,12 +461,18 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \t\tsas->ethdev_txq_count++;\n \t}\n \n-\t/* TODO: initialize reserved queues when supported. */\n \tsas->txq_count = sas->ethdev_txq_count + nb_rsvd_tx_queues;\n \n+\tif (!reconfigure) {\n+\t\trc = sfc_repr_proxy_txq_init(sa);\n+\t\tif (rc != 0)\n+\t\t\tgoto fail_repr_proxy_txq_init;\n+\t}\n+\n done:\n \treturn 0;\n \n+fail_repr_proxy_txq_init:\n fail_tx_qinit_info:\n fail_txqs_ctrl_realloc:\n fail_txqs_realloc:\n@@ -480,6 +490,7 @@ void\n sfc_tx_close(struct sfc_adapter *sa)\n {\n \tsfc_tx_fini_queues(sa, 0);\n+\tsfc_repr_proxy_txq_fini(sa);\n \n \tfree(sa->txq_ctrl);\n \tsa->txq_ctrl = NULL;\ndiff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h\nindex f1700b13ca..1a33199fdc 100644\n--- a/drivers/net/sfc/sfc_tx.h\n+++ b/drivers/net/sfc/sfc_tx.h\n@@ -108,6 +108,7 @@ 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_info(struct sfc_adapter *sa, sfc_sw_index_t 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", "prefixes": [ "18/38" ] }