Skip to contentSkip to conversation

net/mlx5: fix timestamp initialization on empty clock queue

PATCH In review Viacheslav Ovsiienko 2 participants 2 messages Jul 28, 2021 – Jul 29, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix timestamp initialization on empty clock queue

The committing completions by clock queue might be delayed after queue initialization done and the only Clock Queue completion entry (CQE) might keep the invalid status till the CQE first update happens.

The mlx5_txpp_update_timestamp() wrongly recognized invalid status as error and reported about lost synchronization.

The patch recognizes the invalid status as "not updated yet" and accurate scheduling initialization routine waits till CQE first update happens.

Some collateral typos in comment are fixed as well.

Fixes 77522be0a56d ("net/mlx5: introduce clock queue service routine")
---
 drivers/net/mlx5/mlx5_txpp.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5_txpp.c +15 -6
index d90399afb5..4f6da9f2d1 100644
@@ -530,8 +530,8 @@ mlx5_atomic_read_cqe(rte_int128_t *from, rte_int128_t *ts)
 {
 	/*
 	 * The only CQE of Clock Queue is being continuously
-	 * update by hardware with soecified rate. We have to
-	 * read timestump and WQE completion index atomically.
+	 * updated by hardware with specified rate. We must
+	 * read timestamp and WQE completion index atomically.
 	 */
 #if defined(RTE_ARCH_X86_64)
 	rte_int128_t src;
@@ -592,13 +592,22 @@ mlx5_txpp_update_timestamp(struct mlx5_dev_ctx_shared *sh)
 	} to;
 	uint64_t ts;
 	uint16_t ci;
+	uint8_t opcode;
 
 	mlx5_atomic_read_cqe((rte_int128_t *)&cqe->timestamp, &to.u128);
-	if (to.cts.op_own >> 4) {
-		DRV_LOG(DEBUG, "Clock Queue error sync lost.");
-		__atomic_fetch_add(&sh->txpp.err_clock_queue,
+	opcode = MLX5_CQE_OPCODE(to.cts.op_own);
+	if (opcode) {
+		if (opcode != MLX5_CQE_INVALID) {
+			/*
+			 * Commit the error state if and only if
+			 * we have got at least one actual completion.
+			 */
+			DRV_LOG(DEBUG,
+				"Clock Queue error sync lost (%X).", opcode);
+				__atomic_fetch_add(&sh->txpp.err_clock_queue,
 				   1, __ATOMIC_RELAXED);
-		sh->txpp.sync_lost = 1;
+			sh->txpp.sync_lost = 1;
+		}
 		return;
 	}
 	ci = rte_be_to_cpu_16(to.cts.wqe_counter);
Signature · 1 line
2.18.1
#1 lore raw

Hi,

Quoted 10 lines

-----Original Message-----
From: Slava Ovsiienko <[email protected]>
Sent: Wednesday, July 28, 2021 5:24 PM
To: [email protected]
Cc: Raslan Darawsheh <[email protected]>; Matan Azrad <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix timestamp initialization on empty clock queue

The committing completions by clock queue might be delayed after queue initialization done and the only Clock Queue

Added missing auxiliary verb in the syntax,
Should be after queue initialization is done.

Quoted 12 lines

completion entry (CQE) might keep the invalid status till the CQE first update happens.

The mlx5_txpp_update_timestamp() wrongly recognized invalid status as error and reported about lost synchronization.

The patch recognizes the invalid status as "not updated yet" and accurate scheduling initialization routine waits till CQE first update happens.

Some collateral typos in comment are fixed as well.

Quoted 8 lines
Fixes 77522be0a56d ("net/mlx5: introduce clock queue service routine")
---
 drivers/net/mlx5/mlx5_txpp.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh