summaryrefslogtreecommitdiffstats
path: root/src/plugins/map
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/map
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/map')
-rw-r--r--src/plugins/map/map.c8
-rw-r--r--src/plugins/map/map.h13
2 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/map/map.c b/src/plugins/map/map.c
index 2f036da7ebc..6ec9e72b413 100644
--- a/src/plugins/map/map.c
+++ b/src/plugins/map/map.c
@@ -2265,9 +2265,7 @@ map_init (vlib_main_t * vm)
/* IP4 virtual reassembly */
mm->ip4_reass_hash_table = 0;
mm->ip4_reass_pool = 0;
- mm->ip4_reass_lock =
- clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
- *mm->ip4_reass_lock = 0;
+ clib_spinlock_init (&mm->ip4_reass_lock);
mm->ip4_reass_conf_ht_ratio = MAP_IP4_REASS_HT_RATIO_DEFAULT;
mm->ip4_reass_conf_lifetime_ms = MAP_IP4_REASS_LIFETIME_DEFAULT;
mm->ip4_reass_conf_pool_size = MAP_IP4_REASS_POOL_SIZE_DEFAULT;
@@ -2281,9 +2279,7 @@ map_init (vlib_main_t * vm)
/* IP6 virtual reassembly */
mm->ip6_reass_hash_table = 0;
mm->ip6_reass_pool = 0;
- mm->ip6_reass_lock =
- clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
- *mm->ip6_reass_lock = 0;
+ clib_spinlock_init (&mm->ip6_reass_lock);
mm->ip6_reass_conf_ht_ratio = MAP_IP6_REASS_HT_RATIO_DEFAULT;
mm->ip6_reass_conf_lifetime_ms = MAP_IP6_REASS_LIFETIME_DEFAULT;
mm->ip6_reass_conf_pool_size = MAP_IP6_REASS_POOL_SIZE_DEFAULT;
diff --git a/src/plugins/map/map.h b/src/plugins/map/map.h
index 6dc5232bf43..a65a16a06d5 100644
--- a/src/plugins/map/map.h
+++ b/src/plugins/map/map.h
@@ -306,7 +306,7 @@ typedef struct {
u16 ip4_reass_allocated;
u16 *ip4_reass_hash_table;
u16 ip4_reass_fifo_last;
- volatile u32 *ip4_reass_lock;
+ clib_spinlock_t ip4_reass_lock;
/* Counters */
u32 ip4_reass_buffered_counter;
@@ -329,7 +329,7 @@ typedef struct {
u16 ip6_reass_allocated;
u16 *ip6_reass_hash_table;
u16 ip6_reass_fifo_last;
- volatile u32 *ip6_reass_lock;
+ clib_spinlock_t ip6_reass_lock;
/* Counters */
u32 ip6_reass_buffered_counter;
@@ -502,8 +502,8 @@ map_ip4_reass_get(u32 src, u32 dst, u16 fragment_id,
void
map_ip4_reass_free(map_ip4_reass_t *r, u32 **pi_to_drop);
-#define map_ip4_reass_lock() while (clib_atomic_test_and_set (map_main.ip4_reass_lock)) { CLIB_PAUSE (); }
-#define map_ip4_reass_unlock() clib_atomic_release (map_main.ip4_reass_lock)
+#define map_ip4_reass_lock() clib_spinlock_lock (&map_main.ip4_reass_lock)
+#define map_ip4_reass_unlock() clib_spinlock_unlock (&map_main.ip4_reass_lock)
static_always_inline void
map_ip4_reass_get_fragments(map_ip4_reass_t *r, u32 **pi)
@@ -527,8 +527,8 @@ map_ip6_reass_get(ip6_address_t *src, ip6_address_t *dst, u32 fragment_id,
void
map_ip6_reass_free(map_ip6_reass_t *r, u32 **pi_to_drop);
-#define map_ip6_reass_lock() while (clib_atomic_test_and_set (map_main.ip6_reass_lock)) { CLIB_PAUSE (); }
-#define map_ip6_reass_unlock() clib_atomic_release (map_main.ip6_reass_lock)
+#define map_ip6_reass_lock() clib_spinlock_lock (&map_main.ip6_reass_lock)
+#define map_ip6_reass_unlock() clib_spinlock_unlock (&map_main.ip6_reass_lock)
int
map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
@@ -589,6 +589,7 @@ map_domain_counter_lock (map_main_t *mm)
while (clib_atomic_test_and_set (mm->counter_lock))
/* zzzz */ ;
}
+
static inline void
map_domain_counter_unlock (map_main_t *mm)
{