ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[9.20] fix: usr: Limit the outgoing UDP send queue size

Browse Source 
If the operating system UDP queue gets full and the outgoing UDP sending
starts to be delayed, BIND 9 could exhibit memory spikes as it tries to
enqueue all the outgoing UDP messages.  Try a bit harder to deliver the
outgoing UDP messages synchronously and if that fails, drop the outgoing
DNS message that would get queued up and then timeout on the client side.

Closes #4930

Backport of MR !9506

Merge branch 'backport-4930-limit-the-UDP-send-queue-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!9511
This commit is contained in:
Ondřej Surý
2024-09-17 15:37:22 +00:00
parent 6c9f3d0d1e 6bff6df272
commit 251b90c25e
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/isc/netmgr/netmgr-int.h
View File

@@ -60,6 +60,7 @@
*/
#define ISC_NETMGR_UDP_RECVBUF_SIZE UINT16_MAX
#endif
#define ISC_NETMGR_UDP_SENDBUF_SIZE UINT16_MAX
/*
* The TCP send and receive buffers can fit one maximum sized DNS message plus

54
lib/isc/netmgr/udp.c
View File

@@ -19,6 +19,7 @@
#include <isc/buffer.h>
#include <isc/condition.h>
#include <isc/errno.h>
#include <isc/log.h>
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/netmgr.h>
@@ -27,6 +28,7 @@
#include <isc/region.h>
#include <isc/result.h>
#include <isc/sockaddr.h>
#include <isc/stdtime.h>
#include <isc/thread.h>
#include <isc/util.h>
#include <isc/uv.h>
@@ -640,6 +642,19 @@ udp_send_cb(uv_udp_send_t *req, int status) {
isc__nm_sendcb(sock, uvreq, result, false);
}
static _Atomic(isc_stdtime_t) last_udpsends_log = 0;
static bool
can_log_udp_sends(void) {
isc_stdtime_t now = isc_stdtime_now();
isc_stdtime_t last = atomic_exchange_relaxed(&last_udpsends_log, now);
if (now != last) {
return (true);
}
return (false);
}
/*
* Send the data in 'region' to a peer via a UDP socket. We try to find
* a proper sibling/child socket so that we won't have to jump to
@@ -697,12 +712,39 @@ isc__nm_udp_send(isc_nmhandle_t *handle, const isc_region_t *region,
goto fail;
}
r = uv_udp_send(&uvreq->uv_req.udp_send, &sock->uv_handle.udp,
&uvreq->uvbuf, 1, sa, udp_send_cb);
if (r < 0) {
isc__nm_incstats(sock, STATID_SENDFAIL);
result = isc_uverr2result(r);
goto fail;
if (uv_udp_get_send_queue_size(&sock->uv_handle.udp) >
ISC_NETMGR_UDP_SENDBUF_SIZE)
{
/*
* The kernel UDP send queue is full, try sending the UDP
* response synchronously instead of just failing.
*/
r = uv_udp_try_send(&sock->uv_handle.udp, &uvreq->uvbuf, 1, sa);
if (r < 0) {
if (can_log_udp_sends()) {
isc__netmgr_log(
worker->netmgr, ISC_LOG_ERROR,
"Sending UDP messages failed: %s",
isc_result_totext(isc_uverr2result(r)));
}
isc__nm_incstats(sock, STATID_SENDFAIL);
result = isc_uverr2result(r);
goto fail;
}
RUNTIME_CHECK(r == (int)region->length);
isc__nm_sendcb(sock, uvreq, ISC_R_SUCCESS, true);
} else {
/* Send the message asynchronously */
r = uv_udp_send(&uvreq->uv_req.udp_send, &sock->uv_handle.udp,
&uvreq->uvbuf, 1, sa, udp_send_cb);
if (r < 0) {
isc__nm_incstats(sock, STATID_SENDFAIL);
result = isc_uverr2result(r);
goto fail;
}
}
return;
fail: