From 2f6d7bb93c157b874efb79a2d1583a4c368bf89a Mon Sep 17 00:00:00 2001 From: Sirshak Das Date: Wed, 3 Oct 2018 22:53:51 +0000 Subject: vppinfra: add atomic macros for __sync builtins This is first part of addition of atomic macros with only macros for __sync builtins. - Based on earlier patch by Damjan (https://gerrit.fd.io/r/#/c/10729/) Additionally - clib_atomic_release macro added and used in the absence of any memory barrier. - clib_atomic_bool_cmp_and_swap added Change-Id: Ie4e48c1e184a652018d1d0d87c4be80ddd180a3b Original-patch-by: Damjan Marion Signed-off-by: Sirshak Das Reviewed-by: Honnappa Nagarahalli Reviewed-by: Ola Liljedahl Reviewed-by: Steve Capper --- src/plugins/ioam/analyse/ioam_analyse.h | 20 +++++++++++--------- src/plugins/ioam/analyse/ioam_summary_export.c | 4 ++-- src/plugins/ioam/analyse/ip6/node.c | 24 ++++++++++++------------ src/plugins/ioam/export-common/ioam_export.h | 6 +++--- 4 files changed, 28 insertions(+), 26 deletions(-) (limited to 'src/plugins/ioam') diff --git a/src/plugins/ioam/analyse/ioam_analyse.h b/src/plugins/ioam/analyse/ioam_analyse.h index 881b0451721..3aec7a792d8 100644 --- a/src/plugins/ioam/analyse/ioam_analyse.h +++ b/src/plugins/ioam/analyse/ioam_analyse.h @@ -191,7 +191,7 @@ ip6_ioam_analyse_set_paths_down (ioam_analyser_data_t * data) ioam_path_map_t *path; u8 k, i; - while (__sync_lock_test_and_set (data->writer_lock, 1)) + while (clib_atomic_test_and_set (data->writer_lock)) ; trace_data = &data->trace_data; @@ -208,7 +208,7 @@ ip6_ioam_analyse_set_paths_down (ioam_analyser_data_t * data) for (k = 0; k < trace_record->num_nodes; k++) path[k].state_up = 0; } - *(data->writer_lock) = 0; + clib_atomic_release (data->writer_lock); } always_inline void @@ -225,7 +225,7 @@ ip6_ioam_analyse_hbh_trace_loopback (ioam_analyser_data_t * data, u16 size_of_traceopt_per_node; u16 size_of_all_traceopts; - while (__sync_lock_test_and_set (data->writer_lock, 1)) + while (clib_atomic_test_and_set (data->writer_lock)) ; trace_data = &data->trace_data; @@ -277,7 +277,7 @@ ip6_ioam_analyse_hbh_trace_loopback (ioam_analyser_data_t * data, } } end: - *(data->writer_lock) = 0; + clib_atomic_release (data->writer_lock); } always_inline int @@ -295,7 +295,7 @@ ip6_ioam_analyse_hbh_trace (ioam_analyser_data_t * data, ioam_path_map_t *path = NULL; ioam_analyse_trace_record *trace_record; - while (__sync_lock_test_and_set (data->writer_lock, 1)) + while (clib_atomic_test_and_set (data->writer_lock)) ; trace_data = &data->trace_data; @@ -409,7 +409,7 @@ found_match: (u32) ((sum + delay) / (data->seqno_data.rx_packets + 1)); } DONE: - *(data->writer_lock) = 0; + clib_atomic_release (data->writer_lock); return 0; } @@ -417,13 +417,14 @@ always_inline int ip6_ioam_analyse_hbh_e2e (ioam_analyser_data_t * data, ioam_e2e_packet_t * e2e, u16 len) { - while (__sync_lock_test_and_set (data->writer_lock, 1)) + while (clib_atomic_test_and_set (data->writer_lock)) ; ioam_analyze_seqno (&data->seqno_data, (u64) clib_net_to_host_u32 (e2e->e2e_data)); - *(data->writer_lock) = 0; + clib_atomic_release (data->writer_lock); + return 0; } @@ -510,7 +511,8 @@ ioam_analyse_init_data (ioam_analyser_data_t * data) data->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES); - *(data->writer_lock) = 0; + + clib_atomic_release (data->writer_lock); trace_data = &(data->trace_data); for (j = 0; j < IOAM_MAX_PATHS_PER_FLOW; j++) diff --git a/src/plugins/ioam/analyse/ioam_summary_export.c b/src/plugins/ioam/analyse/ioam_summary_export.c index c118bfa3529..440dcca8369 100644 --- a/src/plugins/ioam/analyse/ioam_summary_export.c +++ b/src/plugins/ioam/analyse/ioam_summary_export.c @@ -150,7 +150,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr, ip6_address_t * src, ip6_address_t * dst, u16 src_port, u16 dst_port) { - while (__sync_lock_test_and_set (record->writer_lock, 1)) + while (clib_atomic_test_and_set (record->writer_lock)) ; int field_index = 0; @@ -259,7 +259,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr, *(record->chached_data_list) = *record; record->chached_data_list->chached_data_list = NULL; - *(record->writer_lock) = 0; + clib_atomic_release (record->writer_lock); return offset; } diff --git a/src/plugins/ioam/analyse/ip6/node.c b/src/plugins/ioam/analyse/ip6/node.c index 902fb9b09ce..7a8d71de93b 100644 --- a/src/plugins/ioam/analyse/ip6/node.c +++ b/src/plugins/ioam/analyse/ip6/node.c @@ -256,17 +256,17 @@ ip6_ioam_analyse_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, data0 = ioam_analyse_get_data_from_flow_id (flow_id0); data1 = ioam_analyse_get_data_from_flow_id (flow_id1); - while (__sync_lock_test_and_set (data0->writer_lock, 1)) + while (clib_atomic_test_and_set (data0->writer_lock)) ; data0->pkt_counter++; data0->bytes_counter += p_len0; - *(data0->writer_lock) = 0; + clib_atomic_release (data0->writer_lock); - while (__sync_lock_test_and_set (data1->writer_lock, 1)) + while (clib_atomic_test_and_set (data1->writer_lock)) ; data1->pkt_counter++; data1->bytes_counter += p_len1; - *(data1->writer_lock) = 0; + clib_atomic_release (data1->writer_lock); } else if (error0 == 0) { @@ -274,11 +274,11 @@ ip6_ioam_analyse_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, pkts_failed++; data0 = ioam_analyse_get_data_from_flow_id (flow_id0); - while (__sync_lock_test_and_set (data0->writer_lock, 1)) + while (clib_atomic_test_and_set (data0->writer_lock)) ; data0->pkt_counter++; data0->bytes_counter += p_len0; - *(data0->writer_lock) = 0; + clib_atomic_release (data0->writer_lock); } else if (error1 == 0) { @@ -286,11 +286,11 @@ ip6_ioam_analyse_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, pkts_failed++; data1 = ioam_analyse_get_data_from_flow_id (flow_id1); - while (__sync_lock_test_and_set (data1->writer_lock, 1)) + while (clib_atomic_test_and_set (data1->writer_lock)) ; data1->pkt_counter++; data1->bytes_counter += p_len1; - *(data1->writer_lock) = 0; + clib_atomic_release (data1->writer_lock); } else pkts_failed += 2; @@ -327,12 +327,12 @@ ip6_ioam_analyse_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, { pkts_analysed++; data0 = ioam_analyse_get_data_from_flow_id (flow_id0); - while (__sync_lock_test_and_set (data0->writer_lock, 1)) + while (clib_atomic_test_and_set (data0->writer_lock)) ; data0->pkt_counter++; data0->bytes_counter += clib_net_to_host_u16 (ip60->payload_length); - *(data0->writer_lock) = 0; + clib_atomic_release (data0->writer_lock); } else pkts_failed++; @@ -393,13 +393,13 @@ ip6_ioam_analyse_hbh_pot (u32 flow_id, ip6_hop_by_hop_option_t * opt0, pot_profile = pot_profile_get_active (); ret = pot_validate (pot_profile, cumulative, random); - while (__sync_lock_test_and_set (data->writer_lock, 1)) + while (clib_atomic_test_and_set (data->writer_lock)) ; (0 == ret) ? (data->pot_data.sfc_validated_count++) : (data->pot_data.sfc_invalidated_count++); - *(data->writer_lock) = 0; + clib_atomic_release (data->writer_lock); return 0; } diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h index 36d71d26716..6e640951802 100644 --- a/src/plugins/ioam/export-common/ioam_export.h +++ b/src/plugins/ioam/export-common/ioam_export.h @@ -436,11 +436,11 @@ ioam_export_process_common (ioam_export_main_t * em, vlib_main_t * vm, */ for (i = 0; i < vec_len (thread_index); i++) { - while (__sync_lock_test_and_set (em->lockp[thread_index[i]], 1)) + while (clib_atomic_test_and_set (em->lockp[thread_index[i]])) ; em->buffer_per_thread[thread_index[i]] = vec_pop (vec_buffer_indices); - *em->lockp[thread_index[i]] = 0; + clib_atomic_release (em->lockp[thread_index[i]]); } /* Send the buffers */ @@ -479,7 +479,7 @@ do { \ from = vlib_frame_vector_args (F); \ n_left_from = (F)->n_vectors; \ next_index = (N)->cached_next_index; \ - while (__sync_lock_test_and_set ((EM)->lockp[(VM)->thread_index], 1)); \ + while (clib_atomic_test_and_set ((EM)->lockp[(VM)->thread_index])); \ my_buf = ioam_export_get_my_buffer (EM, (VM)->thread_index); \ my_buf->touched_at = vlib_time_now (VM); \ while (n_left_from > 0) \ -- cgit 1.2.3-korg