mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aio-posix: fix race between epoll upgrade and aio_set_fd_handler()

Browse Source 
If another thread calls aio_set_fd_handler() while the IOThread event
loop is upgrading from ppoll(2) to epoll(7) then we might miss new
AioHandlers. The epollfd will not monitor the new AioHandler's fd,
resulting in hangs.

Take the AioHandler list lock while upgrading to epoll. This prevents
AioHandlers from changing while epoll is being set up. If we cannot lock
because we're in a nested event loop, then don't upgrade to epoll (it
will happen next time we're not in a nested call).

The downside to taking the lock is that the aio_set_fd_handler() thread
has to wait until the epoll upgrade is finished, which involves many
epoll_ctl(2) system calls. However, this scenario is rare and I couldn't
think of another solution that is still simple.

Reported-by: Qing Wang <qinwang@redhat.com>
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2090998
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Fam Zheng <fam@euphon.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230323144859.1338495-1-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit e62da98527)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Stefan Hajnoczi 2023-03-23 10:48:59 -04:00 committed by Michael Tokarev
parent d8592b05be
commit 248aa3deb6
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
util/fdmon-epoll.c
View File

@ -127,6 +127,8 @@ static bool fdmon_epoll_try_enable(AioContext *ctx)
bool fdmon_epoll_try_upgrade(AioContext *ctx, unsigned npfd) bool fdmon_epoll_try_upgrade(AioContext *ctx, unsigned npfd)
{ {
bool ok;
if (ctx->epollfd < 0) { if (ctx->epollfd < 0) {
return false; return false;
} }
@ -136,14 +138,23 @@ bool fdmon_epoll_try_upgrade(AioContext *ctx, unsigned npfd)
return false; return false;
} }
if (npfd >= EPOLL_ENABLE_THRESHOLD) { if (npfd < EPOLL_ENABLE_THRESHOLD) {
if (fdmon_epoll_try_enable(ctx)) { return false;
return true;
} else {
fdmon_epoll_disable(ctx);
}
} }
return false;
/* The list must not change while we add fds to epoll */
if (!qemu_lockcnt_dec_if_lock(&ctx->list_lock)) {
return false;
}
ok = fdmon_epoll_try_enable(ctx);
qemu_lockcnt_inc_and_unlock(&ctx->list_lock);
if (!ok) {
fdmon_epoll_disable(ctx);
}
return ok;
} }
void fdmon_epoll_setup(AioContext *ctx) void fdmon_epoll_setup(AioContext *ctx)