From nobody Fri Oct 14 00:43:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MpSKm74zjz4f5L0; Fri, 14 Oct 2022 00:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MpSKm6cH2z4Nhb; Fri, 14 Oct 2022 00:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665708188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmN9E+70H4VCmVxuCULnqgogvWtKO2ccNndITop40lY=; b=wWyODZWCFxzQPoJmXrEYhGxQUNeqJYBUTbOM/3zMC8AR9+vp9B5Hu3atovv9uo/S1UMWvO Zm9frxcLscZ+Gvt4h5oEzyDXbJViD1wIwejBUyqlNJcFDDoevHS9ysRfFfRGOegDnXJlCe cACrRW3vWaDIhafwmbNIed3bvxj1AFq+XLYVW7ojrcQVyt1HTLqdtSIKplW3IUdCGaRpoF HO6LG8AKSWuUtuMbqWIOnBKGfcQBnBsWtfNfw/jaYOm+rYNbFB9lHeNwGrtduwRzPz2wkO LzmVatovYbMZnGiAiulD/bgUdwejrk9BMpXnKGwYp+NLTpXVNkl8OqafvU/CAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MpSKm5gFpzc4Y; Fri, 14 Oct 2022 00:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29E0h8Gn093176; Fri, 14 Oct 2022 00:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E0h8xH093175; Fri, 14 Oct 2022 00:43:08 GMT (envelope-from git) Date: Fri, 14 Oct 2022 00:43:08 GMT Message-Id: <202210140043.29E0h8xH093175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dd72b2f3de4f - stable/12 - Track kern.ipc.somaxconn -> kern.ipc.soacceptqueue rename List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dd72b2f3de4f41ac612bcbf9ac1d0f294b1ed277 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665708188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmN9E+70H4VCmVxuCULnqgogvWtKO2ccNndITop40lY=; b=hEk7/Zw3K7K6p7rP4sOR/qzWRd3fhs4TJ3I/TPgRV8xi2EwUVGGPPBX2l2kyo0/vripd1Z 9Ke+ak3IqDxrDLo5Sfq/bApam30HR9cgk+3JOFTwKiuTSLSSHeBaWzxqCfsWm2koBJRMun 2QscBpj/G6T2bjGHz0auxkAyOTl5Cc/veJT7YYUs1xumqu/xwE+fFDxQiwhtwZdLCFYk0k uMb2f5sUV0uC1X31feZZyhKX8WvKeBUHPIf4ys82x1+TNERL/QIS+kiGLXwNdMwsAgkFmC Ey8vli1tyzNQhQ6mkGFPH6qtlWEcP4BRwYt6rR5qyDsnFX8qmU6yDW6yy62rfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665708188; a=rsa-sha256; cv=none; b=L+KOHnYzJATXbw0y43DZ1mdXg7NypsRo1850ws/Kb7rpeu+1O80hnKg7QSQKcynX7kCmA0 Pr4fEXNKWYsYpwc/XE1+SQhgV/DGwpqDe/vgbvbUEC8RYY5R8q3kkDCg5CvBVUEVWmTopx /qmZa3qXx+dYOkdLQY2psGWNc3300pQI1baGO+2b4R8pi32g/dBpoi1iPH/oLfjJLkNjdL aVtBcMQuHfzL1PQhcPKEKx94KGggTXgpqg27MJ7nrTFeAAK3NzjzF8Tmb18cuBTvVyuwgc rtNei5XPcKrpxRW4SUSAJluaLNftdq5lJBkHcJ41bxRhmcndB6IWR6N/ZCpaeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dd72b2f3de4f41ac612bcbf9ac1d0f294b1ed277 commit dd72b2f3de4f41ac612bcbf9ac1d0f294b1ed277 Author: Jose Luis Duran AuthorDate: 2022-10-11 16:39:26 +0000 Commit: Ed Maste CommitDate: 2022-10-14 00:42:51 +0000 Track kern.ipc.somaxconn -> kern.ipc.soacceptqueue rename Fixes: 2bdf61ca29d0 ("Hide the unfortunate named sysctl...") (cherry picked from commit 9871ae6aa91f82a6932be7fcfa1023b077be8e2e) (cherry picked from commit f4f6bc636787e110cbea90ca5822cc5209138125) (cherry picked from commit 67d863df0833cdb1ca054a7c4e7d551b4ad28d95) --- release/tools/gce.conf | 2 +- share/man/man7/tuning.7 | 4 ++-- tools/regression/sockets/listen_backlog/listen_backlog.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index f156a5bb93eb..30561acb054c 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -85,7 +85,7 @@ net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 net.inet.tcp.blackhole=2 net.inet.udp.blackhole=1 -kern.ipc.somaxconn=1024 +kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 EOF diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index 63e09ecce098..6cfb0dd15bc4 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 16, 2020 +.Dd October 11, 2022 .Dt TUNING 7 .Os .Sh NAME @@ -482,7 +482,7 @@ By default is set at the maximum allowable port number. .Pp The -.Va kern.ipc.somaxconn +.Va kern.ipc.soacceptqueue sysctl limits the size of the listen queue for accepting new TCP connections. The default value of 128 is typically too low for robust handling of new connections in a heavily loaded web server environment. diff --git a/tools/regression/sockets/listen_backlog/listen_backlog.c b/tools/regression/sockets/listen_backlog/listen_backlog.c index 2276393ee6f1..9d156c36aa60 100644 --- a/tools/regression/sockets/listen_backlog/listen_backlog.c +++ b/tools/regression/sockets/listen_backlog/listen_backlog.c @@ -44,7 +44,7 @@ * * Future things to test: * - * - That if we change the value of kern.ipc.somaxconn, the limits really + * - That if we change the value of kern.ipc.soacceptqueue, the limits really * do change. * * - That limits are, approximately, enforced and implemented. @@ -55,7 +55,7 @@ */ /* - * We retrieve kern.ipc.somaxconn before running the tests in order to use a + * We retrieve kern.ipc.soacceptqueue before running the tests in order to use a * run-time set value of SOMAXCONN, rather than compile-time set. We assume * that no other process will be simultaneously frobbing it, and these tests * may fail if that assumption is not held. @@ -371,9 +371,9 @@ main(void) size_t len; len = sizeof(somaxconn); - if (sysctlbyname("kern.ipc.somaxconn", &somaxconn, &len, NULL, 0) + if (sysctlbyname("kern.ipc.soacceptqueue", &somaxconn, &len, NULL, 0) < 0) - err(-1, "sysctlbyname(kern.ipc.somaxconn)"); + err(-1, "sysctlbyname(kern.ipc.soacceptqueue)"); test_defaults(); test_listen_update();