External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 01:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: eventpoll: Survive EBADF on macOS

Browse Source 
Fixes:
https://www.redhat.com/archives/libvir-list/2017-January/msg00978.html

QEMU is probed through monitor fd to check capabilities during libvirtd init.
The monitor fd is closed after probing by virQEMUCapsInitQMPCommandFree
that calls virQEMUCapsInitQMPCommandAbort that calls qemuMonitorClose,
the latter one notifies the event loop via an interrupt handle in
qemuMonitorUnregister and after then closes monitor fd.

There could be a case when interrupt is sent after eventLoop is unlocked
but before virEventPollRunOnce blocks in poll, shortly before file
descriptor is closed by qemuMonitorClose. Then poll receives closed monitor
fd in fdset and returns EBADF.

EBADF is not mentioned as a valid errno on macOS poll man-page but such
behaviour can appear release-to-release, according to cpython:
https://github.com/python/cpython/blob/master/Modules/selectmodule.c#L1161

The change also fixes the issue in qemucapabilitiestest. It returns
Bad file descriptor message 25 times without the fix.

Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Roman Bolshakov 2018-08-23 11:49:32 +03:00 committed by Michal Privoznik
parent 3b89e1f962
commit 0041eda1e4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/vireventpoll.c
View File

@ -643,6 +643,12 @@ int virEventPollRunOnce(void)
EVENT_DEBUG("Poll got error event %d", errno);
if (errno == EINTR || errno == EAGAIN)
goto retry;
#ifdef __APPLE__
if (errno == EBADF) {
virMutexLock(&eventLoop.lock);
goto cleanup;
}
#endif
virReportSystemError(errno, "%s",
_("Unable to poll on file handles"));
return -1;
@ -660,6 +666,9 @@ int virEventPollRunOnce(void)
virEventPollCleanupTimeouts();
virEventPollCleanupHandles();
#ifdef __APPLE__
cleanup:
#endif
eventLoop.running = 0;
virMutexUnlock(&eventLoop.lock);
return 0;