Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53737/?format=api
{ "id": 53737, "url": "https://patches.dpdk.org/api/patches/53737/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190528120553.2992-4-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-4-lukaszx.krakowiak@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190528120553.2992-4-lukaszx.krakowiak@intel.com", "date": "2019-05-28T12:05:29", "name": "[03/27] sched: update internal data structures", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9234149898d160aa099aad007defedd3b9008f6e", "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-4-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/53737/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/53737/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 DDC391B964;\n\tTue, 28 May 2019 14:08:18 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id AF8A74CA6\n\tfor <dev@dpdk.org>; Tue, 28 May 2019 14:08:11 +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:10 -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:09 -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:29 +0200", "Message-Id": "<20190528120553.2992-4-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 03/27] sched: update internal data structures", "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 internal data structures 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 | 182 +++++++++++++++++++++++++----------\n 1 file changed, 130 insertions(+), 52 deletions(-)", "diff": "diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex a60ddf97e..8256ac407 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -37,6 +37,7 @@\n \n #define RTE_SCHED_TB_RATE_CONFIG_ERR (1e-7)\n #define RTE_SCHED_WRR_SHIFT 3\n+#define RTE_SCHED_TRAFFIC_CLASS_BE (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)\n #define RTE_SCHED_GRINDER_PCACHE_SIZE (64 / RTE_SCHED_QUEUES_PER_PIPE)\n #define RTE_SCHED_PIPE_INVALID UINT32_MAX\n #define RTE_SCHED_BMP_POS_INVALID UINT32_MAX\n@@ -46,6 +47,73 @@\n */\n #define RTE_SCHED_TIME_SHIFT\t\t 8\n \n+struct rte_sched_strict_priority_class {\n+\tstruct rte_sched_queue *queue;\n+\tstruct rte_mbuf **qbase;\n+\tuint32_t qindex;\n+\tuint16_t qsize;\n+};\n+\n+struct rte_sched_best_effort_class {\n+\tstruct rte_sched_queue *queue[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tstruct rte_mbuf **qbase[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tuint32_t qindex[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tuint16_t qsize[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tuint32_t qmask;\n+\tuint32_t qpos;\n+\n+\t/* WRR */\n+\tuint16_t wrr_tokens[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tuint16_t wrr_mask[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+\tuint8_t wrr_cost[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n+};\n+\n+enum grinder_state {\n+\te_GRINDER_PREFETCH_PIPE = 0,\n+\te_GRINDER_PREFETCH_TC_QUEUE_ARRAYS,\n+\te_GRINDER_PREFETCH_MBUF,\n+\te_GRINDER_READ_MBUF\n+};\n+\n+struct rte_sched_grinder {\n+\t/* Pipe cache */\n+\tuint16_t pcache_qmask[RTE_SCHED_GRINDER_PCACHE_SIZE];\n+\tuint32_t pcache_qindex[RTE_SCHED_GRINDER_PCACHE_SIZE];\n+\tuint32_t pcache_w;\n+\tuint32_t pcache_r;\n+\n+\t/* Current pipe */\n+\tenum grinder_state state;\n+\tuint32_t productive;\n+\tuint32_t pindex;\n+\tstruct rte_sched_subport *subport;\n+\tstruct rte_sched_pipe *pipe;\n+\tstruct rte_sched_pipe_profile *pipe_params;\n+\n+\t/* TC cache */\n+\tuint8_t tccache_qmask[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tuint32_t tccache_qindex[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tuint32_t tccache_w;\n+\tuint32_t tccache_r;\n+\n+\t/* Current TC */\n+\tuint32_t tc_index;\n+\tstruct rte_sched_strict_priority_class sp;\n+\tstruct rte_sched_best_effort_class be;\n+\tstruct rte_sched_queue *queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tstruct rte_mbuf **qbase[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tuint32_t qindex[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n+\tuint16_t qsize;\n+\tuint32_t qmask;\n+\tuint32_t qpos;\n+\tstruct rte_mbuf *pkt;\n+\n+\t/* WRR */\n+\tuint16_t wrr_tokens[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n+\tuint16_t wrr_mask[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n+\tuint8_t wrr_cost[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n+};\n+\n struct rte_sched_subport {\n \t/* Token bucket (TB) */\n \tuint64_t tb_time; /* time of last update */\n@@ -71,7 +139,41 @@ struct rte_sched_subport {\n \n \t/* Statistics */\n \tstruct rte_sched_subport_stats stats;\n-};\n+\n+\t/* Subport Pipes*/\n+\tuint32_t n_subport_pipes;\n+\n+\tuint16_t qsize[RTE_SCHED_QUEUES_PER_PIPE];\n+\tuint32_t n_pipe_profiles;\n+\tuint32_t pipe_tc_be_rate_max;\n+#ifdef RTE_SCHED_RED\n+\tstruct rte_red_config red_config[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS];\n+#endif\n+\n+\t/* Scheduling loop detection */\n+\tuint32_t pipe_loop;\n+\tuint32_t pipe_exhaustion;\n+\n+\t/* Bitmap */\n+\tstruct rte_bitmap *bmp;\n+\tuint32_t grinder_base_bmp_pos[RTE_SCHED_PORT_N_GRINDERS] __rte_aligned_16;\n+\n+\t/* Grinders */\n+\tstruct rte_sched_grinder grinder[RTE_SCHED_PORT_N_GRINDERS];\n+\tuint32_t busy_grinders;\n+\n+\t/* Queue base calculation */\n+\tuint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE];\n+\tuint32_t qsize_sum;\n+\n+\tstruct rte_sched_pipe *pipe;\n+\tstruct rte_sched_queue *queue;\n+\tstruct rte_sched_queue_extra *queue_extra;\n+\tstruct rte_sched_pipe_profile *pipe_profiles;\n+\tuint8_t *bmp_array;\n+\tstruct rte_mbuf **queue_array;\n+\tuint8_t memory[0] __rte_cache_aligned;\n+} __rte_cache_aligned;\n \n struct rte_sched_pipe_profile {\n \t/* Token bucket (TB) */\n@@ -84,8 +186,12 @@ struct rte_sched_pipe_profile {\n \tuint32_t tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n \tuint8_t tc_ov_weight;\n \n+\t/* Strict priority and best effort traffic class queues */\n+\tuint8_t n_sp_queues;\n+\tuint8_t n_be_queues;\n+\n \t/* Pipe queues */\n-\tuint8_t wrr_cost[RTE_SCHED_QUEUES_PER_PIPE];\n+\tuint8_t wrr_cost[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n };\n \n struct rte_sched_pipe {\n@@ -100,8 +206,11 @@ struct rte_sched_pipe {\n \tuint64_t tc_time; /* time of next update */\n \tuint32_t tc_credits[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n \n+\tuint8_t n_sp_queues; /* Strict priority traffic class queues */\n+\tuint8_t n_be_queues; /* Best effort traffic class queues */\n+\n \t/* Weighted Round Robin (WRR) */\n-\tuint8_t wrr_tokens[RTE_SCHED_QUEUES_PER_PIPE];\n+\tuint8_t wrr_tokens[RTE_SCHED_WRR_QUEUES_PER_PIPE];\n \n \t/* TC oversubscription */\n \tuint32_t tc_ov_credits;\n@@ -121,55 +230,12 @@ struct rte_sched_queue_extra {\n #endif\n };\n \n-enum grinder_state {\n-\te_GRINDER_PREFETCH_PIPE = 0,\n-\te_GRINDER_PREFETCH_TC_QUEUE_ARRAYS,\n-\te_GRINDER_PREFETCH_MBUF,\n-\te_GRINDER_READ_MBUF\n-};\n-\n-struct rte_sched_grinder {\n-\t/* Pipe cache */\n-\tuint16_t pcache_qmask[RTE_SCHED_GRINDER_PCACHE_SIZE];\n-\tuint32_t pcache_qindex[RTE_SCHED_GRINDER_PCACHE_SIZE];\n-\tuint32_t pcache_w;\n-\tuint32_t pcache_r;\n-\n-\t/* Current pipe */\n-\tenum grinder_state state;\n-\tuint32_t productive;\n-\tuint32_t pindex;\n-\tstruct rte_sched_subport *subport;\n-\tstruct rte_sched_pipe *pipe;\n-\tstruct rte_sched_pipe_profile *pipe_params;\n-\n-\t/* TC cache */\n-\tuint8_t tccache_qmask[4];\n-\tuint32_t tccache_qindex[4];\n-\tuint32_t tccache_w;\n-\tuint32_t tccache_r;\n-\n-\t/* Current TC */\n-\tuint32_t tc_index;\n-\tstruct rte_sched_queue *queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n-\tstruct rte_mbuf **qbase[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n-\tuint32_t qindex[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];\n-\tuint16_t qsize;\n-\tuint32_t qmask;\n-\tuint32_t qpos;\n-\tstruct rte_mbuf *pkt;\n-\n-\t/* WRR */\n-\tuint16_t wrr_tokens[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n-\tuint16_t wrr_mask[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n-\tuint8_t wrr_cost[RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS];\n-};\n-\n struct rte_sched_port {\n \t/* User parameters */\n \tuint32_t n_subports_per_port;\n \tuint32_t n_pipes_per_subport;\n \tuint32_t n_pipes_per_subport_log2;\n+\tint socket;\n \tuint32_t rate;\n \tuint32_t mtu;\n \tuint32_t frame_overhead;\n@@ -199,6 +265,9 @@ struct rte_sched_port {\n \tuint32_t busy_grinders;\n \tstruct rte_mbuf **pkts_out;\n \tuint32_t n_pkts_out;\n+\tuint32_t subport_id;\n+\n+\tuint32_t n_max_subport_pipes_log2; /* Max number of subport pipes */\n \n \t/* Queue base calculation */\n \tuint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE];\n@@ -212,6 +281,7 @@ struct rte_sched_port {\n \tstruct rte_sched_pipe_profile *pipe_profiles;\n \tuint8_t *bmp_array;\n \tstruct rte_mbuf **queue_array;\n+\tstruct rte_sched_subport *subports[RTE_SCHED_SUBPORTS_PER_PORT];\n \tuint8_t memory[0] __rte_cache_aligned;\n } __rte_cache_aligned;\n \n@@ -226,6 +296,16 @@ enum rte_sched_port_array {\n \te_RTE_SCHED_PORT_ARRAY_TOTAL,\n };\n \n+enum rte_sched_subport_array {\n+\te_RTE_SCHED_SUBPORT_ARRAY_PIPE = 0,\n+\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE,\n+\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_EXTRA,\n+\te_RTE_SCHED_SUBPORT_ARRAY_PIPE_PROFILES,\n+\te_RTE_SCHED_SUBPORT_ARRAY_BMP_ARRAY,\n+\te_RTE_SCHED_SUBPORT_ARRAY_QUEUE_ARRAY,\n+\te_RTE_SCHED_SUBPORT_ARRAY_TOTAL,\n+};\n+\n #ifdef RTE_SCHED_COLLECT_STATS\n \n static inline uint32_t\n@@ -483,7 +563,7 @@ rte_sched_port_log_pipe_profile(struct rte_sched_port *port, uint32_t i)\n \t\t\" Token bucket: period = %u, credits per period = %u, size = %u\\n\"\n \t\t\" Traffic classes: period = %u, credits per period = [%u, %u, %u, %u]\\n\"\n \t\t\" Traffic class 3 oversubscription: weight = %hhu\\n\"\n-\t\t\" WRR cost: [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu]\\n\",\n+\t\t\" WRR cost: [%hhu, %hhu, %hhu, %hhu], [%hhu, %hhu, %hhu, %hhu],\\n\",\n \t\ti,\n \n \t\t/* Token bucket */\n@@ -502,10 +582,8 @@ rte_sched_port_log_pipe_profile(struct rte_sched_port *port, uint32_t i)\n \t\tp->tc_ov_weight,\n \n \t\t/* WRR */\n-\t\tp->wrr_cost[ 0], p->wrr_cost[ 1], p->wrr_cost[ 2], p->wrr_cost[ 3],\n-\t\tp->wrr_cost[ 4], p->wrr_cost[ 5], p->wrr_cost[ 6], p->wrr_cost[ 7],\n-\t\tp->wrr_cost[ 8], p->wrr_cost[ 9], p->wrr_cost[10], p->wrr_cost[11],\n-\t\tp->wrr_cost[12], p->wrr_cost[13], p->wrr_cost[14], p->wrr_cost[15]);\n+\t\tp->wrr_cost[0], p->wrr_cost[1], p->wrr_cost[2], p->wrr_cost[3],\n+\t\tp->wrr_cost[4], p->wrr_cost[5], p->wrr_cost[6], p->wrr_cost[7]);\n }\n \n static inline uint64_t\n", "prefixes": [ "03/27" ] }