Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 55348,
    "url": "http://patches.dpdk.org/api/patches/55348/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190625153217.24301-25-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": "<20190625153217.24301-25-jasvinder.singh@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190625153217.24301-25-jasvinder.singh@intel.com",
    "date": "2019-06-25T15:32:13",
    "name": "[v2,24/28] net/softnic: update softnic tm function",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "4f4b8df0f9405f6916cd06ea41d657d7bd3b96b2",
    "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/20190625153217.24301-25-jasvinder.singh@intel.com/mbox/",
    "series": [
        {
            "id": 5160,
            "url": "http://patches.dpdk.org/api/series/5160/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5160",
            "date": "2019-06-25T15:31:49",
            "name": "sched: feature enhancements",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/5160/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/55348/comments/",
    "check": "fail",
    "checks": "http://patches.dpdk.org/api/patches/55348/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 04DC91BBFB;\n\tTue, 25 Jun 2019 17:32:58 +0200 (CEST)",
            "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 6D7C71BB5C\n\tfor <dev@dpdk.org>; Tue, 25 Jun 2019 17:32:35 +0200 (CEST)",
            "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Jun 2019 08:32:34 -0700",
            "from silpixa00381635.ir.intel.com (HELO\n\tsilpixa00381635.ger.corp.intel.com) ([10.237.223.4])\n\tby orsmga006.jf.intel.com with ESMTP; 25 Jun 2019 08:32:32 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.63,416,1557212400\"; d=\"scan'208\";a=\"166711686\"",
        "From": "Jasvinder Singh <jasvinder.singh@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "cristian.dumitrescu@intel.com, Abraham Tovar <abrahamx.tovar@intel.com>, \n\tLukasz Krakowiak <lukaszx.krakowiak@intel.com>",
        "Date": "Tue, 25 Jun 2019 16:32:13 +0100",
        "Message-Id": "<20190625153217.24301-25-jasvinder.singh@intel.com>",
        "X-Mailer": "git-send-email 2.21.0",
        "In-Reply-To": "<20190625153217.24301-1-jasvinder.singh@intel.com>",
        "References": "<20190528120553.2992-2-lukaszx.krakowiak@intel.com>\n\t<20190625153217.24301-1-jasvinder.singh@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v2 24/28] net/softnic: update softnic tm function",
        "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": "Update softnic tm function to allow configuration flexiblity for\npipe traffic classes and queues, and subport level configuration\nof the pipe parameters.\n\nSigned-off-by: Jasvinder Singh <jasvinder.singh@intel.com>\nSigned-off-by: Abraham Tovar <abrahamx.tovar@intel.com>\nSigned-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>\n---\n drivers/net/softnic/rte_eth_softnic.c         | 131 ++++++++\n drivers/net/softnic/rte_eth_softnic_cli.c     | 286 ++++++++++++++++--\n .../net/softnic/rte_eth_softnic_internals.h   |   8 +-\n drivers/net/softnic/rte_eth_softnic_tm.c      |  89 +++---\n 4 files changed, 445 insertions(+), 69 deletions(-)",
    "diff": "diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex 4bda2f2b0..50a48e90b 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -28,6 +28,19 @@\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+#define PMD_PARAM_TM_QSIZE4                                \"tm_qsize4\"\n+#define PMD_PARAM_TM_QSIZE5                                \"tm_qsize5\"\n+#define PMD_PARAM_TM_QSIZE6                                \"tm_qsize6\"\n+#define PMD_PARAM_TM_QSIZE7                                \"tm_qsize7\"\n+#define PMD_PARAM_TM_QSIZE8                                \"tm_qsize8\"\n+#define PMD_PARAM_TM_QSIZE9                                \"tm_qsize9\"\n+#define PMD_PARAM_TM_QSIZE10                               \"tm_qsize10\"\n+#define PMD_PARAM_TM_QSIZE11                               \"tm_qsize11\"\n+#define PMD_PARAM_TM_QSIZE12                               \"tm_qsize12\"\n+#define PMD_PARAM_TM_QSIZE13                               \"tm_qsize13\"\n+#define PMD_PARAM_TM_QSIZE14                               \"tm_qsize14\"\n+#define PMD_PARAM_TM_QSIZE15                               \"tm_qsize15\"\n+\n \n static const char * const pmd_valid_args[] = {\n \tPMD_PARAM_FIRMWARE,\n@@ -39,6 +52,18 @@ static const char * const pmd_valid_args[] = {\n \tPMD_PARAM_TM_QSIZE1,\n \tPMD_PARAM_TM_QSIZE2,\n \tPMD_PARAM_TM_QSIZE3,\n+\tPMD_PARAM_TM_QSIZE4,\n+\tPMD_PARAM_TM_QSIZE5,\n+\tPMD_PARAM_TM_QSIZE6,\n+\tPMD_PARAM_TM_QSIZE7,\n+\tPMD_PARAM_TM_QSIZE8,\n+\tPMD_PARAM_TM_QSIZE9,\n+\tPMD_PARAM_TM_QSIZE10,\n+\tPMD_PARAM_TM_QSIZE11,\n+\tPMD_PARAM_TM_QSIZE12,\n+\tPMD_PARAM_TM_QSIZE13,\n+\tPMD_PARAM_TM_QSIZE14,\n+\tPMD_PARAM_TM_QSIZE15,\n \tNULL\n };\n \n@@ -434,6 +459,18 @@ pmd_parse_args(struct pmd_params *p, const char *params)\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+\tp->tm.qsize[4] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[5] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[6] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[7] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[8] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[9] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[10] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[11] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[12] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[13] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[14] = SOFTNIC_TM_QUEUE_SIZE;\n+\tp->tm.qsize[15] = SOFTNIC_TM_QUEUE_SIZE;\n \n \t/* Firmware script (optional) */\n \tif (rte_kvargs_count(kvlist, PMD_PARAM_FIRMWARE) == 1) {\n@@ -504,6 +541,88 @@ pmd_parse_args(struct pmd_params *p, const char *params)\n \t\t\tgoto out_free;\n \t}\n \n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE4) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE4,\n+\t\t\t&get_uint32, &p->tm.qsize[4]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE5) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE5,\n+\t\t\t&get_uint32, &p->tm.qsize[5]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE6) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE6,\n+\t\t\t&get_uint32, &p->tm.qsize[6]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE7) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE7,\n+\t\t\t&get_uint32, &p->tm.qsize[7]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE8) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE8,\n+\t\t\t&get_uint32, &p->tm.qsize[8]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE9) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE9,\n+\t\t\t&get_uint32, &p->tm.qsize[9]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE10) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE10,\n+\t\t\t&get_uint32, &p->tm.qsize[10]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE11) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE11,\n+\t\t\t&get_uint32, &p->tm.qsize[11]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE12) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE12,\n+\t\t\t&get_uint32, &p->tm.qsize[12]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE13) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE13,\n+\t\t\t&get_uint32, &p->tm.qsize[13]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE14) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE14,\n+\t\t\t&get_uint32, &p->tm.qsize[14]);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE15) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE15,\n+\t\t\t&get_uint32, &p->tm.qsize[15]);\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@@ -588,6 +707,18 @@ RTE_PMD_REGISTER_PARAM_STRING(net_softnic,\n \tPMD_PARAM_TM_QSIZE1 \"=<uint32> \"\n \tPMD_PARAM_TM_QSIZE2 \"=<uint32> \"\n \tPMD_PARAM_TM_QSIZE3 \"=<uint32>\"\n+\tPMD_PARAM_TM_QSIZE4 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE5 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE6 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE7 \"=<uint32>\"\n+\tPMD_PARAM_TM_QSIZE8 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE9 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE10 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE11 \"=<uint32>\"\n+\tPMD_PARAM_TM_QSIZE12 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE13 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE14 \"=<uint32> \"\n+\tPMD_PARAM_TM_QSIZE15 \"=<uint32>\"\n );\n \n \ndiff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c\nindex 56fc92ba2..63325623f 100644\n--- a/drivers/net/softnic/rte_eth_softnic_cli.c\n+++ b/drivers/net/softnic/rte_eth_softnic_cli.c\n@@ -566,9 +566,13 @@ queue_node_id(uint32_t n_spp __rte_unused,\n \tuint32_t tc_id,\n \tuint32_t queue_id)\n {\n-\treturn queue_id +\n-\t\ttc_id * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE +\n-\t\t(pipe_id + subport_id * n_pps) * RTE_SCHED_QUEUES_PER_PIPE;\n+\tif (tc_id < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)\n+\t\treturn queue_id + tc_id +\n+\t\t\t(pipe_id + subport_id * n_pps) * RTE_SCHED_QUEUES_PER_PIPE;\n+\telse\n+\t\treturn queue_id +\n+\t\t\ttc_id * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE +\n+\t\t\t(pipe_id + subport_id * n_pps) * RTE_SCHED_QUEUES_PER_PIPE;\n }\n \n struct tmgr_hierarchy_default_params {\n@@ -617,10 +621,19 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\t},\n \t};\n \n+\tuint32_t *shared_shaper_id =\n+\t\t(uint32_t *) calloc(RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE,\n+\t\tsizeof(uint32_t));\n+\tif (shared_shaper_id == NULL)\n+\t\treturn -1;\n+\n+\tmemcpy(shared_shaper_id, params->shared_shaper_id.tc,\n+\t\tsizeof(params->shared_shaper_id.tc));\n+\n \tstruct rte_tm_node_params tc_node_params[] = {\n \t\t[0] = {\n \t\t\t.shaper_profile_id = params->shaper_profile_id.tc[0],\n-\t\t\t.shared_shaper_id = &params->shared_shaper_id.tc[0],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[0],\n \t\t\t.n_shared_shapers =\n \t\t\t\t(&params->shared_shaper_id.tc_valid[0]) ? 1 : 0,\n \t\t\t.nonleaf = {\n@@ -630,7 +643,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \n \t\t[1] = {\n \t\t\t.shaper_profile_id = params->shaper_profile_id.tc[1],\n-\t\t\t.shared_shaper_id = &params->shared_shaper_id.tc[1],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[1],\n \t\t\t.n_shared_shapers =\n \t\t\t\t(&params->shared_shaper_id.tc_valid[1]) ? 1 : 0,\n \t\t\t.nonleaf = {\n@@ -640,7 +653,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \n \t\t[2] = {\n \t\t\t.shaper_profile_id = params->shaper_profile_id.tc[2],\n-\t\t\t.shared_shaper_id = &params->shared_shaper_id.tc[2],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[2],\n \t\t\t.n_shared_shapers =\n \t\t\t\t(&params->shared_shaper_id.tc_valid[2]) ? 1 : 0,\n \t\t\t.nonleaf = {\n@@ -650,13 +663,63 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \n \t\t[3] = {\n \t\t\t.shaper_profile_id = params->shaper_profile_id.tc[3],\n-\t\t\t.shared_shaper_id = &params->shared_shaper_id.tc[3],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[3],\n \t\t\t.n_shared_shapers =\n \t\t\t\t(&params->shared_shaper_id.tc_valid[3]) ? 1 : 0,\n \t\t\t.nonleaf = {\n \t\t\t\t.n_sp_priorities = 1,\n \t\t\t},\n \t\t},\n+\n+\t\t[4] = {\n+\t\t\t.shaper_profile_id = params->shaper_profile_id.tc[4],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[4],\n+\t\t\t.n_shared_shapers =\n+\t\t\t\t(&params->shared_shaper_id.tc_valid[4]) ? 1 : 0,\n+\t\t\t.nonleaf = {\n+\t\t\t\t.n_sp_priorities = 1,\n+\t\t\t},\n+\t\t},\n+\n+\t\t[5] = {\n+\t\t\t.shaper_profile_id = params->shaper_profile_id.tc[5],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[5],\n+\t\t\t.n_shared_shapers =\n+\t\t\t\t(&params->shared_shaper_id.tc_valid[5]) ? 1 : 0,\n+\t\t\t.nonleaf = {\n+\t\t\t\t.n_sp_priorities = 1,\n+\t\t\t},\n+\t\t},\n+\n+\t\t[6] = {\n+\t\t\t.shaper_profile_id = params->shaper_profile_id.tc[6],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[6],\n+\t\t\t.n_shared_shapers =\n+\t\t\t\t(&params->shared_shaper_id.tc_valid[6]) ? 1 : 0,\n+\t\t\t.nonleaf = {\n+\t\t\t\t.n_sp_priorities = 1,\n+\t\t\t},\n+\t\t},\n+\n+\t\t[7] = {\n+\t\t\t.shaper_profile_id = params->shaper_profile_id.tc[7],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[7],\n+\t\t\t.n_shared_shapers =\n+\t\t\t\t(&params->shared_shaper_id.tc_valid[7]) ? 1 : 0,\n+\t\t\t.nonleaf = {\n+\t\t\t\t.n_sp_priorities = 1,\n+\t\t\t},\n+\t\t},\n+\n+\t\t[8] = {\n+\t\t\t.shaper_profile_id = params->shaper_profile_id.tc[8],\n+\t\t\t.shared_shaper_id = &shared_shaper_id[8],\n+\t\t\t.n_shared_shapers =\n+\t\t\t\t(&params->shared_shaper_id.tc_valid[8]) ? 1 : 0,\n+\t\t\t.nonleaf = {\n+\t\t\t\t.n_sp_priorities = 1,\n+\t\t\t},\n+\t\t},\n \t};\n \n \tstruct rte_tm_node_params queue_node_params = {\n@@ -730,7 +793,21 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\t\t\t\treturn -1;\n \n \t\t\t\t/* Hierarchy level 4: Queue nodes */\n-\t\t\t\tfor (q = 0; q < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; q++) {\n+\t\t\t\tif (t == RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) { /*BE Traffic Class*/\n+\t\t\t\t\tfor (q = 0; q < RTE_SCHED_BE_QUEUES_PER_PIPE; q++) {\n+\t\t\t\t\t\tstatus = rte_tm_node_add(port_id,\n+\t\t\t\t\t\t\tqueue_node_id(n_spp, n_pps, s, p, t, q),\n+\t\t\t\t\t\t\ttc_node_id(n_spp, n_pps, s, p, t),\n+\t\t\t\t\t\t\t0,\n+\t\t\t\t\t\t\tparams->weight.queue[q],\n+\t\t\t\t\t\t\tRTE_TM_NODE_LEVEL_ID_ANY,\n+\t\t\t\t\t\t\t&queue_node_params,\n+\t\t\t\t\t\t\t&error);\n+\t\t\t\t\t\tif (status)\n+\t\t\t\t\t\t\treturn -1;\n+\t\t\t\t\t} /* Queues (BE Traffic Class) */\n+\t\t\t\t} else { /* SP Traffic Class */\n+\t\t\t\t\tq = 0;\n \t\t\t\t\tstatus = rte_tm_node_add(port_id,\n \t\t\t\t\t\tqueue_node_id(n_spp, n_pps, s, p, t, q),\n \t\t\t\t\t\ttc_node_id(n_spp, n_pps, s, p, t),\n@@ -741,7 +818,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\t\t\t\t\t&error);\n \t\t\t\t\tif (status)\n \t\t\t\t\t\treturn -1;\n-\t\t\t\t} /* Queue */\n+\t\t\t\t} /* Queue (SP Traffic Class) */\n \t\t\t} /* TC */\n \t\t} /* Pipe */\n \t} /* Subport */\n@@ -762,13 +839,23 @@ tmgr_hierarchy_default(struct pmd_internals *softnic,\n  *   tc1 <profile_id>\n  *   tc2 <profile_id>\n  *   tc3 <profile_id>\n+ *   tc4 <profile_id>\n+ *   tc5 <profile_id>\n+ *   tc6 <profile_id>\n+ *   tc7 <profile_id>\n+ *   tc8 <profile_id>\n  *  shared shaper\n  *   tc0 <id | none>\n  *   tc1 <id | none>\n  *   tc2 <id | none>\n  *   tc3 <id | none>\n+ *   tc4 <id | none>\n+ *   tc5 <id | none>\n+ *   tc6 <id | none>\n+ *   tc7 <id | none>\n+ *   tc8 <id | none>\n  *  weight\n- *   queue  <q0> ... <q15>\n+ *   queue  <q8> ... <q15>\n  */\n static void\n cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n@@ -778,11 +865,11 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \tsize_t out_size)\n {\n \tstruct tmgr_hierarchy_default_params p;\n-\tint i, status;\n+\tint i, j, status;\n \n \tmemset(&p, 0, sizeof(p));\n \n-\tif (n_tokens != 50) {\n+\tif (n_tokens != 62) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n \t}\n@@ -894,27 +981,77 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\treturn;\n \t}\n \n+\tif (strcmp(tokens[22], \"tc4\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc4\");\n+\t\treturn;\n+\t}\n+\n+\tif (softnic_parser_read_uint32(&p.shaper_profile_id.tc[4], tokens[23]) != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"tc4 profile id\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[24], \"tc5\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc5\");\n+\t\treturn;\n+\t}\n+\n+\tif (softnic_parser_read_uint32(&p.shaper_profile_id.tc[5], tokens[25]) != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"tc5 profile id\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[26], \"tc6\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc6\");\n+\t\treturn;\n+\t}\n+\n+\tif (softnic_parser_read_uint32(&p.shaper_profile_id.tc[6], tokens[27]) != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"tc6 profile id\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[28], \"tc7\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc7\");\n+\t\treturn;\n+\t}\n+\n+\tif (softnic_parser_read_uint32(&p.shaper_profile_id.tc[7], tokens[29]) != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"tc7 profile id\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[30], \"tc8\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc8\");\n+\t\treturn;\n+\t}\n+\n+\tif (softnic_parser_read_uint32(&p.shaper_profile_id.tc[8], tokens[31]) != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"tc8 profile id\");\n+\t\treturn;\n+\t}\n+\n \t/* Shared shaper */\n \n-\tif (strcmp(tokens[22], \"shared\") != 0) {\n+\tif (strcmp(tokens[32], \"shared\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"shared\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[23], \"shaper\") != 0) {\n+\tif (strcmp(tokens[33], \"shaper\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"shaper\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[24], \"tc0\") != 0) {\n+\tif (strcmp(tokens[34], \"tc0\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc0\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[25], \"none\") == 0)\n+\tif (strcmp(tokens[35], \"none\") == 0)\n \t\tp.shared_shaper_id.tc_valid[0] = 0;\n \telse {\n-\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[0], tokens[25]) != 0) {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[0], tokens[35]) != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc0\");\n \t\t\treturn;\n \t\t}\n@@ -922,15 +1059,15 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\tp.shared_shaper_id.tc_valid[0] = 1;\n \t}\n \n-\tif (strcmp(tokens[26], \"tc1\") != 0) {\n+\tif (strcmp(tokens[36], \"tc1\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc1\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[27], \"none\") == 0)\n+\tif (strcmp(tokens[37], \"none\") == 0)\n \t\tp.shared_shaper_id.tc_valid[1] = 0;\n \telse {\n-\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[1], tokens[27]) != 0) {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[1], tokens[37]) != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc1\");\n \t\t\treturn;\n \t\t}\n@@ -938,15 +1075,15 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\tp.shared_shaper_id.tc_valid[1] = 1;\n \t}\n \n-\tif (strcmp(tokens[28], \"tc2\") != 0) {\n+\tif (strcmp(tokens[38], \"tc2\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc2\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[29], \"none\") == 0)\n+\tif (strcmp(tokens[39], \"none\") == 0)\n \t\tp.shared_shaper_id.tc_valid[2] = 0;\n \telse {\n-\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[2], tokens[29]) != 0) {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[2], tokens[39]) != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc2\");\n \t\t\treturn;\n \t\t}\n@@ -954,15 +1091,15 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\tp.shared_shaper_id.tc_valid[2] = 1;\n \t}\n \n-\tif (strcmp(tokens[30], \"tc3\") != 0) {\n+\tif (strcmp(tokens[40], \"tc3\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc3\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[31], \"none\") == 0)\n+\tif (strcmp(tokens[41], \"none\") == 0)\n \t\tp.shared_shaper_id.tc_valid[3] = 0;\n \telse {\n-\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[3], tokens[31]) != 0) {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[3], tokens[41]) != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc3\");\n \t\t\treturn;\n \t\t}\n@@ -970,22 +1107,107 @@ cmd_tmgr_hierarchy_default(struct pmd_internals *softnic,\n \t\tp.shared_shaper_id.tc_valid[3] = 1;\n \t}\n \n+\tif (strcmp(tokens[42], \"tc4\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc4\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[43], \"none\") == 0)\n+\t\tp.shared_shaper_id.tc_valid[4] = 0;\n+\telse {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[4], tokens[43]) != 0) {\n+\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc4\");\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tp.shared_shaper_id.tc_valid[4] = 1;\n+\t}\n+\n+\tif (strcmp(tokens[44], \"tc5\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc5\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[45], \"none\") == 0)\n+\t\tp.shared_shaper_id.tc_valid[5] = 0;\n+\telse {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[5], tokens[45]) != 0) {\n+\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc5\");\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tp.shared_shaper_id.tc_valid[5] = 1;\n+\t}\n+\n+\tif (strcmp(tokens[46], \"tc6\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc3\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[47], \"none\") == 0)\n+\t\tp.shared_shaper_id.tc_valid[6] = 0;\n+\telse {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[6], tokens[47]) != 0) {\n+\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc6\");\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tp.shared_shaper_id.tc_valid[6] = 1;\n+\t}\n+\n+\tif (strcmp(tokens[48], \"tc7\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc7\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[49], \"none\") == 0)\n+\t\tp.shared_shaper_id.tc_valid[7] = 0;\n+\telse {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[7], tokens[49]) != 0) {\n+\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc7\");\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tp.shared_shaper_id.tc_valid[7] = 1;\n+\t}\n+\n+\tif (strcmp(tokens[50], \"tc8\") != 0) {\n+\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"tc8\");\n+\t\treturn;\n+\t}\n+\n+\tif (strcmp(tokens[51], \"none\") == 0)\n+\t\tp.shared_shaper_id.tc_valid[8] = 0;\n+\telse {\n+\t\tif (softnic_parser_read_uint32(&p.shared_shaper_id.tc[8], tokens[51]) != 0) {\n+\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"shared shaper tc8\");\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tp.shared_shaper_id.tc_valid[8] = 1;\n+\t}\n+\n \t/* Weight */\n \n-\tif (strcmp(tokens[32], \"weight\") != 0) {\n+\tif (strcmp(tokens[52], \"weight\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"weight\");\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[33], \"queue\") != 0) {\n+\tif (strcmp(tokens[53], \"queue\") != 0) {\n \t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"queue\");\n \t\treturn;\n \t}\n \n-\tfor (i = 0; i < 16; i++) {\n-\t\tif (softnic_parser_read_uint32(&p.weight.queue[i], tokens[34 + i]) != 0) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"weight queue\");\n-\t\t\treturn;\n+\tfor (i = 0, j = 0; i < 16; i++) {\n+\t\tif (i < RTE_SCHED_BE_QUEUES_PER_PIPE) {\n+\t\t\tp.weight.queue[i] = 1;\n+\t\t} else {\n+\t\t\tif (softnic_parser_read_uint32(&p.weight.queue[i], tokens[54 + j]) != 0) {\n+\t\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"weight queue\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t\tj++;\n \t\t}\n \t}\n \ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex 415434d0d..5525dff98 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -43,7 +43,7 @@ struct pmd_params {\n \t/** Traffic Management (TM) */\n \tstruct {\n \t\tuint32_t n_queues; /**< Number of queues */\n-\t\tuint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\t\tuint16_t qsize[RTE_SCHED_QUEUES_PER_PIPE];\n \t} tm;\n };\n \n@@ -161,13 +161,15 @@ TAILQ_HEAD(softnic_link_list, softnic_link);\n #define TM_MAX_PIPES_PER_SUBPORT\t\t\t4096\n #endif\n \n+#ifndef TM_MAX_PIPE_PROFILE\n+#define TM_MAX_PIPE_PROFILE\t\t\t\t256\n+#endif\n struct tm_params {\n \tstruct rte_sched_port_params port_params;\n \n \tstruct rte_sched_subport_params subport_params[TM_MAX_SUBPORTS];\n \n-\tstruct rte_sched_pipe_params\n-\t\tpipe_profiles[RTE_SCHED_PIPE_PROFILES_PER_PORT];\n+\tstruct rte_sched_pipe_params pipe_profiles[TM_MAX_PIPE_PROFILE];\n \tuint32_t n_pipe_profiles;\n \tuint32_t pipe_to_profile[TM_MAX_SUBPORTS * TM_MAX_PIPES_PER_SUBPORT];\n };\ndiff --git a/drivers/net/softnic/rte_eth_softnic_tm.c b/drivers/net/softnic/rte_eth_softnic_tm.c\nindex 58744a9eb..6ba993147 100644\n--- a/drivers/net/softnic/rte_eth_softnic_tm.c\n+++ b/drivers/net/softnic/rte_eth_softnic_tm.c\n@@ -85,7 +85,8 @@ softnic_tmgr_port_create(struct pmd_internals *p,\n \t/* Subport */\n \tn_subports = t->port_params.n_subports_per_port;\n \tfor (subport_id = 0; subport_id < n_subports; subport_id++) {\n-\t\tuint32_t n_pipes_per_subport = t->port_params.n_pipes_per_subport;\n+\t\tuint32_t n_pipes_per_subport =\n+\t\t\tt->subport_params[subport_id].n_subport_pipes;\n \t\tuint32_t pipe_id;\n \t\tint status;\n \n@@ -367,7 +368,8 @@ tm_level_get_max_nodes(struct rte_eth_dev *dev, enum tm_node_level level)\n {\n \tstruct pmd_internals *p = dev->data->dev_private;\n \tuint32_t n_queues_max = p->params.tm.n_queues;\n-\tuint32_t n_tc_max = n_queues_max / RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS;\n+\tuint32_t n_tc_max =\n+\t\t(n_queues_max * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE) / RTE_SCHED_QUEUES_PER_PIPE;\n \tuint32_t n_pipes_max = n_tc_max / RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE;\n \tuint32_t n_subports_max = n_pipes_max;\n \tuint32_t n_root_max = 1;\n@@ -625,10 +627,10 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {\n \t\t\t.shaper_shared_n_max = 1,\n \n \t\t\t.sched_n_children_max =\n-\t\t\t\tRTE_SCHED_QUEUES_PER_TRAFFIC_CLASS,\n+\t\t\t\tRTE_SCHED_BE_QUEUES_PER_PIPE,\n \t\t\t.sched_sp_n_priorities_max = 1,\n \t\t\t.sched_wfq_n_children_per_group_max =\n-\t\t\t\tRTE_SCHED_QUEUES_PER_TRAFFIC_CLASS,\n+\t\t\t\tRTE_SCHED_BE_QUEUES_PER_PIPE,\n \t\t\t.sched_wfq_n_groups_max = 1,\n \t\t\t.sched_wfq_weight_max = UINT32_MAX,\n \n@@ -793,10 +795,10 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {\n \n \t\t{.nonleaf = {\n \t\t\t.sched_n_children_max =\n-\t\t\t\tRTE_SCHED_QUEUES_PER_TRAFFIC_CLASS,\n+\t\t\t\tRTE_SCHED_BE_QUEUES_PER_PIPE,\n \t\t\t.sched_sp_n_priorities_max = 1,\n \t\t\t.sched_wfq_n_children_per_group_max =\n-\t\t\t\tRTE_SCHED_QUEUES_PER_TRAFFIC_CLASS,\n+\t\t\t\tRTE_SCHED_BE_QUEUES_PER_PIPE,\n \t\t\t.sched_wfq_n_groups_max = 1,\n \t\t\t.sched_wfq_weight_max = UINT32_MAX,\n \t\t} },\n@@ -2043,15 +2045,13 @@ pipe_profile_build(struct rte_eth_dev *dev,\n \n \t\t/* Queue */\n \t\tTAILQ_FOREACH(nq, nl, node) {\n-\t\t\tuint32_t pipe_queue_id;\n \n \t\t\tif (nq->level != TM_NODE_LEVEL_QUEUE ||\n \t\t\t\tnq->parent_node_id != nt->node_id)\n \t\t\t\tcontinue;\n \n-\t\t\tpipe_queue_id = nt->priority *\n-\t\t\t\tRTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue_id;\n-\t\t\tpp->wrr_weights[pipe_queue_id] = nq->weight;\n+\t\t\tif (nt->priority == RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)\n+\t\t\t\tpp->wrr_weights[queue_id] = nq->weight;\n \n \t\t\tqueue_id++;\n \t\t}\n@@ -2065,7 +2065,7 @@ pipe_profile_free_exists(struct rte_eth_dev *dev,\n \tstruct pmd_internals *p = dev->data->dev_private;\n \tstruct tm_params *t = &p->soft.tm.params;\n \n-\tif (t->n_pipe_profiles < RTE_SCHED_PIPE_PROFILES_PER_PORT) {\n+\tif (t->n_pipe_profiles < TM_MAX_PIPE_PROFILE) {\n \t\t*pipe_profile_id = t->n_pipe_profiles;\n \t\treturn 1;\n \t}\n@@ -2213,10 +2213,11 @@ tm_tc_wred_profile_get(struct rte_eth_dev *dev, uint32_t tc_id)\n #ifdef RTE_SCHED_RED\n \n static void\n-wred_profiles_set(struct rte_eth_dev *dev)\n+wred_profiles_set(struct rte_eth_dev *dev, uint32_t subport_id)\n {\n \tstruct pmd_internals *p = dev->data->dev_private;\n-\tstruct rte_sched_port_params *pp = &p->soft.tm.params.port_params;\n+\tstruct rte_sched_subport_params *pp =\n+\t\t&p->soft.tm.params.subport_params[subport_id];\n \tuint32_t tc_id;\n \tenum rte_color color;\n \n@@ -2235,7 +2236,7 @@ wred_profiles_set(struct rte_eth_dev *dev)\n \n #else\n \n-#define wred_profiles_set(dev)\n+#define wred_profiles_set(dev, subport_id)\n \n #endif\n \n@@ -2332,7 +2333,7 @@ hierarchy_commit_check(struct rte_eth_dev *dev, struct rte_tm_error *error)\n \t\t\t\trte_strerror(EINVAL));\n \t}\n \n-\t/* Each pipe has exactly 4 TCs, with exactly one TC for each priority */\n+\t/* Each pipe has exactly 9 TCs, with exactly one TC for each priority */\n \tTAILQ_FOREACH(np, nl, node) {\n \t\tuint32_t mask = 0, mask_expected =\n \t\t\tRTE_LEN2MASK(RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE,\n@@ -2369,7 +2370,7 @@ hierarchy_commit_check(struct rte_eth_dev *dev, struct rte_tm_error *error)\n \t\tif (nt->level != TM_NODE_LEVEL_TC)\n \t\t\tcontinue;\n \n-\t\tif (nt->n_children != RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)\n+\t\tif (nt->n_children != 1 && nt->n_children != RTE_SCHED_BE_QUEUES_PER_PIPE)\n \t\t\treturn -rte_tm_error_set(error,\n \t\t\t\tEINVAL,\n \t\t\t\tRTE_TM_ERROR_TYPE_UNSPECIFIED,\n@@ -2525,19 +2526,8 @@ hierarchy_blueprints_create(struct rte_eth_dev *dev)\n \t\t.frame_overhead =\n \t\t\troot->shaper_profile->params.pkt_length_adjust,\n \t\t.n_subports_per_port = root->n_children,\n-\t\t.n_pipes_per_subport = h->n_tm_nodes[TM_NODE_LEVEL_PIPE] /\n-\t\t\th->n_tm_nodes[TM_NODE_LEVEL_SUBPORT],\n-\t\t.qsize = {p->params.tm.qsize[0],\n-\t\t\tp->params.tm.qsize[1],\n-\t\t\tp->params.tm.qsize[2],\n-\t\t\tp->params.tm.qsize[3],\n-\t\t},\n-\t\t.pipe_profiles = t->pipe_profiles,\n-\t\t.n_pipe_profiles = t->n_pipe_profiles,\n \t};\n \n-\twred_profiles_set(dev);\n-\n \tsubport_id = 0;\n \tTAILQ_FOREACH(n, nl, node) {\n \t\tuint64_t tc_rate[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n@@ -2566,10 +2556,41 @@ hierarchy_blueprints_create(struct rte_eth_dev *dev)\n \t\t\t\t\ttc_rate[1],\n \t\t\t\t\ttc_rate[2],\n \t\t\t\t\ttc_rate[3],\n-\t\t\t},\n-\t\t\t.tc_period = SUBPORT_TC_PERIOD,\n+\t\t\t\t\ttc_rate[4],\n+\t\t\t\t\ttc_rate[5],\n+\t\t\t\t\ttc_rate[6],\n+\t\t\t\t\ttc_rate[7],\n+\t\t\t\t\ttc_rate[8],\n+\t\t\t\t},\n+\t\t\t\t.tc_period = SUBPORT_TC_PERIOD,\n+\n+\t\t\t\t.n_subport_pipes = h->n_tm_nodes[TM_NODE_LEVEL_PIPE] /\n+\t\t\t\t\th->n_tm_nodes[TM_NODE_LEVEL_SUBPORT],\n+\n+\t\t\t\t.qsize = {p->params.tm.qsize[0],\n+\t\t\t\t\tp->params.tm.qsize[1],\n+\t\t\t\t\tp->params.tm.qsize[2],\n+\t\t\t\t\tp->params.tm.qsize[3],\n+\t\t\t\t\tp->params.tm.qsize[4],\n+\t\t\t\t\tp->params.tm.qsize[5],\n+\t\t\t\t\tp->params.tm.qsize[6],\n+\t\t\t\t\tp->params.tm.qsize[7],\n+\t\t\t\t\tp->params.tm.qsize[8],\n+\t\t\t\t\tp->params.tm.qsize[9],\n+\t\t\t\t\tp->params.tm.qsize[10],\n+\t\t\t\t\tp->params.tm.qsize[11],\n+\t\t\t\t\tp->params.tm.qsize[12],\n+\t\t\t\t\tp->params.tm.qsize[13],\n+\t\t\t\t\tp->params.tm.qsize[14],\n+\t\t\t\t\tp->params.tm.qsize[15],\n+\t\t\t\t},\n+\n+\t\t\t\t.pipe_profiles = t->pipe_profiles,\n+\t\t\t\t.n_pipe_profiles = t->n_pipe_profiles,\n+\t\t\t\t.n_max_pipe_profiles = TM_MAX_PIPE_PROFILE,\n \t\t};\n \n+\t\twred_profiles_set(dev, subport_id);\n \t\tsubport_id++;\n \t}\n }\n@@ -2666,7 +2687,7 @@ update_queue_weight(struct rte_eth_dev *dev,\n \tuint32_t subport_id = tm_node_subport_id(dev, ns);\n \n \tuint32_t pipe_queue_id =\n-\t\ttc_id * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue_id;\n+\t\ttc_id * RTE_SCHED_QUEUES_PER_PIPE + queue_id;\n \n \tstruct rte_sched_pipe_params *profile0 = pipe_profile_get(dev, np);\n \tstruct rte_sched_pipe_params profile1;\n@@ -3023,7 +3044,7 @@ tm_port_queue_id(struct rte_eth_dev *dev,\n \tuint32_t port_tc_id =\n \t\tport_pipe_id * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + pipe_tc_id;\n \tuint32_t port_queue_id =\n-\t\tport_tc_id * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + tc_queue_id;\n+\t\tport_tc_id * RTE_SCHED_QUEUES_PER_PIPE + tc_queue_id;\n \n \treturn port_queue_id;\n }\n@@ -3149,8 +3170,8 @@ read_pipe_stats(struct rte_eth_dev *dev,\n \t\tuint32_t qid = tm_port_queue_id(dev,\n \t\t\tsubport_id,\n \t\t\tpipe_id,\n-\t\t\ti / RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS,\n-\t\t\ti % RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS);\n+\t\t\ti / RTE_SCHED_QUEUES_PER_PIPE,\n+\t\t\ti % RTE_SCHED_QUEUES_PER_PIPE);\n \n \t\tint status = rte_sched_queue_read_stats(SCHED(p),\n \t\t\tqid,\n@@ -3202,7 +3223,7 @@ read_tc_stats(struct rte_eth_dev *dev,\n \tuint32_t i;\n \n \t/* Stats read */\n-\tfor (i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {\n+\tfor (i = 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++) {\n \t\tstruct rte_sched_queue_stats s;\n \t\tuint16_t qlen;\n \n",
    "prefixes": [
        "v2",
        "24/28"
    ]
}