mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-21 11:13:30 +00:00
This patch offers a workaround to buf_ring reordering
visible on armv7 and armv8. Similar issue to rS302292. Obtained from: Semihalf Authored by: Michal Krawczyk <mk@semihalf.com> Approved by: wma Differential Revision: https://reviews.freebsd.org/D19932
This commit is contained in:
parent
4bc523382c
commit
c591d46ee9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=346593
@ -310,15 +310,24 @@ buf_ring_peek_clear_sc(struct buf_ring *br)
|
|||||||
if (!mtx_owned(br->br_lock))
|
if (!mtx_owned(br->br_lock))
|
||||||
panic("lock not held on single consumer dequeue");
|
panic("lock not held on single consumer dequeue");
|
||||||
#endif
|
#endif
|
||||||
/*
|
|
||||||
* I believe it is safe to not have a memory barrier
|
|
||||||
* here because we control cons and tail is worst case
|
|
||||||
* a lagging indicator so we worst case we might
|
|
||||||
* return NULL immediately after a buffer has been enqueued
|
|
||||||
*/
|
|
||||||
if (br->br_cons_head == br->br_prod_tail)
|
if (br->br_cons_head == br->br_prod_tail)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
|
||||||
|
#if defined(__arm__) || defined(__aarch64__)
|
||||||
|
/*
|
||||||
|
* The barrier is required there on ARM and ARM64 to ensure, that
|
||||||
|
* br->br_ring[br->br_cons_head] will not be fetched before the above
|
||||||
|
* condition is checked.
|
||||||
|
* Without the barrier, it is possible, that buffer will be fetched
|
||||||
|
* before the enqueue will put mbuf into br, then, in the meantime, the
|
||||||
|
* enqueue will update the array and the br_prod_tail, and the
|
||||||
|
* conditional check will be true, so we will return previously fetched
|
||||||
|
* (and invalid) buffer.
|
||||||
|
*/
|
||||||
|
atomic_thread_fence_acq();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUG_BUFRING
|
#ifdef DEBUG_BUFRING
|
||||||
/*
|
/*
|
||||||
* Single consumer, i.e. cons_head will not move while we are
|
* Single consumer, i.e. cons_head will not move while we are
|
||||||
|
Loading…
Reference in New Issue
Block a user