diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-05-27 19:44:50 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2021-05-28 16:08:32 +0000 |
| commit | f5d9237c5699a6c3e403f09d53ec7d154322823c (patch) | |
| tree | 71e86d19fe1216e553c57a00ef4df132ebec26c1 | |
| parent | 88b2269a45c91e8378a1fd652f28aa39926a7a6a (diff) | |
svm: fix inadequate atomic load for chunk mgr
- Fixes intermittent LDP cut thru iperf3 test
failure on AARCH64
Type: fix
Change-Id: Id21a078d642e03d974bacacd1f4d0faa42fb6652
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
(cherry picked from commit 5c520919e838bcb645ddd879641d54c620740989)
| -rw-r--r-- | src/svm/fifo_segment.c | 6 | ||||
| -rwxr-xr-x | test/test_vcl.py | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index d8b3b259038..cb1f08a7e9f 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -154,7 +154,7 @@ fss_chunk_free_list_push (fifo_segment_header_t *fsh, csp = fs_chunk_sptr (fsh, c); ASSERT (csp <= FS_CL_HEAD_MASK); - old_head = clib_atomic_load_relax_n (&fss->free_chunks[fl_index]); + old_head = clib_atomic_load_acq_n (&fss->free_chunks[fl_index]); do { @@ -174,7 +174,7 @@ fss_chunk_free_list_push_list (fifo_segment_header_t *fsh, headsp = fs_chunk_sptr (fsh, head); ASSERT (headsp <= FS_CL_HEAD_MASK); - old_head = clib_atomic_load_relax_n (&fss->free_chunks[fl_index]); + old_head = clib_atomic_load_acq_n (&fss->free_chunks[fl_index]); do { @@ -194,7 +194,7 @@ fss_chunk_free_list_pop (fifo_segment_header_t *fsh, fifo_segment_slice_t *fss, ASSERT (fss_chunk_fl_index_is_valid (fss, fl_index)); - old_head = clib_atomic_load_relax_n (&fss->free_chunks[fl_index]); + old_head = clib_atomic_load_acq_n (&fss->free_chunks[fl_index]); /* Lock-free stacks are affected by ABA if a side allocates a chunk and * shortly thereafter frees it. To circumvent that, reuse the upper bits diff --git a/test/test_vcl.py b/test/test_vcl.py index a574f7ff6f4..2688816d42a 100755 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -6,7 +6,7 @@ import os import subprocess import signal from framework import VppTestCase, VppTestRunner, running_extended_tests, \ - Worker, is_platform_aarch64 + Worker from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, FibPathProto iperf3 = '/usr/bin/iperf3' @@ -291,8 +291,6 @@ class LDPCutThruTestCase(VCLTestCase): "sock_test_client", self.client_echo_test_args) @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") - @unittest.skipIf(is_platform_aarch64, - "intermittently fails on AARCH64 CI jobs") def test_ldp_cut_thru_iperf3(self): """ run LDP cut thru iperf3 test """ |