diff options
| -rw-r--r-- | src/vnet/devices/devices.h | 10 | ||||
| -rw-r--r-- | src/vnet/devices/virtio/vhost_user_input.c | 4 | ||||
| -rw-r--r-- | src/vppinfra/atomics.h | 5 | ||||
| -rw-r--r-- | src/vppinfra/smp.h | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/vnet/devices/devices.h b/src/vnet/devices/devices.h index ac5be229b76..cc960c98f23 100644 --- a/src/vnet/devices/devices.h +++ b/src/vnet/devices/devices.h @@ -148,16 +148,20 @@ vnet_device_input_set_interrupt_pending (vnet_main_t * vnm, u32 hw_if_index, rt = vlib_node_get_runtime_data (vm, hw->input_node_index); idx = hw->dq_runtime_index_by_queue[queue_id]; dq = vec_elt_at_index (rt->devices_and_queues, idx); - dq->interrupt_pending = 1; + + clib_atomic_store_rel_n (&(dq->interrupt_pending), 1); vlib_node_set_interrupt_pending (vm, hw->input_node_index); } +/* + * Acquire RMW Access + * Paired with Release Store in vnet_device_input_set_interrupt_pending + */ #define foreach_device_and_queue(var,vec) \ for (var = (vec); var < vec_end (vec); var++) \ if ((var->mode == VNET_HW_INTERFACE_RX_MODE_POLLING) \ - || clib_smp_swap (&((var)->interrupt_pending), 0)) - + || clib_atomic_swap_acq_n (&((var)->interrupt_pending), 0)) #endif /* included_vnet_vnet_device_h */ diff --git a/src/vnet/devices/virtio/vhost_user_input.c b/src/vnet/devices/virtio/vhost_user_input.c index 291d687ab6a..8e88695957b 100644 --- a/src/vnet/devices/virtio/vhost_user_input.c +++ b/src/vnet/devices/virtio/vhost_user_input.c @@ -641,8 +641,8 @@ VLIB_NODE_FN (vhost_user_input_node) (vlib_main_t * vm, vec_foreach (dq, rt->devices_and_queues) { - if (clib_smp_swap (&dq->interrupt_pending, 0) || - (node->state == VLIB_NODE_STATE_POLLING)) + if ((node->state == VLIB_NODE_STATE_POLLING) || + clib_atomic_swap_acq_n (&dq->interrupt_pending, 0)) { vui = pool_elt_at_index (vum->vhost_user_interfaces, dq->dev_instance); diff --git a/src/vppinfra/atomics.h b/src/vppinfra/atomics.h index 8ddf13801df..420ae837fc0 100644 --- a/src/vppinfra/atomics.h +++ b/src/vppinfra/atomics.h @@ -37,9 +37,10 @@ #define clib_atomic_cmp_and_swap(addr,old,new) __sync_val_compare_and_swap(addr, old, new) #define clib_atomic_bool_cmp_and_swap(addr,old,new) __sync_bool_compare_and_swap(addr, old, new) -/*Accquire Barrier*/ #define clib_atomic_test_and_set(a) __sync_lock_test_and_set(a, 1) -/*Release Barrier*/ #define clib_atomic_release(a) __sync_lock_release(a) +#define clib_atomic_store_rel_n(a, b) __atomic_store_n ((a), (b), __ATOMIC_RELEASE) +#define clib_atomic_swap_acq_n(a, b) __atomic_exchange_n ((a), (b), __ATOMIC_ACQUIRE) + #endif /* included_clib_atomics_h */ diff --git a/src/vppinfra/smp.h b/src/vppinfra/smp.h index 7146e51ac77..2b3ed548dfa 100644 --- a/src/vppinfra/smp.h +++ b/src/vppinfra/smp.h @@ -41,8 +41,6 @@ #include <vppinfra/cache.h> #include <vppinfra/os.h> /* for os_panic */ -#define clib_smp_swap(addr,new) __sync_lock_test_and_set(addr,new) - #if defined (i386) || defined (__x86_64__) #define clib_smp_pause() do { asm volatile ("pause"); } while (0) #elif defined (__aarch64__) || defined (__arm__) |