From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8B83CA0471 for ; Fri, 19 Jul 2019 01:04:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51176231E; Fri, 19 Jul 2019 01:04:25 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 038FA1DBE for ; Fri, 19 Jul 2019 01:04:23 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2019 16:04:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,279,1559545200"; d="scan'208";a="179403822" Received: from irsmsx102.ger.corp.intel.com ([163.33.3.155]) by orsmga002.jf.intel.com with ESMTP; 18 Jul 2019 16:04:21 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.229]) by IRSMSX102.ger.corp.intel.com ([169.254.2.59]) with mapi id 14.03.0439.000; Fri, 19 Jul 2019 00:04:20 +0100 From: "Dumitrescu, Cristian" To: "Singh, Jasvinder" , "dev@dpdk.org" CC: "Tovar, AbrahamX" , "Krakowiak, LukaszX" Thread-Topic: [PATCH v5 02/11] sched: add config flexibility to tc queue sizes Thread-Index: AQHVPK3iWNNap6Vph0Wxl9XlRAckGKbRAAtQ Date: Thu, 18 Jul 2019 23:04:20 +0000 Message-ID: <3EB4FA525960D640B5BDFFD6A3D891268E8F03B9@IRSMSX108.ger.corp.intel.com> References: <20190712095729.159767-2-jasvinder.singh@intel.com> <20190717144245.138876-1-jasvinder.singh@intel.com> <20190717144245.138876-3-jasvinder.singh@intel.com> In-Reply-To: <20190717144245.138876-3-jasvinder.singh@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTZmZTY3MWYtZmRjMS00MzMzLWFjODItMTgwMmM4YzZlNzkyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoic2MrODVwc3NjK2hPM3NJZzlQajVnYnJPNitVWlYxd3JXbHlVZ2RpY3RlN2llVjh4RDA1S1wvSXNlNjd1Vm9VMU4ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v5 02/11] sched: add config flexibility to tc queue sizes X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Singh, Jasvinder > Sent: Wednesday, July 17, 2019 4:43 PM > To: dev@dpdk.org > Cc: Dumitrescu, Cristian ; Tovar, AbrahamX > ; Krakowiak, LukaszX > > Subject: [PATCH v5 02/11] sched: add config flexibility to tc queue sizes >=20 > Add support for zero queue sizes of the traffic classes. The queues > which are not used can be set to zero size. This helps in reducing > memory footprint of the hierarchical scheduler. >=20 > Signed-off-by: Jasvinder Singh > Signed-off-by: Abraham Tovar > Signed-off-by: Lukasz Krakowiak > --- > lib/librte_sched/rte_sched.c | 356 +++++++++++++++++++++-------------- > lib/librte_sched/rte_sched.h | 6 +- > 2 files changed, 214 insertions(+), 148 deletions(-) >=20 > diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c > index f7c218ef0..3d3d4c69f 100644 > --- a/lib/librte_sched/rte_sched.c > +++ b/lib/librte_sched/rte_sched.c > @@ -146,15 +146,15 @@ struct rte_sched_grinder { > struct rte_sched_pipe_profile *pipe_params; >=20 > /* TC cache */ > - uint8_t tccache_qmask[4]; > - uint32_t tccache_qindex[4]; > + uint8_t tccache_qmask[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > + uint32_t tccache_qindex[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > uint32_t tccache_w; > uint32_t tccache_r; >=20 > /* Current TC */ > uint32_t tc_index; > - struct rte_sched_queue > *queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > - struct rte_mbuf **qbase[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > + struct rte_sched_queue > *queue[RTE_SCHED_MAX_QUEUES_PER_TC]; > + struct rte_mbuf **qbase[RTE_SCHED_MAX_QUEUES_PER_TC]; > uint32_t qindex[RTE_SCHED_MAX_QUEUES_PER_TC]; > uint16_t qsize; > uint32_t qmask; > @@ -172,6 +172,9 @@ struct rte_sched_port { > uint32_t n_subports_per_port; > uint32_t n_pipes_per_subport; > uint32_t n_pipes_per_subport_log2; > + uint16_t pipe_queue[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > + uint8_t pipe_tc[RTE_SCHED_QUEUES_PER_PIPE]; > + uint8_t tc_queue[RTE_SCHED_QUEUES_PER_PIPE]; I suggest we create simple functions to access the above 3 data structures = as opposed to access them directly, similar to the rte_sched_port_qsize() f= unction (and maybe place them just below this function). > uint32_t rate; > uint32_t mtu; > uint32_t frame_overhead; > @@ -257,14 +260,14 @@ rte_sched_port_qbase(struct rte_sched_port > *port, uint32_t qindex) > static inline uint16_t > rte_sched_port_qsize(struct rte_sched_port *port, uint32_t qindex) > { > - uint32_t tc =3D (qindex >> 2) & 0x3; > + uint32_t tc =3D port->pipe_tc[qindex & > (RTE_SCHED_QUEUES_PER_PIPE - 1)]; >=20 > return port->qsize[tc]; > } >=20 > static int > pipe_profile_check(struct rte_sched_pipe_params *params, > - uint32_t rate) > + uint32_t rate, uint16_t *qsize) > { > uint32_t i; >=20 > @@ -281,25 +284,27 @@ pipe_profile_check(struct rte_sched_pipe_params > *params, > if (params->tb_size =3D=3D 0) > return -12; >=20 > - /* TC rate: non-zero, less than pipe rate */ > + /* TC rate: non-zero if qsize non-zero, less than pipe rate */ > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) { > - if (params->tc_rate[i] =3D=3D 0 || > - params->tc_rate[i] > params->tb_rate) > + if ((qsize[i] =3D=3D 0 && params->tc_rate[i] !=3D 0) || > + (qsize[i] !=3D 0 && (params->tc_rate[i] =3D=3D 0 || > + params->tc_rate[i] > params->tb_rate))) > return -13; > } > + if (params->tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE] =3D=3D 0 || > + qsize[RTE_SCHED_TRAFFIC_CLASS_BE] =3D=3D 0) > + return -13; >=20 > /* TC period: non-zero */ > if (params->tc_period =3D=3D 0) > return -14; >=20 > -#ifdef RTE_SCHED_SUBPORT_TC_OV > /* TC3 oversubscription weight: non-zero */ > if (params->tc_ov_weight =3D=3D 0) > return -15; > -#endif >=20 > /* Queue WRR weights: non-zero */ > - for (i =3D 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++) { > + for (i =3D 0; i < RTE_SCHED_BE_QUEUES_PER_PIPE; i++) { > if (params->wrr_weights[i] =3D=3D 0) > return -16; > } > @@ -344,7 +349,8 @@ rte_sched_port_check_params(struct > rte_sched_port_params *params) > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) { > uint16_t qsize =3D params->qsize[i]; >=20 > - if (qsize =3D=3D 0 || !rte_is_power_of_2(qsize)) > + if ((qsize !=3D 0 && !rte_is_power_of_2(qsize)) || > + ((i =3D=3D RTE_SCHED_TRAFFIC_CLASS_BE) && (qsize =3D=3D > 0))) > return -8; > } >=20 > @@ -358,7 +364,7 @@ rte_sched_port_check_params(struct > rte_sched_port_params *params) > struct rte_sched_pipe_params *p =3D params->pipe_profiles + > i; > int status; >=20 > - status =3D pipe_profile_check(p, params->rate); > + status =3D pipe_profile_check(p, params->rate, ¶ms- > >qsize[0]); > if (status !=3D 0) > return status; > } > @@ -388,8 +394,12 @@ rte_sched_port_get_array_base(struct > rte_sched_port_params *params, enum rte_sch >=20 > size_per_pipe_queue_array =3D 0; > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) { > - size_per_pipe_queue_array +=3D > RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS > - * params->qsize[i] * sizeof(struct rte_mbuf *); > + if (i < RTE_SCHED_TRAFFIC_CLASS_BE) > + size_per_pipe_queue_array +=3D > + params->qsize[i] * sizeof(struct rte_mbuf *); > + else > + size_per_pipe_queue_array +=3D > RTE_SCHED_MAX_QUEUES_PER_TC * > + params->qsize[i] * sizeof(struct rte_mbuf *); > } > size_queue_array =3D n_pipes_per_port * > size_per_pipe_queue_array; >=20 > @@ -449,31 +459,27 @@ rte_sched_port_get_memory_footprint(struct > rte_sched_port_params *params) > static void > rte_sched_port_config_qsize(struct rte_sched_port *port) > { > - /* TC 0 */ > + uint32_t i; > + > port->qsize_add[0] =3D 0; > - port->qsize_add[1] =3D port->qsize_add[0] + port->qsize[0]; > - port->qsize_add[2] =3D port->qsize_add[1] + port->qsize[0]; > - port->qsize_add[3] =3D port->qsize_add[2] + port->qsize[0]; > - > - /* TC 1 */ > - port->qsize_add[4] =3D port->qsize_add[3] + port->qsize[0]; > - port->qsize_add[5] =3D port->qsize_add[4] + port->qsize[1]; > - port->qsize_add[6] =3D port->qsize_add[5] + port->qsize[1]; > - port->qsize_add[7] =3D port->qsize_add[6] + port->qsize[1]; > - > - /* TC 2 */ > - port->qsize_add[8] =3D port->qsize_add[7] + port->qsize[1]; > - port->qsize_add[9] =3D port->qsize_add[8] + port->qsize[2]; > - port->qsize_add[10] =3D port->qsize_add[9] + port->qsize[2]; > - port->qsize_add[11] =3D port->qsize_add[10] + port->qsize[2]; > - > - /* TC 3 */ > - port->qsize_add[12] =3D port->qsize_add[11] + port->qsize[2]; > - port->qsize_add[13] =3D port->qsize_add[12] + port->qsize[3]; > - port->qsize_add[14] =3D port->qsize_add[13] + port->qsize[3]; > - port->qsize_add[15] =3D port->qsize_add[14] + port->qsize[3]; > - > - port->qsize_sum =3D port->qsize_add[15] + port->qsize[3]; > + > + /* Strict prority traffic class */ > + for (i =3D 1; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + port->qsize_add[i] =3D port->qsize_add[i-1] + port->qsize[i-1]; > + > + /* Best-effort traffic class */ > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE + 1] =3D > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE] + > + port->qsize[RTE_SCHED_TRAFFIC_CLASS_BE]; > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE + 2] =3D > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE + 1] + > + port->qsize[RTE_SCHED_TRAFFIC_CLASS_BE]; > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE + 3] =3D > + port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE + 2] + > + port->qsize[RTE_SCHED_TRAFFIC_CLASS_BE]; > + > + port->qsize_sum =3D port->qsize_add[RTE_SCHED_TRAFFIC_CLASS_BE > + 3] + > + port->qsize[RTE_SCHED_TRAFFIC_CLASS_BE]; > } >=20 > static void > @@ -482,10 +488,11 @@ rte_sched_port_log_pipe_profile(struct > rte_sched_port *port, uint32_t i) > struct rte_sched_pipe_profile *p =3D port->pipe_profiles + i; >=20 > RTE_LOG(DEBUG, SCHED, "Low level config for pipe profile %u:\n" > - " Token bucket: period =3D %u, credits per period =3D %u, size =3D > %u\n" > - " Traffic classes: period =3D %u, credits per period =3D [%u, %u, > %u, %u]\n" > - " Traffic class 3 oversubscription: weight =3D %hhu\n" > - " WRR cost: [%hhu, %hhu, %hhu, %hhu]\n", > + " Token bucket: period =3D %u, credits per period =3D %u, > size =3D %u\n" > + " Traffic classes: period =3D %u,\n" > + " credits per period =3D [%u, %u, %u, %u, %u, %u, %u, > %u, %u, %u, %u, %u, %u]\n" > + " Best-effort traffic class oversubscription: weight =3D > %hhu\n" > + " WRR cost: [%hhu, %hhu, %hhu, %hhu]\n", > i, >=20 > /* Token bucket */ > @@ -499,6 +506,15 @@ rte_sched_port_log_pipe_profile(struct > rte_sched_port *port, uint32_t i) > p->tc_credits_per_period[1], > p->tc_credits_per_period[2], > p->tc_credits_per_period[3], > + p->tc_credits_per_period[4], > + p->tc_credits_per_period[5], > + p->tc_credits_per_period[6], > + p->tc_credits_per_period[7], > + p->tc_credits_per_period[8], > + p->tc_credits_per_period[9], > + p->tc_credits_per_period[10], > + p->tc_credits_per_period[11], > + p->tc_credits_per_period[12], >=20 > /* Traffic class 3 oversubscription */ > p->tc_ov_weight, > @@ -518,7 +534,8 @@ rte_sched_time_ms_to_bytes(uint32_t time_ms, > uint32_t rate) > } >=20 > static void > -rte_sched_pipe_profile_convert(struct rte_sched_pipe_params *src, > +rte_sched_pipe_profile_convert(struct rte_sched_port *port, > + struct rte_sched_pipe_params *src, > struct rte_sched_pipe_profile *dst, > uint32_t rate) > { > @@ -546,13 +563,12 @@ rte_sched_pipe_profile_convert(struct > rte_sched_pipe_params *src, > rate); >=20 > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > - dst->tc_credits_per_period[i] > - =3D rte_sched_time_ms_to_bytes(src->tc_period, > - src->tc_rate[i]); > + if (port->qsize[i]) > + dst->tc_credits_per_period[i] > + =3D rte_sched_time_ms_to_bytes(src- > >tc_period, > + src->tc_rate[i]); >=20 > -#ifdef RTE_SCHED_SUBPORT_TC_OV > dst->tc_ov_weight =3D src->tc_ov_weight; > -#endif >=20 > /* WRR queues */ > wrr_cost[0] =3D src->wrr_weights[0]; > @@ -585,14 +601,14 @@ rte_sched_port_config_pipe_profile_table(struct > rte_sched_port *port, > struct rte_sched_pipe_params *src =3D params->pipe_profiles > + i; > struct rte_sched_pipe_profile *dst =3D port->pipe_profiles + i; >=20 > - rte_sched_pipe_profile_convert(src, dst, params->rate); > + rte_sched_pipe_profile_convert(port, src, dst, params- > >rate); > rte_sched_port_log_pipe_profile(port, i); > } >=20 > port->pipe_tc3_rate_max =3D 0; > for (i =3D 0; i < port->n_pipe_profiles; i++) { > struct rte_sched_pipe_params *src =3D params->pipe_profiles > + i; > - uint32_t pipe_tc3_rate =3D src->tc_rate[3]; > + uint32_t pipe_tc3_rate =3D src- > >tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE]; >=20 > if (port->pipe_tc3_rate_max < pipe_tc3_rate) > port->pipe_tc3_rate_max =3D pipe_tc3_rate; > @@ -603,7 +619,7 @@ struct rte_sched_port * > rte_sched_port_config(struct rte_sched_port_params *params) > { > struct rte_sched_port *port =3D NULL; > - uint32_t mem_size, bmp_mem_size, n_queues_per_port, i, > cycles_per_byte; > + uint32_t mem_size, bmp_mem_size, n_queues_per_port, i, j, > cycles_per_byte; >=20 > /* Check user parameters. Determine the amount of memory to > allocate */ > mem_size =3D rte_sched_port_get_memory_footprint(params); > @@ -625,6 +641,23 @@ rte_sched_port_config(struct > rte_sched_port_params *params) > port->n_pipes_per_subport =3D params->n_pipes_per_subport; > port->n_pipes_per_subport_log2 =3D > __builtin_ctz(params->n_pipes_per_subport); > + > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + port->pipe_queue[i] =3D i; > + > + for (i =3D 0, j =3D 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++) { > + port->pipe_tc[i] =3D j; > + > + if (j < RTE_SCHED_TRAFFIC_CLASS_BE) > + j++; > + } > + > + for (i =3D 0, j =3D 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++) { > + port->tc_queue[i] =3D j; > + > + if (i >=3D RTE_SCHED_TRAFFIC_CLASS_BE) > + j++; > + } > port->rate =3D params->rate; > port->mtu =3D params->mtu + params->frame_overhead; > port->frame_overhead =3D params->frame_overhead; > @@ -734,12 +767,14 @@ rte_sched_port_free(struct rte_sched_port *port) > for (qindex =3D 0; qindex < n_queues_per_port; qindex++) { > struct rte_mbuf **mbufs =3D rte_sched_port_qbase(port, > qindex); > uint16_t qsize =3D rte_sched_port_qsize(port, qindex); > - struct rte_sched_queue *queue =3D port->queue + qindex; > - uint16_t qr =3D queue->qr & (qsize - 1); > - uint16_t qw =3D queue->qw & (qsize - 1); > + if (qsize !=3D 0) { > + struct rte_sched_queue *queue =3D port->queue + > qindex; > + uint16_t qr =3D queue->qr & (qsize - 1); > + uint16_t qw =3D queue->qw & (qsize - 1); >=20 > - for (; qr !=3D qw; qr =3D (qr + 1) & (qsize - 1)) > - rte_pktmbuf_free(mbufs[qr]); > + for (; qr !=3D qw; qr =3D (qr + 1) & (qsize - 1)) > + rte_pktmbuf_free(mbufs[qr]); > + } > } >=20 > rte_bitmap_free(port->bmp); > @@ -752,9 +787,10 @@ rte_sched_port_log_subport_config(struct > rte_sched_port *port, uint32_t i) > struct rte_sched_subport *s =3D port->subport + i; >=20 > RTE_LOG(DEBUG, SCHED, "Low level config for subport %u:\n" > - " Token bucket: period =3D %u, credits per period =3D %u, size =3D > %u\n" > - " Traffic classes: period =3D %u, credits per period =3D [%u, %u, > %u, %u]\n" > - " Traffic class 3 oversubscription: wm min =3D %u, wm max =3D > %u\n", > + " Token bucket: period =3D %u, credits per period =3D %u, > size =3D %u\n" > + " Traffic classes: period =3D %u\n" > + " credits per period =3D [%u, %u, %u, %u, %u, %u, %u, > %u, %u, %u, %u, %u, %u]\n" > + " Best effort traffic class oversubscription: wm min =3D > %u, wm max =3D %u\n", > i, >=20 > /* Token bucket */ > @@ -768,6 +804,15 @@ rte_sched_port_log_subport_config(struct > rte_sched_port *port, uint32_t i) > s->tc_credits_per_period[1], > s->tc_credits_per_period[2], > s->tc_credits_per_period[3], > + s->tc_credits_per_period[4], > + s->tc_credits_per_period[5], > + s->tc_credits_per_period[6], > + s->tc_credits_per_period[7], > + s->tc_credits_per_period[8], > + s->tc_credits_per_period[9], > + s->tc_credits_per_period[10], > + s->tc_credits_per_period[11], > + s->tc_credits_per_period[12], >=20 > /* Traffic class 3 oversubscription */ > s->tc_ov_wm_min, > @@ -795,11 +840,19 @@ rte_sched_subport_config(struct rte_sched_port > *port, > return -3; >=20 > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) { > - if (params->tc_rate[i] =3D=3D 0 || > - params->tc_rate[i] > params->tb_rate) > + uint32_t tc_rate =3D params->tc_rate[i]; > + uint16_t qsize =3D port->qsize[i]; > + > + if ((qsize =3D=3D 0 && tc_rate !=3D 0) || > + (qsize !=3D 0 && tc_rate =3D=3D 0) || > + (tc_rate > params->tb_rate)) > return -4; > } >=20 > + if (port->qsize[RTE_SCHED_TRAFFIC_CLASS_BE] =3D=3D 0 || > + params->tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE] =3D=3D 0) > + return -4; > + > if (params->tc_period =3D=3D 0) > return -5; >=20 > @@ -823,15 +876,17 @@ rte_sched_subport_config(struct rte_sched_port > *port, > /* Traffic Classes (TCs) */ > s->tc_period =3D rte_sched_time_ms_to_bytes(params->tc_period, > port->rate); > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) { > - s->tc_credits_per_period[i] > - =3D rte_sched_time_ms_to_bytes(params->tc_period, > - params->tc_rate[i]); > + if (port->qsize[i]) > + s->tc_credits_per_period[i] > + =3D rte_sched_time_ms_to_bytes(params- > >tc_period, > + params- > >tc_rate[i]); > + > } > s->tc_time =3D port->time + s->tc_period; > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > - s->tc_credits[i] =3D s->tc_credits_per_period[i]; > + if (port->qsize[i]) > + s->tc_credits[i] =3D s->tc_credits_per_period[i]; >=20 > -#ifdef RTE_SCHED_SUBPORT_TC_OV > /* TC oversubscription */ > s->tc_ov_wm_min =3D port->mtu; > s->tc_ov_wm_max =3D rte_sched_time_ms_to_bytes(params- > >tc_period, > @@ -841,7 +896,6 @@ rte_sched_subport_config(struct rte_sched_port > *port, > s->tc_ov =3D 0; > s->tc_ov_n =3D 0; > s->tc_ov_rate =3D 0; > -#endif >=20 > rte_sched_port_log_subport_config(port, subport_id); >=20 > @@ -881,10 +935,9 @@ rte_sched_pipe_config(struct rte_sched_port *port, > if (p->tb_time) { > params =3D port->pipe_profiles + p->profile; >=20 > -#ifdef RTE_SCHED_SUBPORT_TC_OV > - double subport_tc3_rate =3D (double) s- > >tc_credits_per_period[3] > + double subport_tc3_rate =3D (double) s- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] > / (double) s->tc_period; > - double pipe_tc3_rate =3D (double) params- > >tc_credits_per_period[3] > + double pipe_tc3_rate =3D (double) params- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] > / (double) params->tc_period; > uint32_t tc3_ov =3D s->tc_ov; >=20 > @@ -898,7 +951,6 @@ rte_sched_pipe_config(struct rte_sched_port *port, > "Subport %u TC3 oversubscription is OFF > (%.4lf >=3D %.4lf)\n", > subport_id, subport_tc3_rate, s- > >tc_ov_rate); > } > -#endif >=20 > /* Reset the pipe */ > memset(p, 0, sizeof(struct rte_sched_pipe)); > @@ -917,15 +969,18 @@ rte_sched_pipe_config(struct rte_sched_port > *port, >=20 > /* Traffic Classes (TCs) */ > p->tc_time =3D port->time + params->tc_period; > + > for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > - p->tc_credits[i] =3D params->tc_credits_per_period[i]; > + if (port->qsize[i]) > + p->tc_credits[i] =3D params->tc_credits_per_period[i]; >=20 > -#ifdef RTE_SCHED_SUBPORT_TC_OV > { > /* Subport TC3 oversubscription */ > - double subport_tc3_rate =3D (double) s- > >tc_credits_per_period[3] > + double subport_tc3_rate =3D > + (double) s- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] > / (double) s->tc_period; > - double pipe_tc3_rate =3D (double) params- > >tc_credits_per_period[3] > + double pipe_tc3_rate =3D > + (double) params- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] > / (double) params->tc_period; > uint32_t tc3_ov =3D s->tc_ov; >=20 > @@ -941,7 +996,6 @@ rte_sched_pipe_config(struct rte_sched_port *port, > p->tc_ov_period_id =3D s->tc_ov_period_id; > p->tc_ov_credits =3D s->tc_ov_wm; > } > -#endif >=20 > return 0; > } > @@ -964,12 +1018,12 @@ rte_sched_port_pipe_profile_add(struct > rte_sched_port *port, > return -2; >=20 > /* Pipe params */ > - status =3D pipe_profile_check(params, port->rate); > + status =3D pipe_profile_check(params, port->rate, &port->qsize[0]); > if (status !=3D 0) > return status; >=20 > pp =3D &port->pipe_profiles[port->n_pipe_profiles]; > - rte_sched_pipe_profile_convert(params, pp, port->rate); > + rte_sched_pipe_profile_convert(port, params, pp, port->rate); >=20 > /* Pipe profile not exists */ > for (i =3D 0; i < port->n_pipe_profiles; i++) > @@ -980,8 +1034,8 @@ rte_sched_port_pipe_profile_add(struct > rte_sched_port *port, > *pipe_profile_id =3D port->n_pipe_profiles; > port->n_pipe_profiles++; >=20 > - if (port->pipe_tc3_rate_max < params->tc_rate[3]) > - port->pipe_tc3_rate_max =3D params->tc_rate[3]; > + if (port->pipe_tc3_rate_max < params- > >tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE]) > + port->pipe_tc3_rate_max =3D params- > >tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE]; >=20 > rte_sched_port_log_pipe_profile(port, *pipe_profile_id); >=20 > @@ -998,9 +1052,8 @@ rte_sched_port_qindex(struct rte_sched_port > *port, > return ((subport & (port->n_subports_per_port - 1)) << > (port->n_pipes_per_subport_log2 + 4)) | > ((pipe & (port->n_pipes_per_subport - 1)) << 4) | > - ((traffic_class & > - (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)) << > 2) | > - (queue & > (RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS - 1)); > + ((port->pipe_queue[traffic_class] + queue) & > + (RTE_SCHED_QUEUES_PER_PIPE - 1)); > } >=20 > void > @@ -1010,8 +1063,9 @@ rte_sched_port_pkt_write(struct rte_sched_port > *port, > uint32_t traffic_class, > uint32_t queue, enum rte_color color) > { > - uint32_t queue_id =3D rte_sched_port_qindex(port, subport, pipe, > - traffic_class, queue); > + uint32_t queue_id =3D > + rte_sched_port_qindex(port, subport, pipe, traffic_class, > queue); > + > rte_mbuf_sched_set(pkt, queue_id, traffic_class, (uint8_t)color); > } >=20 > @@ -1022,12 +1076,12 @@ rte_sched_port_pkt_read_tree_path(struct > rte_sched_port *port, > uint32_t *traffic_class, uint32_t *queue) > { > uint32_t queue_id =3D rte_mbuf_sched_queue_get(pkt); > + uint32_t pipe_queue =3D queue_id & (RTE_SCHED_QUEUES_PER_PIPE > - 1); >=20 > *subport =3D queue_id >> (port->n_pipes_per_subport_log2 + 4); > *pipe =3D (queue_id >> 4) & (port->n_pipes_per_subport - 1); > - *traffic_class =3D (queue_id >> 2) & > - (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - > 1); > - *queue =3D queue_id & (RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS - > 1); > + *traffic_class =3D port->pipe_tc[pipe_queue]; > + *queue =3D port->tc_queue[pipe_queue]; > } >=20 > enum rte_color > @@ -1108,7 +1162,7 @@ static inline void > rte_sched_port_update_subport_stats(struct rte_sched_port *port, > uint32_t qindex, struct rte_mbuf *pkt) > { > struct rte_sched_subport *s =3D port->subport + (qindex / > rte_sched_port_queues_per_subport(port)); > - uint32_t tc_index =3D (qindex >> 2) & 0x3; > + uint32_t tc_index =3D port->pipe_tc[qindex & > (RTE_SCHED_QUEUES_PER_PIPE - 1)]; > uint32_t pkt_len =3D pkt->pkt_len; >=20 > s->stats.n_pkts_tc[tc_index] +=3D 1; > @@ -1128,7 +1182,7 @@ > rte_sched_port_update_subport_stats_on_drop(struct rte_sched_port > *port, > #endif > { > struct rte_sched_subport *s =3D port->subport + (qindex / > rte_sched_port_queues_per_subport(port)); > - uint32_t tc_index =3D (qindex >> 2) & 0x3; > + uint32_t tc_index =3D port->pipe_tc[qindex & > (RTE_SCHED_QUEUES_PER_PIPE - 1)]; > uint32_t pkt_len =3D pkt->pkt_len; >=20 > s->stats.n_pkts_tc_dropped[tc_index] +=3D 1; > @@ -1183,7 +1237,7 @@ rte_sched_port_red_drop(struct rte_sched_port > *port, struct rte_mbuf *pkt, uint3 > uint32_t tc_index; > enum rte_color color; >=20 > - tc_index =3D (qindex >> 2) & 0x3; > + tc_index =3D port->pipe_tc[qindex & (RTE_SCHED_QUEUES_PER_PIPE > - 1)]; > color =3D rte_sched_port_pkt_read_color(pkt); > red_cfg =3D &port->red_config[tc_index][color]; >=20 > @@ -1500,6 +1554,7 @@ grinder_credits_update(struct rte_sched_port > *port, uint32_t pos) > struct rte_sched_pipe *pipe =3D grinder->pipe; > struct rte_sched_pipe_profile *params =3D grinder->pipe_params; > uint64_t n_periods; > + uint32_t i; >=20 > /* Subport TB */ > n_periods =3D (port->time - subport->tb_time) / subport->tb_period; > @@ -1515,19 +1570,17 @@ grinder_credits_update(struct rte_sched_port > *port, uint32_t pos) >=20 > /* Subport TCs */ > if (unlikely(port->time >=3D subport->tc_time)) { > - subport->tc_credits[0] =3D subport->tc_credits_per_period[0]; > - subport->tc_credits[1] =3D subport->tc_credits_per_period[1]; > - subport->tc_credits[2] =3D subport->tc_credits_per_period[2]; > - subport->tc_credits[3] =3D subport->tc_credits_per_period[3]; > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + subport->tc_credits[i] =3D subport- > >tc_credits_per_period[i]; > + > subport->tc_time =3D port->time + subport->tc_period; > } >=20 > /* Pipe TCs */ > if (unlikely(port->time >=3D pipe->tc_time)) { > - pipe->tc_credits[0] =3D params->tc_credits_per_period[0]; > - pipe->tc_credits[1] =3D params->tc_credits_per_period[1]; > - pipe->tc_credits[2] =3D params->tc_credits_per_period[2]; > - pipe->tc_credits[3] =3D params->tc_credits_per_period[3]; > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + pipe->tc_credits[i] =3D params- > >tc_credits_per_period[i]; > + > pipe->tc_time =3D port->time + params->tc_period; > } > } > @@ -1540,21 +1593,29 @@ grinder_tc_ov_credits_update(struct > rte_sched_port *port, uint32_t pos) > struct rte_sched_grinder *grinder =3D port->grinder + pos; > struct rte_sched_subport *subport =3D grinder->subport; > uint32_t > tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > - uint32_t tc_ov_consumption_max; > + uint32_t tc_consumption =3D 0, tc_ov_consumption_max; > uint32_t tc_ov_wm =3D subport->tc_ov_wm; > + uint32_t i; >=20 > if (subport->tc_ov =3D=3D 0) > return subport->tc_ov_wm_max; >=20 > - tc_ov_consumption[0] =3D subport->tc_credits_per_period[0] - > subport->tc_credits[0]; > - tc_ov_consumption[1] =3D subport->tc_credits_per_period[1] - > subport->tc_credits[1]; > - tc_ov_consumption[2] =3D subport->tc_credits_per_period[2] - > subport->tc_credits[2]; > - tc_ov_consumption[3] =3D subport->tc_credits_per_period[3] - > subport->tc_credits[3]; > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASS_BE; i++) { > + tc_ov_consumption[i] =3D > + subport->tc_credits_per_period[i] - subport- > >tc_credits[i]; > + tc_consumption +=3D tc_ov_consumption[i]; > + } > + > + tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASS_BE] =3D > + subport- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] - > + subport->tc_credits[RTE_SCHED_TRAFFIC_CLASS_BE]; >=20 > - tc_ov_consumption_max =3D subport->tc_credits_per_period[3] - > - (tc_ov_consumption[0] + tc_ov_consumption[1] + > tc_ov_consumption[2]); >=20 > - if (tc_ov_consumption[3] > (tc_ov_consumption_max - port->mtu)) > { > + tc_ov_consumption_max =3D > + subport- > >tc_credits_per_period[RTE_SCHED_TRAFFIC_CLASS_BE] - tc_consumption; > + > + if (tc_ov_consumption[RTE_SCHED_TRAFFIC_CLASS_BE] > > + (tc_ov_consumption_max - port->mtu)) { > tc_ov_wm -=3D tc_ov_wm >> 7; > if (tc_ov_wm < subport->tc_ov_wm_min) > tc_ov_wm =3D subport->tc_ov_wm_min; > @@ -1577,6 +1638,7 @@ grinder_credits_update(struct rte_sched_port > *port, uint32_t pos) > struct rte_sched_pipe *pipe =3D grinder->pipe; > struct rte_sched_pipe_profile *params =3D grinder->pipe_params; > uint64_t n_periods; > + uint32_t i; >=20 > /* Subport TB */ > n_periods =3D (port->time - subport->tb_time) / subport->tb_period; > @@ -1594,10 +1656,8 @@ grinder_credits_update(struct rte_sched_port > *port, uint32_t pos) > if (unlikely(port->time >=3D subport->tc_time)) { > subport->tc_ov_wm =3D grinder_tc_ov_credits_update(port, > pos); >=20 > - subport->tc_credits[0] =3D subport->tc_credits_per_period[0]; > - subport->tc_credits[1] =3D subport->tc_credits_per_period[1]; > - subport->tc_credits[2] =3D subport->tc_credits_per_period[2]; > - subport->tc_credits[3] =3D subport->tc_credits_per_period[3]; > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + subport->tc_credits[i] =3D subport- > >tc_credits_per_period[i]; >=20 > subport->tc_time =3D port->time + subport->tc_period; > subport->tc_ov_period_id++; > @@ -1605,10 +1665,8 @@ grinder_credits_update(struct rte_sched_port > *port, uint32_t pos) >=20 > /* Pipe TCs */ > if (unlikely(port->time >=3D pipe->tc_time)) { > - pipe->tc_credits[0] =3D params->tc_credits_per_period[0]; > - pipe->tc_credits[1] =3D params->tc_credits_per_period[1]; > - pipe->tc_credits[2] =3D params->tc_credits_per_period[2]; > - pipe->tc_credits[3] =3D params->tc_credits_per_period[3]; > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + pipe->tc_credits[i] =3D params- > >tc_credits_per_period[i]; > pipe->tc_time =3D port->time + params->tc_period; > } >=20 > @@ -1673,11 +1731,18 @@ grinder_credits_check(struct rte_sched_port > *port, uint32_t pos) > uint32_t subport_tc_credits =3D subport->tc_credits[tc_index]; > uint32_t pipe_tb_credits =3D pipe->tb_credits; > uint32_t pipe_tc_credits =3D pipe->tc_credits[tc_index]; > - uint32_t pipe_tc_ov_mask1[] =3D {UINT32_MAX, UINT32_MAX, > UINT32_MAX, pipe->tc_ov_credits}; > - uint32_t pipe_tc_ov_mask2[] =3D {0, 0, 0, UINT32_MAX}; > - uint32_t pipe_tc_ov_credits =3D pipe_tc_ov_mask1[tc_index]; > + uint32_t > pipe_tc_ov_mask1[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; > + uint32_t > pipe_tc_ov_mask2[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE] =3D {0}; > + uint32_t pipe_tc_ov_credits, i; > int enough_credits; >=20 > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) > + pipe_tc_ov_mask1[i] =3D UINT32_MAX; > + > + pipe_tc_ov_mask1[RTE_SCHED_TRAFFIC_CLASS_BE] =3D pipe- > >tc_ov_credits; > + pipe_tc_ov_mask2[RTE_SCHED_TRAFFIC_CLASS_BE] =3D > UINT32_MAX; > + pipe_tc_ov_credits =3D pipe_tc_ov_mask1[tc_index]; > + > /* Check pipe and subport credits */ > enough_credits =3D (pkt_len <=3D subport_tb_credits) && > (pkt_len <=3D subport_tc_credits) && > @@ -1832,31 +1897,23 @@ static inline void > grinder_tccache_populate(struct rte_sched_port *port, uint32_t pos, > uint32_t qindex, uint16_t qmask) > { > struct rte_sched_grinder *grinder =3D port->grinder + pos; > - uint8_t b[4]; > + uint8_t b, i; >=20 > grinder->tccache_w =3D 0; > grinder->tccache_r =3D 0; >=20 > - b[0] =3D (uint8_t) (qmask & 0xF); > - b[1] =3D (uint8_t) ((qmask >> 4) & 0xF); > - b[2] =3D (uint8_t) ((qmask >> 8) & 0xF); > - b[3] =3D (uint8_t) ((qmask >> 12) & 0xF); > - > - grinder->tccache_qmask[grinder->tccache_w] =3D b[0]; > - grinder->tccache_qindex[grinder->tccache_w] =3D qindex; > - grinder->tccache_w +=3D (b[0] !=3D 0); > - > - grinder->tccache_qmask[grinder->tccache_w] =3D b[1]; > - grinder->tccache_qindex[grinder->tccache_w] =3D qindex + 4; > - grinder->tccache_w +=3D (b[1] !=3D 0); > - > - grinder->tccache_qmask[grinder->tccache_w] =3D b[2]; > - grinder->tccache_qindex[grinder->tccache_w] =3D qindex + 8; > - grinder->tccache_w +=3D (b[2] !=3D 0); > + for (i =3D 0; i < RTE_SCHED_TRAFFIC_CLASS_BE; i++) { > + b =3D (uint8_t) ((qmask >> i) & 0x1); > + grinder->tccache_qmask[grinder->tccache_w] =3D b; > + grinder->tccache_qindex[grinder->tccache_w] =3D qindex + i; > + grinder->tccache_w +=3D (b !=3D 0); > + } >=20 > - grinder->tccache_qmask[grinder->tccache_w] =3D b[3]; > - grinder->tccache_qindex[grinder->tccache_w] =3D qindex + 12; > - grinder->tccache_w +=3D (b[3] !=3D 0); > + b =3D (uint8_t) (qmask >> (RTE_SCHED_TRAFFIC_CLASS_BE)); > + grinder->tccache_qmask[grinder->tccache_w] =3D b; > + grinder->tccache_qindex[grinder->tccache_w] =3D qindex + > + RTE_SCHED_TRAFFIC_CLASS_BE; > + grinder->tccache_w +=3D (b !=3D 0); > } >=20 > static inline int > @@ -1874,14 +1931,18 @@ grinder_next_tc(struct rte_sched_port *port, > uint32_t pos) > qbase =3D rte_sched_port_qbase(port, qindex); > qsize =3D rte_sched_port_qsize(port, qindex); >=20 > - grinder->tc_index =3D (qindex >> 2) & 0x3; > + grinder->tc_index =3D port->pipe_tc[qindex & > (RTE_SCHED_QUEUES_PER_PIPE - 1)]; > grinder->qmask =3D grinder->tccache_qmask[grinder->tccache_r]; > grinder->qsize =3D qsize; >=20 > - grinder->qindex[0] =3D qindex; > - grinder->qindex[1] =3D qindex + 1; > - grinder->qindex[2] =3D qindex + 2; > - grinder->qindex[3] =3D qindex + 3; > + if (grinder->tc_index < RTE_SCHED_TRAFFIC_CLASS_BE) { > + grinder->queue[0] =3D port->queue + qindex; > + grinder->qbase[0] =3D qbase; > + grinder->qindex[0] =3D qindex; > + grinder->tccache_r++; > + > + return 1; > + } >=20 > grinder->queue[0] =3D port->queue + qindex; > grinder->queue[1] =3D port->queue + qindex + 1; > @@ -1893,6 +1954,11 @@ grinder_next_tc(struct rte_sched_port *port, > uint32_t pos) > grinder->qbase[2] =3D qbase + 2 * qsize; > grinder->qbase[3] =3D qbase + 3 * qsize; >=20 > + grinder->qindex[0] =3D qindex; > + grinder->qindex[1] =3D qindex + 1; > + grinder->qindex[2] =3D qindex + 2; > + grinder->qindex[3] =3D qindex + 3; > + > grinder->tccache_r++; > return 1; > } > diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h > index f9947c4cd..2b55c97ab 100644 > --- a/lib/librte_sched/rte_sched.h > +++ b/lib/librte_sched/rte_sched.h > @@ -85,7 +85,9 @@ extern "C" { > /** Number of traffic classes per pipe (as well as subport). > * Cannot be changed. > */ > -#define RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE 4 > +#define RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE \ > +(RTE_SCHED_QUEUES_PER_PIPE - RTE_SCHED_BE_QUEUES_PER_PIPE + 1) > + >=20 > /** Number of queues per pipe traffic class. Cannot be changed. */ > #define RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS 4 > @@ -172,9 +174,7 @@ struct rte_sched_pipe_params { > /**< Traffic class rates (measured in bytes per second) */ > uint32_t tc_period; > /**< Enforcement period (measured in milliseconds) */ > -#ifdef RTE_SCHED_SUBPORT_TC_OV > uint8_t tc_ov_weight; /**< Weight Traffic class 3 > oversubscription */ > -#endif >=20 > /* Pipe queues */ > uint8_t wrr_weights[RTE_SCHED_BE_QUEUES_PER_PIPE]; /**< > WRR weights */ > -- > 2.21.0