diff mbox series

[18/27] sched: update mbuf prefetch function

Message ID	20190528120553.2992-19-lukaszx.krakowiak@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Cristian Dumitrescu
Headers	From: Lukasz Krakowiak <lukaszx.krakowiak@intel.com> To: cristian.dumitrescu@intel.com Cc: dev@dpdk.org, Jasvinder Singh <jasvinder.singh@intel.com>, Abraham Tovar <abrahamx.tovar@intel.com>, Lukasz Krakowiak <lukaszx.krakowiak@intel.com> Date: Tue, 28 May 2019 14:05:44 +0200 Message-Id: <20190528120553.2992-19-lukaszx.krakowiak@intel.com> 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 18/27] sched: update mbuf prefetch function Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	sched: feature enhancements \| [00/27] sched: feature enhancements [01/27] sched: update macros for flexible config [02/27] sched: update subport and pipe data structures [03/27] sched: update internal data structures [04/27] sched: update port config api [05/27] sched: update port free api [06/27] sched: update subport config api [07/27] sched: update pipe profile add api [08/27] sched: update pipe config api [09/27] sched: update pkt read and write api [10/27] sched: update subport and tc queue stats [11/27] sched: update port memory footprint api [12/27] sched: update packet enqueue api [13/27] sched: update grinder pipe and tc cache [14/27] sched: update grinder next pipe and tc functions [15/27] sched: update pipe and tc queues prefetch [16/27] sched: update grinder wrr compute function [17/27] sched: modify credits update function [18/27] sched: update mbuf prefetch function [19/27] sched: update grinder schedule function [20/27] sched: update grinder handle function [21/27] sched: update packet dequeue api [22/27] sched: update sched queue stats api [23/27] test/sched: update unit test [24/27] net/softnic: update softnic tm function [25/27] examples/qos_sched: update qos sched sample app [26/27] examples/ip_pipeline: update ip pipeline sample app [27/27] sched: code cleanup

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues
ci/Intel-compilation	fail	Compilation issues

Commit Message

Lukasz Krakowiak May 28, 2019, 12:05 p.m. UTC

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

Update mbuf prefetch function of the scheduler grinder 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, 33 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index ba344f0a1..06d89e3fd 100644
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -2478,19 +2478,43 @@  grinder_prefetch_tc_queue_arrays(struct rte_sched_port *port, uint32_t pos)
 }
 
 static inline void
-grinder_prefetch_mbuf(struct rte_sched_port *port, uint32_t pos)
+grinder_prefetch_mbuf(struct rte_sched_subport *subport, uint32_t pos)
 {
-	struct rte_sched_grinder *grinder = port->grinder + pos;
-	uint32_t qpos = grinder->qpos;
-	struct rte_mbuf **qbase = grinder->qbase[qpos];
-	uint16_t qsize = grinder->qsize;
-	uint16_t qr = grinder->queue[qpos]->qr & (qsize - 1);
+	struct rte_sched_grinder *grinder = subport->grinder + pos;
+	struct rte_mbuf **qbase;
+	uint32_t tc_index = grinder->tc_index;
+	uint32_t qpos;
+	uint16_t qsize, qr;
+
+	if (tc_index < RTE_SCHED_TRAFFIC_CLASS_BE) {
+		qbase = grinder->sp.qbase;
+		qsize = grinder->sp.qsize;
+		qr = grinder->sp.queue->qr & (qsize - 1);
+
+		grinder->pkt = qbase[qr];
+		rte_prefetch0(grinder->pkt);
+
+		if (unlikely((qr & 0x7) == 7)) {
+			uint16_t qr_next =
+				(grinder->sp.queue->qr + 1) & (qsize - 1);
+
+			rte_prefetch0(qbase + qr_next);
+		}
+
+		return;
+	}
+
+	qpos = grinder->be.qpos;
+	qbase = grinder->be.qbase[qpos];
+	qsize = grinder->be.qsize[qpos];
+	qr = grinder->be.queue[qpos]->qr & (qsize - 1);
 
 	grinder->pkt = qbase[qr];
 	rte_prefetch0(grinder->pkt);
 
 	if (unlikely((qr & 0x7) == 7)) {
-		uint16_t qr_next = (grinder->queue[qpos]->qr + 1) & (qsize - 1);
+		uint16_t qr_next =
+			(grinder->be.queue[qpos]->qr + 1) & (qsize - 1);
 
 		rte_prefetch0(qbase + qr_next);
 	}
@@ -2529,7 +2553,7 @@  grinder_handle(struct rte_sched_port *port, uint32_t pos)
 
 	case e_GRINDER_PREFETCH_MBUF:
 	{
-		grinder_prefetch_mbuf(port, pos);
+		grinder_prefetch_mbuf(port->subport, pos);
 
 		grinder->state = e_GRINDER_READ_MBUF;
 		return 0;
@@ -2544,7 +2568,7 @@  grinder_handle(struct rte_sched_port *port, uint32_t pos)
 		/* Look for next packet within the same TC */
 		if (result && grinder->qmask) {
 			grinder_wrr(port->subport, pos);
-			grinder_prefetch_mbuf(port, pos);
+			grinder_prefetch_mbuf(port->subport, pos);
 
 			return 1;
 		}