Skip to contentSkip to conversation

lib/distributor: fix deadlock issue for aarch64

PATCH Superseded Ruifeng Wang 6 participants 23 messages Oct 8, 2019 – Oct 25, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/distributor: fix deadlock issue for aarch64

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
---
 lib/librte_distributor/rte_distributor.c     | 28 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 34 +++++++++++++-------
 2 files changed, 41 insertions(+), 21 deletions(-)
lib/librte_distributor/rte_distributor.c +19 -9
index 21eb1fb0a..7bf96e224 100644
@@ -50,7 +50,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 
 	retptr64 = &(buf->retptr64[0]);
 	/* Spin while handshake bits are set (scheduler clears it) */
-	while (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {
+	while (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF)) {
 		rte_pause();
 		uint64_t t = rte_rdtsc()+100;
 
@@ -76,7 +77,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 	 * Finally, set the GET_BUF  to signal to distributor that cache
 	 * line is ready for processing
 	 */
-	*retptr64 |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,
+			__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d,
@@ -99,7 +101,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	}
 
 	/* If bit is set, return */
-	if (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return -1;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -116,6 +119,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	 * on the next cacheline while we're working.
 	 */
 	buf->bufptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return count;
 }
@@ -183,7 +188,8 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			RTE_DISTRIB_FLAG_BITS) | RTE_DISTRIB_RETURN_BUF;
 
 	/* set the GET_BUF but even if we got no returns */
-	buf->retptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->retptr64[0]),
+		buf->retptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return 0;
 }
@@ -273,7 +279,8 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 	unsigned int count = 0;
 	unsigned int i;
 
-	if (buf->retptr64[0] & RTE_DISTRIB_GET_BUF) {
+	if (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF) {
 		for (i = 0; i < RTE_DIST_BURST_SIZE; i++) {
 			if (buf->retptr64[i] & RTE_DISTRIB_RETURN_BUF) {
 				oldbuf = ((uintptr_t)(buf->retptr64[i] >>
@@ -287,7 +294,7 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 		d->returns.start = ret_start;
 		d->returns.count = ret_count;
 		/* Clear for the worker to populate with more returns */
-		buf->retptr64[0] = 0;
+		__atomic_store_n(&(buf->retptr64[0]), 0, __ATOMIC_RELEASE);
 	}
 	return count;
 }
@@ -307,7 +314,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	struct rte_distributor_buffer *buf = &(d->bufs[wkr]);
 	unsigned int i;
 
-	while (!(d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+	while (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF))
 		rte_pause();
 
 	handle_returns(d, wkr);
@@ -328,7 +336,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	d->backlog[wkr].count = 0;
 
 	/* Clear the GET bit */
-	buf->bufptr64[0] &= ~RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 	return  buf->count;
 
 }
@@ -574,7 +583,8 @@ rte_distributor_clear_returns_v1705(struct rte_distributor *d)
 
 	/* throw away returns, so workers can exit */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
-		d->bufs[wkr].retptr64[0] = 0;
+		__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,
+				__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d),
lib/librte_distributor/rte_distributor_v20.c +22 -12
index cdc0969a8..3a5810c6d 100644
@@ -34,9 +34,10 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	int64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
 			| RTE_DISTRIB_GET_BUF;
-	while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))
+	while (unlikely(__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_FLAGS_MASK))
 		rte_pause();
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 }
 VERSION_SYMBOL(rte_distributor_request_pkt, _v20, 2.0);
 
@@ -45,7 +46,8 @@ rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,
 		unsigned worker_id)
 {
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
-	if (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return NULL;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -73,7 +75,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	uint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
 			| RTE_DISTRIB_RETURN_BUF;
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 	return 0;
 }
 VERSION_SYMBOL(rte_distributor_return_pkt, _v20, 2.0);
@@ -117,7 +119,7 @@ handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)
 {
 	d->in_flight_tags[wkr] = 0;
 	d->in_flight_bitmask &= ~(1UL << wkr);
-	d->bufs[wkr].bufptr64 = 0;
+	__atomic_store_n(&(d->bufs[wkr].bufptr64), 0, __ATOMIC_RELEASE);
 	if (unlikely(d->backlog[wkr].count != 0)) {
 		/* On return of a packet, we need to move the
 		 * queued packets for this core elsewhere.
@@ -165,13 +167,17 @@ process_returns(struct rte_distributor_v20 *d)
 		const int64_t data = d->bufs[wkr].bufptr64;
 		uintptr_t oldbuf = 0;
 
-		if (data & RTE_DISTRIB_GET_BUF) {
+		if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) {
 			flushed++;
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d->backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					backlog_pop(&d->backlog[wkr]),
+					__ATOMIC_RELEASE);
 			else {
-				d->bufs[wkr].bufptr64 = RTE_DISTRIB_GET_BUF;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					RTE_DISTRIB_GET_BUF,
+					__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = 0;
 				d->in_flight_bitmask &= ~(1UL << wkr);
 			}
@@ -251,7 +257,8 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,
 			}
 		}
 
-		if ((data & RTE_DISTRIB_GET_BUF) &&
+		if ((__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) &&
 				(d->backlog[wkr].count || next_mb)) {
 
 			if (d->backlog[wkr].count)
@@ -280,13 +287,16 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,
 	 * if they are ready */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
 		if (d->backlog[wkr].count &&
-				(d->bufs[wkr].bufptr64 & RTE_DISTRIB_GET_BUF)) {
+				(__atomic_load_n(&(d->bufs[wkr].bufptr64),
+				__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)) {
 
 			int64_t oldbuf = d->bufs[wkr].bufptr64 >>
 					RTE_DISTRIB_FLAG_BITS;
 			store_return(oldbuf, d, &ret_start, &ret_count);
 
-			d->bufs[wkr].bufptr64 = backlog_pop(&d->backlog[wkr]);
+			__atomic_store_n(&(d->bufs[wkr].bufptr64),
+				backlog_pop(&d->backlog[wkr]),
+				__ATOMIC_RELEASE);
 		}
 
 	d->returns.start = ret_start;
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
Quoted 7 lines
---
  lib/librte_distributor/rte_distributor.c     | 28 ++++++++++------
  lib/librte_distributor/rte_distributor_v20.c | 34 +++++++++++++-------
  2 files changed, 41 insertions(+), 21 deletions(-)

--snip--

I tested this on my system, and saw no performance degradation. Looks good. Thanks.

#2 lore raw
In reply to Ruifeng Wang
Quoted 7 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Quoted 7 lines

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status 255 or signal 127 SIGinvalid)

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket /var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Quoted 202 lines
 lib/librte_distributor/rte_distributor.c     | 28 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 34 +++++++++++++-------
 2 files changed, 41 insertions(+), 21 deletions(-)
lib/librte_distributor/rte_distributor.c +19 -9
index 21eb1fb0a..7bf96e224 100644
@@ -50,7 +50,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 
 	retptr64 = &(buf->retptr64[0]);
 	/* Spin while handshake bits are set (scheduler clears it) */
-	while (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {
+	while (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF)) {
 		rte_pause();
 		uint64_t t = rte_rdtsc()+100;
 
@@ -76,7 +77,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 	 * Finally, set the GET_BUF  to signal to distributor that cache
 	 * line is ready for processing
 	 */
-	*retptr64 |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,
+			__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d,
@@ -99,7 +101,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	}
 
 	/* If bit is set, return */
-	if (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return -1;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -116,6 +119,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	 * on the next cacheline while we're working.
 	 */
 	buf->bufptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return count;
 }
@@ -183,7 +188,8 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			RTE_DISTRIB_FLAG_BITS) | RTE_DISTRIB_RETURN_BUF;
 
 	/* set the GET_BUF but even if we got no returns */
-	buf->retptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->retptr64[0]),
+		buf->retptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return 0;
 }
@@ -273,7 +279,8 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 	unsigned int count = 0;
 	unsigned int i;
 
-	if (buf->retptr64[0] & RTE_DISTRIB_GET_BUF) {
+	if (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF) {
 		for (i = 0; i < RTE_DIST_BURST_SIZE; i++) {
 			if (buf->retptr64[i] & RTE_DISTRIB_RETURN_BUF) {
 				oldbuf = ((uintptr_t)(buf->retptr64[i] >>
@@ -287,7 +294,7 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 		d->returns.start = ret_start;
 		d->returns.count = ret_count;
 		/* Clear for the worker to populate with more returns */
-		buf->retptr64[0] = 0;
+		__atomic_store_n(&(buf->retptr64[0]), 0, __ATOMIC_RELEASE);
 	}
 	return count;
 }
@@ -307,7 +314,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	struct rte_distributor_buffer *buf = &(d->bufs[wkr]);
 	unsigned int i;
 
-	while (!(d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+	while (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF))
 		rte_pause();
 
 	handle_returns(d, wkr);
@@ -328,7 +336,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	d->backlog[wkr].count = 0;
 
 	/* Clear the GET bit */
-	buf->bufptr64[0] &= ~RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 	return  buf->count;
 
 }
@@ -574,7 +583,8 @@ rte_distributor_clear_returns_v1705(struct rte_distributor *d)
 
 	/* throw away returns, so workers can exit */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
-		d->bufs[wkr].retptr64[0] = 0;
+		__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,
+				__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d),
lib/librte_distributor/rte_distributor_v20.c +22 -12
index cdc0969a8..3a5810c6d 100644
@@ -34,9 +34,10 @@ rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	int64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
 			| RTE_DISTRIB_GET_BUF;
-	while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))
+	while (unlikely(__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_FLAGS_MASK))
 		rte_pause();
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 }
 VERSION_SYMBOL(rte_distributor_request_pkt, _v20, 2.0);
 
@@ -45,7 +46,8 @@ rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,
 		unsigned worker_id)
 {
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
-	if (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return NULL;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -73,7 +75,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	uint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
 			| RTE_DISTRIB_RETURN_BUF;
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 	return 0;
 }
 VERSION_SYMBOL(rte_distributor_return_pkt, _v20, 2.0);
@@ -117,7 +119,7 @@ handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)
 {
 	d->in_flight_tags[wkr] = 0;
 	d->in_flight_bitmask &= ~(1UL << wkr);
-	d->bufs[wkr].bufptr64 = 0;
+	__atomic_store_n(&(d->bufs[wkr].bufptr64), 0, __ATOMIC_RELEASE);
 	if (unlikely(d->backlog[wkr].count != 0)) {
 		/* On return of a packet, we need to move the
 		 * queued packets for this core elsewhere.
@@ -165,13 +167,17 @@ process_returns(struct rte_distributor_v20 *d)
 		const int64_t data = d->bufs[wkr].bufptr64;
 		uintptr_t oldbuf = 0;
 
-		if (data & RTE_DISTRIB_GET_BUF) {
+		if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) {
 			flushed++;
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d->backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					backlog_pop(&d->backlog[wkr]),
+					__ATOMIC_RELEASE);
 			else {
-				d->bufs[wkr].bufptr64 = RTE_DISTRIB_GET_BUF;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					RTE_DISTRIB_GET_BUF,
+					__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = 0;
 				d->in_flight_bitmask &= ~(1UL << wkr);
 			}
@@ -251,7 +257,8 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,
 			}
 		}
 
-		if ((data & RTE_DISTRIB_GET_BUF) &&
+		if ((__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) &&
 				(d->backlog[wkr].count || next_mb)) {
 
 			if (d->backlog[wkr].count)
@@ -280,13 +287,16 @@ rte_distributor_process_v20(struct rte_distributor_v20 *d,
 	 * if they are ready */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
 		if (d->backlog[wkr].count &&
-				(d->bufs[wkr].bufptr64 & RTE_DISTRIB_GET_BUF)) {
+				(__atomic_load_n(&(d->bufs[wkr].bufptr64),
+				__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)) {
 
 			int64_t oldbuf = d->bufs[wkr].bufptr64 >>
 					RTE_DISTRIB_FLAG_BITS;
 			store_return(oldbuf, d, &ret_start, &ret_count);
 
-			d->bufs[wkr].bufptr64 = backlog_pop(&d->backlog[wkr]);
+			__atomic_store_n(&(d->bufs[wkr].bufptr64),
+				backlog_pop(&d->backlog[wkr]),
+				__ATOMIC_RELEASE);
 		}
 
 	d->returns.start = ret_start;
#3 lore raw
Quoted 86 lines · Aaron Conole
Quoted 7 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Quoted 7 lines

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status 255 or signal 127 SIGinvalid)

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket /var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

Quoted 7 lines

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Idem, and with the same loop I used before, it can be caught quickly.

# time (log=/tmp/$$.log; while true; do echo distributor_autotest
|taskset -c 0-1 ./build-gcc-static/app/test/dpdk-test --log-level *:8
-l 0-1 >$log 2>&1; grep -q 'Test OK' $log || break; done; cat $log; rm
-f $log)

[snip]

RTE>>distributor_autotest
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 2MB
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: alloc_pages_on_heap(): couldn't allocate physically contiguous space
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 8MB
=== Basic distributor sanity tests ===
Worker 0 handled 32 packets
Sanity test with all zero hashes done.
Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (single) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===
Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test
=== Basic distributor sanity tests ===
Worker 0 handled 32 packets
Sanity test with all zero hashes done.
Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (burst) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) === Line 326: Packet count is incorrect, 1048568, expected 1048576 Test Failed
RTE>>
real 0m36.668s
user 1m7.293s
sys 0m1.560s

Could be worth running this loop on all tests? (not talking about the CI, it would be a manual effort to catch lurking issues).

Signature · 1 line
David Marchand
#4 lore raw
Quoted 102 lines · David Marchand
Quoted 89 lines · Aaron Conole
Quoted 7 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Quoted 7 lines

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status 255 or signal 127 SIGinvalid)

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket /var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

Quoted 7 lines

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Idem, and with the same loop I used before, it can be caught quickly.

# time (log=/tmp/$$.log; while true; do echo distributor_autotest
|taskset -c 0-1 ./build-gcc-static/app/test/dpdk-test --log-level *:8

Review

Quoted 2 lines
(quoted diff) +0 -2
-l 0-1 >$log 2>&1; grep -q 'Test OK' $log || break; done; cat $log; rm
-f $log)

Probably good to document it, yes. It seems to be a good technique for reproducing failures.

Quoted 47 lines

[snip]

RTE>>distributor_autotest
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 2MB
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: alloc_pages_on_heap(): couldn't allocate physically contiguous space
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 8MB
=== Basic distributor sanity tests ===
Worker 0 handled 32 packets
Sanity test with all zero hashes done.
Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (single) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===
Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test
=== Basic distributor sanity tests ===
Worker 0 handled 32 packets
Sanity test with all zero hashes done.
Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (burst) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) === Line 326: Packet count is incorrect, 1048568, expected 1048576 Test Failed
RTE>>
real 0m36.668s
user 1m7.293s
sys 0m1.560s

Could be worth running this loop on all tests? (not talking about the CI, it would be a manual effort to catch lurking issues).

#5 lore raw
In reply to David Marchand
Quoted 111 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, October 9, 2019 03:47
To: Aaron Conole <[email protected]>
Cc: Ruifeng Wang (Arm Technology China) <[email protected]>; David Hunt <[email protected]>; dev <[email protected]>; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] lib/distributor: fix deadlock issue for aarch64

Quoted 14 lines · Aaron Conole
Quoted 11 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
Quoted 7 lines
Quoted 3 lines

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status 255

or signal 127 SIGinvalid)

Quoted 67 lines

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket /var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

Quoted 7 lines

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Quoted 6 lines

Idem, and with the same loop I used before, it can be caught quickly.

# time (log=/tmp/$$.log; while true; do echo distributor_autotest
|taskset -c 0-1 ./build-gcc-static/app/test/dpdk-test --log-level *:8
-l 0-1 >$log 2>&1; grep -q 'Test OK' $log || break; done; cat $log; rm -f $log)

Thanks Aaron and David for your report. I can reproduce this issue with the script. Will fix it in next version.

Quoted 46 lines

[snip]

RTE>>distributor_autotest
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 2MB
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: alloc_pages_on_heap(): couldn't allocate physically contiguous space
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 8MB === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero hashes done. Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (single) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) === Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero hashes done. Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (burst) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) === Line 326: Packet count is incorrect, 1048568, expected 1048576 Test Failed
RTE>>
real 0m36.668s
user 1m7.293s
sys 0m1.560s

Could be worth running this loop on all tests? (not talking about the CI, it would be a manual effort to catch lurking issues).

--
David Marchand

#6 lore raw

Hi

I tested this patch, following are my observations:
1. With this patch distributor_autotest getting suspended on arm64 platform is resolved. But continous execution of this test results in test failure, as reported by Aaron.
2. While testing on x86 platform, still I can observe distributor_autotest getting suspeneded(stuck) on continous execution of the test (it took almost 7-8 iterations to reproduce the suspension).

Thanks

Quoted 169 lines · Ruifeng Wang (Arm Technology China)

External Email

----------------------------------------------------------------------

Quoted 110 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, October 9, 2019 03:47
To: Aaron Conole <[email protected]>
Cc: Ruifeng Wang (Arm Technology China) <[email protected]>; David Hunt <[email protected]>; dev <[email protected]>; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] lib/distributor: fix deadlock issue for aarch64

Quoted 14 lines · Aaron Conole
Quoted 11 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
Quoted 7 lines
Quoted 3 lines

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status 255

or signal 127 SIGinvalid)

Quoted 67 lines

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket /var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

Quoted 7 lines

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Quoted 6 lines

Idem, and with the same loop I used before, it can be caught quickly.

# time (log=/tmp/$$.log; while true; do echo distributor_autotest
|taskset -c 0-1 ./build-gcc-static/app/test/dpdk-test --log-level *:8
-l 0-1 >$log 2>&1; grep -q 'Test OK' $log || break; done; cat $log; rm -f $log)

Thanks Aaron and David for your report. I can reproduce this issue with the script. Will fix it in next version.

Quoted 46 lines

[snip]

RTE>>distributor_autotest
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 2MB
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: alloc_pages_on_heap(): couldn't allocate physically contiguous space
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 8MB === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero hashes done. Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (single) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) === Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero hashes done. Worker 0 handled 32 packets
Sanity test with non-zero hashes done
=== testing big burst (burst) ===
Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) === Line 326: Packet count is incorrect, 1048568, expected 1048576 Test Failed
RTE>>
real 0m36.668s
user 1m7.293s
sys 0m1.560s

Could be worth running this loop on all tests? (not talking about the CI, it would be a manual effort to catch lurking issues).

--
David Marchand

#7 lore raw

Hi Harman,

Thank you for testing this.

Quoted 14 lines

-----Original Message-----
From: Harman Kalra <[email protected]>
Sent: Thursday, October 17, 2019 19:42
To: Ruifeng Wang (Arm Technology China) <[email protected]>
Cc: David Marchand <[email protected]>; Aaron Conole <[email protected]>; David Hunt <[email protected]>; dev <[email protected]>; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [EXT] RE: [dpdk-stable] [dpdk-dev] [PATCH] lib/distributor: fix deadlock issue for aarch64

Hi

Quoted 7 lines

I tested this patch, following are my observations:
1. With this patch distributor_autotest getting suspended on arm64 platform is resolved. But continous execution of this test results in test failure, as reported by Aaron.
2. While testing on x86 platform, still I can observe distributor_autotest getting suspeneded(stuck) on continous execution of the test (it took almost 7-8 iterations to reproduce the suspension).

Yes, this v1 patch is not complete to solve the issue. I have posted v3:
http://patches.dpdk.org/project/dpdk/list/?series=6856
With the new patch set, I didn't observe test failure in my test. Will you try that?

Thanks.
/Ruifeng

Quoted 183 lines

Thanks

Quoted 18 lines · Ruifeng Wang (Arm Technology China)

External Email

----------------------------------------------------------------------

Quoted 14 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, October 9, 2019 03:47
To: Aaron Conole <[email protected]>
Cc: Ruifeng Wang (Arm Technology China) <[email protected]>; David Hunt <[email protected]>; dev <[email protected]>; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; dpdk stable <[email protected]>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] lib/distributor: fix deadlock issue for aarch64

On Tue, Oct 8, 2019 at 7:06 PM Aaron Conole <[email protected]>

Quoted 15 lines · wrote:
Quoted 15 lines
Quoted 15 lines
Quoted 12 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable

library")
Cc: [email protected]

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

---

I see a failure in the distributor_autotest (on one of the builds):

64/82 DPDK:fast-tests / distributor_autotest FAIL 0.37 s (exit status

255

Quoted 79 lines
Quoted 79 lines

or signal 127 SIGinvalid)

Quoted 68 lines

--- command ---

DPDK_TEST='distributor_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=distributor_autotest

--- stdout ---

EAL: Probing VFIO support...

APP: HPET is not enabled, using TSC as default timer

RTE>>distributor_autotest

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (single) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) ===

Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test

=== Basic distributor sanity tests ===

Worker 0 handled 32 packets

Sanity test with all zero hashes done.

Worker 0 handled 32 packets

Sanity test with non-zero hashes done

=== testing big burst (burst) ===

Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) ===

Line 326: Packet count is incorrect, 1048568, expected 1048576

Test Failed

RTE>>

--- stderr ---

EAL: Detected 2 lcore(s)

EAL: Detected 1 NUMA nodes

EAL: Multi-process socket
/var/run/dpdk/distributor_autotest/mp_socket

EAL: Selected IOVA mode 'PA'

Quoted 7 lines

EAL: No available hugepages reported in hugepages-1048576kB

-------

Not sure how to help debug further. I'll re-start the job to see if it 'clears' up - but I guess there may be a delicate synchronization somewhere that needs to be accounted.

Idem, and with the same loop I used before, it can be caught quickly.

Quoted 7 lines
Quoted 6 lines
# time (log=/tmp/$$.log; while true; do echo distributor_autotest
|taskset -c 0-1 ./build-gcc-static/app/test/dpdk-test --log-level
|*:8
-l 0-1 >$log 2>&1; grep -q 'Test OK' $log || break; done; cat $log;
rm -f $log)

Thanks Aaron and David for your report. I can reproduce this issue with the

script.

Quoted 21 lines

Will fix it in next version.

Quoted 19 lines

[snip]

RTE>>distributor_autotest
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 2MB
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: alloc_pages_on_heap(): couldn't allocate physically contiguous space
EAL: Trying to obtain current memory policy.
EAL: Setting policy MPOL_PREFERRED for socket 0
EAL: Restoring previous memory policy: 0
EAL: request: mp_malloc_sync
EAL: Heap on socket 0 was expanded by 8MB === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero

hashes done.

Quoted 9 lines
Quoted 9 lines

Worker 0 handled 32 packets
Sanity test with non-zero hashes done === testing big burst (single) === Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (single) === Sanity test with mbuf alloc/free passed

Too few cores to run worker shutdown test === Basic distributor sanity tests === Worker 0 handled 32 packets Sanity test with all zero

hashes done.

Quoted 17 lines
Quoted 17 lines

Worker 0 handled 32 packets
Sanity test with non-zero hashes done === testing big burst (burst) === Sanity test of returned packets done

=== Sanity test with mbuf alloc/free (burst) === Line 326: Packet count is incorrect, 1048568, expected 1048576 Test Failed RTE>>
real 0m36.668s
user 1m7.293s
sys 0m1.560s

Could be worth running this loop on all tests? (not talking about the CI, it would be a manual effort to catch lurking issues).

--
David Marchand

#8 lore raw

v2 cover fix distributor unit test

In reply to Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

---
v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Additional patch to fix non-atomic operation in unit test.

Ruifeng Wang (2):
lib/distributor: fix deadlock issue for aarch64
test/distributor: fix false unit test failure

 app/test/test_distributor.c                  |  6 ++-
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 39 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 49 +++++++++++++-------
 4 files changed, 67 insertions(+), 32 deletions(-)
Signature · 1 line
2.17.1
#9 lore raw

PATCH v2 1/2 lib/distributor: fix deadlock issue for aarch64

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
---
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 39 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 49 +++++++++++++-------
 3 files changed, 63 insertions(+), 30 deletions(-)
lib/librte_distributor/meson.build +5 -0
index dba7e3b2a..26577dbc1 100644
@@ -9,3 +9,8 @@ else
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
+
+# for clang 32-bit compiles we need libatomic for 64-bit atomic ops
+if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
+	ext_deps += cc.find_library('atomic')
+endif
lib/librte_distributor/rte_distributor.c +26 -13
index 21eb1fb0a..b653146d0 100644
@@ -50,7 +50,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 
 	retptr64 = &(buf->retptr64[0]);
 	/* Spin while handshake bits are set (scheduler clears it) */
-	while (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {
+	while (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF)) {
 		rte_pause();
 		uint64_t t = rte_rdtsc()+100;
 
@@ -76,7 +77,8 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,
 	 * Finally, set the GET_BUF  to signal to distributor that cache
 	 * line is ready for processing
 	 */
-	*retptr64 |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,
+			__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d,
@@ -99,7 +101,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	}
 
 	/* If bit is set, return */
-	if (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return -1;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -115,7 +118,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,
 	 * mbuf pointers, so toggle the bit so scheduler can start working
 	 * on the next cacheline while we're working.
 	 */
-	buf->bufptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return count;
 }
@@ -174,6 +178,7 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			return -EINVAL;
 	}
 
+	__atomic_thread_fence(__ATOMIC_ACQUIRE);
 	for (i = 0; i < RTE_DIST_BURST_SIZE; i++)
 		/* Switch off the return bit first */
 		buf->retptr64[i] &= ~RTE_DISTRIB_RETURN_BUF;
@@ -183,7 +188,8 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			RTE_DISTRIB_FLAG_BITS) | RTE_DISTRIB_RETURN_BUF;
 
 	/* set the GET_BUF but even if we got no returns */
-	buf->retptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->retptr64[0]),
+		buf->retptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 
 	return 0;
 }
@@ -273,7 +279,8 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 	unsigned int count = 0;
 	unsigned int i;
 
