Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42546/?format=api
{ "id": 42546, "url": "http://patches.dpdk.org/api/patches/42546/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180706172116.50951-7-jasvinder.singh@intel.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": "<20180706172116.50951-7-jasvinder.singh@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180706172116.50951-7-jasvinder.singh@intel.com", "date": "2018-07-06T17:20:59", "name": "[v5,06/23] net/softnic: add traffic manager object", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "118d480e6aca52897894f959ca544925811acb77", "submitter": { "id": 285, "url": "http://patches.dpdk.org/api/people/285/?format=api", "name": "Jasvinder Singh", "email": "jasvinder.singh@intel.com" }, "delegate": { "id": 10018, "url": "http://patches.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180706172116.50951-7-jasvinder.singh@intel.com/mbox/", "series": [ { "id": 460, "url": "http://patches.dpdk.org/api/series/460/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=460", "date": "2018-07-06T17:20:53", "name": "net/softnic: refactoring", "version": 5, "mbox": "http://patches.dpdk.org/series/460/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42546/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42546/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 E62901BF3C;\n\tFri, 6 Jul 2018 19:21:46 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id E055D1BEE8\n\tfor <dev@dpdk.org>; Fri, 6 Jul 2018 19:21:32 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Jul 2018 10:21:29 -0700", "from silpixa00381635.ir.intel.com (HELO\n\tsilpixa00381635.ger.corp.intel.com) ([10.237.222.149])\n\tby orsmga003.jf.intel.com with ESMTP; 06 Jul 2018 10:21:23 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,317,1526367600\"; d=\"scan'208\";a=\"64955294\"", "From": "Jasvinder Singh <jasvinder.singh@intel.com>", "To": "dev@dpdk.org", "Cc": "cristian.dumitrescu@intel.com", "Date": "Fri, 6 Jul 2018 18:20:59 +0100", "Message-Id": "<20180706172116.50951-7-jasvinder.singh@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20180706172116.50951-1-jasvinder.singh@intel.com>", "References": "<20180705154754.147420-2-jasvinder.singh@intel.com>\n\t<20180706172116.50951-1-jasvinder.singh@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 06/23] net/softnic: add traffic manager object", "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": "Add traffic manager(tmgr) object to the softnic.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Jasvinder Singh <jasvinder.singh@intel.com>\n---\n drivers/net/softnic/rte_eth_softnic.c | 70 +++++++++++++++-\n drivers/net/softnic/rte_eth_softnic.h | 11 ++-\n drivers/net/softnic/rte_eth_softnic_internals.h | 39 +++++++--\n drivers/net/softnic/rte_eth_softnic_tm.c | 103 +++++++++++++++++++++---\n 4 files changed, 201 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex 4cd5cb7..eefcb76 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -20,10 +20,23 @@\n \n #define PMD_PARAM_FIRMWARE \"firmware\"\n #define PMD_PARAM_CPU_ID \"cpu_id\"\n+#define PMD_PARAM_SCRIPT \"script\"\n+#define PMD_PARAM_CONN_PORT \"conn_port\"\n+#define PMD_PARAM_CPU_ID \"cpu_id\"\n+#define PMD_PARAM_TM_N_QUEUES \"tm_n_queues\"\n+#define PMD_PARAM_TM_QSIZE0 \"tm_qsize0\"\n+#define PMD_PARAM_TM_QSIZE1 \"tm_qsize1\"\n+#define PMD_PARAM_TM_QSIZE2 \"tm_qsize2\"\n+#define PMD_PARAM_TM_QSIZE3 \"tm_qsize3\"\n \n static const char *pmd_valid_args[] = {\n \tPMD_PARAM_FIRMWARE,\n \tPMD_PARAM_CPU_ID,\n+\tPMD_PARAM_TM_N_QUEUES,\n+\tPMD_PARAM_TM_QSIZE0,\n+\tPMD_PARAM_TM_QSIZE1,\n+\tPMD_PARAM_TM_QSIZE2,\n+\tPMD_PARAM_TM_QSIZE3,\n \tNULL\n };\n \n@@ -154,7 +167,7 @@ pmd_link_update(struct rte_eth_dev *dev __rte_unused,\n static int\n pmd_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)\n {\n-\t*(const struct rte_tm_ops **)arg = NULL;\n+\t*(const struct rte_tm_ops **)arg = &pmd_tm_ops;\n \n \treturn 0;\n }\n@@ -225,6 +238,8 @@ pmd_init(struct pmd_params *params)\n \tsoftnic_mempool_init(p);\n \tsoftnic_swq_init(p);\n \tsoftnic_link_init(p);\n+\ttm_init(p);\n+\tsoftnic_tmgr_init(p);\n \tsoftnic_tap_init(p);\n \n \treturn p;\n@@ -237,6 +252,8 @@ pmd_free(struct pmd_internals *p)\n \t\treturn;\n \n \tsoftnic_tap_free(p);\n+\tsoftnic_tmgr_free(p);\n+\ttm_free(p);\n \tsoftnic_link_free(p);\n \tsoftnic_swq_free(p);\n \tsoftnic_mempool_free(p);\n@@ -322,6 +339,11 @@ pmd_parse_args(struct pmd_params *p, const char *params)\n \tmemset(p, 0, sizeof(*p));\n \tp->firmware = SOFTNIC_FIRMWARE;\n \tp->cpu_id = SOFTNIC_CPU_ID;\n+\tp->tm.n_queues = SOFTNIC_TM_N_QUEUES;\n+\tp->tm.qsize[0] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[1] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[2] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[3] = SOFTNIC_TM_QUEUE_SIZE;\n \n \t/* Firmware script (optional) */\n \tif (rte_kvargs_count(kvlist, PMD_PARAM_FIRMWARE) == 1) {\n@@ -339,6 +361,43 @@ pmd_parse_args(struct pmd_params *p, const char *params)\n \t\t\tgoto out_free;\n \t}\n \n+\t/* TM number of queues (optional) */\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_N_QUEUES) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_N_QUEUES,\n+\t\t\t&get_uint32, &p->tm.n_queues);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\t/* TM queue size 0 .. 3 (optional) */\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE0) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE0,\n+\t\t\t&get_uint32, &p->tm.qsize[0]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE1) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE1,\n+\t\t\t&get_uint32, &p->tm.qsize[1]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE2) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE2,\n+\t\t\t&get_uint32, &p->tm.qsize[2]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE3) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE3,\n+\t\t\t&get_uint32, &p->tm.qsize[3]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n out_free:\n \trte_kvargs_free(kvlist);\n \treturn ret;\n@@ -417,9 +476,16 @@ static struct rte_vdev_driver pmd_softnic_drv = {\n RTE_PMD_REGISTER_VDEV(net_softnic, pmd_softnic_drv);\n RTE_PMD_REGISTER_PARAM_STRING(net_softnic,\n \tPMD_PARAM_FIRMWARE \"=<string> \"\n-\tPMD_PARAM_CPU_ID \"=<uint32>\");\n+\tPMD_PARAM_CPU_ID \"=<uint32> \"\n+\tPMD_PARAM_TM_N_QUEUES \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE0 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE1 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE2 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE3 \"=<uint32>\"\n+);\n \n RTE_INIT(pmd_softnic_init_log);\n+\n static void\n pmd_softnic_init_log(void)\n {\ndiff --git a/drivers/net/softnic/rte_eth_softnic.h b/drivers/net/softnic/rte_eth_softnic.h\nindex fb1d170..98b0828 100644\n--- a/drivers/net/softnic/rte_eth_softnic.h\n+++ b/drivers/net/softnic/rte_eth_softnic.h\n@@ -21,6 +21,16 @@ extern \"C\" {\n #define SOFTNIC_CPU_ID 0\n #endif\n \n+/** Traffic Manager: Number of scheduler queues. */\n+#ifndef SOFTNIC_TM_N_QUEUES\n+#define SOFTNIC_TM_N_QUEUES (64 * 1024)\n+#endif\n+\n+/** Traffic Manager: Scheduler queue size (per traffic class). */\n+#ifndef SOFTNIC_TM_QUEUE_SIZE\n+#define SOFTNIC_TM_QUEUE_SIZE 64\n+#endif\n+\n /**\n * Soft NIC run.\n *\n@@ -29,7 +39,6 @@ extern \"C\" {\n * @return\n * Zero on success, error code otherwise.\n */\n-\n int\n rte_pmd_softnic_run(uint16_t port_id);\n \ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex c7177d4..f6000fd 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -89,7 +89,7 @@ struct softnic_link {\n TAILQ_HEAD(softnic_link_list, softnic_link);\n \n /**\n- * Traffic Management (TM) Internals\n+ * TMGR\n */\n \n #ifndef TM_MAX_SUBPORTS\n@@ -200,6 +200,14 @@ struct tm_internals {\n \tstruct rte_sched_port *sched;\n };\n \n+struct softnic_tmgr_port {\n+\tTAILQ_ENTRY(softnic_tmgr_port) node;\n+\tchar name[NAME_SIZE];\n+\tstruct rte_sched_port *s;\n+};\n+\n+TAILQ_HEAD(softnic_tmgr_port_list, softnic_tmgr_port);\n+\n /**\n * TAP\n */\n@@ -218,7 +226,6 @@ struct pmd_internals {\n \t/** Params */\n \tstruct pmd_params params;\n \n-\t/** Soft device */\n \tstruct {\n \t\tstruct tm_internals tm; /**< Traffic Management */\n \t} soft;\n@@ -226,6 +233,7 @@ struct pmd_internals {\n \tstruct softnic_mempool_list mempool_list;\n \tstruct softnic_swq_list swq_list;\n \tstruct softnic_link_list link_list;\n+\tstruct softnic_tmgr_port_list tmgr_port_list;\n \tstruct softnic_tap_list tap_list;\n };\n \n@@ -284,12 +292,25 @@ softnic_link_create(struct pmd_internals *p,\n \tstruct softnic_link_params *params);\n \n /**\n- * Traffic Management (TM) Operation\n+ * TMGR\n */\n-extern const struct rte_tm_ops pmd_tm_ops;\n+int\n+softnic_tmgr_init(struct pmd_internals *p);\n+\n+void\n+softnic_tmgr_free(struct pmd_internals *p);\n+\n+struct softnic_tmgr_port *\n+softnic_tmgr_port_find(struct pmd_internals *p,\n+\tconst char *name);\n+\n+struct softnic_tmgr_port *\n+softnic_tmgr_port_create(struct pmd_internals *p,\n+\tconst char *name,\n+\tstruct rte_sched_port *sched);\n \n int\n-tm_init(struct pmd_internals *p, struct pmd_params *params, int numa_node);\n+tm_init(struct pmd_internals *p);\n \n void\n tm_free(struct pmd_internals *p);\n@@ -301,11 +322,15 @@ void\n tm_stop(struct pmd_internals *p);\n \n static inline int\n-tm_used(struct rte_eth_dev *dev __rte_unused)\n+tm_used(struct rte_eth_dev *dev)\n {\n-\treturn 0;\n+\tstruct pmd_internals *p = dev->data->dev_private;\n+\n+\treturn p->soft.tm.h.n_tm_nodes[TM_NODE_LEVEL_PORT];\n }\n \n+extern const struct rte_tm_ops pmd_tm_ops;\n+\n /**\n * TAP\n */\ndiff --git a/drivers/net/softnic/rte_eth_softnic_tm.c b/drivers/net/softnic/rte_eth_softnic_tm.c\nindex 8da8310..8e473c8 100644\n--- a/drivers/net/softnic/rte_eth_softnic_tm.c\n+++ b/drivers/net/softnic/rte_eth_softnic_tm.c\n@@ -7,14 +7,83 @@\n #include <string.h>\n \n #include <rte_malloc.h>\n+#include <rte_string_fns.h>\n \n #include \"rte_eth_softnic_internals.h\"\n #include \"rte_eth_softnic.h\"\n \n-#define BYTES_IN_MBPS\t\t(1000 * 1000 / 8)\n #define SUBPORT_TC_PERIOD\t10\n #define PIPE_TC_PERIOD\t\t40\n \n+int\n+softnic_tmgr_init(struct pmd_internals *p)\n+{\n+\tTAILQ_INIT(&p->tmgr_port_list);\n+\n+\treturn 0;\n+}\n+\n+void\n+softnic_tmgr_free(struct pmd_internals *p)\n+{\n+\tfor ( ; ; ) {\n+\t\tstruct softnic_tmgr_port *tmgr_port;\n+\n+\t\ttmgr_port = TAILQ_FIRST(&p->tmgr_port_list);\n+\t\tif (tmgr_port == NULL)\n+\t\t\tbreak;\n+\n+\t\tTAILQ_REMOVE(&p->tmgr_port_list, tmgr_port, node);\n+\t\tfree(tmgr_port);\n+\t}\n+}\n+\n+struct softnic_tmgr_port *\n+softnic_tmgr_port_find(struct pmd_internals *p,\n+\tconst char *name)\n+{\n+\tstruct softnic_tmgr_port *tmgr_port;\n+\n+\tif (name == NULL)\n+\t\treturn NULL;\n+\n+\tTAILQ_FOREACH(tmgr_port, &p->tmgr_port_list, node)\n+\t\tif (strcmp(tmgr_port->name, name) == 0)\n+\t\t\treturn tmgr_port;\n+\n+\treturn NULL;\n+}\n+\n+struct softnic_tmgr_port *\n+softnic_tmgr_port_create(struct pmd_internals *p,\n+\tconst char *name,\n+\tstruct rte_sched_port *sched)\n+{\n+\tstruct softnic_tmgr_port *tmgr_port;\n+\n+\t/* Check input params */\n+\tif (name == NULL ||\n+\t\tsoftnic_tmgr_port_find(p, name) ||\n+\t\tsched == NULL)\n+\t\treturn NULL;\n+\n+\t/* Resource */\n+\n+\t/* Node allocation */\n+\ttmgr_port = calloc(1, sizeof(struct softnic_tmgr_port));\n+\tif (tmgr_port == NULL)\n+\t\treturn NULL;\n+\n+\t/* Node fill in */\n+\tstrlcpy(tmgr_port->name, name, sizeof(tmgr_port->name));\n+\ttmgr_port->s = sched;\n+\n+\t/* Node add to list */\n+\tTAILQ_INSERT_TAIL(&p->tmgr_port_list, tmgr_port, node);\n+\n+\treturn tmgr_port;\n+}\n+\n static void\n tm_hierarchy_init(struct pmd_internals *p)\n {\n@@ -89,9 +158,7 @@ tm_hierarchy_uninit(struct pmd_internals *p)\n }\n \n int\n-tm_init(struct pmd_internals *p,\n-\tstruct pmd_params *params __rte_unused,\n-\tint numa_node __rte_unused)\n+tm_init(struct pmd_internals *p)\n {\n \ttm_hierarchy_init(p);\n \n@@ -107,7 +174,9 @@ tm_free(struct pmd_internals *p)\n int\n tm_start(struct pmd_internals *p)\n {\n+\tstruct softnic_tmgr_port *tmgr_port;\n \tstruct tm_params *t = &p->soft.tm.params;\n+\tstruct rte_sched_port *sched;\n \tuint32_t n_subports, subport_id;\n \tint status;\n \n@@ -116,8 +185,8 @@ tm_start(struct pmd_internals *p)\n \t\treturn -1;\n \n \t/* Port */\n-\tp->soft.tm.sched = rte_sched_port_config(&t->port_params);\n-\tif (p->soft.tm.sched == NULL)\n+\tsched = rte_sched_port_config(&t->port_params);\n+\tif (sched == NULL)\n \t\treturn -1;\n \n \t/* Subport */\n@@ -127,11 +196,11 @@ tm_start(struct pmd_internals *p)\n \t\t\tt->port_params.n_pipes_per_subport;\n \t\tuint32_t pipe_id;\n \n-\t\tstatus = rte_sched_subport_config(p->soft.tm.sched,\n+\t\tstatus = rte_sched_subport_config(sched,\n \t\t\tsubport_id,\n \t\t\t&t->subport_params[subport_id]);\n \t\tif (status) {\n-\t\t\trte_sched_port_free(p->soft.tm.sched);\n+\t\t\trte_sched_port_free(sched);\n \t\t\treturn -1;\n \t\t}\n \n@@ -145,26 +214,36 @@ tm_start(struct pmd_internals *p)\n \t\t\tif (profile_id < 0)\n \t\t\t\tcontinue;\n \n-\t\t\tstatus = rte_sched_pipe_config(p->soft.tm.sched,\n+\t\t\tstatus = rte_sched_pipe_config(sched,\n \t\t\t\tsubport_id,\n \t\t\t\tpipe_id,\n \t\t\t\tprofile_id);\n \t\t\tif (status) {\n-\t\t\t\trte_sched_port_free(p->soft.tm.sched);\n+\t\t\t\trte_sched_port_free(sched);\n \t\t\t\treturn -1;\n \t\t\t}\n \t\t}\n \t}\n \n+\ttmgr_port = softnic_tmgr_port_create(p, \"TMGR\", sched);\n+\tif (tmgr_port == NULL) {\n+\t\trte_sched_port_free(sched);\n+\t\treturn -1;\n+\t}\n+\n+\t/* Commit */\n+\tp->soft.tm.sched = sched;\n+\n \treturn 0;\n }\n \n void\n tm_stop(struct pmd_internals *p)\n {\n-\tif (p->soft.tm.sched)\n+\tif (p->soft.tm.sched) {\n \t\trte_sched_port_free(p->soft.tm.sched);\n-\n+\t\tp->soft.tm.sched = NULL;\n+\t}\n \t/* Unfreeze hierarchy */\n \tp->soft.tm.hierarchy_frozen = 0;\n }\n", "prefixes": [ "v5", "06/23" ] }