Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53759/?format=api
{ "id": 53759, "url": "https://patches.dpdk.org/api/patches/53759/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190528120553.2992-20-lukaszx.krakowiak@intel.com/", "project": { "id": 1, "url": "https://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": "<20190528120553.2992-20-lukaszx.krakowiak@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190528120553.2992-20-lukaszx.krakowiak@intel.com", "date": "2019-05-28T12:05:45", "name": "[19/27] sched: update grinder schedule function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e752959e20e4314d98279ce6592130e611296fa5", "submitter": { "id": 1221, "url": "https://patches.dpdk.org/api/people/1221/?format=api", "name": "Lukasz Krakowiak", "email": "lukaszx.krakowiak@intel.com" }, "delegate": { "id": 10018, "url": "https://patches.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190528120553.2992-20-lukaszx.krakowiak@intel.com/mbox/", "series": [ { "id": 4794, "url": "https://patches.dpdk.org/api/series/4794/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=4794", "date": "2019-05-28T12:05:26", "name": "sched: feature enhancements", "version": 1, "mbox": "https://patches.dpdk.org/series/4794/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/53759/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/53759/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 6DBB81B9E9;\n\tTue, 28 May 2019 14:08:51 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id E234A1B99B\n\tfor <dev@dpdk.org>; Tue, 28 May 2019 14:08:38 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 May 2019 05:08:38 -0700", "from lkrakowx-mobl.ger.corp.intel.com ([10.103.104.99])\n\tby fmsmga001.fm.intel.com with ESMTP; 28 May 2019 05:08:36 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Lukasz Krakowiak <lukaszx.krakowiak@intel.com>", "To": "cristian.dumitrescu@intel.com", "Cc": "dev@dpdk.org, Jasvinder Singh <jasvinder.singh@intel.com>,\n\tAbraham Tovar <abrahamx.tovar@intel.com>,\n\tLukasz Krakowiak <lukaszx.krakowiak@intel.com>", "Date": "Tue, 28 May 2019 14:05:45 +0200", "Message-Id": "<20190528120553.2992-20-lukaszx.krakowiak@intel.com>", "X-Mailer": "git-send-email 2.19.2.windows.1", "In-Reply-To": "<20190528120553.2992-1-lukaszx.krakowiak@intel.com>", "References": "<20190528120553.2992-1-lukaszx.krakowiak@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 19/27] 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": "From: Jasvinder Singh <jasvinder.singh@intel.com>\n\nUpdate grinder schedule function of the scheduler to allow configuration\nflexiblity for pipe traffic classes and queues, and subport level\nconfiguration 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 | 120 ++++++++++++++++++++++++++---------\n 1 file changed, 90 insertions(+), 30 deletions(-)", "diff": "diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex 06d89e3fd..34b85af20 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -2007,10 +2007,10 @@ 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_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_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@@ -2030,7 +2030,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@@ -2042,10 +2042,10 @@ 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_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_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@@ -2054,11 +2054,18 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)\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_CLASS_BE];\n+\tuint32_t pipe_tc_ov_mask2[RTE_SCHED_TRAFFIC_CLASS_BE] = {0};\n+\tuint32_t pipe_tc_ov_credits, i;\n \tint enough_credits;\n \n+\tfor (i = 0; i < RTE_DIM(pipe_tc_ov_mask1); 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@@ -2081,17 +2088,47 @@ 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+static inline void\n+grinder_schedule_sp(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_sched_queue *queue = grinder->sp.queue;\n \tstruct rte_mbuf *pkt = grinder->pkt;\n \tuint32_t pkt_len = pkt->pkt_len + port->frame_overhead;\n \n-\tif (!grinder_credits_check(port, pos))\n-\t\treturn 0;\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+\n+\tif (queue->qr == queue->qw) {\n+\t\tuint32_t qindex = grinder->sp.qindex;\n+\n+\t\trte_bitmap_clear(subport->bmp, qindex);\n+\t\trte_sched_port_set_queue_empty_timestamp(port, subport, qindex);\n+\t}\n+\n+\t/* Reset pipe loop detection */\n+\tsubport->pipe_loop = RTE_SCHED_PIPE_INVALID;\n+\tgrinder->productive = 1;\n+}\n+\n+static inline void\n+grinder_schedule_be(struct rte_sched_port *port,\n+\tstruct rte_sched_subport *subport, uint32_t pos)\n+{\n+\tstruct rte_sched_grinder *grinder = subport->grinder + pos;\n+\tstruct rte_mbuf *pkt = grinder->pkt;\n+\tstruct rte_sched_queue *queue;\n+\tuint32_t qpos, pkt_len;\n+\n+\t/* Best effort TC */\n+\tpkt_len = pkt->pkt_len + port->frame_overhead;\n+\tqpos = grinder->be.qpos;\n+\tqueue = grinder->be.queue[qpos];\n \n \t/* Advance port time */\n \tport->time += pkt_len;\n@@ -2099,19 +2136,41 @@ grinder_schedule(struct rte_sched_port *port, uint32_t pos)\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+\tgrinder->be.wrr_tokens[qpos] += pkt_len * grinder->be.wrr_cost[qpos];\n \tif (queue->qr == queue->qw) {\n-\t\tuint32_t qindex = grinder->qindex[grinder->qpos];\n+\t\tuint32_t qindex = grinder->be.qindex[qpos];\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_bitmap_clear(subport->bmp, qindex);\n+\t\tgrinder->be.qmask &= ~(1 << qpos);\n+\t\tgrinder->be.wrr_mask[qpos] = 0;\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+\n+static inline int\n+grinder_schedule(struct rte_sched_port *port,\n+\tstruct rte_sched_subport *subport, uint32_t pos)\n+{\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+\n+\tif (!grinder_credits_check(port, subport, pos))\n+\t\treturn 0;\n+\n+\t/* Strict priority TC */\n+\tif (tc_index < pipe->n_sp_queues) {\n+\t\tgrinder_schedule_sp(port, subport, pos);\n+\t\treturn 1;\n+\t}\n+\n+\t/* Best Effort TC */\n+\tgrinder_schedule_be(port, subport, pos);\n \n \treturn 1;\n }\n@@ -2523,14 +2582,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@@ -2553,7 +2613,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@@ -2563,7 +2623,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": [ "19/27" ] }