External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 05:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Fix learning address thread shutdown

Browse Source 
If the learning thread is configured to learn on all ethernet frames
(which is hardcoded) then chances are high that there is a packet on
every iteration of inspecting frames loop. As result we will hang on
shutdown because we don't check threadsTerminate if there is packet.

Let's just check termination conditions on every iteration. Since
we'll check each iteration, the check after pcap_next essentially
is unnecessary since on failure we'd loop back to the top and timeout
and then fail.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Nikolay Shirokovskiy 2018-10-12 10:23:07 +03:00 committed by John Ferlan
parent b05eeacbfd
commit 49825dcf31
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nwfilter/nwfilter_learnipaddr.c
View File

@ -483,6 +483,12 @@ learnIPAddressThread(void *arg)
while (req->status == 0 && vmaddr == 0) {
int n = poll(fds, ARRAY_CARDINALITY(fds), PKT_TIMEOUT_MS);
if (threadsTerminate || req->terminate) {
req->status = ECANCELED;
showError = false;
break;
}
if (n < 0) {
if (errno == EAGAIN || errno == EINTR)
continue;
@ -492,15 +498,8 @@ learnIPAddressThread(void *arg)
break;
}
if (n == 0) {
if (threadsTerminate || req->terminate) {
VIR_DEBUG("Terminate request seen, cancelling pcap");
req->status = ECANCELED;
showError = false;
break;
}
if (n == 0)
continue;
}
if (fds[0].revents & (POLLHUP | POLLERR)) {
VIR_DEBUG("Error from FD probably dev deleted");
@ -512,13 +511,6 @@ learnIPAddressThread(void *arg)
packet = pcap_next(handle, &header);
if (!packet) {
/* Already handled with poll, but lets be sure */
if (threadsTerminate || req->terminate) {
req->status = ECANCELED;
showError = false;
break;
}
/* Again, already handled above, but lets be sure */
if (virNetDevValidateConfig(req->binding->portdevname, NULL, req->ifindex) <= 0) {
virResetLastError();