-	if (buf->retptr64[0] & RTE_DISTRIB_GET_BUF) {
+	if (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF) {
 		for (i = 0; i < RTE_DIST_BURST_SIZE; i++) {
 			if (buf->retptr64[i] & RTE_DISTRIB_RETURN_BUF) {
 				oldbuf = ((uintptr_t)(buf->retptr64[i] >>
@@ -287,7 +294,7 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 		d->returns.start = ret_start;
 		d->returns.count = ret_count;
 		/* Clear for the worker to populate with more returns */
-		buf->retptr64[0] = 0;
+		__atomic_store_n(&(buf->retptr64[0]), 0, __ATOMIC_RELEASE);
 	}
 	return count;
 }
@@ -307,7 +314,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	struct rte_distributor_buffer *buf = &(d->bufs[wkr]);
 	unsigned int i;
 
-	while (!(d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+	while (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF))
 		rte_pause();
 
 	handle_returns(d, wkr);
@@ -328,7 +336,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	d->backlog[wkr].count = 0;
 
 	/* Clear the GET bit */
-	buf->bufptr64[0] &= ~RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);
 	return  buf->count;
 
 }
@@ -355,7 +364,8 @@ rte_distributor_process_v1705(struct rte_distributor *d,
 	if (unlikely(num_mbufs == 0)) {
 		/* Flush out all non-full cache-lines to workers. */
 		for (wid = 0 ; wid < d->num_workers; wid++) {
-			if (d->bufs[wid].bufptr64[0] & RTE_DISTRIB_GET_BUF) {
+			if (__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+				__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF) {
 				release(d, wid);
 				handle_returns(d, wid);
 			}
@@ -367,7 +377,8 @@ rte_distributor_process_v1705(struct rte_distributor *d,
 		uint16_t matches[RTE_DIST_BURST_SIZE];
 		unsigned int pkts;
 
-		if (d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF)
+		if (__atomic_load_n(&(d->bufs[wkr].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)
 			d->bufs[wkr].count = 0;
 
 		if ((num_mbufs - next_idx) < RTE_DIST_BURST_SIZE)
@@ -465,7 +476,8 @@ rte_distributor_process_v1705(struct rte_distributor *d,
 
 	/* Flush out all non-full cache-lines to workers. */
 	for (wid = 0 ; wid < d->num_workers; wid++)
-		if ((d->bufs[wid].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+		if ((__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF))
 			release(d, wid);
 
 	return num_mbufs;
@@ -574,7 +586,8 @@ rte_distributor_clear_returns_v1705(struct rte_distributor *d)
 
 	/* throw away returns, so workers can exit */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
-		d->bufs[wkr].retptr64[0] = 0;
+		__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,
+				__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);
 MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d),
lib/librte_distributor/rte_distributor_v20.c +32 -17

114 lines not on this page · raw message

Signature · 1 line
2.17.1
#10 lore raw

Hi Ruifeng,
Typically, we have followed the convention of adding comments whenever C11 atomic APIs are used. Can you please add comments indicating why acquire or release semantics are used?

Quoted 341 lines

-----Original Message-----
From: Ruifeng Wang <[email protected]>
Sent: Friday, October 11, 2019 9:44 PM
To: [email protected]
Cc: [email protected]; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; Ruifeng Wang (Arm Technology China) <[email protected]>; [email protected]
Subject: [PATCH v2 1/2] lib/distributor: fix deadlock issue for aarch64

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64. Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
---
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 39 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 49 +++++++++++++-------
 3 files changed, 63 insertions(+), 30 deletions(-)
lib/librte_distributor/meson.build +5 -0
index dba7e3b2a..26577dbc1 100644
@@ -9,3 +9,8 @@ else
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
+
+# for clang 32-bit compiles we need libatomic for 64-bit atomic ops if
+cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
+	ext_deps += cc.find_library('atomic')
+endif
lib/librte_distributor/rte_distributor.c +4 -2
index 21eb1fb0a..b653146d0 100644
@@ -50,7 +50,8 @@ rte_distributor_request_pkt_v1705(struct
 rte_distributor *d,
 
 	retptr64 = &(buf->retptr64[0]);
 	/* Spin while handshake bits are set (scheduler clears it) */
-	while (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {
+	while (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF)) {
 		rte_pause();
 		uint64_t t = rte_rdtsc()+100;
@@ -76,7 +77,8 @@ rte_distributor_request_pkt_v1705(struct
 rte_distributor *d,
 	 * Finally, set the GET_BUF  to signal to distributor that cache
 	 * line is ready for processing
 	 */
-	*retptr64 |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,
+			__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);

MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d, @@ -99,7 +101,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +2 -1
 	}
 
 	/* If bit is set, return */
-	if (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return -1;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */ @@ -

115,7 +118,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +2 -1
 	 * mbuf pointers, so toggle the bit so scheduler can start working
 	 * on the next cacheline while we're working.
 	 */
-	buf->bufptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] | RTE_DISTRIB_GET_BUF,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +1 -0
 	return count;
 }
@@ -174,6 +178,7 @@ rte_distributor_return_pkt_v1705(struct
 rte_distributor *d,
 			return -EINVAL;
 	}
 
+	__atomic_thread_fence(__ATOMIC_ACQUIRE);
 	for (i = 0; i < RTE_DIST_BURST_SIZE; i++)
 		/* Switch off the return bit first */
lib/librte_distributor/rte_distributor.c +1 -0
 		buf->retptr64[i] &= ~RTE_DISTRIB_RETURN_BUF; @@ -183,7
+188,8 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			RTE_DISTRIB_FLAG_BITS) |

RTE_DISTRIB_RETURN_BUF;

lib/librte_distributor/rte_distributor.c +2 -1
 	/* set the GET_BUF but even if we got no returns */
-	buf->retptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->retptr64[0]),
+		buf->retptr64[0] | RTE_DISTRIB_GET_BUF,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +2 -1
 	return 0;
 }
@@ -273,7 +279,8 @@ handle_returns(struct rte_distributor *d, unsigned
 int wkr)
 	unsigned int count = 0;
 	unsigned int i;
 
-	if (buf->retptr64[0] & RTE_DISTRIB_GET_BUF) {
+	if (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF) {
 		for (i = 0; i < RTE_DIST_BURST_SIZE; i++) {
 			if (buf->retptr64[i] & RTE_DISTRIB_RETURN_BUF) {
lib/librte_distributor/rte_distributor.c +1 -2
 				oldbuf = ((uintptr_t)(buf->retptr64[i] >> @@
-287,7 +294,7 @@ handle_returns(struct rte_distributor *d, unsigned int wkr)
 		d->returns.start = ret_start;
 		d->returns.count = ret_count;
 		/* Clear for the worker to populate with more returns */
-		buf->retptr64[0] = 0;
+		__atomic_store_n(&(buf->retptr64[0]), 0,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +2 -1
 	}
 	return count;
 }
@@ -307,7 +314,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	struct rte_distributor_buffer *buf = &(d->bufs[wkr]);
 	unsigned int i;
 
-	while (!(d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+	while (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]),
 __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF))
 		rte_pause();
 
lib/librte_distributor/rte_distributor.c +2 -1
 	handle_returns(d, wkr);
@@ -328,7 +336,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	d->backlog[wkr].count = 0;
 
 	/* Clear the GET bit */
-	buf->bufptr64[0] &= ~RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF,
 __ATOMIC_RELEASE);
 	return  buf->count;
 

}

lib/librte_distributor/rte_distributor.c +2 -1
@@ -355,7 +364,8 @@ rte_distributor_process_v1705(struct rte_distributor
 *d,
 	if (unlikely(num_mbufs == 0)) {
 		/* Flush out all non-full cache-lines to workers. */
 		for (wid = 0 ; wid < d->num_workers; wid++) {
-			if (d->bufs[wid].bufptr64[0] & RTE_DISTRIB_GET_BUF)
 {
+			if (__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+				__ATOMIC_ACQUIRE) &
 RTE_DISTRIB_GET_BUF) {
lib/librte_distributor/rte_distributor.c +2 -1
 				release(d, wid);
 				handle_returns(d, wid);
 			}
@@ -367,7 +377,8 @@ rte_distributor_process_v1705(struct rte_distributor
 *d,
 		uint16_t matches[RTE_DIST_BURST_SIZE];
 		unsigned int pkts;
 
-		if (d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF)
+		if (__atomic_load_n(&(d->bufs[wkr].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)
 			d->bufs[wkr].count = 0;
 

if ((num_mbufs - next_idx) < RTE_DIST_BURST_SIZE) @@ -
465,7 +476,8 @@ rte_distributor_process_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +4 -2
 	/* Flush out all non-full cache-lines to workers. */
 	for (wid = 0 ; wid < d->num_workers; wid++)
-		if ((d->bufs[wid].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+		if ((__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF))
 			release(d, wid);
 
 	return num_mbufs;
@@ -574,7 +586,8 @@ rte_distributor_clear_returns_v1705(struct
 rte_distributor *d)
 
 	/* throw away returns, so workers can exit */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
-		d->bufs[wkr].retptr64[0] = 0;
+		__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,
+				__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);

MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d), diff --git a/lib/librte_distributor/rte_distributor_v20.c b/lib/librte_distributor/rte_distributor_v20.c
index cdc0969a8..41411e3c1 100644

lib/librte_distributor/rte_distributor_v20.c +3 -2
@@ -34,9 +34,10 @@ rte_distributor_request_pkt_v20(struct
 rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	int64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
 			| RTE_DISTRIB_GET_BUF;
-	while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))
+	while (unlikely(__atomic_load_n(&(buf->bufptr64),
 __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_FLAGS_MASK))
 		rte_pause();
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 }

VERSION_SYMBOL(rte_distributor_request_pkt, _v20, 2.0);

lib/librte_distributor/rte_distributor_v20.c +2 -1
@@ -45,7 +46,8 @@ rte_distributor_poll_pkt_v20(struct rte_distributor_v20
 *d,
 		unsigned worker_id)
 {
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
-	if (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return NULL;
 

/* since bufptr64 is signed, this should be an arithmetic shift */ @@ -
73,7 +75,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,

lib/librte_distributor/rte_distributor_v20.c +0 -0
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	uint64_t req = (((int64_t)(uintptr_t)oldpkt) <<

RTE_DISTRIB_FLAG_BITS)

lib/librte_distributor/rte_distributor_v20.c +1 -1
 			| RTE_DISTRIB_RETURN_BUF;
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 	return 0;
 }
 VERSION_SYMBOL(rte_distributor_return_pkt, _v20, 2.0); @@ -117,7 +119,7

@@ handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr) {

lib/librte_distributor/rte_distributor_v20.c +11 -6
 	d->in_flight_tags[wkr] = 0;
 	d->in_flight_bitmask &= ~(1UL << wkr);
-	d->bufs[wkr].bufptr64 = 0;
+	__atomic_store_n(&(d->bufs[wkr].bufptr64), 0, __ATOMIC_RELEASE);
 	if (unlikely(d->backlog[wkr].count != 0)) {
 		/* On return of a packet, we need to move the
 		 * queued packets for this core elsewhere.
@@ -165,18 +167,23 @@ process_returns(struct rte_distributor_v20 *d)
 		const int64_t data = d->bufs[wkr].bufptr64;
 		uintptr_t oldbuf = 0;
 
-		if (data & RTE_DISTRIB_GET_BUF) {
+		if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) {
 			flushed++;
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d-
 >backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					backlog_pop(&d->backlog[wkr]),
+					__ATOMIC_RELEASE);
 			else {
-				d->bufs[wkr].bufptr64 =
 RTE_DISTRIB_GET_BUF;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					RTE_DISTRIB_GET_BUF,
+					__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = 0;
 				d->in_flight_bitmask &= ~(1UL << wkr);
 			}
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
-		} else if (data & RTE_DISTRIB_RETURN_BUF) {
+		} else if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_RETURN_BUF) {
 			handle_worker_shutdown(d, wkr);
lib/librte_distributor/rte_distributor_v20.c +10 -5
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
 		}
@@ -251,21 +258,26 @@ rte_distributor_process_v20(struct
 rte_distributor_v20 *d,
 			}
 		}
 
-		if ((data & RTE_DISTRIB_GET_BUF) &&
+		if ((__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) &&
 				(d->backlog[wkr].count || next_mb)) {
 
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d-
 >backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+						backlog_pop(&d-
 >backlog[wkr]),
+						__ATOMIC_RELEASE);
 
 			else {
-				d->bufs[wkr].bufptr64 = next_value;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+						next_value,
+						__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = new_tag;
 				d->in_flight_bitmask |= (1UL << wkr);
 				next_mb = NULL;
 			}
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
-		} else if (data & RTE_DISTRIB_RETURN_BUF) {
+		} else if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_RETURN_BUF) {
lib/librte_distributor/rte_distributor_v20.c +2 -2
 			handle_worker_shutdown(d, wkr);
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
 		}
@@ -280,13 +292,16 @@ rte_distributor_process_v20(struct
 rte_distributor_v20 *d,
 	 * if they are ready */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
 		if (d->backlog[wkr].count &&
-				(d->bufs[wkr].bufptr64 &
 RTE_DISTRIB_GET_BUF)) {
+				(__atomic_load_n(&(d->bufs[wkr].bufptr64),
+				__ATOMIC_ACQUIRE) &
 RTE_DISTRIB_GET_BUF)) {
 
 			int64_t oldbuf = d->bufs[wkr].bufptr64 >>
 					RTE_DISTRIB_FLAG_BITS;
 			store_return(oldbuf, d, &ret_start, &ret_count);
 
-			d->bufs[wkr].bufptr64 = backlog_pop(&d-
Quoted 1 line

backlog[wkr]);

lib/librte_distributor/rte_distributor_v20.c +3 -1
+			__atomic_store_n(&(d->bufs[wkr].bufptr64),
+				backlog_pop(&d->backlog[wkr]),
+				__ATOMIC_RELEASE);
 		}
 
 	d->returns.start = ret_start;
--

2.17.1

#11 lore raw
Quoted 12 lines

-----Original Message-----
From: Honnappa Nagarahalli <[email protected]>
Sent: Sunday, October 13, 2019 10:32
To: Ruifeng Wang (Arm Technology China) <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; nd <[email protected]>; Ruifeng Wang (Arm Technology China) <[email protected]>; [email protected]; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>
Subject: RE: [PATCH v2 1/2] lib/distributor: fix deadlock issue for aarch64

Quoted 5 lines

Hi Ruifeng,
Typically, we have followed the convention of adding comments
whenever C11 atomic APIs are used. Can you please add comments indicating why acquire or release semantics are used?

OK. Comments will be added to explain acquire/release semantics used.

Quoted 356 lines
Quoted 7 lines

-----Original Message-----
From: Ruifeng Wang <[email protected]>
Sent: Friday, October 11, 2019 9:44 PM
To: [email protected]
Cc: [email protected]; [email protected]; Gavin Hu (Arm Technology China) <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>; Ruifeng Wang

(Arm

Quoted 7 lines

Technology China) <[email protected]>; [email protected]
Subject: [PATCH v2 1/2] lib/distributor: fix deadlock issue for aarch64

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as

aarch64.

Quoted 112 lines

Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
---
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 39 ++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 49
+++++++++++++-------
 3 files changed, 63 insertions(+), 30 deletions(-)
lib/librte_distributor/meson.build +5 -0
index dba7e3b2a..26577dbc1 100644
@@ -9,3 +9,8 @@ else
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
+
+# for clang 32-bit compiles we need libatomic for 64-bit atomic ops
+if
+cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
+	ext_deps += cc.find_library('atomic') endif
lib/librte_distributor/rte_distributor.c +4 -2
index 21eb1fb0a..b653146d0 100644
@@ -50,7 +50,8 @@ rte_distributor_request_pkt_v1705(struct
 rte_distributor *d,
 
 	retptr64 = &(buf->retptr64[0]);
 	/* Spin while handshake bits are set (scheduler clears it) */
-	while (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {
+	while (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF)) {
 		rte_pause();
 		uint64_t t = rte_rdtsc()+100;
@@ -76,7 +77,8 @@ rte_distributor_request_pkt_v1705(struct
 rte_distributor *d,
 	 * Finally, set the GET_BUF  to signal to distributor that cache
 	 * line is ready for processing
 	 */
-	*retptr64 |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,
+			__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);

MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d, @@ -99,7 +101,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +2 -1
 	}
 
 	/* If bit is set, return */
-	if (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return -1;
 
 	/* since bufptr64 is signed, this should be an arithmetic shift */

@@ -
115,7 +118,8 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +2 -1
 	 * mbuf pointers, so toggle the bit so scheduler can start working
 	 * on the next cacheline while we're working.
 	 */
-	buf->bufptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] | RTE_DISTRIB_GET_BUF,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +1 -0
 	return count;
 }
@@ -174,6 +178,7 @@ rte_distributor_return_pkt_v1705(struct
 rte_distributor *d,
 			return -EINVAL;
 	}
 
+	__atomic_thread_fence(__ATOMIC_ACQUIRE);
 	for (i = 0; i < RTE_DIST_BURST_SIZE; i++)
 		/* Switch off the return bit first */
lib/librte_distributor/rte_distributor.c +1 -0
 		buf->retptr64[i] &= ~RTE_DISTRIB_RETURN_BUF; @@ -183,7
+188,8 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,
 			RTE_DISTRIB_FLAG_BITS) |

RTE_DISTRIB_RETURN_BUF;

lib/librte_distributor/rte_distributor.c +2 -1
 	/* set the GET_BUF but even if we got no returns */
-	buf->retptr64[0] |= RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->retptr64[0]),
+		buf->retptr64[0] | RTE_DISTRIB_GET_BUF,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +2 -1
 	return 0;
 }
@@ -273,7 +279,8 @@ handle_returns(struct rte_distributor *d, unsigned
 int wkr)
 	unsigned int count = 0;
 	unsigned int i;
 
-	if (buf->retptr64[0] & RTE_DISTRIB_GET_BUF) {
+	if (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF) {
 		for (i = 0; i < RTE_DIST_BURST_SIZE; i++) {
 			if (buf->retptr64[i] & RTE_DISTRIB_RETURN_BUF) {
Quoted 2 lines

oldbuf = ((uintptr_t)(buf->retptr64[i] >> @@
-287,7 +294,7 @@ handle_returns(struct rte_distributor *d, unsigned int

wkr)

Quoted 32 lines
lib/librte_distributor/rte_distributor.c +1 -1
 		d->returns.start = ret_start;
 		d->returns.count = ret_count;
 		/* Clear for the worker to populate with more returns */
-		buf->retptr64[0] = 0;
+		__atomic_store_n(&(buf->retptr64[0]), 0,

__ATOMIC_RELEASE);

lib/librte_distributor/rte_distributor.c +2 -1
 	}
 	return count;
 }
@@ -307,7 +314,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	struct rte_distributor_buffer *buf = &(d->bufs[wkr]);
 	unsigned int i;
 
-	while (!(d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+	while (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]),
 __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF))
 		rte_pause();
 
lib/librte_distributor/rte_distributor.c +2 -1
 	handle_returns(d, wkr);
@@ -328,7 +336,8 @@ release(struct rte_distributor *d, unsigned int wkr)
 	d->backlog[wkr].count = 0;
 
 	/* Clear the GET bit */
-	buf->bufptr64[0] &= ~RTE_DISTRIB_GET_BUF;
+	__atomic_store_n(&(buf->bufptr64[0]),
+		buf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF,
 __ATOMIC_RELEASE);
 	return  buf->count;
 

}

lib/librte_distributor/rte_distributor.c rte_distributor_process_v1705(struct · line 359

Quoted 5 lines
lib/librte_distributor/rte_distributor.c +0 -1
@@ -355,7 +364,8 @@ rte_distributor_process_v1705(struct
 rte_distributor *d,
 	if (unlikely(num_mbufs == 0)) {
 		/* Flush out all non-full cache-lines to workers. */
 		for (wid = 0 ; wid < d->num_workers; wid++) {
-			if (d->bufs[wid].bufptr64[0] &

RTE_DISTRIB_GET_BUF)

Quoted 47 lines
lib/librte_distributor/rte_distributor.c +2 -0
 {
+			if (__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+				__ATOMIC_ACQUIRE) &
 RTE_DISTRIB_GET_BUF) {
lib/librte_distributor/rte_distributor.c +2 -1
 				release(d, wid);
 				handle_returns(d, wid);
 			}
@@ -367,7 +377,8 @@ rte_distributor_process_v1705(struct
 rte_distributor *d,
 		uint16_t matches[RTE_DIST_BURST_SIZE];
 		unsigned int pkts;
 
-		if (d->bufs[wkr].bufptr64[0] & RTE_DISTRIB_GET_BUF)
+		if (__atomic_load_n(&(d->bufs[wkr].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)
 			d->bufs[wkr].count = 0;
 

if ((num_mbufs - next_idx) < RTE_DIST_BURST_SIZE) @@ -
465,7 +476,8 @@ rte_distributor_process_v1705(struct rte_distributor *d,

lib/librte_distributor/rte_distributor.c +4 -2
 	/* Flush out all non-full cache-lines to workers. */
 	for (wid = 0 ; wid < d->num_workers; wid++)
-		if ((d->bufs[wid].bufptr64[0] & RTE_DISTRIB_GET_BUF))
+		if ((__atomic_load_n(&(d->bufs[wid].bufptr64[0]),
+			__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF))
 			release(d, wid);
 
 	return num_mbufs;
@@ -574,7 +586,8 @@ rte_distributor_clear_returns_v1705(struct
 rte_distributor *d)
 
 	/* throw away returns, so workers can exit */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
-		d->bufs[wkr].retptr64[0] = 0;
+		__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,
+				__ATOMIC_RELEASE);
 }
 BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);

MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d), diff --git a/lib/librte_distributor/rte_distributor_v20.c b/lib/librte_distributor/rte_distributor_v20.c index cdc0969a8..41411e3c1 100644

lib/librte_distributor/rte_distributor_v20.c rte_distributor_request_pkt_v20(struct · line 36

Quoted 3 lines
lib/librte_distributor/rte_distributor_v20.c +0 -0
@@ -34,9 +34,10 @@ rte_distributor_request_pkt_v20(struct
 rte_distributor_v20 *d,
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	int64_t req = (((int64_t)(uintptr_t)oldpkt) <<

RTE_DISTRIB_FLAG_BITS)

Quoted 21 lines
lib/librte_distributor/rte_distributor_v20.c +3 -2
 			| RTE_DISTRIB_GET_BUF;
-	while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))
+	while (unlikely(__atomic_load_n(&(buf->bufptr64),
 __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_FLAGS_MASK))
 		rte_pause();
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 }

VERSION_SYMBOL(rte_distributor_request_pkt, _v20, 2.0);

lib/librte_distributor/rte_distributor_v20.c +2 -1
@@ -45,7 +46,8 @@ rte_distributor_poll_pkt_v20(struct
 rte_distributor_v20 *d,
 		unsigned worker_id)
 {
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
-	if (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
+	if (__atomic_load_n(&(buf->bufptr64), __ATOMIC_ACQUIRE)
+		& RTE_DISTRIB_GET_BUF)
 		return NULL;
 
Quoted 3 lines

/* since bufptr64 is signed, this should be an arithmetic shift */
@@ -
73,7 +75,7 @@ rte_distributor_return_pkt_v20(struct rte_distributor_v20

*d,

Quoted 12 lines
lib/librte_distributor/rte_distributor_v20.c +0 -0
 	union rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];
 	uint64_t req = (((int64_t)(uintptr_t)oldpkt) <<

RTE_DISTRIB_FLAG_BITS)

lib/librte_distributor/rte_distributor_v20.c +2 -1
 			| RTE_DISTRIB_RETURN_BUF;
-	buf->bufptr64 = req;
+	__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
 	return 0;
 }
 VERSION_SYMBOL(rte_distributor_return_pkt, _v20, 2.0); @@ -117,7
+119,7 @@ handle_worker_shutdown(struct rte_distributor_v20 *d,

unsigned int
wkr) {

lib/librte_distributor/rte_distributor_v20.c handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)

Quoted 4 lines
lib/librte_distributor/rte_distributor_v20.c +1 -1
 	d->in_flight_tags[wkr] = 0;
 	d->in_flight_bitmask &= ~(1UL << wkr);
-	d->bufs[wkr].bufptr64 = 0;
+	__atomic_store_n(&(d->bufs[wkr].bufptr64), 0,

__ATOMIC_RELEASE);

Quoted 94 lines
lib/librte_distributor/rte_distributor_v20.c +10 -5
 	if (unlikely(d->backlog[wkr].count != 0)) {
 		/* On return of a packet, we need to move the
 		 * queued packets for this core elsewhere.
@@ -165,18 +167,23 @@ process_returns(struct rte_distributor_v20 *d)
 		const int64_t data = d->bufs[wkr].bufptr64;
 		uintptr_t oldbuf = 0;
 
-		if (data & RTE_DISTRIB_GET_BUF) {
+		if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) {
 			flushed++;
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d-
 >backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					backlog_pop(&d->backlog[wkr]),
+					__ATOMIC_RELEASE);
 			else {
-				d->bufs[wkr].bufptr64 =
 RTE_DISTRIB_GET_BUF;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+					RTE_DISTRIB_GET_BUF,
+					__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = 0;
 				d->in_flight_bitmask &= ~(1UL << wkr);
 			}
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
-		} else if (data & RTE_DISTRIB_RETURN_BUF) {
+		} else if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_RETURN_BUF) {
 			handle_worker_shutdown(d, wkr);
lib/librte_distributor/rte_distributor_v20.c +10 -5
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
 		}
@@ -251,21 +258,26 @@ rte_distributor_process_v20(struct
 rte_distributor_v20 *d,
 			}
 		}
 
-		if ((data & RTE_DISTRIB_GET_BUF) &&
+		if ((__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_GET_BUF) &&
 				(d->backlog[wkr].count || next_mb)) {
 
 			if (d->backlog[wkr].count)
-				d->bufs[wkr].bufptr64 =
-						backlog_pop(&d-
 >backlog[wkr]);
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+						backlog_pop(&d-
 >backlog[wkr]),
+						__ATOMIC_RELEASE);
 
 			else {
-				d->bufs[wkr].bufptr64 = next_value;
+				__atomic_store_n(&(d->bufs[wkr].bufptr64),
+						next_value,
+						__ATOMIC_RELEASE);
 				d->in_flight_tags[wkr] = new_tag;
 				d->in_flight_bitmask |= (1UL << wkr);
 				next_mb = NULL;
 			}
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
-		} else if (data & RTE_DISTRIB_RETURN_BUF) {
+		} else if (__atomic_load_n(&data, __ATOMIC_ACQUIRE)
+			& RTE_DISTRIB_RETURN_BUF) {
lib/librte_distributor/rte_distributor_v20.c +2 -2
 			handle_worker_shutdown(d, wkr);
 			oldbuf = data >> RTE_DISTRIB_FLAG_BITS;
 		}
@@ -280,13 +292,16 @@ rte_distributor_process_v20(struct
 rte_distributor_v20 *d,
 	 * if they are ready */
 	for (wkr = 0; wkr < d->num_workers; wkr++)
 		if (d->backlog[wkr].count &&
-				(d->bufs[wkr].bufptr64 &
 RTE_DISTRIB_GET_BUF)) {
+				(__atomic_load_n(&(d->bufs[wkr].bufptr64),
+				__ATOMIC_ACQUIRE) &
 RTE_DISTRIB_GET_BUF)) {
 
 			int64_t oldbuf = d->bufs[wkr].bufptr64 >>
 					RTE_DISTRIB_FLAG_BITS;
 			store_return(oldbuf, d, &ret_start, &ret_count);
 
-			d->bufs[wkr].bufptr64 = backlog_pop(&d-
Quoted 1 line

backlog[wkr]);

lib/librte_distributor/rte_distributor_v20.c +3 -1
+			__atomic_store_n(&(d->bufs[wkr].bufptr64),
+				backlog_pop(&d->backlog[wkr]),
+				__ATOMIC_RELEASE);
 		}
 
 	d->returns.start = ret_start;
--

2.17.1

#12 lore raw

PATCH v2 2/2 test/distributor: fix false unit test failure

In reply to Ruifeng Wang

Sanity test could spuriously fail with reporting flush count error. It was caused by worker stat coherent issue between distributor and worker thread.
Fix this issue by using atomic operations to update worker stat.

Fixes c3eabff124e6 ("distributor: add unit tests")
---
 app/test/test_distributor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
app/test/test_distributor.c +4 -2
index 7090b55f8..ba1f81cf8 100644
@@ -70,12 +70,14 @@ handle_work(void *arg)
 		buf[i] = NULL;
 	num = rte_distributor_get_pkt(db, id, buf, buf, num);
 	while (!quit) {
-		worker_stats[id].handled_packets += num;
+		__atomic_fetch_add(&worker_stats[id].handled_packets, num,
+				__ATOMIC_RELAXED);
 		count += num;
 		num = rte_distributor_get_pkt(db, id,
 				buf, buf, num);
 	}
-	worker_stats[id].handled_packets += num;
+	__atomic_fetch_add(&worker_stats[id].handled_packets, num,
+			__ATOMIC_RELAXED);
 	count += num;
 	rte_distributor_return_pkt(db, id, buf, num);
 	return 0;
Signature · 1 line
2.17.1
#13 lore raw

v3 cover fix distributor unit test

In reply to Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

---
v3:
Added comments for using of C11 acquire/release semantics. (Honnappa)

v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Fixed Clang build on 32bit systems.
Additional patch to fix non-atomic operation in unit test.

Ruifeng Wang (2):
lib/distributor: fix deadlock issue for aarch64
test/distributor: fix false unit test failure

 app/test/test_distributor.c                  |  6 +-
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 68 ++++++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 59 ++++++++++++-----
 4 files changed, 101 insertions(+), 37 deletions(-)
Signature · 1 line
2.17.1
#14 lore raw

PATCH v3 1/2 lib/distributor: fix deadlock issue for aarch64

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")
---
 lib/librte_distributor/meson.build           |  5 ++
 lib/librte_distributor/rte_distributor.c     | 68 ++++++++++++++------
 lib/librte_distributor/rte_distributor_v20.c | 59 ++++++++++++-----
 3 files changed, 97 insertions(+), 35 deletions(-)
lib/librte_distributor/meson.build +5 -0
index dba7e3b2a..26577dbc1 100644
@@ -9,3 +9,8 @@ else
 endif
 headers = files('rte_distributor.h')
 deps += ['mbuf']
+
+# for clang 32-bit compiles we need libatomic for 64-bit atomic ops
+if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false
+	ext_deps += cc.find_library('atomic')
+endif
lib/librte_distributor/rte_distributor.c +50 -18

154 lines not on this page · raw message

lib/librte_distributor/rte_distributor_v20.c +42 -17

122 lines not on this page · raw message

Signature · 1 line
2.17.1
Acked-by on v3 1/2
#15 lore raw
Quoted 7 lines · Ruifeng Wang

Distributor and worker threads rely on data structs in cache line for synchronization. The shared data structs were not protected. This caused deadlock issue on weaker memory ordering platforms as aarch64.
Fix this issue by adding memory barriers to ensure synchronization among cores.

Quoted 7 lines

Bugzilla ID: 342

Fixes 775003ad2f96 ("distributor: add new burst-capable library")

---

#16 lore raw

PATCH v3 2/2 test/distributor: fix false unit test failure

In reply to Ruifeng Wang

Sanity test could spuriously fail with reporting flush count error. It was caused by worker stat coherent issue between distributor and worker thread.
Fix this issue by using atomic operations to update worker stat.

Fixes c3eabff124e6 ("distributor: add unit tests")
---
 app/test/test_distributor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
app/test/test_distributor.c +4 -2
index 7090b55f8..ba1f81cf8 100644
@@ -70,12 +70,14 @@ handle_work(void *arg)
 		buf[i] = NULL;
 	num = rte_distributor_get_pkt(db, id, buf, buf, num);
 	while (!quit) {
-		worker_stats[id].handled_packets += num;
+		__atomic_fetch_add(&worker_stats[id].handled_packets, num,
+				__ATOMIC_RELAXED);
 		count += num;
 		num = rte_distributor_get_pkt(db, id,
 				buf, buf, num);
 	}
-	worker_stats[id].handled_packets += num;
+	__atomic_fetch_add(&worker_stats[id].handled_packets, num,
+			__ATOMIC_RELAXED);
 	count += num;
 	rte_distributor_return_pkt(db, id, buf, num);
 	return 0;
Signature · 1 line
2.17.1
Acked-by on v3 2/2
#17 lore raw

Re: [dpdk-dev] [PATCH v3 2/2] test/distributor: fix false unit test failure

Quoted 8 lines · Ruifeng Wang

Sanity test could spuriously fail with reporting flush count error. It was caused by worker stat coherent issue between distributor and worker thread.
Fix this issue by using atomic operations to update worker stat.

Fixes c3eabff124e6 ("distributor: add unit tests")
Quoted 6 lines
---
  app/test/test_distributor.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
	return 0;
#18 lore raw

Re: [dpdk-dev] [PATCH v3 0/2] fix distributor unit test

In reply to Ruifeng Wang
Quoted 11 lines · Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

Quoted 8 lines

---
v3:
Added comments for using of C11 acquire/release semantics. (Honnappa)

v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Fixed Clang build on 32bit systems.
Additional patch to fix non-atomic operation in unit test.

David,

Can you review this series?
Thanks.

Signature · 1 line
David Marchand
#19 lore raw

Re: [dpdk-dev] [PATCH v3 0/2] fix distributor unit test

Quoted 15 lines · David Marchand
Quoted 14 lines · Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

---
v3:
Added comments for using of C11 acquire/release semantics. (Honnappa)

Quoted 9 lines
Quoted 4 lines

v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Fixed Clang build on 32bit systems.
Additional patch to fix non-atomic operation in unit test.

David,

Can you review this series?
Thanks.

Hi David,

    I had tested this previously, including performance comparisons against original version on x86, and saw no performance degradation, so I Acked it. I can re-ack on the latest version now.

Thanks,
Dave.

#20 lore raw

Re: [dpdk-dev] [PATCH v3 0/2] fix distributor unit test

Quoted 10 lines · David
Quoted 7 lines · David Marchand
Quoted 6 lines · Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

---
v3:
Added comments for using of C11 acquire/release semantics. (Honnappa)

The comments are also something to maintain, so checking the v3 made sense to me.

Quoted 11 lines
Quoted 10 lines
Quoted 5 lines

v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Fixed Clang build on 32bit systems.
Additional patch to fix non-atomic operation in unit test.

David,

Can you review this series?
Thanks.

Quoted 5 lines

Hi David,

I had tested this previously, including performance comparisons
against original version on x86, and saw no performance degradation, so I Acked it. I can re-ack on the latest version now.

If you think this is fine as is, I will go and apply with your ack.

Signature · 1 line
David Marchand
#21 lore raw

Re: [dpdk-dev] [PATCH v3 0/2] fix distributor unit test

Quoted 14 lines · David Marchand
Quoted 13 lines · David
Quoted 11 lines · David Marchand
Quoted 10 lines · Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

---
v3:
Added comments for using of C11 acquire/release semantics. (Honnappa)

The comments are also something to maintain, so checking the v3 made sense to me.

  I agree, and the comments look good to me.

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 5 lines

v2:
Fixed intermittent packet count incorrect failure. (Aaron, David) Fixed Clang build on 32bit systems.
Additional patch to fix non-atomic operation in unit test.

David,

Can you review this series?
Thanks.

Quoted 6 lines
Quoted 5 lines

Hi David,

I had tested this previously, including performance comparisons
against original version on x86, and saw no performance degradation, so I Acked it. I can re-ack on the latest version now.

If you think this is fine as is, I will go and apply with your ack.

Sure, thanks.

Regards,

Dave.

Acked-by David Hunt on the v3 series Applied
#22 lore raw

Re: [dpdk-dev] [PATCH v3 0/2] fix distributor unit test

In reply to Ruifeng Wang
Quoted 10 lines · Ruifeng Wang

Bug 342 reported distributor_autotest execution suspension on aarch64 platform.
Issue was due to lack of synchronization among threads. Distributor thread and worker thread may get deadlocked.
Fixed synchronization issue by adding barriers.

Another issue identified was in test case. Non-atomic operation on stat value could cause value reset not been observed by worker thread and mess counters. The issue was fixed by using atomic operations.

Applied, thanks.

--
David Marchand