diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-20 20:13:08 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-20 20:36:56 +0100 |
| commit | 2c33da507046c25d87741fe0ce7947985c8c7a10 (patch) | |
| tree | c329d195445d8fcd41b1112ea5b8b2b78359f162 /sysdep | |
| parent | 7d95c44572d79ef15ec8b0220950b4e4374c6bc6 (diff) | |
Netlink: fix occasional netlink hangs on busy machines
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/linux/netlink.c | 1 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c index 368e0ef9..22313f43 100644 --- a/sysdep/linux/netlink.c +++ b/sysdep/linux/netlink.c @@ -1497,6 +1497,7 @@ nl_async_hook(sock *sk, uint size UNUSED) * One day we might react to it by asking for route table * scan in near future. */ + log(L_WARN "Kernel dropped some netlink messages, will resync on next scan."); return 1; /* More data are likely to be ready */ } else if (errno != EWOULDBLOCK) diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 644a4fcd..8773f4c4 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -2238,7 +2238,8 @@ io_loop(void) if (pfd[s->index].revents & (POLLHUP | POLLERR)) { sk_err(s, pfd[s->index].revents); - goto next2; + if (s != current_sock) + goto next2; } current_sock = sk_next(s); |