Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55340/?format=api
{ "id": 55340, "url": "http://patches.dpdk.org/api/patches/55340/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190625153217.24301-17-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-17-jasvinder.singh@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190625153217.24301-17-jasvinder.singh@intel.com", "date": "2019-06-25T15:32:05", "name": "[v2,16/28] sched: update grinder wrr compute function", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "826bce225936254ef56b50c8dc47b6c035be52b2", "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-17-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/55340/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/55340/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 DEA831BB86;\n\tTue, 25 Jun 2019 17:32:43 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id CA2EB1BB09\n\tfor <dev@dpdk.org>; Tue, 25 Jun 2019 17:32:22 +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:22 -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:21 -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=\"166711566\"", "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:05 +0100", "Message-Id": "<20190625153217.24301-17-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 16/28] sched: update grinder wrr compute\n\tfunction", "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 weighted round robin function for best-effort traffic\nclass queues to allow configuration flexiblity for pipe traffic\nclasses and queues, and subport level configuration of the pipe\nparameters.\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 lib/librte_sched/rte_sched.c | 111 ++++++++++++++++++----------\n lib/librte_sched/rte_sched_common.h | 41 ++++++++++\n 2 files changed, 111 insertions(+), 41 deletions(-)", "diff": "diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex 00ee9e7a2..90c41e549 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -2416,71 +2416,100 @@ grinder_next_pipe(struct rte_sched_subport *subport, uint32_t pos)\n \n \n static inline void\n-grinder_wrr_load(struct rte_sched_port *port, uint32_t pos)\n+grinder_wrr_load(struct rte_sched_subport *subport, uint32_t pos)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n \tstruct rte_sched_pipe_profile *pipe_params = grinder->pipe_params;\n-\tuint32_t tc_index = grinder->tc_index;\n \tuint32_t qmask = grinder->qmask;\n-\tuint32_t qindex;\n-\n-\tqindex = tc_index * 4;\n-\n-\tgrinder->wrr_tokens[0] = ((uint16_t) pipe->wrr_tokens[qindex]) << RTE_SCHED_WRR_SHIFT;\n-\tgrinder->wrr_tokens[1] = ((uint16_t) pipe->wrr_tokens[qindex + 1]) << RTE_SCHED_WRR_SHIFT;\n-\tgrinder->wrr_tokens[2] = ((uint16_t) pipe->wrr_tokens[qindex + 2]) << RTE_SCHED_WRR_SHIFT;\n-\tgrinder->wrr_tokens[3] = ((uint16_t) pipe->wrr_tokens[qindex + 3]) << RTE_SCHED_WRR_SHIFT;\n-\n-\tgrinder->wrr_mask[0] = (qmask & 0x1) * 0xFFFF;\n-\tgrinder->wrr_mask[1] = ((qmask >> 1) & 0x1) * 0xFFFF;\n-\tgrinder->wrr_mask[2] = ((qmask >> 2) & 0x1) * 0xFFFF;\n-\tgrinder->wrr_mask[3] = ((qmask >> 3) & 0x1) * 0xFFFF;\n+\tuint32_t qindex = grinder->qindex[0];\n+\tuint32_t i;\n \n-\tgrinder->wrr_cost[0] = pipe_params->wrr_cost[qindex];\n-\tgrinder->wrr_cost[1] = pipe_params->wrr_cost[qindex + 1];\n-\tgrinder->wrr_cost[2] = pipe_params->wrr_cost[qindex + 2];\n-\tgrinder->wrr_cost[3] = pipe_params->wrr_cost[qindex + 3];\n+\tfor (i = 0; i < pipe->n_be_queues; i++) {\n+\t\tgrinder->wrr_tokens[i] =\n+\t\t\t((uint16_t) pipe->wrr_tokens[qindex + i]) << RTE_SCHED_WRR_SHIFT;\n+\t\tgrinder->wrr_mask[i] = ((qmask >> i) & 0x1) * 0xFFFF;\n+\t\tgrinder->wrr_cost[i] = pipe_params->wrr_cost[qindex + i];\n+\t}\n }\n \n static inline void\n-grinder_wrr_store(struct rte_sched_port *port, uint32_t pos)\n+grinder_wrr_store(struct rte_sched_subport *subport, uint32_t pos)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n-\tuint32_t tc_index = grinder->tc_index;\n-\tuint32_t qindex;\n-\n-\tqindex = tc_index * 4;\n+\tuint32_t i;\n \n-\tpipe->wrr_tokens[qindex] = (grinder->wrr_tokens[0] & grinder->wrr_mask[0])\n-\t\t>> RTE_SCHED_WRR_SHIFT;\n-\tpipe->wrr_tokens[qindex + 1] = (grinder->wrr_tokens[1] & grinder->wrr_mask[1])\n-\t\t>> RTE_SCHED_WRR_SHIFT;\n-\tpipe->wrr_tokens[qindex + 2] = (grinder->wrr_tokens[2] & grinder->wrr_mask[2])\n-\t\t>> RTE_SCHED_WRR_SHIFT;\n-\tpipe->wrr_tokens[qindex + 3] = (grinder->wrr_tokens[3] & grinder->wrr_mask[3])\n-\t\t>> RTE_SCHED_WRR_SHIFT;\n+\tfor (i = 0; i < pipe->n_be_queues; i++)\n+\t\tpipe->wrr_tokens[i] =\n+\t\t\t(grinder->wrr_tokens[i] & grinder->wrr_mask[i]) >>\n+\t\t\t\tRTE_SCHED_WRR_SHIFT;\n }\n \n static inline void\n-grinder_wrr(struct rte_sched_port *port, uint32_t pos)\n+grinder_wrr(struct rte_sched_subport *subport, uint32_t pos)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n+\tstruct rte_sched_pipe *pipe = grinder->pipe;\n+\tuint32_t n_be_queues = pipe->n_be_queues;\n \tuint16_t wrr_tokens_min;\n \n+\tif (n_be_queues == 1) {\n+\t\tgrinder->wrr_tokens[0] |= ~grinder->wrr_mask[0];\n+\t\tgrinder->qpos = 0;\n+\t\twrr_tokens_min = grinder->wrr_tokens[0];\n+\t\tgrinder->wrr_tokens[0] -= wrr_tokens_min;\n+\t\treturn;\n+\t}\n+\n+\tif (n_be_queues == 2) {\n+\t\tgrinder->wrr_tokens[0] |= ~grinder->wrr_mask[0];\n+\t\tgrinder->wrr_tokens[1] |= ~grinder->wrr_mask[1];\n+\n+\t\tgrinder->qpos = rte_min_pos_2_u16(grinder->wrr_tokens);\n+\t\twrr_tokens_min = grinder->wrr_tokens[grinder->qpos];\n+\n+\t\tgrinder->wrr_tokens[0] -= wrr_tokens_min;\n+\t\tgrinder->wrr_tokens[1] -= wrr_tokens_min;\n+\t\treturn;\n+\t}\n+\n+\tif (n_be_queues == 4) {\n+\t\tgrinder->wrr_tokens[0] |= ~grinder->wrr_mask[0];\n+\t\tgrinder->wrr_tokens[1] |= ~grinder->wrr_mask[1];\n+\t\tgrinder->wrr_tokens[2] |= ~grinder->wrr_mask[2];\n+\t\tgrinder->wrr_tokens[3] |= ~grinder->wrr_mask[3];\n+\n+\t\tgrinder->qpos = rte_min_pos_4_u16(grinder->wrr_tokens);\n+\t\twrr_tokens_min = grinder->wrr_tokens[grinder->qpos];\n+\n+\t\tgrinder->wrr_tokens[0] -= wrr_tokens_min;\n+\t\tgrinder->wrr_tokens[1] -= wrr_tokens_min;\n+\t\tgrinder->wrr_tokens[2] -= wrr_tokens_min;\n+\t\tgrinder->wrr_tokens[3] -= wrr_tokens_min;\n+\t\treturn;\n+\t}\n+\n \tgrinder->wrr_tokens[0] |= ~grinder->wrr_mask[0];\n \tgrinder->wrr_tokens[1] |= ~grinder->wrr_mask[1];\n \tgrinder->wrr_tokens[2] |= ~grinder->wrr_mask[2];\n \tgrinder->wrr_tokens[3] |= ~grinder->wrr_mask[3];\n+\tgrinder->wrr_tokens[4] |= ~grinder->wrr_mask[4];\n+\tgrinder->wrr_tokens[5] |= ~grinder->wrr_mask[5];\n+\tgrinder->wrr_tokens[6] |= ~grinder->wrr_mask[6];\n+\tgrinder->wrr_tokens[7] |= ~grinder->wrr_mask[7];\n \n-\tgrinder->qpos = rte_min_pos_4_u16(grinder->wrr_tokens);\n+\tgrinder->qpos = rte_min_pos_8_u16(grinder->wrr_tokens);\n \twrr_tokens_min = grinder->wrr_tokens[grinder->qpos];\n \n \tgrinder->wrr_tokens[0] -= wrr_tokens_min;\n \tgrinder->wrr_tokens[1] -= wrr_tokens_min;\n \tgrinder->wrr_tokens[2] -= wrr_tokens_min;\n \tgrinder->wrr_tokens[3] -= wrr_tokens_min;\n+\tgrinder->wrr_tokens[4] -= wrr_tokens_min;\n+\tgrinder->wrr_tokens[5] -= wrr_tokens_min;\n+\tgrinder->wrr_tokens[6] -= wrr_tokens_min;\n+\tgrinder->wrr_tokens[7] -= wrr_tokens_min;\n }\n \n \n@@ -2522,8 +2551,8 @@ grinder_prefetch_tc_queue_arrays(struct rte_sched_port *port, uint32_t pos)\n \t\trte_prefetch0(grinder->qbase[i] + qr[i]);\n \t}\n \n-\tgrinder_wrr_load(port, pos);\n-\tgrinder_wrr(port, pos);\n+\tgrinder_wrr_load(port->subport, pos);\n+\tgrinder_wrr(port->subport, pos);\n }\n \n static inline void\n@@ -2592,12 +2621,12 @@ grinder_handle(struct rte_sched_port *port, uint32_t pos)\n \n \t\t/* Look for next packet within the same TC */\n \t\tif (result && grinder->qmask) {\n-\t\t\tgrinder_wrr(port, pos);\n+\t\t\tgrinder_wrr(port->subport, pos);\n \t\t\tgrinder_prefetch_mbuf(port, pos);\n \n \t\t\treturn 1;\n \t\t}\n-\t\tgrinder_wrr_store(port, pos);\n+\t\tgrinder_wrr_store(port->subport, pos);\n \n \t\t/* Look for another active TC within same pipe */\n \t\tif (grinder_next_tc(port->subport, pos)) {\ndiff --git a/lib/librte_sched/rte_sched_common.h b/lib/librte_sched/rte_sched_common.h\nindex 8c191a9b8..bb3595f26 100644\n--- a/lib/librte_sched/rte_sched_common.h\n+++ b/lib/librte_sched/rte_sched_common.h\n@@ -20,6 +20,18 @@ rte_sched_min_val_2_u32(uint32_t x, uint32_t y)\n \treturn (x < y)? x : y;\n }\n \n+/* Simplified version to remove branches with CMOV instruction */\n+static inline uint32_t\n+rte_min_pos_2_u16(uint16_t *x)\n+{\n+\tuint32_t pos0 = 0;\n+\n+\tif (x[1] <= x[0])\n+\t\tpos0 = 1;\n+\n+\treturn pos0;\n+}\n+\n #if 0\n static inline uint32_t\n rte_min_pos_4_u16(uint16_t *x)\n@@ -50,6 +62,35 @@ rte_min_pos_4_u16(uint16_t *x)\n \n #endif\n \n+/* Simplified version to remove branches with CMOV instruction */\n+static inline uint32_t\n+rte_min_pos_8_u16(uint16_t *x)\n+{\n+\tuint32_t pos0 = 0;\n+\tuint32_t pos1 = 2;\n+\tuint32_t pos2 = 4;\n+\tuint32_t pos3 = 6;\n+\n+\tif (x[1] <= x[0])\n+\t\tpos0 = 1;\n+\tif (x[3] <= x[2])\n+\t\tpos1 = 3;\n+\tif (x[5] <= x[4])\n+\t\tpos2 = 5;\n+\tif (x[7] <= x[6])\n+\t\tpos3 = 7;\n+\n+\tif (x[pos1] <= x[pos0])\n+\t\tpos0 = pos1;\n+\tif (x[pos3] <= x[pos2])\n+\t\tpos2 = pos3;\n+\n+\tif (x[pos2] <= x[pos0])\n+\t\tpos0 = pos2;\n+\n+\treturn pos0;\n+}\n+\n /*\n * Compute the Greatest Common Divisor (GCD) of two numbers.\n * This implementation uses Euclid's algorithm:\n", "prefixes": [ "v2", "16/28" ] }