Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/40836/?format=api
{ "id": 40836, "url": "https://patches.dpdk.org/api/patches/40836/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180608124155.140663-11-jasvinder.singh@intel.com/", "project": { "id": 1, "url": "https://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": "<20180608124155.140663-11-jasvinder.singh@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180608124155.140663-11-jasvinder.singh@intel.com", "date": "2018-06-08T12:41:44", "name": "[dpdk-dev,10/21] net/softnic: add thread", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2500480b542b21f9dbf67f1b1c7985b8c9be299f", "submitter": { "id": 285, "url": "https://patches.dpdk.org/api/people/285/?format=api", "name": "Jasvinder Singh", "email": "jasvinder.singh@intel.com" }, "delegate": { "id": 10018, "url": "https://patches.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180608124155.140663-11-jasvinder.singh@intel.com/mbox/", "series": [ { "id": 52, "url": "https://patches.dpdk.org/api/series/52/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=52", "date": "2018-06-08T12:41:35", "name": "[dpdk-dev,01/21] net/softnic: restructuring", "version": 1, "mbox": "https://patches.dpdk.org/series/52/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/40836/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/40836/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 462527CBF;\n\tFri, 8 Jun 2018 14:42:30 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 142806CA3\n\tfor <dev@dpdk.org>; Fri, 8 Jun 2018 14:42:07 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Jun 2018 05:42:07 -0700", "from silpixa00381635.ir.intel.com (HELO\n\tsilpixa00381635.ger.corp.intel.com) ([10.237.222.149])\n\tby fmsmga005.fm.intel.com with ESMTP; 08 Jun 2018 05:42:06 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.49,490,1520924400\"; d=\"scan'208\";a=\"235505353\"", "From": "Jasvinder Singh <jasvinder.singh@intel.com>", "To": "dev@dpdk.org", "Cc": "cristian.dumitrescu@intel.com", "Date": "Fri, 8 Jun 2018 13:41:44 +0100", "Message-Id": "<20180608124155.140663-11-jasvinder.singh@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20180608124155.140663-1-jasvinder.singh@intel.com>", "References": "<20180608124155.140663-1-jasvinder.singh@intel.com>", "Subject": "[dpdk-dev] [PATCH 10/21] net/softnic: add thread", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add thread data structure and init function to run softnic pipelines\nobjects.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Jasvinder Singh <jasvinder.singh@intel.com>\n---\n drivers/net/softnic/Makefile | 1 +\n drivers/net/softnic/rte_eth_softnic.c | 8 +++\n drivers/net/softnic/rte_eth_softnic_internals.h | 69 +++++++++++++++++++\n drivers/net/softnic/rte_eth_softnic_thread.c | 90 +++++++++++++++++++++++++\n 4 files changed, 168 insertions(+)\n create mode 100644 drivers/net/softnic/rte_eth_softnic_thread.c", "diff": "diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile\nindex c3a3a6f..def7397 100644\n--- a/drivers/net/softnic/Makefile\n+++ b/drivers/net/softnic/Makefile\n@@ -31,6 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c\n+SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c\n \n #\n # Export include files\ndiff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex 81a7735..f4bd3f3 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -210,6 +210,7 @@ static void *\n pmd_init(struct pmd_params *params)\n {\n \tstruct pmd_internals *p;\n+\tint status;\n \n \tp = rte_zmalloc_socket(params->name,\n \t\tsizeof(struct pmd_internals),\n@@ -231,6 +232,12 @@ pmd_init(struct pmd_params *params)\n \ttable_action_profile_init(p);\n \tpipeline_init(p);\n \n+\tstatus = thread_init(p);\n+\tif (status) {\n+\t\trte_free(p);\n+\t\treturn NULL;\n+\t}\n+\n \treturn p;\n }\n \n@@ -240,6 +247,7 @@ pmd_free(struct pmd_internals *p)\n \tif (p == NULL)\n \t\treturn;\n \n+\tthread_free(p);\n \tpipeline_free(p);\n \ttable_action_profile_free(p);\n \tport_in_action_profile_free(p);\ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex d805270..3ef55c6 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -434,10 +434,68 @@ struct pipeline {\n \n TAILQ_HEAD(pipeline_list, pipeline);\n \n+/**\n+ * Thread\n+ */\n+#ifndef THREAD_PIPELINES_MAX\n+#define THREAD_PIPELINES_MAX 256\n+#endif\n+\n+#ifndef THREAD_MSGQ_SIZE\n+#define THREAD_MSGQ_SIZE 64\n+#endif\n+\n+#ifndef THREAD_TIMER_PERIOD_MS\n+#define THREAD_TIMER_PERIOD_MS 100\n+#endif\n+\n+/**\n+ * Master thead: data plane thread context\n+ */\n+struct thread {\n+\tstruct rte_ring *msgq_req;\n+\tstruct rte_ring *msgq_rsp;\n+\n+\tuint32_t enabled;\n+};\n+\n+/**\n+ * Data plane threads: context\n+ */\n #ifndef TABLE_RULE_ACTION_SIZE_MAX\n #define TABLE_RULE_ACTION_SIZE_MAX 2048\n #endif\n \n+struct table_data {\n+\tstruct rte_table_action *a;\n+};\n+\n+struct pipeline_data {\n+\tstruct rte_pipeline *p;\n+\tstruct table_data table_data[RTE_PIPELINE_TABLE_MAX];\n+\tuint32_t n_tables;\n+\n+\tstruct rte_ring *msgq_req;\n+\tstruct rte_ring *msgq_rsp;\n+\tuint64_t timer_period; /* Measured in CPU cycles. */\n+\tuint64_t time_next;\n+\n+\tuint8_t buffer[TABLE_RULE_ACTION_SIZE_MAX];\n+};\n+\n+struct thread_data {\n+\tstruct rte_pipeline *p[THREAD_PIPELINES_MAX];\n+\tuint32_t n_pipelines;\n+\n+\tstruct pipeline_data pipeline_data[THREAD_PIPELINES_MAX];\n+\tstruct rte_ring *msgq_req;\n+\tstruct rte_ring *msgq_rsp;\n+\tuint64_t timer_period; /* Measured in CPU cycles. */\n+\tuint64_t time_next;\n+\tuint64_t time_next_min;\n+\tuint64_t iter;\n+} __rte_cache_aligned;\n+\n /**\n * PMD Internals\n */\n@@ -458,6 +516,8 @@ struct pmd_internals {\n \tstruct port_in_action_profile_list port_in_action_profile_list;\n \tstruct table_action_profile_list table_action_profile_list;\n \tstruct pipeline_list pipeline_list;\n+\tstruct thread thread[RTE_MAX_LCORE];\n+\tstruct thread_data thread_data[RTE_MAX_LCORE];\n };\n \n /**\n@@ -639,4 +699,13 @@ pipeline_table_create(struct pmd_internals *p,\n \tconst char *pipeline_name,\n \tstruct table_params *params);\n \n+/**\n+ * Thread\n+ */\n+int\n+thread_init(struct pmd_internals *p);\n+\n+void\n+thread_free(struct pmd_internals *p);\n+\n #endif /* __INCLUDE_RTE_ETH_SOFTNIC_INTERNALS_H__ */\ndiff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c\nnew file mode 100644\nindex 0000000..4da1383\n--- /dev/null\n+++ b/drivers/net/softnic/rte_eth_softnic_thread.c\n@@ -0,0 +1,90 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2010-2018 Intel Corporation\n+ */\n+\n+#include <stdlib.h>\n+\n+#include <rte_cycles.h>\n+#include <rte_lcore.h>\n+#include <rte_ring.h>\n+\n+#include \"rte_eth_softnic_internals.h\"\n+\n+/**\n+ * Master thread: data plane thread init\n+ */\n+void\n+thread_free(struct pmd_internals *softnic)\n+{\n+\tuint32_t i;\n+\n+\tRTE_LCORE_FOREACH_SLAVE(i) {\n+\t\tstruct thread *t = &softnic->thread[i];\n+\n+\t\t/* MSGQs */\n+\t\tif (t->msgq_req)\n+\t\t\trte_ring_free(t->msgq_req);\n+\n+\t\tif (t->msgq_rsp)\n+\t\t\trte_ring_free(t->msgq_rsp);\n+\t}\n+}\n+\n+int\n+thread_init(struct pmd_internals *softnic)\n+{\n+\tuint32_t i;\n+\n+\tRTE_LCORE_FOREACH_SLAVE(i) {\n+\t\tchar ring_name[NAME_MAX];\n+\t\tstruct rte_ring *msgq_req, *msgq_rsp;\n+\t\tstruct thread *t = &softnic->thread[i];\n+\t\tstruct thread_data *t_data = &softnic->thread_data[i];\n+\t\tuint32_t cpu_id = rte_lcore_to_socket_id(i);\n+\n+\t\t/* MSGQs */\n+\t\tsnprintf(ring_name, sizeof(ring_name), \"%s-TH%u-REQ\",\n+\t\t\tsoftnic->params.name,\n+\t\t\ti);\n+\n+\t\tmsgq_req = rte_ring_create(ring_name,\n+\t\t\tTHREAD_MSGQ_SIZE,\n+\t\t\tcpu_id,\n+\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n+\n+\t\tif (msgq_req == NULL) {\n+\t\t\tthread_free(softnic);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tsnprintf(ring_name, sizeof(ring_name), \"%s-TH%u-RSP\",\n+\t\t\tsoftnic->params.name,\n+\t\t\ti);\n+\n+\t\tmsgq_rsp = rte_ring_create(ring_name,\n+\t\t\tTHREAD_MSGQ_SIZE,\n+\t\t\tcpu_id,\n+\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n+\n+\t\tif (msgq_rsp == NULL) {\n+\t\t\tthread_free(softnic);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* Master thread records */\n+\t\tt->msgq_req = msgq_req;\n+\t\tt->msgq_rsp = msgq_rsp;\n+\t\tt->enabled = 1;\n+\n+\t\t/* Data plane thread records */\n+\t\tt_data->n_pipelines = 0;\n+\t\tt_data->msgq_req = msgq_req;\n+\t\tt_data->msgq_rsp = msgq_rsp;\n+\t\tt_data->timer_period =\n+\t\t\t(rte_get_tsc_hz() * THREAD_TIMER_PERIOD_MS) / 1000;\n+\t\tt_data->time_next = rte_get_tsc_cycles() + t_data->timer_period;\n+\t\tt_data->time_next_min = t_data->time_next;\n+\t}\n+\n+\treturn 0;\n+}\n", "prefixes": [ "dpdk-dev", "10/21" ] }