Attention is currently required from: Arne Schwabe.
Hello Arne Schwabe,
I'd like you to do a code review.
Please visit
https://gerrit.openvpn.net/c/openvpn/+/2210?usp=email
to review the following change.
Change subject: socket: pause the listeners when accept() runs out of resources
......................................................................
socket: pause the listeners when accept() runs out of resources
When accept() fails with EMFILE, Linux and FreeBSD leave the pending
connection in the listen queue and the level-triggered listener is
reported again on every wait. The server keeps creating and destroying
an instance for it, never gets an empty event set, so the timers do not
run and hand-window never reaps the idle connections that hold the
descriptors: the server stays at 100% CPU, writes the failure to the log
in a loop and stops serving new TCP and UDP clients until the peer
closes its connections. A management client connecting while the
descriptors are exhausted causes the same loop on the management
listener.
When accept() fails for lack of resources, stop polling the TCP
listeners and, in server mode, the management listener for up to a
second.
GitHub: OpenVPN/openvpn#1148
Change-Id: I978041ea4e6323f5a92d8721809f0fa44b9c2e03
Signed-off-by: Gianmarco De Gregori <[email protected]>
---
M src/openvpn/manage.c
M src/openvpn/multi_io.c
M src/openvpn/socket.c
M src/openvpn/socket.h
4 files changed, 70 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/2210/1
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index ae30930..e0a490e 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -3320,11 +3320,14 @@
switch (man->connection.state)
{
case MS_LISTEN:
- if (man_persist_state(persistent, 1))
+ {
+ const bool paused = (man->settings.flags & MF_SERVER) &&
socket_accept_paused();
+ if (man_persist_state(persistent, paused ? 4 : 1))
{
- event_ctl(es, ev, EVENT_READ, arg);
+ event_ctl(es, ev, paused ? 0 : EVENT_READ, arg);
}
break;
+ }
case MS_CC_WAIT_READ:
if (man_persist_state(persistent, 2))
@@ -3402,11 +3405,14 @@
switch (man->connection.state)
{
case MS_LISTEN:
- if (man_persist_state(persistent, 1))
+ {
+ const bool paused = (man->settings.flags & MF_SERVER) &&
socket_accept_paused();
+ if (man_persist_state(persistent, paused ? 4 : 1))
{
- event_ctl(es, man->connection.sd_top, EVENT_READ, arg);
+ event_ctl(es, man->connection.sd_top, paused ? 0 : EVENT_READ,
arg);
}
break;
+ }
case MS_CC_WAIT_READ:
if (man_persist_state(persistent, 2))
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index e07b691..afa31bc 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -187,10 +187,25 @@
}
else if (!tuntap_is_dco_win(m->top.c1.tuntap))
{
- socket_set_listen_persistent(sock, m->multi_io->es, &sock->ev_arg);
+ if (socket_accept_paused())
+ {
+ socket_unset_listen_persistent(sock, m->multi_io->es);
+ }
+ else
+ {
+ socket_set_listen_persistent(sock, m->multi_io->es,
&sock->ev_arg);
+ }
}
}
+ const time_t delay = socket_accept_paused();
+ if (delay && m->top.c2.timeval.tv_sec >= delay)
+ {
+ m->top.c2.timeval.tv_sec = delay;
+ m->top.c2.timeval.tv_usec = 0;
+ m->earliest_wakeup = NULL;
+ }
+
tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN,
persistent);
#if defined(ENABLE_DCO)
dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO);
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index c07ef60..8a5225f 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -422,6 +422,29 @@
gc_free(&gc);
}
+/* accept() failed for lack of resources: no new accept() before this time */
+static time_t accept_resume = 0; /* GLOBAL */
+
+static void
+accept_check_resources(const int err)
+{
+#ifdef _WIN32
+ const bool out_of_resources = err == WSAEMFILE || err == WSAENOBUFS;
+#else
+ const bool out_of_resources = err == EMFILE || err == ENFILE || err ==
ENOBUFS || err == ENOMEM;
+#endif
+ if (out_of_resources)
+ {
+ accept_resume = now + 1;
+ }
+}
+
+time_t
+socket_accept_paused(void)
+{
+ return now < accept_resume ? accept_resume - now : 0;
+}
+
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-conversion"
@@ -456,6 +479,10 @@
else
{
new_sd = accept(sd, &act->dest.addr.sa, &remote_len);
+ if (!socket_defined(new_sd))
+ {
+ accept_check_resources(openvpn_errno());
+ }
}
#if 0 /* For debugging only, test the effect of accept() failures */
@@ -2700,6 +2727,10 @@
* scripts don't have access to it */
set_cloexec(ret);
}
+ else
+ {
+ accept_check_resources(openvpn_errno());
+ }
return ret;
}
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 2210bfe..6324a17 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -410,6 +410,9 @@
const char *bind_dev, struct
addrinfo *bind_addr,
bool bind_ipv6_only, bool
optional);
+/* Seconds left before accept() is retried after it failed for lack of
resources */
+time_t socket_accept_paused(void);
+
socket_descriptor_t socket_do_accept(socket_descriptor_t sd, struct
link_socket_actual *act,
const bool nowait);
@@ -846,6 +849,16 @@
}
static inline void
+socket_unset_listen_persistent(struct link_socket *sock, struct event_set *es)
+{
+ if (sock && sock->listen_persistent_queued)
+ {
+ event_del(es, socket_listen_event_handle(sock));
+ sock->listen_persistent_queued = false;
+ }
+}
+
+static inline void
socket_reset_listen_persistent(struct link_socket *sock)
{
#ifdef _WIN32
--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2210?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I978041ea4e6323f5a92d8721809f0fa44b9c2e03
Gerrit-Change-Number: 2210
Gerrit-PatchSet: 1
Gerrit-Owner: Gianmarco De Gregori <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: Arne Schwabe <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel