Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55343/?format=api
{ "id": 55343, "url": "http://patches.dpdk.org/api/patches/55343/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190625153217.24301-20-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-20-jasvinder.singh@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190625153217.24301-20-jasvinder.singh@intel.com", "date": "2019-06-25T15:32:08", "name": "[v2,19/28] sched: update grinder schedule function", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "ee5271f60f8dbf43a48a1b96bbb0c4938bcbc044", "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-20-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/55343/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/55343/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 542881BBDF;\n\tTue, 25 Jun 2019 17:32:50 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 41BE11BA42\n\tfor <dev@dpdk.org>; Tue, 25 Jun 2019 17:32:27 +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:26 -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:25 -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=\"166711615\"", "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:08 +0100", "Message-Id": "<20190625153217.24301-20-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 19/28] sched: update grinder schedule 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 grinder schedule function to allow configuration\nflexiblity for pipe traffic classes and queues, and subport\nlevel configuration of 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 lib/librte_sched/rte_sched.c | 82 ++++++++++++++++++++++--------------\n 1 file changed, 51 insertions(+), 31 deletions(-)", "diff": "diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex 607fe6c18..f468827f4 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -2096,14 +2096,14 @@ grinder_credits_update(struct rte_sched_port *port,\n #ifndef RTE_SCHED_SUBPORT_TC_OV\n \n static inline int\n-grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\n+grinder_credits_check(struct rte_sched_subport *subport,\n+\tuint32_t pos, uint32_t frame_overhead)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n-\tstruct rte_sched_subport *subport = grinder->subport;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n \tstruct rte_mbuf *pkt = grinder->pkt;\n \tuint32_t tc_index = grinder->tc_index;\n-\tuint32_t pkt_len = pkt->pkt_len + port->frame_overhead;\n+\tuint32_t pkt_len = pkt->pkt_len + frame_overhead;\n \tuint32_t subport_tb_credits = subport->tb_credits;\n \tuint32_t subport_tc_credits = subport->tc_credits[tc_index];\n \tuint32_t pipe_tb_credits = pipe->tb_credits;\n@@ -2119,7 +2119,7 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\n \tif (!enough_credits)\n \t\treturn 0;\n \n-\t/* Update port credits */\n+\t/* Update subport credits */\n \tsubport->tb_credits -= pkt_len;\n \tsubport->tc_credits[tc_index] -= pkt_len;\n \tpipe->tb_credits -= pkt_len;\n@@ -2131,23 +2131,30 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\n #else\n \n static inline int\n-grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\n+grinder_credits_check(struct rte_sched_subport *subport,\n+\tuint32_t pos, uint32_t frame_overhead)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n-\tstruct rte_sched_subport *subport = grinder->subport;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_sched_pipe *pipe = grinder->pipe;\n \tstruct rte_mbuf *pkt = grinder->pkt;\n \tuint32_t tc_index = grinder->tc_index;\n-\tuint32_t pkt_len = pkt->pkt_len + port->frame_overhead;\n+\tuint32_t pkt_len = pkt->pkt_len + frame_overhead;\n \tuint32_t subport_tb_credits = subport->tb_credits;\n \tuint32_t subport_tc_credits = subport->tc_credits[tc_index];\n \tuint32_t pipe_tb_credits = pipe->tb_credits;\n \tuint32_t pipe_tc_credits = pipe->tc_credits[tc_index];\n-\tuint32_t pipe_tc_ov_mask1[] = {UINT32_MAX, UINT32_MAX, UINT32_MAX, pipe->tc_ov_credits};\n-\tuint32_t pipe_tc_ov_mask2[] = {0, 0, 0, UINT32_MAX};\n-\tuint32_t pipe_tc_ov_credits = pipe_tc_ov_mask1[tc_index];\n+\tuint32_t pipe_tc_ov_mask1[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tuint32_t pipe_tc_ov_mask2[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE] = {0};\n+\tuint32_t pipe_tc_ov_credits, i;\n \tint enough_credits;\n \n+\tfor (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)\n+\t\tpipe_tc_ov_mask1[i] = UINT32_MAX;\n+\n+\tpipe_tc_ov_mask1[RTE_SCHED_TRAFFIC_CLASS_BE] = pipe->tc_ov_credits;\n+\tpipe_tc_ov_mask2[RTE_SCHED_TRAFFIC_CLASS_BE] = UINT32_MAX;\n+\tpipe_tc_ov_credits = pipe_tc_ov_mask1[tc_index];\n+\n \t/* Check pipe and subport credits */\n \tenough_credits = (pkt_len <= subport_tb_credits) &&\n \t\t(pkt_len <= subport_tc_credits) &&\n@@ -2170,36 +2177,48 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\n \n #endif /* RTE_SCHED_SUBPORT_TC_OV */\n \n-\n static inline int\n-grinder_schedule(struct rte_sched_port *port, uint32_t pos)\n+grinder_schedule(struct rte_sched_port *port,\n+\tstruct rte_sched_subport *subport, uint32_t pos)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n-\tstruct rte_sched_queue *queue = grinder->queue[grinder->qpos];\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \tstruct rte_mbuf *pkt = grinder->pkt;\n-\tuint32_t pkt_len = pkt->pkt_len + port->frame_overhead;\n+\tstruct rte_sched_queue *queue;\n+\tuint32_t frame_overhead = port->frame_overhead;\n+\tuint32_t qpos, pkt_len;\n+\tint be_tc_active;\n \n-\tif (!grinder_credits_check(port, pos))\n+\tif (!grinder_credits_check(subport, pos, frame_overhead))\n \t\treturn 0;\n \n+\tpkt_len = pkt->pkt_len + frame_overhead;\n+\tqpos = grinder->qpos;\n+\tqueue = grinder->queue[qpos];\n+\n \t/* Advance port time */\n \tport->time += pkt_len;\n \n \t/* Send packet */\n \tport->pkts_out[port->n_pkts_out++] = pkt;\n \tqueue->qr++;\n-\tgrinder->wrr_tokens[grinder->qpos] += pkt_len * grinder->wrr_cost[grinder->qpos];\n+\n+\tbe_tc_active = (grinder->tc_index == RTE_SCHED_TRAFFIC_CLASS_BE);\n+\tgrinder->wrr_tokens[qpos] +=\n+\t\tpkt_len * grinder->wrr_cost[qpos] * be_tc_active;\n+\n \tif (queue->qr == queue->qw) {\n-\t\tuint32_t qindex = grinder->qindex[grinder->qpos];\n+\t\tuint32_t qindex = grinder->qindex[qpos];\n+\n+\t\trte_bitmap_clear(subport->bmp, qindex);\n+\t\tgrinder->qmask &= ~(1 << qpos);\n+\t\tif (be_tc_active)\n+\t\t\tgrinder->wrr_mask[qpos] = 0;\n \n-\t\trte_bitmap_clear(port->bmp, qindex);\n-\t\tgrinder->qmask &= ~(1 << grinder->qpos);\n-\t\tgrinder->wrr_mask[grinder->qpos] = 0;\n-\t\trte_sched_port_set_queue_empty_timestamp(port, port->subport, qindex);\n+\t\trte_sched_port_set_queue_empty_timestamp(port, subport, qindex);\n \t}\n \n \t/* Reset pipe loop detection */\n-\tport->pipe_loop = RTE_SCHED_PIPE_INVALID;\n+\tsubport->pipe_loop = RTE_SCHED_PIPE_INVALID;\n \tgrinder->productive = 1;\n \n \treturn 1;\n@@ -2585,14 +2604,15 @@ grinder_prefetch_mbuf(struct rte_sched_subport *subport, uint32_t pos)\n static inline uint32_t\n grinder_handle(struct rte_sched_port *port, uint32_t pos)\n {\n-\tstruct rte_sched_grinder *grinder = port->grinder + pos;\n+\tstruct rte_sched_subport *subport = port->subport;\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n \n \tswitch (grinder->state) {\n \tcase e_GRINDER_PREFETCH_PIPE:\n \t{\n-\t\tif (grinder_next_pipe(port->subport, pos)) {\n-\t\t\tgrinder_prefetch_pipe(port->subport, pos);\n-\t\t\tport->busy_grinders++;\n+\t\tif (grinder_next_pipe(subport, pos)) {\n+\t\t\tgrinder_prefetch_pipe(subport, pos);\n+\t\t\tsubport->busy_grinders++;\n \n \t\t\tgrinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;\n \t\t\treturn 0;\n@@ -2615,7 +2635,7 @@ grinder_handle(struct rte_sched_port *port, uint32_t pos)\n \n \tcase e_GRINDER_PREFETCH_MBUF:\n \t{\n-\t\tgrinder_prefetch_mbuf(port->subport, pos);\n+\t\tgrinder_prefetch_mbuf(subport, pos);\n \n \t\tgrinder->state = e_GRINDER_READ_MBUF;\n \t\treturn 0;\n@@ -2625,7 +2645,7 @@ grinder_handle(struct rte_sched_port *port, uint32_t pos)\n \t{\n \t\tuint32_t result = 0;\n \n-\t\tresult = grinder_schedule(port, pos);\n+\t\tresult = grinder_schedule(port, subport, pos);\n \n \t\t/* Look for next packet within the same TC */\n \t\tif (result && grinder->qmask) {\n", "prefixes": [ "v2", "19/28" ] }