Page MenuHomeFreeBSD
Files F145303747

D24316.1777612020.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D24316.1777612020.diff
View Options

Index: head/lib/libc/sys/listen.2
===================================================================
--- head/lib/libc/sys/listen.2
+++ head/lib/libc/sys/listen.2
@@ -28,7 +28,7 @@
.\" From: @(#)listen.2 8.2 (Berkeley) 12/11/93
.\" $FreeBSD$
.\"
-.Dd August 18, 2016
+.Dd April 14, 2020
.Dt LISTEN 2
.Os
.Sh NAME
@@ -110,6 +110,13 @@
.Fa backlog
is silently forced to
.Va kern.ipc.soacceptqueue .
+.Pp
+If the listen queue overflows, the kernel will emit a LOG_DEBUG syslog message.
+The
+.Xr sysctl 3
+MIB variable
+.Va kern.ipc.sooverinterval
+specifies a per-socket limit on how often the kernel will emit these messages.
.Sh INTERACTION WITH ACCEPT FILTERS
When accept filtering is used on a socket, a second queue will
be used to hold sockets that have connected, but have not yet
Index: head/sys/kern/uipc_socket.c
===================================================================
--- head/sys/kern/uipc_socket.c
+++ head/sys/kern/uipc_socket.c
@@ -575,6 +575,11 @@
&regression_sonewconn_earlytest, 0, "Perform early sonewconn limit test");
#endif
+static struct timeval overinterval = { 60, 0 };
+SYSCTL_TIMEVAL_SEC(_kern_ipc, OID_AUTO, sooverinterval, CTLFLAG_RW,
+ &overinterval,
+ "Delay in seconds between warnings for listen socket overflows");
+
/*
* When an attempt at a new connection is noted on a socket which accepts
* connections, sonewconn is called. If the connection is possible (subject
@@ -587,14 +592,10 @@
struct socket *
sonewconn(struct socket *head, int connstatus)
{
- static struct timeval lastover;
- static struct timeval overinterval = { 60, 0 };
- static int overcount;
-
struct sbuf descrsb;
struct socket *so;
- u_int over;
- int len;
+ int len, overcount;
+ u_int qlen;
const char localprefix[] = "local:";
char descrbuf[SUNPATHLEN + sizeof(localprefix)];
#if defined(INET6)
@@ -602,18 +603,31 @@
#elif defined(INET)
char addrbuf[INET_ADDRSTRLEN];
#endif
+ bool dolog, over;
SOLISTEN_LOCK(head);
over = (head->sol_qlen > 3 * head->sol_qlimit / 2);
- SOLISTEN_UNLOCK(head);
#ifdef REGRESSION
if (regression_sonewconn_earlytest && over) {
#else
if (over) {
#endif
- overcount++;
+ head->sol_overcount++;
+ dolog = !!ratecheck(&head->sol_lastover, &overinterval);
- if (ratecheck(&lastover, &overinterval)) {
+ /*
+ * If we're going to log, copy the overflow count and queue
+ * length from the listen socket before dropping the lock.
+ * Also, reset the overflow count.
+ */
+ if (dolog) {
+ overcount = head->sol_overcount;
+ head->sol_overcount = 0;
+ qlen = head->sol_qlen;
+ }
+ SOLISTEN_UNLOCK(head);
+
+ if (dolog) {
/*
* Try to print something descriptive about the
* socket for the error message.
@@ -686,7 +700,7 @@
"%i already in queue awaiting acceptance "
"(%d occurrences)\n",
__func__, head->so_pcb, sbuf_data(&descrsb),
- head->sol_qlen, overcount);
+ qlen, overcount);
sbuf_delete(&descrsb);
overcount = 0;
@@ -694,6 +708,7 @@
return (NULL);
}
+ SOLISTEN_UNLOCK(head);
VNET_ASSERT(head->so_vnet != NULL, ("%s: so %p vnet is NULL",
__func__, head));
so = soalloc(head->so_vnet);
Index: head/sys/sys/socketvar.h
===================================================================
--- head/sys/sys/socketvar.h
+++ head/sys/sys/socketvar.h
@@ -172,6 +172,10 @@
short sol_sbsnd_flags;
sbintime_t sol_sbrcv_timeo;
sbintime_t sol_sbsnd_timeo;
+
+ /* Information tracking listen queue overflows. */
+ struct timeval sol_lastover; /* (e) */
+ int sol_overcount; /* (e) */
};
};
};

File Metadata

Mime Type
text/plain
Expires
Fri, May 1, 5:07 AM (37 m, 55 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28511722
Default Alt Text
D24316.1777612020.diff (3 KB)

Event Timeline