summaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/analyse/ip6/node.c
diff options
context:
space:
mode:
authorjaszha03 <jason.zhang2@arm.com>2019-07-11 20:47:24 +0000
committerDave Barach <openvpp@barachs.net>2019-07-31 13:53:55 +0000
commit5cdde5c25a0e71d923a6d56e5c94e058887f95d8 (patch)
treec54eeb5a91ce67417806fabd1fca8d287993e71d /src/plugins/ioam/analyse/ip6/node.c
parent9a4e631890a70978d414b4937cb94b50cfd778e6 (diff)
vppinfra: refactor test_and_set spinlocks to use clib_spinlock_t
Spinlock performance improved when implemented with compare_and_exchange instead of test_and_set. All instances of test_and_set locks were refactored to use clib_spinlock_t when possible. Some locks e.g. ssvm synchronize between processes rather than threads, so they cannot directly use clib_spinlock_t. Type: refactor Change-Id: Ia16b5d4cd49209b2b57b8df6c94615c28b11bb60 Signed-off-by: Jason Zhang <jason.zhang2@arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com> Reviewed-by: Lijian Zhang <Lijian.Zhang@arm.com>
Diffstat (limited to 'src/plugins/ioam/analyse/ip6/node.c')
-rw-r--r--src/plugins/ioam/analyse/ip6/node.c30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/plugins/ioam/analyse/ip6/node.c b/src/plugins/ioam/analyse/ip6/node.c
index 7a8d71de93b..2568e305b39 100644
--- a/src/plugins/ioam/analyse/ip6/node.c
+++ b/src/plugins/ioam/analyse/ip6/node.c
@@ -256,17 +256,15 @@ 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 (clib_atomic_test_and_set (data0->writer_lock))
- ;
+ clib_spinlock_lock (&data0->writer_lock);
data0->pkt_counter++;
data0->bytes_counter += p_len0;
- clib_atomic_release (data0->writer_lock);
+ clib_spinlock_unlock (&data0->writer_lock);
- while (clib_atomic_test_and_set (data1->writer_lock))
- ;
+ clib_spinlock_lock (&data1->writer_lock);
data1->pkt_counter++;
data1->bytes_counter += p_len1;
- clib_atomic_release (data1->writer_lock);
+ clib_spinlock_unlock (&data1->writer_lock);
}
else if (error0 == 0)
{
@@ -274,11 +272,10 @@ 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 (clib_atomic_test_and_set (data0->writer_lock))
- ;
+ clib_spinlock_lock (&data0->writer_lock);
data0->pkt_counter++;
data0->bytes_counter += p_len0;
- clib_atomic_release (data0->writer_lock);
+ clib_spinlock_unlock (&data0->writer_lock);
}
else if (error1 == 0)
{
@@ -286,11 +283,10 @@ 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 (clib_atomic_test_and_set (data1->writer_lock))
- ;
+ clib_spinlock_lock (&data1->writer_lock);
data1->pkt_counter++;
data1->bytes_counter += p_len1;
- clib_atomic_release (data1->writer_lock);
+ clib_spinlock_unlock (&data1->writer_lock);
}
else
pkts_failed += 2;
@@ -327,12 +323,11 @@ 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 (clib_atomic_test_and_set (data0->writer_lock))
- ;
+ clib_spinlock_lock (&data0->writer_lock);
data0->pkt_counter++;
data0->bytes_counter +=
clib_net_to_host_u16 (ip60->payload_length);
- clib_atomic_release (data0->writer_lock);
+ clib_spinlock_unlock (&data0->writer_lock);
}
else
pkts_failed++;
@@ -393,13 +388,12 @@ 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 (clib_atomic_test_and_set (data->writer_lock))
- ;
+ clib_spinlock_lock (&data->writer_lock);
(0 == ret) ? (data->pot_data.sfc_validated_count++) :
(data->pot_data.sfc_invalidated_count++);
- clib_atomic_release (data->writer_lock);
+ clib_spinlock_unlock (&data->writer_lock);
return 0;
}