Patch Detail

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

{
    "id": 80160,
    "url": "http://patchwork.dpdk.org/api/patches/80160/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20201009123919.43004-4-savinay.dharmappa@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.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": "<20201009123919.43004-4-savinay.dharmappa@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20201009123919.43004-4-savinay.dharmappa@intel.com",
    "date": "2020-10-09T12:39:14",
    "name": "[v9,3/8] sched: update subport rate dynamically",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "6ac4a60e39f6037a205dbcf6e008ef773b69c8bb",
    "submitter": {
        "id": 1535,
        "url": "http://patchwork.dpdk.org/api/people/1535/?format=api",
        "name": "Savinay Dharmappa",
        "email": "savinay.dharmappa@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20201009123919.43004-4-savinay.dharmappa@intel.com/mbox/",
    "series": [
        {
            "id": 12825,
            "url": "http://patchwork.dpdk.org/api/series/12825/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=12825",
            "date": "2020-10-09T12:39:11",
            "name": "Enable dynamic config of subport bandwidth",
            "version": 9,
            "mbox": "http://patchwork.dpdk.org/series/12825/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/80160/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/80160/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 525D9A04BC;\n\tFri,  9 Oct 2020 14:40:43 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 13E5A1D62C;\n\tFri,  9 Oct 2020 14:39:41 +0200 (CEST)",
            "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by dpdk.org (Postfix) with ESMTP id 3ACDE1D616\n for <dev@dpdk.org>; Fri,  9 Oct 2020 14:39:35 +0200 (CEST)",
            "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Oct 2020 05:39:34 -0700",
            "from silpixa00400629.ir.intel.com ([10.237.214.112])\n by orsmga005.jf.intel.com with ESMTP; 09 Oct 2020 05:39:33 -0700"
        ],
        "IronPort-SDR": [
            "\n dKX+AhPpchdRlIumrD105irEr+PKW00AgFP4ky9gcuxdgtJqtGRSs2ezf+1MQWzIS4jiV43RWE\n YNxA9nVtBurw==",
            "\n DZHV16p3b9K882TMgfrOAWWBU1ACXAN8lxr/1SmS97jlh4Qcnuf45nKYzXyCrs8SRIT5SfpFPI\n meRVb+Ixfrcw=="
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9768\"; a=\"152397579\"",
            "E=Sophos;i=\"5.77,355,1596524400\"; d=\"scan'208\";a=\"152397579\"",
            "E=Sophos;i=\"5.77,355,1596524400\"; d=\"scan'208\";a=\"528914514\""
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "From": "Savinay Dharmappa <savinay.dharmappa@intel.com>",
        "To": "cristian.dumitrescu@intel.com,\n\tjasvinder.singh@intel.com,\n\tdev@dpdk.org",
        "Cc": "savinay.dharmappa@intel.com",
        "Date": "Fri,  9 Oct 2020 13:39:14 +0100",
        "Message-Id": "<20201009123919.43004-4-savinay.dharmappa@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20201009123919.43004-1-savinay.dharmappa@intel.com>",
        "References": "<20201007140915.19491-1-savinay.dharmappa@intel.com>\n <20201009123919.43004-1-savinay.dharmappa@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v9 3/8] sched: update subport rate dynamically",
        "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": "Add support to update subport rate dynamically.\n\nSigned-off-by: Savinay Dharmappa <savinay.dharmappa@intel.com>\n---\n app/test/test_sched.c                    |   2 +-\n doc/guides/rel_notes/deprecation.rst     |   6 -\n doc/guides/rel_notes/release_20_11.rst   |   9 +\n drivers/net/softnic/rte_eth_softnic_tm.c |   6 +-\n examples/ip_pipeline/tmgr.c              |   6 +-\n examples/qos_sched/init.c                |   3 +-\n lib/librte_sched/rte_sched.c             | 415 ++++++++++-------------\n lib/librte_sched/rte_sched.h             |  13 +-\n 8 files changed, 213 insertions(+), 247 deletions(-)",
    "diff": "diff --git a/app/test/test_sched.c b/app/test/test_sched.c\nindex fc31080ef..5e5c2a59b 100644\n--- a/app/test/test_sched.c\n+++ b/app/test/test_sched.c\n@@ -138,7 +138,7 @@ test_sched(void)\n \tport = rte_sched_port_config(&port_param);\n \tTEST_ASSERT_NOT_NULL(port, \"Error config sched port\\n\");\n \n-\terr = rte_sched_subport_config(port, SUBPORT, subport_param);\n+\terr = rte_sched_subport_config(port, SUBPORT, subport_param, 0);\n \tTEST_ASSERT_SUCCESS(err, \"Error config sched, err=%d\\n\", err);\n \n \tfor (pipe = 0; pipe < subport_param[0].n_pipes_per_subport_enabled; pipe++) {\ndiff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 584e72087..f7363a585 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -212,12 +212,6 @@ Deprecation Notices\n   in \"rte_sched.h\". These changes are aligned to improvements suggested in the\n   RFC https://mails.dpdk.org/archives/dev/2018-November/120035.html.\n \n-* sched: To allow dynamic configuration of the subport bandwidth profile,\n-  changes will be made to data structures ``rte_sched_subport_params``,\n-  ``rte_sched_port_params`` and new data structure, API functions will be\n-  defined in ``rte_sched.h``. These changes are aligned as suggested in the\n-  RFC https://mails.dpdk.org/archives/dev/2020-July/175161.html\n-\n * metrics: The function ``rte_metrics_init`` will have a non-void return\n   in order to notify errors instead of calling ``rte_exit``.\n \ndiff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst\nindex 6968c27f6..85d56d46c 100644\n--- a/doc/guides/rel_notes/release_20_11.rst\n+++ b/doc/guides/rel_notes/release_20_11.rst\n@@ -136,6 +136,12 @@ New Features\n   * Extern objects and functions can be plugged into the pipeline.\n   * Transaction-oriented table updates.\n \n+* **Added support to update subport bandwidth dynamically.**\n+\n+   * Added new API ``rte_sched_port_subport_profile_add`` to add new\n+     subport bandwidth profile to subport porfile table at runtime.\n+\n+   * Added support to update subport rate dynamically.\n \n Removed Items\n -------------\n@@ -287,6 +293,9 @@ ABI Changes\n \n   * Added new fields to ``struct rte_sched_subport_port_params``.\n \n+  * Added ``subport_profile_id`` as a argument to function\n+    ``rte_sched_subport_config``.\n+\n Known Issues\n ------------\n \ndiff --git a/drivers/net/softnic/rte_eth_softnic_tm.c b/drivers/net/softnic/rte_eth_softnic_tm.c\nindex d30976378..5199dd2cd 100644\n--- a/drivers/net/softnic/rte_eth_softnic_tm.c\n+++ b/drivers/net/softnic/rte_eth_softnic_tm.c\n@@ -92,7 +92,7 @@ softnic_tmgr_port_create(struct pmd_internals *p,\n \n \t\tstatus = rte_sched_subport_config(sched,\n \t\t\tsubport_id,\n-\t\t\t&t->subport_params[subport_id]);\n+\t\t\t&t->subport_params[subport_id], 0);\n \t\tif (status) {\n \t\t\trte_sched_port_free(sched);\n \t\t\treturn NULL;\n@@ -1141,7 +1141,7 @@ update_subport_tc_rate(struct rte_eth_dev *dev,\n \n \t/* Update the subport configuration. */\n \tif (rte_sched_subport_config(SCHED(p),\n-\t\tsubport_id, &subport_params))\n+\t\tsubport_id, &subport_params, 0))\n \t\treturn -1;\n \n \t/* Commit changes. */\n@@ -2912,7 +2912,7 @@ update_subport_rate(struct rte_eth_dev *dev,\n \n \t/* Update the subport configuration. */\n \tif (rte_sched_subport_config(SCHED(p), subport_id,\n-\t\t&subport_params))\n+\t\t&subport_params, 0))\n \t\treturn -1;\n \n \t/* Commit changes. */\ndiff --git a/examples/ip_pipeline/tmgr.c b/examples/ip_pipeline/tmgr.c\nindex 91ccbf60f..46c6a83a4 100644\n--- a/examples/ip_pipeline/tmgr.c\n+++ b/examples/ip_pipeline/tmgr.c\n@@ -119,7 +119,8 @@ tmgr_port_create(const char *name, struct tmgr_port_params *params)\n \t\tstatus = rte_sched_subport_config(\n \t\t\ts,\n \t\t\ti,\n-\t\t\t&subport_profile[0]);\n+\t\t\t&subport_profile[0],\n+\t\t\t0);\n \n \t\tif (status) {\n \t\t\trte_sched_port_free(s);\n@@ -180,7 +181,8 @@ tmgr_subport_config(const char *port_name,\n \tstatus = rte_sched_subport_config(\n \t\tport->s,\n \t\tsubport_id,\n-\t\t&subport_profile[subport_profile_id]);\n+\t\t&subport_profile[subport_profile_id],\n+\t\t0);\n \n \treturn status;\n }\ndiff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c\nindex 06328ddb2..b188c624b 100644\n--- a/examples/qos_sched/init.c\n+++ b/examples/qos_sched/init.c\n@@ -314,7 +314,8 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)\n \t}\n \n \tfor (subport = 0; subport < port_params.n_subports_per_port; subport ++) {\n-\t\terr = rte_sched_subport_config(port, subport, &subport_params[subport]);\n+\t\terr = rte_sched_subport_config(port, subport,\n+\t\t\t\t&subport_params[subport], 0);\n \t\tif (err) {\n \t\t\trte_exit(EXIT_FAILURE, \"Unable to config sched subport %u, err=%d\\n\",\n \t\t\t\t\tsubport, err);\ndiff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex 895b40d72..7c5688068 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -123,6 +123,7 @@ struct rte_sched_grinder {\n \tuint32_t productive;\n \tuint32_t pindex;\n \tstruct rte_sched_subport *subport;\n+\tstruct rte_sched_subport_profile *subport_params;\n \tstruct rte_sched_pipe *pipe;\n \tstruct rte_sched_pipe_profile *pipe_params;\n \n@@ -151,16 +152,11 @@ struct rte_sched_grinder {\n struct rte_sched_subport {\n \t/* Token bucket (TB) */\n \tuint64_t tb_time; /* time of last update */\n-\tuint64_t tb_period;\n-\tuint64_t tb_credits_per_period;\n-\tuint64_t tb_size;\n \tuint64_t tb_credits;\n \n \t/* Traffic classes (TCs) */\n \tuint64_t tc_time; /* time of next update */\n-\tuint64_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n \tuint64_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n-\tuint64_t tc_period;\n \n \t/* TC oversubscription */\n \tuint64_t tc_ov_wm;\n@@ -174,6 +170,8 @@ struct rte_sched_subport {\n \t/* Statistics */\n \tstruct rte_sched_subport_stats stats __rte_cache_aligned;\n \n+\t/* subport profile */\n+\tuint32_t profile;\n \t/* Subport pipes */\n \tuint32_t n_pipes_per_subport_enabled;\n \tuint32_t n_pipe_profiles;\n@@ -834,18 +832,6 @@ rte_sched_subport_check_params(struct rte_sched_subport_params *params,\n \t\treturn -EINVAL;\n \t}\n \n-\tif (params->tb_rate == 0 || params->tb_rate > rate) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Incorrect value for tb rate\\n\", __func__);\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tif (params->tb_size == 0) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Incorrect value for tb size\\n\", __func__);\n-\t\treturn -EINVAL;\n-\t}\n-\n \t/* qsize: if non-zero, power of 2,\n \t * no bigger than 32K (due to 16-bit read/write pointers)\n \t */\n@@ -859,29 +845,8 @@ rte_sched_subport_check_params(struct rte_sched_subport_params *params,\n \t\t}\n \t}\n \n-\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {\n-\t\tuint64_t tc_rate = params->tc_rate[i];\n-\t\tuint16_t qsize = params->qsize[i];\n-\n-\t\tif ((qsize == 0 && tc_rate != 0) ||\n-\t\t\t(qsize != 0 && tc_rate == 0) ||\n-\t\t\t(tc_rate > params->tb_rate)) {\n-\t\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\t\"%s: Incorrect value for tc rate\\n\", __func__);\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\t}\n-\n-\tif (params->qsize[RTE_SCHED_TRAFFIC_CLASS_BE] == 0 ||\n-\t\tparams->tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE] == 0) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Incorrect qsize or tc rate(best effort)\\n\", __func__);\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tif (params->tc_period == 0) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Incorrect value for tc period\\n\", __func__);\n+\tif (params->qsize[RTE_SCHED_TRAFFIC_CLASS_BE] == 0) {\n+\t\tRTE_LOG(ERR, SCHED, \"%s: Incorrect qsize\\n\", __func__);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1098,48 +1063,6 @@ rte_sched_port_free(struct rte_sched_port *port)\n \trte_free(port);\n }\n \n-static void\n-rte_sched_port_log_subport_config(struct rte_sched_port *port, uint32_t i)\n-{\n-\tstruct rte_sched_subport *s = port->subports[i];\n-\n-\tRTE_LOG(DEBUG, SCHED, \"Low level config for subport %u:\\n\"\n-\t\t\"\tToken bucket: period = %\"PRIu64\", credits per period = %\"PRIu64\n-\t\t\", size = %\"PRIu64\"\\n\"\n-\t\t\"\tTraffic classes: period = %\"PRIu64\"\\n\"\n-\t\t\"\tcredits per period = [%\"PRIu64\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\n-\t\t\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\n-\t\t\", %\"PRIu64\", %\"PRIu64\", %\"PRIu64\"]\\n\"\n-\t\t\"\tBest effort traffic class oversubscription: wm min = %\"PRIu64\n-\t\t\", wm max = %\"PRIu64\"\\n\",\n-\t\ti,\n-\n-\t\t/* Token bucket */\n-\t\ts->tb_period,\n-\t\ts->tb_credits_per_period,\n-\t\ts->tb_size,\n-\n-\t\t/* Traffic classes */\n-\t\ts->tc_period,\n-\t\ts->tc_credits_per_period[0],\n-\t\ts->tc_credits_per_period[1],\n-\t\ts->tc_credits_per_period[2],\n-\t\ts->tc_credits_per_period[3],\n-\t\ts->tc_credits_per_period[4],\n-\t\ts->tc_credits_per_period[5],\n-\t\ts->tc_credits_per_period[6],\n-\t\ts->tc_credits_per_period[7],\n-\t\ts->tc_credits_per_period[8],\n-\t\ts->tc_credits_per_period[9],\n-\t\ts->tc_credits_per_period[10],\n-\t\ts->tc_credits_per_period[11],\n-\t\ts->tc_credits_per_period[12],\n-\n-\t\t/* Best effort traffic class oversubscription */\n-\t\ts->tc_ov_wm_min,\n-\t\ts->tc_ov_wm_max);\n-}\n-\n static void\n rte_sched_free_memory(struct rte_sched_port *port, uint32_t n_subports)\n {\n@@ -1158,10 +1081,12 @@ rte_sched_free_memory(struct rte_sched_port *port, uint32_t n_subports)\n int\n rte_sched_subport_config(struct rte_sched_port *port,\n \tuint32_t subport_id,\n-\tstruct rte_sched_subport_params *params)\n+\tstruct rte_sched_subport_params *params,\n+\tuint32_t subport_profile_id)\n {\n \tstruct rte_sched_subport *s = NULL;\n \tuint32_t n_subports = subport_id;\n+\tstruct rte_sched_subport_profile *profile;\n \tuint32_t n_subport_pipe_queues, i;\n \tuint32_t size0, size1, bmp_mem_size;\n \tint status;\n@@ -1181,165 +1106,183 @@ rte_sched_subport_config(struct rte_sched_port *port,\n \t\treturn -EINVAL;\n \t}\n \n-\tstatus = rte_sched_subport_check_params(params,\n-\t\tport->n_pipes_per_subport,\n-\t\tport->rate);\n-\tif (status != 0) {\n-\t\tRTE_LOG(NOTICE, SCHED,\n-\t\t\t\"%s: Port scheduler params check failed (%d)\\n\",\n-\t\t\t__func__, status);\n-\n+\tif (subport_profile_id >= port->n_max_subport_profiles) {\n+\t\tRTE_LOG(ERR, SCHED, \"%s: \"\n+\t\t\t\"Number of subport profile exceeds the max limit\\n\",\n+\t\t\t__func__);\n \t\trte_sched_free_memory(port, n_subports);\n \t\treturn -EINVAL;\n \t}\n \n-\t/* Determine the amount of memory to allocate */\n-\tsize0 = sizeof(struct rte_sched_subport);\n-\tsize1 = rte_sched_subport_get_array_base(params,\n-\t\t\t\te_RTE_SCHED_SUBPORT_ARRAY_TOTAL);\n+\t/** Memory is allocated only on first invocation of the api for a\n+\t * given subport. Subsequent invocation on same subport will just\n+\t * update subport bandwidth parameter.\n+\t **/\n+\tif (port->subports[subport_id] == NULL) {\n \n-\t/* Allocate memory to store the data structures */\n-\ts = rte_zmalloc_socket(\"subport_params\", size0 + size1,\n-\t\tRTE_CACHE_LINE_SIZE, port->socket);\n-\tif (s == NULL) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Memory allocation fails\\n\", __func__);\n+\t\tstatus = rte_sched_subport_check_params(params,\n+\t\t\tport->n_pipes_per_subport,\n+\t\t\tport->rate);\n+\t\tif (status != 0) {\n+\t\t\tRTE_LOG(NOTICE, SCHED,\n+\t\t\t\t\"%s: Port scheduler params check failed (%d)\\n\",\n+\t\t\t\t__func__, status);\n \n-\t\trte_sched_free_memory(port, n_subports);\n-\t\treturn -ENOMEM;\n-\t}\n+\t\t\trte_sched_free_memory(port, n_subports);\n+\t\t\treturn -EINVAL;\n+\t\t}\n \n-\tn_subports++;\n+\t\t/* Determine the amount of memory to allocate */\n+\t\tsize0 = sizeof(struct rte_sched_subport);\n+\t\tsize1 = rte_sched_subport_get_array_base(params,\n+\t\t\t\t\te_RTE_SCHED_SUBPORT_ARRAY_TOTAL);\n \n-\t/* Port */\n-\tport->subports[subport_id] = s;\n+\t\t/* Allocate memory to store the data structures */\n+\t\ts = rte_zmalloc_socket(\"subport_params\", size0 + size1,\n+\t\t\tRTE_CACHE_LINE_SIZE, port->socket);\n+\t\tif (s == NULL) {\n+\t\t\tRTE_LOG(ERR, SCHED,\n+\t\t\t\t\"%s: Memory allocation fails\\n\", __func__);\n \n-\t/* Token Bucket (TB) */\n-\tif (params->tb_rate == port->rate) {\n-\t\ts->tb_credits_per_period = 1;\n-\t\ts->tb_period = 1;\n-\t} else {\n-\t\tdouble tb_rate = ((double) params->tb_rate) / ((double) port->rate);\n-\t\tdouble d = RTE_SCHED_TB_RATE_CONFIG_ERR;\n+\t\t\trte_sched_free_memory(port, n_subports);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n \n-\t\trte_approx_64(tb_rate, d, &s->tb_credits_per_period, &s->tb_period);\n-\t}\n+\t\tn_subports++;\n \n-\ts->tb_size = params->tb_size;\n-\ts->tb_time = port->time;\n-\ts->tb_credits = s->tb_size / 2;\n+\t\tsubport_profile_id = 0;\n \n-\t/* Traffic Classes (TCs) */\n-\ts->tc_period = rte_sched_time_ms_to_bytes(params->tc_period, port->rate);\n-\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {\n-\t\tif (params->qsize[i])\n-\t\t\ts->tc_credits_per_period[i]\n-\t\t\t\t= rte_sched_time_ms_to_bytes(params->tc_period,\n-\t\t\t\t\tparams->tc_rate[i]);\n-\t}\n-\ts->tc_time = port->time + s->tc_period;\n-\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)\n-\t\tif (params->qsize[i])\n-\t\t\ts->tc_credits[i] = s->tc_credits_per_period[i];\n+\t\t/* Port */\n+\t\tport->subports[subport_id] = s;\n \n-\t/* compile time checks */\n-\tRTE_BUILD_BUG_ON(RTE_SCHED_PORT_N_GRINDERS == 0);\n-\tRTE_BUILD_BUG_ON(RTE_SCHED_PORT_N_GRINDERS &\n-\t\t(RTE_SCHED_PORT_N_GRINDERS - 1));\n+\t\ts->tb_time = port->time;\n \n-\t/* User parameters */\n-\ts->n_pipes_per_subport_enabled = params->n_pipes_per_subport_enabled;\n-\tmemcpy(s->qsize, params->qsize, sizeof(params->qsize));\n-\ts->n_pipe_profiles = params->n_pipe_profiles;\n-\ts->n_max_pipe_profiles = params->n_max_pipe_profiles;\n+\t\t/* compile time checks */\n+\t\tRTE_BUILD_BUG_ON(RTE_SCHED_PORT_N_GRINDERS == 0);\n+\t\tRTE_BUILD_BUG_ON(RTE_SCHED_PORT_N_GRINDERS &\n+\t\t\t(RTE_SCHED_PORT_N_GRINDERS - 1));\n+\n+\t\t/* User parameters */\n+\t\ts->n_pipes_per_subport_enabled =\n+\t\t\t\tparams->n_pipes_per_subport_enabled;\n+\t\tmemcpy(s->qsize, params->qsize, sizeof(params->qsize));\n+\t\ts->n_pipe_profiles = params->n_pipe_profiles;\n+\t\ts->n_max_pipe_profiles = params->n_max_pipe_profiles;\n \n #ifdef RTE_SCHED_RED\n-\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {\n-\t\tuint32_t j;\n+\t\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {\n+\t\t\tuint32_t j;\n \n-\t\tfor (j = 0; j < RTE_COLORS; j++) {\n+\t\t\tfor (j = 0; j < RTE_COLORS; j++) {\n \t\t\t/* if min/max are both zero, then RED is disabled */\n-\t\t\tif ((params->red_params[i][j].min_th |\n-\t\t\t     params->red_params[i][j].max_th) == 0) {\n-\t\t\t\tcontinue;\n+\t\t\t\tif ((params->red_params[i][j].min_th |\n+\t\t\t\t     params->red_params[i][j].max_th) == 0) {\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\n+\t\t\t\tif (rte_red_config_init(&s->red_config[i][j],\n+\t\t\t\t    params->red_params[i][j].wq_log2,\n+\t\t\t\t    params->red_params[i][j].min_th,\n+\t\t\t\t    params->red_params[i][j].max_th,\n+\t\t\t\t    params->red_params[i][j].maxp_inv) != 0) {\n+\t\t\t\t\trte_sched_free_memory(port, n_subports);\n+\n+\t\t\t\t\tRTE_LOG(NOTICE, SCHED,\n+\t\t\t\t\t\"%s: RED configuration init fails\\n\",\n+\t\t\t\t\t__func__);\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n \t\t\t}\n+\t\t}\n+#endif\n \n-\t\t\tif (rte_red_config_init(&s->red_config[i][j],\n-\t\t\t\tparams->red_params[i][j].wq_log2,\n-\t\t\t\tparams->red_params[i][j].min_th,\n-\t\t\t\tparams->red_params[i][j].max_th,\n-\t\t\t\tparams->red_params[i][j].maxp_inv) != 0) {\n-\t\t\t\trte_sched_free_memory(port, n_subports);\n+\t\t/* Scheduling loop detection */\n+\t\ts->pipe_loop = RTE_SCHED_PIPE_INVALID;\n+\t\ts->pipe_exhaustion = 0;\n+\n+\t\t/* Grinders */\n+\t\ts->busy_grinders = 0;\n+\n+\t\t/* Queue base calculation */\n+\t\trte_sched_subport_config_qsize(s);\n+\n+\t\t/* Large data structures */\n+\t\ts->pipe = (struct rte_sched_pipe *)\n+\t\t\t(s->memory + rte_sched_subport_get_array_base(params,\n+\t\t\te_RTE_SCHED_SUBPORT_ARRAY_PIPE));\n+\t\ts->queue = (struct rte_sched_queue *)\n+\t\t\t(s->memory + rte_sched_subport_get_array_base(params,\n+\t\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE));\n+\t\ts->queue_extra = (struct rte_sched_queue_extra *)\n+\t\t\t(s->memory + rte_sched_subport_get_array_base(params,\n+\t\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_EXTRA));\n+\t\ts->pipe_profiles = (struct rte_sched_pipe_profile *)\n+\t\t\t(s->memory + rte_sched_subport_get_array_base(params,\n+\t\t\te_RTE_SCHED_SUBPORT_ARRAY_PIPE_PROFILES));\n+\t\ts->bmp_array =  s->memory + rte_sched_subport_get_array_base(\n+\t\t\t\tparams, e_RTE_SCHED_SUBPORT_ARRAY_BMP_ARRAY);\n+\t\ts->queue_array = (struct rte_mbuf **)\n+\t\t\t(s->memory + rte_sched_subport_get_array_base(params,\n+\t\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_ARRAY));\n+\n+\t\t/* Pipe profile table */\n+\t\trte_sched_subport_config_pipe_profile_table(s, params,\n+\t\t\t\t\t\t\t    port->rate);\n+\n+\t\t/* Bitmap */\n+\t\tn_subport_pipe_queues = rte_sched_subport_pipe_queues(s);\n+\t\tbmp_mem_size = rte_bitmap_get_memory_footprint(\n+\t\t\t\t\t\tn_subport_pipe_queues);\n+\t\ts->bmp = rte_bitmap_init(n_subport_pipe_queues, s->bmp_array,\n+\t\t\t\t\tbmp_mem_size);\n+\t\tif (s->bmp == NULL) {\n+\t\t\tRTE_LOG(ERR, SCHED,\n+\t\t\t\t\"%s: Subport bitmap init error\\n\", __func__);\n \n-\t\t\t\tRTE_LOG(NOTICE, SCHED,\n-\t\t\t\t\"%s: RED configuration init fails\\n\", __func__);\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n+\t\t\trte_sched_free_memory(port, n_subports);\n+\t\t\treturn -EINVAL;\n \t\t}\n-\t}\n-#endif\n \n-\t/* Scheduling loop detection */\n-\ts->pipe_loop = RTE_SCHED_PIPE_INVALID;\n-\ts->pipe_exhaustion = 0;\n+\t\tfor (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i++)\n+\t\t\ts->grinder_base_bmp_pos[i] = RTE_SCHED_PIPE_INVALID;\n \n-\t/* Grinders */\n-\ts->busy_grinders = 0;\n+#ifdef RTE_SCHED_SUBPORT_TC_OV\n+\t\t/* TC oversubscription */\n+\t\ts->tc_ov_wm_min = port->mtu;\n+\t\ts->tc_ov_wm = s->tc_ov_wm_max;\n+\t\ts->tc_ov_period_id = 0;\n+\t\ts->tc_ov = 0;\n+\t\ts->tc_ov_n = 0;\n+\t\ts->tc_ov_rate = 0;\n+#endif\n+\t}\n \n-\t/* Queue base calculation */\n-\trte_sched_subport_config_qsize(s);\n+\t{\n+\t/* update subport parameters from subport profile table*/\n+\t\tprofile = port->subport_profiles + subport_profile_id;\n \n-\t/* Large data structures */\n-\ts->pipe = (struct rte_sched_pipe *)\n-\t\t(s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_PIPE));\n-\ts->queue = (struct rte_sched_queue *)\n-\t\t(s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE));\n-\ts->queue_extra = (struct rte_sched_queue_extra *)\n-\t\t(s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_EXTRA));\n-\ts->pipe_profiles = (struct rte_sched_pipe_profile *)\n-\t\t(s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_PIPE_PROFILES));\n-\ts->bmp_array =  s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_BMP_ARRAY);\n-\ts->queue_array = (struct rte_mbuf **)\n-\t\t(s->memory + rte_sched_subport_get_array_base(params,\n-\t\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_ARRAY));\n-\n-\t/* Pipe profile table */\n-\trte_sched_subport_config_pipe_profile_table(s, params, port->rate);\n+\t\ts = port->subports[subport_id];\n \n-\t/* Bitmap */\n-\tn_subport_pipe_queues = rte_sched_subport_pipe_queues(s);\n-\tbmp_mem_size = rte_bitmap_get_memory_footprint(n_subport_pipe_queues);\n-\ts->bmp = rte_bitmap_init(n_subport_pipe_queues, s->bmp_array,\n-\t\t\t\tbmp_mem_size);\n-\tif (s->bmp == NULL) {\n-\t\tRTE_LOG(ERR, SCHED,\n-\t\t\t\"%s: Subport bitmap init error\\n\", __func__);\n+\t\ts->tb_credits = profile->tb_size / 2;\n \n-\t\trte_sched_free_memory(port, n_subports);\n-\t\treturn -EINVAL;\n-\t}\n+\t\ts->tc_time = port->time + profile->tc_period;\n \n-\tfor (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i++)\n-\t\ts->grinder_base_bmp_pos[i] = RTE_SCHED_PIPE_INVALID;\n+\t\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)\n+\t\t\tif (s->qsize[i])\n+\t\t\t\ts->tc_credits[i] =\n+\t\t\t\t\tprofile->tc_credits_per_period[i];\n+\t\t\telse\n+\t\t\t\tprofile->tc_credits_per_period[i] = 0;\n \n #ifdef RTE_SCHED_SUBPORT_TC_OV\n-\t/* TC oversubscription */\n-\ts->tc_ov_wm_min = port->mtu;\n-\ts->tc_ov_wm_max = rte_sched_time_ms_to_bytes(params->tc_period,\n-\t\t\t\t\t\t     s->pipe_tc_be_rate_max);\n-\ts->tc_ov_wm = s->tc_ov_wm_max;\n-\ts->tc_ov_period_id = 0;\n-\ts->tc_ov = 0;\n-\ts->tc_ov_n = 0;\n-\ts->tc_ov_rate = 0;\n+\t\ts->tc_ov_wm_max = rte_sched_time_ms_to_bytes(profile->tc_period,\n+\t\t\t\t\t\t\ts->pipe_tc_be_rate_max);\n #endif\n+\t\ts->profile = subport_profile_id;\n \n-\trte_sched_port_log_subport_config(port, subport_id);\n+\t}\n+\n+\trte_sched_port_log_subport_profile(port, subport_profile_id);\n \n \treturn 0;\n }\n@@ -1351,6 +1294,7 @@ rte_sched_pipe_config(struct rte_sched_port *port,\n \tint32_t pipe_profile)\n {\n \tstruct rte_sched_subport *s;\n+\tstruct rte_sched_subport_profile *sp;\n \tstruct rte_sched_pipe *p;\n \tstruct rte_sched_pipe_profile *params;\n \tuint32_t n_subports = subport_id + 1;\n@@ -1391,14 +1335,15 @@ rte_sched_pipe_config(struct rte_sched_port *port,\n \t\treturn -EINVAL;\n \t}\n \n+\tsp = port->subport_profiles + s->profile;\n \t/* Handle the case when pipe already has a valid configuration */\n \tp = s->pipe + pipe_id;\n \tif (p->tb_time) {\n \t\tparams = s->pipe_profiles + p->profile;\n \n \t\tdouble subport_tc_be_rate =\n-\t\t\t(double) s->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n-\t\t\t/ (double) s->tc_period;\n+\t\t(double)sp->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n+\t\t\t/ (double) sp->tc_period;\n \t\tdouble pipe_tc_be_rate =\n \t\t\t(double) params->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n \t\t\t/ (double) params->tc_period;\n@@ -1440,8 +1385,8 @@ rte_sched_pipe_config(struct rte_sched_port *port,\n \t{\n \t\t/* Subport best effort tc oversubscription */\n \t\tdouble subport_tc_be_rate =\n-\t\t\t(double) s->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n-\t\t\t/ (double) s->tc_period;\n+\t\t(double)sp->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n+\t\t\t/ (double) sp->tc_period;\n \t\tdouble pipe_tc_be_rate =\n \t\t\t(double) params->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE]\n \t\t\t/ (double) params->tc_period;\n@@ -2229,14 +2174,15 @@ grinder_credits_update(struct rte_sched_port *port,\n \tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n \tstruct rte_sched_pipe_profile *params = grinder->pipe_params;\n+\tstruct rte_sched_subport_profile *sp = grinder->subport_params;\n \tuint64_t n_periods;\n \tuint32_t i;\n \n \t/* Subport TB */\n-\tn_periods = (port->time - subport->tb_time) / subport->tb_period;\n-\tsubport->tb_credits += n_periods * subport->tb_credits_per_period;\n-\tsubport->tb_credits = RTE_MIN(subport->tb_credits, subport->tb_size);\n-\tsubport->tb_time += n_periods * subport->tb_period;\n+\tn_periods = (port->time - subport->tb_time) / sp->tb_period;\n+\tsubport->tb_credits += n_periods * sp->tb_credits_per_period;\n+\tsubport->tb_credits = RTE_MIN(subport->tb_credits, sp->tb_size);\n+\tsubport->tb_time += n_periods * sp->tb_period;\n \n \t/* Pipe TB */\n \tn_periods = (port->time - pipe->tb_time) / params->tb_period;\n@@ -2247,9 +2193,9 @@ grinder_credits_update(struct rte_sched_port *port,\n \t/* Subport TCs */\n \tif (unlikely(port->time >= subport->tc_time)) {\n \t\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)\n-\t\t\tsubport->tc_credits[i] = subport->tc_credits_per_period[i];\n+\t\t\tsubport->tc_credits[i] = sp->tc_credits_per_period[i];\n \n-\t\tsubport->tc_time = port->time + subport->tc_period;\n+\t\tsubport->tc_time = port->time + sp->tc_period;\n \t}\n \n \t/* Pipe TCs */\n@@ -2265,8 +2211,10 @@ grinder_credits_update(struct rte_sched_port *port,\n \n static inline uint64_t\n grinder_tc_ov_credits_update(struct rte_sched_port *port,\n-\tstruct rte_sched_subport *subport)\n+\tstruct rte_sched_subport *subport, uint32_t pos)\n {\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n+\tstruct rte_sched_subport_profile *sp = grinder->subport_params;\n \tuint64_t tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n \tuint64_t tc_consumption = 0, tc_ov_consumption_max;\n \tuint64_t tc_ov_wm = subport->tc_ov_wm;\n@@ -2276,17 +2224,17 @@ grinder_tc_ov_credits_update(struct rte_sched_port *port,\n \t\treturn subport->tc_ov_wm_max;\n \n \tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASS_BE; i++) {\n-\t\ttc_ov_consumption[i] =\n-\t\t\tsubport->tc_credits_per_period[i] - subport->tc_credits[i];\n+\t\ttc_ov_consumption[i] = sp->tc_credits_per_period[i]\n+\t\t\t\t\t-  subport->tc_credits[i];\n \t\ttc_consumption += tc_ov_consumption[i];\n \t}\n \n \ttc_ov_consumption[RTE_SCHED_TRAFFIC_CLASS_BE] =\n-\t\tsubport->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] -\n+\tsp->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] -\n \t\tsubport->tc_credits[RTE_SCHED_TRAFFIC_CLASS_BE];\n \n \ttc_ov_consumption_max =\n-\t\tsubport->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] -\n+\tsp->tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] -\n \t\t\ttc_consumption;\n \n \tif (tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASS_BE] >\n@@ -2312,14 +2260,15 @@ grinder_credits_update(struct rte_sched_port *port,\n \tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n \tstruct rte_sched_pipe_profile *params = grinder->pipe_params;\n+\tstruct rte_sched_subport_profile *sp = grinder->subport_params;\n \tuint64_t n_periods;\n \tuint32_t i;\n \n \t/* Subport TB */\n-\tn_periods = (port->time - subport->tb_time) / subport->tb_period;\n-\tsubport->tb_credits += n_periods * subport->tb_credits_per_period;\n-\tsubport->tb_credits = RTE_MIN(subport->tb_credits, subport->tb_size);\n-\tsubport->tb_time += n_periods * subport->tb_period;\n+\tn_periods = (port->time - subport->tb_time) / sp->tb_period;\n+\tsubport->tb_credits += n_periods * sp->tb_credits_per_period;\n+\tsubport->tb_credits = RTE_MIN(subport->tb_credits, sp->tb_size);\n+\tsubport->tb_time += n_periods * sp->tb_period;\n \n \t/* Pipe TB */\n \tn_periods = (port->time - pipe->tb_time) / params->tb_period;\n@@ -2329,12 +2278,13 @@ grinder_credits_update(struct rte_sched_port *port,\n \n \t/* Subport TCs */\n \tif (unlikely(port->time >= subport->tc_time)) {\n-\t\tsubport->tc_ov_wm = grinder_tc_ov_credits_update(port, subport);\n+\t\tsubport->tc_ov_wm =\n+\t\t\tgrinder_tc_ov_credits_update(port, subport, pos);\n \n \t\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)\n-\t\t\tsubport->tc_credits[i] = subport->tc_credits_per_period[i];\n+\t\t\tsubport->tc_credits[i] = sp->tc_credits_per_period[i];\n \n-\t\tsubport->tc_time = port->time + subport->tc_period;\n+\t\tsubport->tc_time = port->time + sp->tc_period;\n \t\tsubport->tc_ov_period_id++;\n \t}\n \n@@ -2857,6 +2807,9 @@ grinder_handle(struct rte_sched_port *port,\n \t\tstruct rte_sched_pipe *pipe = grinder->pipe;\n \n \t\tgrinder->pipe_params = subport->pipe_profiles + pipe->profile;\n+\t\tgrinder->subport_params = port->subport_profiles +\n+\t\t\t\t\t\tsubport->profile;\n+\n \t\tgrinder_prefetch_tc_queue_arrays(subport, pos);\n \t\tgrinder_credits_update(port, subport, pos);\n \ndiff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h\nindex aede2e986..1506c6487 100644\n--- a/lib/librte_sched/rte_sched.h\n+++ b/lib/librte_sched/rte_sched.h\n@@ -361,20 +361,27 @@ rte_sched_port_subport_profile_add(struct rte_sched_port *port,\n \n /**\n  * Hierarchical scheduler subport configuration\n- *\n+ * Note that this function is safe to use at runtime\n+ * to configure subport bandwidth profile.\n  * @param port\n  *   Handle to port scheduler instance\n  * @param subport_id\n  *   Subport ID\n  * @param params\n- *   Subport configuration parameters\n+ *   Subport configuration parameters. Must be non-NULL\n+ *   for first invocation (i.e initialization) for a given\n+ *   subport. Ignored (recommended value is NULL) for all\n+ *   subsequent invocation on the same subport.\n+ * @param subport_profile_id\n+ *   ID of subport bandwidth profile\n  * @return\n  *   0 upon success, error code otherwise\n  */\n int\n rte_sched_subport_config(struct rte_sched_port *port,\n \tuint32_t subport_id,\n-\tstruct rte_sched_subport_params *params);\n+\tstruct rte_sched_subport_params *params,\n+\tuint32_t subport_profile_id);\n \n /**\n  * Hierarchical scheduler pipe configuration\n",
    "prefixes": [
        "v9",
        "3/8"
    ]
}