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

dm: iothread: fix bug in iothread handler 

Fix the bug in iothread handler, the event should be read out so that the
next epoll_wait not return directly as the fd can still readable.

Tracked-On: #8181
Signed-off-by: Conghui <conghui.chen@intel.com>
Acked-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Conghui 2022-09-01 11:24:30 +08:00 committed by acrnsi-robot
parent fcd92f1c2f
commit 91cc0d5bf8
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devicemodel/core/iothread.c
View File

@ -21,6 +21,7 @@
#define MEVENT_MAX 64 #define MEVENT_MAX 64
#define MAX_EVENT_NUM 64
struct iothread_ctx { struct iothread_ctx {
pthread_t tid; pthread_t tid;
int epfd; int epfd;
@ -34,7 +35,8 @@ io_thread(void *arg)
{ {
struct epoll_event eventlist[MEVENT_MAX]; struct epoll_event eventlist[MEVENT_MAX];
struct iothread_mevent *aevp; struct iothread_mevent *aevp;
int i, n; int i, n, status;
char buf[MAX_EVENT_NUM];
while(ioctx.started) { while(ioctx.started) {
n = epoll_wait(ioctx.epfd, eventlist, MEVENT_MAX, -1); n = epoll_wait(ioctx.epfd, eventlist, MEVENT_MAX, -1);
@ -47,8 +49,13 @@ io_thread(void *arg)
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
aevp = eventlist[i].data.ptr; aevp = eventlist[i].data.ptr;
if (aevp && aevp->run) if (aevp && aevp->run) {
/* Mitigate the epoll_wait repeat cycles by reading out the events as more as possile.*/
do {
status = read(aevp->fd, buf, sizeof(buf));
} while (status == MAX_EVENT_NUM);
(*aevp->run)(aevp->arg); (*aevp->run)(aevp->arg);
}
} }
} }

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

@ -104,6 +104,7 @@ virtio_set_iothread(struct virtio_base *base,
vq->viothrd.idx = idx; vq->viothrd.idx = idx;
vq->viothrd.iomvt.arg = &vq->viothrd; vq->viothrd.iomvt.arg = &vq->viothrd;
vq->viothrd.iomvt.run = iothread_handler; vq->viothrd.iomvt.run = iothread_handler;
vq->viothrd.iomvt.fd = vq->viothrd.kick_fd;
if (!iothread_add(vq->viothrd.kick_fd, &vq->viothrd.iomvt)) if (!iothread_add(vq->viothrd.kick_fd, &vq->viothrd.iomvt))
if (!virtio_register_ioeventfd(base, idx, true)) if (!virtio_register_ioeventfd(base, idx, true))

1
devicemodel/include/iothread.h
View File

@ -10,6 +10,7 @@
struct iothread_mevent { struct iothread_mevent {
void (*run)(void *); void (*run)(void *);
void *arg; void *arg;
int fd;
}; };
int iothread_add(int fd, struct iothread_mevent *aevt); int iothread_add(int fd, struct iothread_mevent *aevt);
int iothread_del(int fd); int iothread_del(int fd);