Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54259/?format=api
{ "id": 54259, "url": "http://patches.dpdk.org/api/patches/54259/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1559583160-13944-34-git-send-email-anoobj@marvell.com/", "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": "<1559583160-13944-34-git-send-email-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1559583160-13944-34-git-send-email-anoobj@marvell.com", "date": "2019-06-03T17:32:33", "name": "[33/39] eventdev: add Tx adapter support", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "6995f0049c44e1222595bbe87096374d60b9b442", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1559583160-13944-34-git-send-email-anoobj@marvell.com/mbox/", "series": [ { "id": 4868, "url": "http://patches.dpdk.org/api/series/4868/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4868", "date": "2019-06-03T17:32:00", "name": "adding eventmode helper library", "version": 1, "mbox": "http://patches.dpdk.org/series/4868/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54259/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54259/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 8CD0E1BBEE;\n\tMon, 3 Jun 2019 19:37:10 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 3DBF71B9FB\n\tfor <dev@dpdk.org>; Mon, 3 Jun 2019 19:37:08 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx53HKkeW000882; Mon, 3 Jun 2019 10:37:07 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2sw2wmhdvp-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tMon, 03 Jun 2019 10:36:49 -0700", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com\n\t(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tMon, 3 Jun 2019 10:36:43 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n\t(10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Mon, 3 Jun 2019 10:36:43 -0700", "from ajoseph83.caveonetworks.com.com (unknown [10.29.45.56])\n\tby maili.marvell.com (Postfix) with ESMTP id 7ABC43F703F;\n\tMon, 3 Jun 2019 10:36:38 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-transfer-encoding : content-type; s=pfpt0818;\n\tbh=WUTU2yeKalcAKiiIgQpDfE1R6BIe6N1eIdyKyRwzf4w=;\n\tb=uZVUXBwnY4PzkG0zZL/Gx0ov6wwprup1SNGsz3RustuC6ZFr4ymoDKRNKe2RHtFttoeD\n\t17CY03hN9TYIhzy7Iv6ey6Caj5J3BLAosgioU9Sir52rY+oKnDFSrKKJsNHR9+p3tZ8P\n\tvU+jmlrh8xWaNRd4c034TkFzM/1zUTfQcsSwS8mMUO/J7tjP0+9mqs9cNmQftexKOtm0\n\tAO7HtV6FV4L0QofzXsj44fu4ptTR0V3iUm8ta37hjdgT3uhbgEwBxoWQVCPWSTGxImQP\n\tlHQRN08ZcIV6ndeUy5cGej8qQ4pg+YFUJ9pXQtxWWSgKHHiMgAYNxFFOb2PDvzKwS5DN\n\trw== ", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Jerin Jacob <jerinj@marvell.com>, Nikhil Rao <nikhil.rao@intel.com>,\n\t\"Erik Gabriel Carrillo\" <erik.g.carrillo@intel.com>, Abhinandan Gujjar\n\t<abhinandan.gujjar@intel.com>,\n\tBruce Richardson <bruce.richardson@intel.com>,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>", "CC": "Anoob Joseph <anoobj@marvell.com>, Narayana Prasad <pathreya@marvell.com>,\n\t<dev@dpdk.org>, Lukasz Bartosik <lbartosik@marvell.com>, Pavan Nikhilesh\n\t<pbhagavatula@marvell.com>, Hemant Agrawal <hemant.agrawal@nxp.com>,\n\t\"Nipun Gupta\" <nipun.gupta@nxp.com>, Harry van Haaren\n\t<harry.van.haaren@intel.com>, =?utf-8?q?Mattias_R=C3=B6nnblom?=\n\t<mattias.ronnblom@ericsson.com>, Liang Ma <liang.j.ma@intel.com>", "Date": "Mon, 3 Jun 2019 23:02:33 +0530", "Message-ID": "<1559583160-13944-34-git-send-email-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1559583160-13944-1-git-send-email-anoobj@marvell.com>", "References": "<1559583160-13944-1-git-send-email-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-06-03_13:, , signatures=0", "Subject": "[dpdk-dev] [PATCH 33/39] eventdev: add Tx adapter support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Adding support for Tx adapter.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\nSigned-off-by: Lukasz Bartosik <lbartosik@marvell.com>\n---\n lib/librte_eventdev/rte_eventmode_helper.c | 349 ++++++++++++++++++++-\n lib/librte_eventdev/rte_eventmode_helper.h | 24 ++\n .../rte_eventmode_helper_internal.h | 30 ++\n lib/librte_eventdev/rte_eventmode_helper_prints.c | 9 +\n 4 files changed, 399 insertions(+), 13 deletions(-)", "diff": "diff --git a/lib/librte_eventdev/rte_eventmode_helper.c b/lib/librte_eventdev/rte_eventmode_helper.c\nindex 77a5a4e..f237cab 100644\n--- a/lib/librte_eventdev/rte_eventmode_helper.c\n+++ b/lib/librte_eventdev/rte_eventmode_helper.c\n@@ -8,6 +8,7 @@\n #include <rte_eventdev.h>\n #include <rte_eventmode_helper.h>\n #include <rte_event_eth_rx_adapter.h>\n+#include <rte_event_eth_tx_adapter.h>\n #include <rte_malloc.h>\n \n #include \"rte_eventmode_helper_internal.h\"\n@@ -50,25 +51,51 @@ internal_parse_decimal(const char *str)\n \treturn num;\n }\n \n+static int\n+internal_get_enabled_cores(unsigned int core_mask)\n+{\n+\tint i;\n+\tint count = 0;\n+\n+\tRTE_LCORE_FOREACH(i) {\n+\t\t/* Check if this core is enabled in core_mask*/\n+\t\tif (core_mask & (1 << i)) {\n+\t\t\t/* We have enabled core */\n+\t\t\tcount++;\n+\t\t}\n+\t}\n+\treturn count;\n+}\n+\n static inline unsigned int\n-internal_get_next_rx_core(struct eventmode_conf *em_conf,\n-\t\tunsigned int prev_core)\n+internal_get_next_eth_core(struct eventmode_conf *em_conf)\n {\n \tunsigned int next_core;\n+\tstatic unsigned int prev_core = -1;\n+\n+\t/*\n+\t * Make sure we have atleast one eth core running, else the following\n+\t * logic would lead to an infinite loop.\n+\t */\n+\tif (internal_get_enabled_cores(em_conf->eth_core_mask) == 0) {\n+\t\tRTE_EM_HLPR_LOG_INFO(\"No enabled eth core found\");\n+\t\treturn RTE_MAX_LCORE;\n+\t}\n \n get_next_core:\n \t/* Get the next core */\n-\tnext_core = rte_get_next_lcore(prev_core, 0, 0);\n+\tnext_core = rte_get_next_lcore(prev_core, 0, 1);\n \n \t/* Check if we have reached max lcores */\n \tif (next_core == RTE_MAX_LCORE)\n \t\treturn next_core;\n \n+\t/* Update prev_core */\n+\tprev_core = next_core;\n+\n \t/* Only some cores would be marked as rx cores. Skip others */\n-\tif (!(em_conf->eth_core_mask & (1 << next_core))) {\n-\t\tprev_core = next_core;\n+\tif (!(em_conf->eth_core_mask & (1 << next_core)))\n \t\tgoto get_next_core;\n-\t}\n \n \treturn next_core;\n }\n@@ -164,7 +191,7 @@ static void\n em_initialize_helper_conf(struct rte_eventmode_helper_conf *conf)\n {\n \tstruct eventmode_conf *em_conf = NULL;\n-\tunsigned int rx_core_id;\n+\tunsigned int eth_core_id;\n \n \t/* Set default conf */\n \n@@ -180,12 +207,21 @@ em_initialize_helper_conf(struct rte_eventmode_helper_conf *conf)\n \t/* Schedule type: ordered */\n \t/* FIXME */\n \tem_conf->ext_params.sched_type = RTE_SCHED_TYPE_ORDERED;\n-\t/* Set rx core. Use first core other than master core as Rx core */\n-\trx_core_id = rte_get_next_lcore(0, /* curr core */\n-\t\t\t\t\t1, /* skip master core */\n-\t\t\t\t\t0 /* wrap */);\n+\t/* Set two cores as eth cores for Rx & Tx */\n+\n+\t/* Use first core other than master core as Rx core */\n+\teth_core_id = rte_get_next_lcore(0,\t/* curr core */\n+\t\t\t\t\t 1,\t/* skip master core */\n+\t\t\t\t\t 0\t/* wrap */);\n \n-\tem_conf->eth_core_mask = (1 << rx_core_id);\n+\tem_conf->eth_core_mask = (1 << eth_core_id);\n+\n+\t/* Use next core as Tx core */\n+\teth_core_id = rte_get_next_lcore(eth_core_id,\t/* curr core */\n+\t\t\t\t\t 1,\t\t/* skip master core */\n+\t\t\t\t\t 0\t\t/* wrap */);\n+\n+\tem_conf->eth_core_mask |= (1 << eth_core_id);\n }\n \n struct rte_eventmode_helper_conf * __rte_experimental\n@@ -354,7 +390,7 @@ rte_eventmode_helper_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)\n \t/* Set adapter conf */\n \tadapter->eventdev_id = eventdev_id;\n \tadapter->adapter_id = adapter_id;\n-\tadapter->rx_core_id = internal_get_next_rx_core(em_conf, -1);\n+\tadapter->rx_core_id = internal_get_next_eth_core(em_conf);\n \n \t/*\n \t * All queues of one eth device (port) will be mapped to one event\n@@ -403,6 +439,100 @@ rte_eventmode_helper_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)\n }\n \n static int\n+rte_eventmode_helper_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)\n+{\n+\tint nb_eth_dev;\n+\tint eventdev_id;\n+\tint adapter_id;\n+\tint i;\n+\tint conn_id;\n+\tstruct eventdev_params *eventdev_config;\n+\tstruct tx_adapter_conf *tx_adapter;\n+\tstruct tx_adapter_connection_info *conn;\n+\n+\t/*\n+\t * Create one Tx adapter with all eth queues mapped to event queues\n+\t * 1:1.\n+\t */\n+\n+\tif (em_conf->nb_eventdev == 0) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\"No event devs registered\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* Get the number of eth devs */\n+\tnb_eth_dev = rte_eth_dev_count_avail();\n+\n+\t/* Use the first event dev */\n+\teventdev_config = &(em_conf->eventdev_config[0]);\n+\n+\t/* Get eventdev ID */\n+\teventdev_id = eventdev_config->eventdev_id;\n+\tadapter_id = 0;\n+\n+\t/* Get adapter conf */\n+\ttx_adapter = &(em_conf->tx_adapter[adapter_id]);\n+\n+\t/* Set adapter conf */\n+\ttx_adapter->eventdev_id = eventdev_id;\n+\ttx_adapter->adapter_id = adapter_id;\n+\n+\t/* TODO: Tx core is required only when internal port is not present */\n+\n+\ttx_adapter->tx_core_id = internal_get_next_eth_core(em_conf);\n+\n+\t/*\n+\t * Application would need to use one event queue per adapter for\n+\t * submitting packets for Tx. Reserving the last queue available\n+\t * and decrementing the total available event queues for this\n+\t */\n+\n+\t/* Queue numbers start at 0 */\n+\ttx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue - 1;\n+\n+\t/* Update the number of event queues available in eventdev */\n+\teventdev_config->nb_eventqueue--;\n+\n+\t/*\n+\t * All Tx queues of the eth device (port) will be mapped to the event\n+\t * device.\n+\t */\n+\n+\t/* Set defaults for connections */\n+\n+\t/*\n+\t * One eth device (port) would be one connection. All Tx queues of\n+\t * the device would be mapped to the Tx adapter.\n+\t */\n+\n+\tfor (i = 0; i < nb_eth_dev; i++) {\n+\n+\t\t/* Use only the ports enabled */\n+\t\tif ((em_conf->eth_portmask & (1 << i)) == 0)\n+\t\t\tcontinue;\n+\n+\t\t/* Get the connection id */\n+\t\tconn_id = tx_adapter->nb_connections;\n+\n+\t\t/* Get the connection */\n+\t\tconn = &(tx_adapter->conn[conn_id]);\n+\n+\t\t/* Add ethdev to connections */\n+\t\tconn->ethdev_id = i;\n+\n+\t\t/* Add all eth tx queues to adapter */\n+\t\tconn->ethdev_tx_qid = -1;\n+\n+\t\t/* Update no of connections */\n+\t\ttx_adapter->nb_connections++;\n+\t}\n+\n+\t/* We have setup one adapter */\n+\tem_conf->nb_tx_adapter = 1;\n+\treturn 0;\n+}\n+\n+static int\n rte_eventmode_helper_set_default_conf_link(struct eventmode_conf *em_conf)\n {\n \tint i, j;\n@@ -501,6 +631,16 @@ rte_eventmode_helper_validate_conf(struct eventmode_conf *em_conf)\n \t}\n \n \t/*\n+\t * See if tx adapters are specified. Else generate a default conf\n+\t * with one tx adapter.\n+\t */\n+\tif (em_conf->nb_tx_adapter == 0) {\n+\t\tret = rte_eventmode_helper_set_default_conf_tx_adapter(em_conf);\n+\t\tif (ret != 0)\n+\t\t\treturn ret;\n+\t}\n+\n+\t/*\n \t * See if links are specified. Else generate a default conf for\n \t * the event ports used.\n \t */\n@@ -799,6 +939,150 @@ rte_eventmode_helper_initialize_rx_adapter(struct eventmode_conf *em_conf)\n \treturn 0;\n }\n \n+static int\n+tx_adapter_configure(struct eventmode_conf *em_conf,\n+\tstruct tx_adapter_conf *adapter)\n+{\n+\tint ret, j;\n+\tuint8_t tx_port_id = 0;\n+\tuint8_t eventdev_id;\n+\tuint32_t service_id;\n+\tstruct rte_event_port_conf port_conf = {0};\n+\tstruct rte_event_dev_info evdev_default_conf = {0};\n+\tstruct tx_adapter_connection_info *conn;\n+\tstruct eventdev_params *eventdev_config;\n+\n+\t/* Get event dev ID */\n+\teventdev_id = adapter->eventdev_id;\n+\n+\t/* Get event device conf */\n+\teventdev_config = internal_get_eventdev_params(em_conf, eventdev_id);\n+\n+\t/* Create Tx adapter */\n+\n+\t/* Get default configuration of event dev */\n+\tret = rte_event_dev_info_get(eventdev_id, &evdev_default_conf);\n+\tif (ret < 0) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\n+\t\t\t\"Error in getting event device info[devID:%d]\",\n+\t\t\teventdev_id);\n+\t\treturn ret;\n+\t}\n+\n+\t/* Setup port conf */\n+\tport_conf.new_event_threshold =\n+\t\t\tevdev_default_conf.max_num_events;\n+\tport_conf.dequeue_depth =\n+\t\t\tevdev_default_conf.max_event_port_dequeue_depth;\n+\tport_conf.enqueue_depth =\n+\t\t\tevdev_default_conf.max_event_port_enqueue_depth;\n+\n+\t/* Create Tx adapter */\n+\tret = rte_event_eth_tx_adapter_create(adapter->adapter_id,\n+\t\t\tadapter->eventdev_id,\n+\t\t\t&port_conf);\n+\tif (ret < 0) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\"Error in Tx adapter creation\");\n+\t\treturn ret;\n+\t}\n+\n+\t/* Setup various connections in the adapter */\n+\tfor (j = 0; j < adapter->nb_connections; j++) {\n+\n+\t\t/* Get connection */\n+\t\tconn = &(adapter->conn[j]);\n+\n+\t\t/* Add queue to the adapter */\n+\t\tret = rte_event_eth_tx_adapter_queue_add(\n+\t\t\t\tadapter->adapter_id,\n+\t\t\t\tconn->ethdev_id,\n+\t\t\t\tconn->ethdev_tx_qid);\n+\t\tif (ret < 0) {\n+\t\t\tRTE_EM_HLPR_LOG_ERR(\n+\t\t\t\t\"Error in adding eth queue in Tx adapter\");\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\t/* Get event port used by the adapter */\n+\tret = rte_event_eth_tx_adapter_event_port_get(\n+\t\t\tadapter->adapter_id,\n+\t\t\t&tx_port_id);\n+\tif (ret) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\"Failed to get Tx adapter port ID\");\n+\t\treturn ret;\n+\t}\n+\n+\t/*\n+\t * TODO: event queue for Tx adapter is required only if the\n+\t * INTERNAL PORT is not present.\n+\t */\n+\n+\t/*\n+\t * Tx event queue would be reserved for Tx adapter. Need to unlink\n+\t * this queue from all other ports\n+\t *\n+\t */\n+\tfor (j = 0; j < eventdev_config->nb_eventport; j++) {\n+\t\trte_event_port_unlink(eventdev_id, j,\n+\t\t\t\t &(adapter->tx_ev_queue), 1);\n+\t}\n+\n+\tret = rte_event_port_link(\n+\t\t\teventdev_id,\n+\t\t\ttx_port_id,\n+\t\t\t&(adapter->tx_ev_queue),\n+\t\t\tNULL, 1);\n+\tif (ret != 1) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\"Failed to link event queue to port\");\n+\t\treturn ret;\n+\t}\n+\n+\t/* Get the service ID used by Tx adapter */\n+\tret = rte_event_eth_tx_adapter_service_id_get(adapter->adapter_id,\n+\t\t\t\t\t\t &service_id);\n+\tif (ret != -ESRCH && ret != 0) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\n+\t\t\t\"Error getting service ID used by adapter\");\n+\t\treturn ret;\n+\t}\n+\n+\t/*\n+\t * TODO\n+\t * Tx core will invoke the service when required. The runstate check\n+\t * is not required.\n+\t *\n+\t */\n+\trte_service_set_runstate_mapped_check(service_id, 0);\n+\n+\t/* Start adapter */\n+\tret = rte_event_eth_tx_adapter_start(adapter->adapter_id);\n+\tif (ret) {\n+\t\tRTE_EM_HLPR_LOG_ERR(\"Error in starting Tx adapter\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+rte_eventmode_helper_initialize_tx_adapter(struct eventmode_conf *em_conf)\n+{\n+\tint i, ret;\n+\tstruct tx_adapter_conf *adapter;\n+\n+\t/* Configure Tx adapters */\n+\tfor (i = 0; i < em_conf->nb_tx_adapter; i++) {\n+\t\tadapter = &(em_conf->tx_adapter[i]);\n+\t\tret = tx_adapter_configure(em_conf, adapter);\n+\t\tif (ret < 0) {\n+\t\t\tRTE_EM_HLPR_LOG_ERR(\"Tx adapter configuration failed\");\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n int32_t __rte_experimental\n rte_eventmode_helper_initialize_devs(\n \t\tstruct rte_eventmode_helper_conf *mode_conf)\n@@ -861,6 +1145,11 @@ rte_eventmode_helper_initialize_devs(\n \tif (ret != 0)\n \t\treturn ret;\n \n+\t/* Setup Tx adapter */\n+\tret = rte_eventmode_helper_initialize_tx_adapter(em_conf);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n \t/* Start eth devices after setting up adapter */\n \tRTE_ETH_FOREACH_DEV(portid) {\n \n@@ -1001,6 +1290,7 @@ rte_eventmode_helper_start_worker_eth_core(struct eventmode_conf *em_conf,\n {\n \tuint32_t service_id[EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE];\n \tstruct rx_adapter_conf *rx_adapter;\n+\tstruct tx_adapter_conf *tx_adapter;\n \tint service_count = 0;\n \tint adapter_id;\n \tint32_t ret;\n@@ -1042,6 +1332,39 @@ rte_eventmode_helper_start_worker_eth_core(struct eventmode_conf *em_conf,\n \t\tservice_count++;\n \t}\n \n+\t/*\n+\t * Need to parse adapter conf to see which all Tx adapters need to be\n+\t * handled this core.\n+\t */\n+\tfor (i = 0; i < em_conf->nb_tx_adapter; i++) {\n+\t\t/* Check if we have exceeded the max allowed */\n+\t\tif (service_count > EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE) {\n+\t\t\tRTE_EM_HLPR_LOG_ERR(\n+\t\t\t\t\"Exceeded the max allowed adapters per Tx core\");\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\ttx_adapter = &(em_conf->tx_adapter[i]);\n+\t\tif (tx_adapter->tx_core_id != lcore_id)\n+\t\t\tcontinue;\n+\n+\t\t/* Adapter need to be handled by this core */\n+\t\tadapter_id = tx_adapter->adapter_id;\n+\n+\t\t/* Get the service ID for the adapters */\n+\t\tret = rte_event_eth_tx_adapter_service_id_get(adapter_id,\n+\t\t\t\t&(service_id[service_count]));\n+\n+\t\tif (ret != -ESRCH && ret != 0) {\n+\t\t\tRTE_EM_HLPR_LOG_ERR(\n+\t\t\t\t\"Error getting service ID used by Tx adapter\");\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\t/* Update service count */\n+\t\tservice_count++;\n+\t}\n+\n \teth_core_running = true;\n \n \twhile (eth_core_running) {\ndiff --git a/lib/librte_eventdev/rte_eventmode_helper.h b/lib/librte_eventdev/rte_eventmode_helper.h\nindex 1235ca4..2212622 100644\n--- a/lib/librte_eventdev/rte_eventmode_helper.h\n+++ b/lib/librte_eventdev/rte_eventmode_helper.h\n@@ -10,6 +10,14 @@ extern \"C\" {\n \n #include <rte_common.h>\n #include <rte_compat.h>\n+#include <rte_config.h>\n+#include <rte_event_eth_tx_adapter.h>\n+\n+/* Flag to indicate that the event device used by all adapters is same */\n+#define RTE_EM_HELPER_TX_EV_LINK_COMMON_EVENT_DEV\t(1 << 0)\n+\n+/* Flag to indicate that the event queue to be used for all adapters is same */\n+#define RTE_EM_HELPER_TX_EV_LINK_COMMON_EVENT_QUEUE\t(1 << 1)\n \n /* Packet transfer mode of the application */\n enum rte_eventmode_helper_pkt_transfer_mode {\n@@ -55,6 +63,22 @@ struct rte_eventmode_helper_event_link_info {\n \t\t/**< Lcore to be polling on this port */\n };\n \n+/*\n+ * Tx event queue - port link conf\n+ *\n+ * Application would need to know which event queue would correspond to which\n+ * eth port, so that it can send out accordingly.\n+ */\n+struct rte_eventmode_helper_tx_ev_link_conf {\n+\tuint8_t flags;\n+\tstruct {\n+\t\tuint8_t eventdev_id;\n+\t\t\t/**< Event device ID */\n+\t\tuint8_t tx_ev_queue;\n+\t\t\t/**< Tx event queue */\n+\t} ports[RTE_MAX_ETHPORTS];\n+};\n+\n /* Workers registered by the application */\n struct rte_eventmode_helper_app_worker_params {\n \tunion {\ndiff --git a/lib/librte_eventdev/rte_eventmode_helper_internal.h b/lib/librte_eventdev/rte_eventmode_helper_internal.h\nindex 906766c..1daca22 100644\n--- a/lib/librte_eventdev/rte_eventmode_helper_internal.h\n+++ b/lib/librte_eventdev/rte_eventmode_helper_internal.h\n@@ -38,9 +38,15 @@\n /* Max Rx adapters supported */\n #define EVENT_MODE_MAX_RX_ADAPTERS RTE_EVENT_MAX_DEVS\n \n+/* Max Tx adapters supported */\n+#define EVENT_MODE_MAX_TX_ADAPTERS RTE_EVENT_MAX_DEVS\n+\n /* Max Rx adapter connections */\n #define EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER 16\n \n+/* Max Tx adapter connections */\n+#define EVENT_MODE_MAX_CONNECTIONS_PER_TX_ADAPTER 16\n+\n /* Max event queues supported per event device */\n #define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV\n \n@@ -51,6 +57,9 @@\n /* Max adapters that one Rx core can handle */\n #define EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE EVENT_MODE_MAX_RX_ADAPTERS\n \n+/* Max adapters that one Tx core can handle */\n+#define EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE EVENT_MODE_MAX_TX_ADAPTERS\n+\n /* Event dev params */\n struct eventdev_params {\n \tuint8_t eventdev_id;\n@@ -76,6 +85,23 @@ struct rx_adapter_conf {\n \t\t\tconn[EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER];\n };\n \n+/* Tx adapter connection info */\n+struct tx_adapter_connection_info {\n+\tuint8_t ethdev_id;\n+\tint32_t ethdev_tx_qid;\n+};\n+\n+/* Tx adapter conf */\n+struct tx_adapter_conf {\n+\tint32_t eventdev_id;\n+\tint32_t adapter_id;\n+\tuint32_t tx_core_id;\n+\tuint8_t nb_connections;\n+\tstruct tx_adapter_connection_info\n+\t\t\tconn[EVENT_MODE_MAX_CONNECTIONS_PER_TX_ADAPTER];\n+\tuint8_t tx_ev_queue;\n+};\n+\n /* Eventmode conf data */\n struct eventmode_conf {\n \tint nb_eventdev;\n@@ -86,6 +112,10 @@ struct eventmode_conf {\n \t\t/**< No of Rx adapters */\n \tstruct rx_adapter_conf rx_adapter[EVENT_MODE_MAX_RX_ADAPTERS];\n \t\t/**< Rx adapter conf */\n+\tuint8_t nb_tx_adapter;\n+\t\t/**< No of Tx adapters */\n+\tstruct tx_adapter_conf tx_adapter[EVENT_MODE_MAX_TX_ADAPTERS];\n+\t\t/** Tx adapter conf */\n \tuint8_t nb_link;\n \t\t/**< No of links */\n \tstruct rte_eventmode_helper_event_link_info\ndiff --git a/lib/librte_eventdev/rte_eventmode_helper_prints.c b/lib/librte_eventdev/rte_eventmode_helper_prints.c\nindex 3114d29..387302a 100644\n--- a/lib/librte_eventdev/rte_eventmode_helper_prints.c\n+++ b/lib/librte_eventdev/rte_eventmode_helper_prints.c\n@@ -95,6 +95,12 @@ rte_eventmode_display_rx_adapter_conf(struct eventmode_conf *em_conf)\n }\n \n static void\n+rte_eventmode_display_tx_adapter_conf(struct eventmode_conf *em_conf)\n+{\n+\tRTE_SET_USED(em_conf);\n+}\n+\n+static void\n rte_eventmode_display_link_conf(struct eventmode_conf *em_conf)\n {\n \tint i;\n@@ -155,6 +161,9 @@ rte_eventmode_helper_display_conf(struct rte_eventmode_helper_conf *mode_conf)\n \t/* Display Rx adapter conf */\n \trte_eventmode_display_rx_adapter_conf(em_conf);\n \n+\t/* Display Tx adapter conf */\n+\trte_eventmode_display_tx_adapter_conf(em_conf);\n+\n \t/* Display event-lcore link */\n \trte_eventmode_display_link_conf(em_conf);\n }\n", "prefixes": [ "33/39" ] }