diff options
| author |   jaszha03 <jason.zhang2@arm.com> | 2019-07-11 20:47:24 +0000 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-07-31 13:53:55 +0000 |
| commit | 5cdde5c25a0e71d923a6d56e5c94e058887f95d8 (patch) | |
| tree | c54eeb5a91ce67417806fabd1fca8d287993e71d /src/vnet/interface.h | |
| parent | 9a4e631890a70978d414b4937cb94b50cfd778e6 (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/vnet/interface.h')
| -rw-r--r-- | src/vnet/interface.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/interface.h b/src/vnet/interface.h index c6400ce6978..d3065dc2a9f 100644 --- a/src/vnet/interface.h +++ b/src/vnet/interface.h @@ -43,6 +43,7 @@ #include <vlib/vlib.h> #include <vppinfra/pcap.h> #include <vnet/l3_types.h> +#include <vppinfra/lock.h> struct vnet_main_t; struct vnet_hw_interface_t; @@ -836,7 +837,7 @@ typedef struct /* Software interface counters both simple and combined packet and byte counters. */ - volatile u32 *sw_if_counter_lock; + clib_spinlock_t sw_if_counter_lock; vlib_simple_counter_main_t *sw_if_counters; vlib_combined_counter_main_t *combined_sw_if_counters; @@ -868,15 +869,14 @@ static inline void vnet_interface_counter_lock (vnet_interface_main_t * im) { if (im->sw_if_counter_lock) - while (clib_atomic_test_and_set (im->sw_if_counter_lock)) - /* zzzz */ ; + clib_spinlock_lock (&im->sw_if_counter_lock); } static inline void vnet_interface_counter_unlock (vnet_interface_main_t * im) { if (im->sw_if_counter_lock) - clib_atomic_release (im->sw_if_counter_lock); + clib_spinlock_unlock (&im->sw_if_counter_lock); } void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add); |