github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 05:30:24 +00:00
Code Issues Projects Releases Wiki Activity

ACRN:DM: Fix the vhost register kick fd issue.

Browse Source 
Add the new parameter for register ioevent function, let the vhost
vq and viothread vq can share the register ioevent common API.

Tracked-On: #8323
Signed-off-by: Liu Long <long.liu@linux.intel.com>
Reviewed-by: Conghui <conghui.chen@intel.com>
This commit is contained in:
Liu Long 2022-11-16 15:59:59 +08:00 committed by acrnsi-robot
parent 796fb2971c
commit 0caf1ac0de
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devicemodel/hw/pci/virtio/vhost.c
View File

@ -196,7 +196,7 @@ vhost_vq_register_eventfd(struct vhost_dev *vdev,
irqfd.flags = ACRN_IRQFD_FLAG_DEASSIGN;
}
virtio_register_ioeventfd(base, idx, is_register);
virtio_register_ioeventfd(base, idx, is_register, vq->kick_fd);
/* register irqfd for notify */
mte = &vdev->base->dev->msix.table[vqi->msix_idx];
msi.msi_addr = mte->addr;

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

@ -107,10 +107,10 @@ virtio_set_iothread(struct virtio_base *base,
vq->viothrd.iomvt.fd = vq->viothrd.kick_fd;
if (!iothread_add(vq->viothrd.kick_fd, &vq->viothrd.iomvt))
if (!virtio_register_ioeventfd(base, idx, true))
if (!virtio_register_ioeventfd(base, idx, true, vq->viothrd.kick_fd))
vq->viothrd.ioevent_started = true;
} else {
if (!virtio_register_ioeventfd(base, idx, false))
if (!virtio_register_ioeventfd(base, idx, false, vq->viothrd.kick_fd))
if (!iothread_del(vq->viothrd.kick_fd)) {
vq->viothrd.ioevent_started = false;
if (vq->viothrd.kick_fd) {
@ -1991,16 +1991,15 @@ acrn_parse_virtio_poll_interval(const char *optarg)
return 0;
}
int virtio_register_ioeventfd(struct virtio_base *base, int idx, bool is_register)
int virtio_register_ioeventfd(struct virtio_base *base, int idx, bool is_register, int fd)
{
struct acrn_ioeventfd ioeventfd = {0};
struct virtio_vq_info *vq;
struct pcibar *bar;
int rc = 0;
if (!is_register)
ioeventfd.flags = ACRN_IOEVENTFD_FLAG_DEASSIGN;
else
else if (base->iothread)
/* Enable ASYNCIO by default. If ASYNCIO is not supported by kernel
* or hyperviosr, this flag will be ignored.
*/
@ -2040,8 +2039,7 @@ int virtio_register_ioeventfd(struct virtio_base *base, int idx, bool is_registe
ACRN_IOEVENTFD_FLAG_PIO);
}
vq = &base->queues[idx];
ioeventfd.fd = vq->viothrd.kick_fd;
ioeventfd.fd = fd;
if (is_register)
pr_info("[ioeventfd: %d][0x%lx@%d][flags: 0x%x][data: 0x%lx]\r\n",
ioeventfd.fd, ioeventfd.addr, ioeventfd.len,

2
devicemodel/include/virtio.h
View File

@ -776,5 +776,5 @@ uint32_t virtio_device_cfg_read(
int virtio_set_modern_pio_bar(
struct virtio_base *base, int barnum);
int virtio_register_ioeventfd(struct virtio_base *base, int idx, bool is_register);
int virtio_register_ioeventfd(struct virtio_base *base, int idx, bool is_register, int fd);
#endif /* _VIRTIO_H_ */