Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66579/?format=api
{ "id": 66579, "url": "http://patches.dpdk.org/api/patches/66579/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200312111907.31555-5-ndabilpuram@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": "<20200312111907.31555-5-ndabilpuram@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200312111907.31555-5-ndabilpuram@marvell.com", "date": "2020-03-12T11:19:00", "name": "[04/11] net/octeontx2: add tm node add and delete cb", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "36b7efaae8ff1bd4abd2ea114ab0ce3b4033dff9", "submitter": { "id": 1202, "url": "http://patches.dpdk.org/api/people/1202/?format=api", "name": "Nithin Dabilpuram", "email": "ndabilpuram@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/20200312111907.31555-5-ndabilpuram@marvell.com/mbox/", "series": [ { "id": 8894, "url": "http://patches.dpdk.org/api/series/8894/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8894", "date": "2020-03-12T11:18:56", "name": "net/octeontx2: add traffic manager support", "version": 1, "mbox": "http://patches.dpdk.org/series/8894/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66579/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/66579/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 32417A056B;\n\tThu, 12 Mar 2020 12:20:20 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EFEEB1C07F;\n\tThu, 12 Mar 2020 12:19:29 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 58E931C030\n for <dev@dpdk.org>; Thu, 12 Mar 2020 12:19:27 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 02CBG0KU017747 for <dev@dpdk.org>; Thu, 12 Mar 2020 04:19:26 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0b-0016f401.pphosted.com with ESMTP id 2yqfggs6eu-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Thu, 12 Mar 2020 04:19:26 -0700", "from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 Mar\n 2020 04:19:24 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com\n (10.93.176.82) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Thu, 12 Mar 2020 04:19:24 -0700", "from hyd1588t430.marvell.com (unknown [10.29.52.204])\n by maili.marvell.com (Postfix) with ESMTP id 9D4B13F7043;\n Thu, 12 Mar 2020 04:19:22 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-type; s=pfpt0818; bh=ZlN2oxCMWbsxEe9EQnyTaUaR3XGC3G7xPHkIfo6V894=;\n b=GVl1YkSGo3J/S9TgLjdbpDpl/mjcRUeCHW7+Yj5Rbxe6jEwMFVOzvfV5QSzu5mUdFOjW\n DhhRGb81Yxs1Mvdw4UNQHhrEUFQ7TZ9XwX4GCxETLKhzZXCUU+f3e5h2WSVHWXk0RyqS\n Ez5dOr3OuPOIxjuaUOlNISYPQJBzggW8ptEtO8d5OFjftYlFuHQjzXte3IEv83OA2XiP\n 0zT96e/6i/rwxhwDQ0BvjF3cZYKNMbP99gxSTy0RalhTRCmCAmvmLCpUiHXHW5AWkL8/\n W/lGYrEcT84Zo+sQpF0VEy+U4Ek1GHGKWIxdB1/O1IVdKRJCNHVdAI/I/So7rBE54cc2 /Q==", "From": "Nithin Dabilpuram <ndabilpuram@marvell.com>", "To": "Jerin Jacob <jerinj@marvell.com>, Nithin Dabilpuram\n <ndabilpuram@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>", "CC": "Krzysztof Kanas <kkanas@marvell.com>, <dev@dpdk.org>", "Date": "Thu, 12 Mar 2020 16:49:00 +0530", "Message-ID": "<20200312111907.31555-5-ndabilpuram@marvell.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20200312111907.31555-1-ndabilpuram@marvell.com>", "References": "<20200312111907.31555-1-ndabilpuram@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572\n definitions=2020-03-12_03:2020-03-11,\n 2020-03-12 signatures=0", "Subject": "[dpdk-dev] [PATCH 04/11] net/octeontx2: add tm node add and delete\n\tcb", "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 <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": "Adds support to Traffic Management callbacks \"node_add\"\nand \"node_delete\". These callbacks doesn't support\ndynamic node addition or deletion post hierarchy commit.\n\nSigned-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>\nSigned-off-by: Krzysztof Kanas <kkanas@marvell.com>\n---\n drivers/net/octeontx2/otx2_tm.c | 271 ++++++++++++++++++++++++++++++++++++++++\n drivers/net/octeontx2/otx2_tm.h | 2 +\n 2 files changed, 273 insertions(+)", "diff": "diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c\nindex b6da668..579265c 100644\n--- a/drivers/net/octeontx2/otx2_tm.c\n+++ b/drivers/net/octeontx2/otx2_tm.c\n@@ -1534,6 +1534,277 @@ nix_tm_alloc_resources(struct rte_eth_dev *eth_dev, bool xmit_enable)\n \treturn 0;\n }\n \n+static uint16_t\n+nix_tm_lvl2nix(struct otx2_eth_dev *dev, uint32_t lvl)\n+{\n+\tif (nix_tm_have_tl1_access(dev)) {\n+\t\tswitch (lvl) {\n+\t\tcase OTX2_TM_LVL_ROOT:\n+\t\t\treturn NIX_TXSCH_LVL_TL1;\n+\t\tcase OTX2_TM_LVL_SCH1:\n+\t\t\treturn NIX_TXSCH_LVL_TL2;\n+\t\tcase OTX2_TM_LVL_SCH2:\n+\t\t\treturn NIX_TXSCH_LVL_TL3;\n+\t\tcase OTX2_TM_LVL_SCH3:\n+\t\t\treturn NIX_TXSCH_LVL_TL4;\n+\t\tcase OTX2_TM_LVL_SCH4:\n+\t\t\treturn NIX_TXSCH_LVL_SMQ;\n+\t\tdefault:\n+\t\t\treturn NIX_TXSCH_LVL_CNT;\n+\t\t}\n+\t} else {\n+\t\tswitch (lvl) {\n+\t\tcase OTX2_TM_LVL_ROOT:\n+\t\t\treturn NIX_TXSCH_LVL_TL2;\n+\t\tcase OTX2_TM_LVL_SCH1:\n+\t\t\treturn NIX_TXSCH_LVL_TL3;\n+\t\tcase OTX2_TM_LVL_SCH2:\n+\t\t\treturn NIX_TXSCH_LVL_TL4;\n+\t\tcase OTX2_TM_LVL_SCH3:\n+\t\t\treturn NIX_TXSCH_LVL_SMQ;\n+\t\tdefault:\n+\t\t\treturn NIX_TXSCH_LVL_CNT;\n+\t\t}\n+\t}\n+}\n+\n+static uint16_t\n+nix_max_prio(struct otx2_eth_dev *dev, uint16_t hw_lvl)\n+{\n+\tif (hw_lvl >= NIX_TXSCH_LVL_CNT)\n+\t\treturn 0;\n+\n+\t/* MDQ doesn't support SP */\n+\tif (hw_lvl == NIX_TXSCH_LVL_MDQ)\n+\t\treturn 0;\n+\n+\t/* PF's TL1 with VF's enabled doesn't support SP */\n+\tif (hw_lvl == NIX_TXSCH_LVL_TL1 &&\n+\t (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL2 ||\n+\t (dev->tm_flags & NIX_TM_TL1_NO_SP)))\n+\t\treturn 0;\n+\n+\treturn TXSCH_TLX_SP_PRIO_MAX - 1;\n+}\n+\n+\n+static int\n+validate_prio(struct otx2_eth_dev *dev, uint32_t lvl,\n+\t uint32_t parent_id, uint32_t priority,\n+\t struct rte_tm_error *error)\n+{\n+\tuint8_t priorities[TXSCH_TLX_SP_PRIO_MAX];\n+\tstruct otx2_nix_tm_node *tm_node;\n+\tuint32_t rr_num = 0;\n+\tint i;\n+\n+\t/* Validate priority against max */\n+\tif (priority > nix_max_prio(dev, nix_tm_lvl2nix(dev, lvl - 1))) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_CAPABILITIES;\n+\t\terror->message = \"unsupported priority value\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (parent_id == RTE_TM_NODE_ID_NULL)\n+\t\treturn 0;\n+\n+\tmemset(priorities, 0, TXSCH_TLX_SP_PRIO_MAX);\n+\tpriorities[priority] = 1;\n+\n+\tTAILQ_FOREACH(tm_node, &dev->node_list, node) {\n+\t\tif (!tm_node->parent)\n+\t\t\tcontinue;\n+\n+\t\tif (!(tm_node->flags & NIX_TM_NODE_USER))\n+\t\t\tcontinue;\n+\n+\t\tif (tm_node->parent->id != parent_id)\n+\t\t\tcontinue;\n+\n+\t\tpriorities[tm_node->priority]++;\n+\t}\n+\n+\tfor (i = 0; i < TXSCH_TLX_SP_PRIO_MAX; i++)\n+\t\tif (priorities[i] > 1)\n+\t\t\trr_num++;\n+\n+\t/* At max, one rr groups per parent */\n+\tif (rr_num > 1) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_PRIORITY;\n+\t\terror->message = \"multiple DWRR node priority\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Check for previous priority to avoid holes in priorities */\n+\tif (priority && !priorities[priority - 1]) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_PRIORITY;\n+\t\terror->message = \"priority not in order\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+nix_tm_node_add(struct rte_eth_dev *eth_dev, uint32_t node_id,\n+\t\tuint32_t parent_node_id, uint32_t priority,\n+\t\tuint32_t weight, uint32_t lvl,\n+\t\tstruct rte_tm_node_params *params,\n+\t\tstruct rte_tm_error *error)\n+{\n+\tstruct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);\n+\tstruct otx2_nix_tm_node *parent_node;\n+\tint rc, clear_on_fail = 0;\n+\tuint32_t exp_next_lvl;\n+\tuint16_t hw_lvl;\n+\n+\t/* we don't support dynamic updates */\n+\tif (dev->tm_flags & NIX_TM_COMMITTED) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_CAPABILITIES;\n+\t\terror->message = \"dynamic update not supported\";\n+\t\treturn -EIO;\n+\t}\n+\n+\t/* Leaf nodes have to be same priority */\n+\tif (nix_tm_is_leaf(dev, lvl) && priority != 0) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_CAPABILITIES;\n+\t\terror->message = \"queue shapers must be priority 0\";\n+\t\treturn -EIO;\n+\t}\n+\n+\tparent_node = nix_tm_node_search(dev, parent_node_id, true);\n+\n+\t/* find the right level */\n+\tif (lvl == RTE_TM_NODE_LEVEL_ID_ANY) {\n+\t\tif (parent_node_id == RTE_TM_NODE_ID_NULL) {\n+\t\t\tlvl = OTX2_TM_LVL_ROOT;\n+\t\t} else if (parent_node) {\n+\t\t\tlvl = parent_node->lvl + 1;\n+\t\t} else {\n+\t\t\t/* Neigher proper parent nor proper level id given */\n+\t\t\terror->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;\n+\t\t\terror->message = \"invalid parent node id\";\n+\t\t\treturn -ERANGE;\n+\t\t}\n+\t}\n+\n+\t/* Translate rte_tm level id's to nix hw level id's */\n+\thw_lvl = nix_tm_lvl2nix(dev, lvl);\n+\tif (hw_lvl == NIX_TXSCH_LVL_CNT &&\n+\t !nix_tm_is_leaf(dev, lvl)) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_LEVEL_ID;\n+\t\terror->message = \"invalid level id\";\n+\t\treturn -ERANGE;\n+\t}\n+\n+\tif (node_id < dev->tm_leaf_cnt)\n+\t\texp_next_lvl = NIX_TXSCH_LVL_SMQ;\n+\telse\n+\t\texp_next_lvl = hw_lvl + 1;\n+\n+\t/* Check if there is no parent node yet */\n+\tif (hw_lvl != dev->otx2_tm_root_lvl &&\n+\t (!parent_node || parent_node->hw_lvl != exp_next_lvl)) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;\n+\t\terror->message = \"invalid parent node id\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Check if a node already exists */\n+\tif (nix_tm_node_search(dev, node_id, true)) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_ID;\n+\t\terror->message = \"node already exists\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Check if shaper profile exists for non leaf node */\n+\tif (!nix_tm_is_leaf(dev, lvl) &&\n+\t params->shaper_profile_id != RTE_TM_SHAPER_PROFILE_ID_NONE &&\n+\t !nix_tm_shaper_profile_search(dev, params->shaper_profile_id)) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;\n+\t\terror->message = \"invalid shaper profile\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Check if there is second DWRR already in siblings or holes in prio */\n+\tif (validate_prio(dev, lvl, parent_node_id, priority, error))\n+\t\treturn -EINVAL;\n+\n+\tif (weight > MAX_SCHED_WEIGHT) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_WEIGHT;\n+\t\terror->message = \"max weight exceeded\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\trc = nix_tm_node_add_to_list(dev, node_id, parent_node_id,\n+\t\t\t\t priority, weight, hw_lvl,\n+\t\t\t\t lvl, true, params);\n+\tif (rc) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;\n+\t\t/* cleanup user added nodes */\n+\t\tif (clear_on_fail)\n+\t\t\tnix_tm_free_resources(dev, NIX_TM_NODE_USER,\n+\t\t\t\t\t NIX_TM_NODE_USER, false);\n+\t\terror->message = \"failed to add node\";\n+\t\treturn rc;\n+\t}\n+\terror->type = RTE_TM_ERROR_TYPE_NONE;\n+\treturn 0;\n+}\n+\n+static int\n+nix_tm_node_delete(struct rte_eth_dev *eth_dev, uint32_t node_id,\n+\t\t struct rte_tm_error *error)\n+{\n+\tstruct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);\n+\tstruct otx2_nix_tm_node *tm_node, *child_node;\n+\tstruct otx2_nix_tm_shaper_profile *profile;\n+\tuint32_t profile_id;\n+\n+\t/* we don't support dynamic updates yet */\n+\tif (dev->tm_flags & NIX_TM_COMMITTED) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_CAPABILITIES;\n+\t\terror->message = \"hierarchy exists\";\n+\t\treturn -EIO;\n+\t}\n+\n+\tif (node_id == RTE_TM_NODE_ID_NULL) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_ID;\n+\t\terror->message = \"invalid node id\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\ttm_node = nix_tm_node_search(dev, node_id, true);\n+\tif (!tm_node) {\n+\t\terror->type = RTE_TM_ERROR_TYPE_NODE_ID;\n+\t\terror->message = \"no such node\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Check for any existing children */\n+\tTAILQ_FOREACH(child_node, &dev->node_list, node) {\n+\t\tif (child_node->parent == tm_node) {\n+\t\t\terror->type = RTE_TM_ERROR_TYPE_NODE_ID;\n+\t\t\terror->message = \"children exist\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\t/* Remove shaper profile reference */\n+\tprofile_id = tm_node->params.shaper_profile_id;\n+\tprofile = nix_tm_shaper_profile_search(dev, profile_id);\n+\tprofile->reference_count--;\n+\n+\tTAILQ_REMOVE(&dev->node_list, tm_node, node);\n+\trte_free(tm_node);\n+\treturn 0;\n+}\n+\n+const struct rte_tm_ops otx2_tm_ops = {\n+\t.node_add = nix_tm_node_add,\n+\t.node_delete = nix_tm_node_delete,\n+};\n+\n static int\n nix_tm_prepare_default_tree(struct rte_eth_dev *eth_dev)\n {\ndiff --git a/drivers/net/octeontx2/otx2_tm.h b/drivers/net/octeontx2/otx2_tm.h\nindex 413120a..ebb4e90 100644\n--- a/drivers/net/octeontx2/otx2_tm.h\n+++ b/drivers/net/octeontx2/otx2_tm.h\n@@ -135,6 +135,8 @@ TAILQ_HEAD(otx2_nix_tm_shaper_profile_list, otx2_nix_tm_shaper_profile);\n #define TXSCH_TL1_DFLT_RR_QTM ((1 << 24) - 1)\n #define TXSCH_TL1_DFLT_RR_PRIO 1\n \n+#define TXSCH_TLX_SP_PRIO_MAX 10\n+\n static inline const char *\n nix_hwlvl2str(uint32_t hw_lvl)\n {\n", "prefixes": [ "04/11" ] }