Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 18.11-rc3
[deb_dpdk.git]
/
lib
/
librte_ring
/
rte_ring_c11_mem.h
diff --git
a/lib/librte_ring/rte_ring_c11_mem.h
b/lib/librte_ring/rte_ring_c11_mem.h
index
7bc74a4
..
0fb73a3
100644
(file)
--- a/
lib/librte_ring/rte_ring_c11_mem.h
+++ b/
lib/librte_ring/rte_ring_c11_mem.h
@@
-61,11
+61,14
@@
__rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,
unsigned int max = n;
int success;
unsigned int max = n;
int success;
- *old_head = __atomic_load_n(&r->prod.head, __ATOMIC_
ACQUIRE
);
+ *old_head = __atomic_load_n(&r->prod.head, __ATOMIC_
RELAXED
);
do {
/* Reset n to the initial burst count */
n = max;
do {
/* Reset n to the initial burst count */
n = max;
+ /* Ensure the head is read before tail */
+ __atomic_thread_fence(__ATOMIC_ACQUIRE);
+
/* load-acquire synchronize with store-release of ht->tail
* in update_tail.
*/
/* load-acquire synchronize with store-release of ht->tail
* in update_tail.
*/
@@
-94,7
+97,7
@@
__rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,
/* on failure, *old_head is updated */
success = __atomic_compare_exchange_n(&r->prod.head,
old_head, *new_head,
/* on failure, *old_head is updated */
success = __atomic_compare_exchange_n(&r->prod.head,
old_head, *new_head,
- 0, __ATOMIC_
ACQUIRE
,
+ 0, __ATOMIC_
RELAXED
,
__ATOMIC_RELAXED);
} while (unlikely(success == 0));
return n;
__ATOMIC_RELAXED);
} while (unlikely(success == 0));
return n;
@@
-134,11
+137,14
@@
__rte_ring_move_cons_head(struct rte_ring *r, int is_sc,
int success;
/* move cons.head atomically */
int success;
/* move cons.head atomically */
- *old_head = __atomic_load_n(&r->cons.head, __ATOMIC_
ACQUIRE
);
+ *old_head = __atomic_load_n(&r->cons.head, __ATOMIC_
RELAXED
);
do {
/* Restore n as it may change every loop */
n = max;
do {
/* Restore n as it may change every loop */
n = max;
+ /* Ensure the head is read before tail */
+ __atomic_thread_fence(__ATOMIC_ACQUIRE);
+
/* this load-acquire synchronize with store-release of ht->tail
* in update_tail.
*/
/* this load-acquire synchronize with store-release of ht->tail
* in update_tail.
*/
@@
-166,7
+172,7
@@
__rte_ring_move_cons_head(struct rte_ring *r, int is_sc,
/* on failure, *old_head will be updated */
success = __atomic_compare_exchange_n(&r->cons.head,
old_head, *new_head,
/* on failure, *old_head will be updated */
success = __atomic_compare_exchange_n(&r->cons.head,
old_head, *new_head,
- 0, __ATOMIC_
ACQUIRE
,
+ 0, __ATOMIC_
RELAXED
,
__ATOMIC_RELAXED);
} while (unlikely(success == 0));
return n;
__ATOMIC_RELAXED);
} while (unlikely(success == 0));
return n;