OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: virtio: add memory barrier before notify FE 

Without memory barrier, the change of used ring index could not
immediately detected by FE, this would bring some problems.

For virtio-blk FE driver, when it receives an interrupt, and confirms the
used ring index has changed, it will first set ring flags with
VRING_AVAIL_F_NO_INTERRUPT, then get buffer from virtqueue, after
process this request, it will mask VRING_AVAIL_F_NO_INTERRUPT, and get
used ring index again before return. If used ring changes, it will
process it. At the same time, BE will read this flags before each notify,
if VRING_AVAIL_F_NO_INTERRUPT was set, BE will not inject interrupt.

Without memory barrier, before FE mask VRING_AVAIL_F_NO_INTERRUPT, BE
has finished notify without interrupt, then FE mask
VRING_AVAIL_F_NO_INTERRUPT, and get used ring index but failed (index
has changed from BE side). FE will return from interrupt handler
function, and wait for next interrupt which was not injected by BE. Thus,
this will cause kernel hung.

Tracked-On: #2732
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Wang Yu <yu1.wang@intel.com>
This commit is contained in:
Conghui Chen 2019-02-27 05:36:21 +08:00 committed by wenlingz
parent 7ab6e7ea03
commit 6f482b8856
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devicemodel/hw/pci/virtio/virtio.c
View File

@ -35,6 +35,7 @@
#include "pci_core.h" #include "pci_core.h"
#include "virtio.h" #include "virtio.h"
#include "timer.h" #include "timer.h"
#include <atomic.h>
/* /*
* Functions for dealing with generalized "virtual devices" as * Functions for dealing with generalized "virtual devices" as
@ -611,6 +612,9 @@ vq_endchains(struct virtio_vq_info *vq, int used_all_avail)
* In any case, though, if NOTIFY_ON_EMPTY is set and the * In any case, though, if NOTIFY_ON_EMPTY is set and the
* entire avail was processed, we need to interrupt always. * entire avail was processed, we need to interrupt always.
*/ */
atomic_thread_fence();
base = vq->base; base = vq->base;
old_idx = vq->save_used; old_idx = vq->save_used;
vq->save_used = new_idx = vq->used->idx; vq->save_used = new_idx = vq->used->idx;