[dpdk-dev] [PATCH 15/27] sched: update pipe and tc queues prefetch

[Lukasz Krakowiak <lukaszx.krakowiak@intel.com>]

From: Jasvinder Singh <jasvinder.singh@intel.com>

Update pipe and tc queues prefetch functions of scheduler to allow
configuration flexiblity for pipe traffic classes and queues, and subport
level configuration of the pipe parameters..

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Abraham Tovar <abrahamx.tovar@intel.com>
Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
---
 lib/librte_sched/rte_sched.c | 42 +++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index 74a8e0a71..07939c04f 100644
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -2389,34 +2389,42 @@ grinder_wrr(struct rte_sched_port *port, uint32_t pos)
 #define grinder_evict(port, pos)
 
 static inline void
-grinder_prefetch_pipe(struct rte_sched_port *port, uint32_t pos)
+grinder_prefetch_pipe(struct rte_sched_subport *subport, uint32_t pos)
 {
-	struct rte_sched_grinder *grinder = port->grinder + pos;
+	struct rte_sched_grinder *grinder = subport->grinder + pos;
 
 	rte_prefetch0(grinder->pipe);
-	rte_prefetch0(grinder->queue[0]);
+	rte_prefetch0(grinder->sp.queue);
 }
 
 static inline void
 grinder_prefetch_tc_queue_arrays(struct rte_sched_port *port, uint32_t pos)
 {
-	struct rte_sched_grinder *grinder = port->grinder + pos;
-	uint16_t qsize, qr[4];
+	struct rte_sched_grinder *grinder = port->subport->grinder + pos;
+	struct rte_sched_pipe *pipe = grinder->pipe;
+	struct rte_sched_queue *queue;
+	uint32_t tc_index = grinder->tc_index, i;
+	uint16_t qsize, qr[RTE_SCHED_WRR_QUEUES_PER_PIPE];
+
+	if (tc_index < pipe->n_sp_queues) {
+		queue = grinder->sp.queue;
+		qsize = grinder->sp.qsize;
+		qr[0] = queue->qr & (qsize - 1);
 
-	qsize = grinder->qsize;
-	qr[0] = grinder->queue[0]->qr & (qsize - 1);
-	qr[1] = grinder->queue[1]->qr & (qsize - 1);
-	qr[2] = grinder->queue[2]->qr & (qsize - 1);
-	qr[3] = grinder->queue[3]->qr & (qsize - 1);
+		rte_prefetch0(grinder->sp.qbase + qr[0]);
+		return;
+	}
+
+	for (i = 0; i < pipe->n_be_queues; i++) {
+		queue = grinder->be.queue[i];
+		qsize = grinder->be.qsize[i];
+		qr[i] = queue->qr & (qsize - 1);
 
-	rte_prefetch0(grinder->qbase[0] + qr[0]);
-	rte_prefetch0(grinder->qbase[1] + qr[1]);
+		rte_prefetch0(grinder->be.qbase[i] + qr[i]);
+	}
 
 	grinder_wrr_load(port, pos);
 	grinder_wrr(port, pos);
-
-	rte_prefetch0(grinder->qbase[2] + qr[2]);
-	rte_prefetch0(grinder->qbase[3] + qr[3]);
 }
 
 static inline void
@@ -2447,7 +2455,7 @@ grinder_handle(struct rte_sched_port *port, uint32_t pos)
 	case e_GRINDER_PREFETCH_PIPE:
 	{
 		if (grinder_next_pipe(port->subport, pos)) {
-			grinder_prefetch_pipe(port, pos);
+			grinder_prefetch_pipe(port->subport, pos);
 			port->busy_grinders++;
 
 			grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
@@ -2508,7 +2516,7 @@ grinder_handle(struct rte_sched_port *port, uint32_t pos)
 
 		/* Look for another active pipe */
 		if (grinder_next_pipe(port->subport, pos)) {
-			grinder_prefetch_pipe(port, pos);
+			grinder_prefetch_pipe(port->subport, pos);
 
 			grinder->state = e_GRINDER_PREFETCH_TC_QUEUE_ARRAYS;
 			return result;
-- 
2.20.1