examples/l3fwd: fix TX burst queue drain edge case

Message ID 20210223182300.29817-1-kathleen.capella@arm.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series examples/l3fwd: fix TX burst queue drain edge case |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-mellanox-Functional success Functional Testing PASS
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-testing success Testing PASS

Commit Message

Kathleen Capella Feb. 23, 2021, 6:23 p.m. UTC
  Initialize prev_tsc to cur_tsc. This avoids running the TX queue drain
in the first iteration of the packet processing loop.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
---
 examples/l3fwd/l3fwd_em.c  | 9 +++++----
 examples/l3fwd/l3fwd_lpm.c | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)
  

Comments

Thomas Monjalon March 24, 2021, 5:15 p.m. UTC | #1
23/02/2021 19:23, Kathleen Capella:
> Initialize prev_tsc to cur_tsc. This avoids running the TX queue drain
> in the first iteration of the packet processing loop.

Is it really a fix? What was broken?
Isn't it an optimization?

> Fixes: af75078fece3 ("first public release")

If it's really a fix, we should probably backport it, so
Cc: stable@dpdk.org

> Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
  
Kathleen Capella March 26, 2021, 4:27 p.m. UTC | #2
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Wednesday, March 24, 2021 1:16 PM
> To: Kathleen Capella <Kathleen.Capella@arm.com>
> Cc: dev@dpdk.org; nd <nd@arm.com>; Honnappa Nagarahalli
> <Honnappa.Nagarahalli@arm.com>
> Subject: Re: [dpdk-dev] [PATCH] examples/l3fwd: fix TX burst queue drain edge
> case
> 
> 23/02/2021 19:23, Kathleen Capella:
> > Initialize prev_tsc to cur_tsc. This avoids running the TX queue drain
> > in the first iteration of the packet processing loop.
> 
> Is it really a fix? What was broken?
> Isn't it an optimization?

It could be considered an optimization since effectively it prevents entering the if statement on the
first iteration of the loop. I will remove the "fixes" line and reword the subject line.
> 
> > Fixes: af75078fece3 ("first public release")
> 
> If it's really a fix, we should probably backport it, so
> Cc: stable@dpdk.org

[Kathleen Capella] 
It is not really a significant problem to be fixed in previous releases so it does not need to be backported.
> 
> > Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
> > Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
> 
>
  

Patch

diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 9996bfba3..01f8dff48 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -629,8 +629,6 @@  em_main_loop(__rte_unused void *dummy)
 	const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
 		US_PER_S * BURST_TX_DRAIN_US;
 
-	prev_tsc = 0;
-
 	lcore_id = rte_lcore_id();
 	qconf = &lcore_conf[lcore_id];
 
@@ -650,9 +648,10 @@  em_main_loop(__rte_unused void *dummy)
 			lcore_id, portid, queueid);
 	}
 
-	while (!force_quit) {
+	cur_tsc = rte_rdtsc();
+	prev_tsc = cur_tsc;
 
-		cur_tsc = rte_rdtsc();
+	while (!force_quit) {
 
 		/*
 		 * TX burst queue drain
@@ -692,6 +691,8 @@  em_main_loop(__rte_unused void *dummy)
 							portid, qconf);
 #endif
 		}
+
+		cur_tsc = rte_rdtsc();
 	}
 
 	return 0;
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 3dcf1fef1..375746fef 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -185,8 +185,6 @@  lpm_main_loop(__rte_unused void *dummy)
 	const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
 		US_PER_S * BURST_TX_DRAIN_US;
 
-	prev_tsc = 0;
-
 	lcore_id = rte_lcore_id();
 	qconf = &lcore_conf[lcore_id];
 
@@ -206,9 +204,10 @@  lpm_main_loop(__rte_unused void *dummy)
 			lcore_id, portid, queueid);
 	}
 
-	while (!force_quit) {
+	cur_tsc = rte_rdtsc();
+	prev_tsc = cur_tsc;
 
-		cur_tsc = rte_rdtsc();
+	while (!force_quit) {
 
 		/*
 		 * TX burst queue drain
@@ -249,6 +248,8 @@  lpm_main_loop(__rte_unused void *dummy)
 							portid, qconf);
 #endif /* X86 */
 		}
+
+		cur_tsc = rte_rdtsc();
 	}
 
 	return 0;