From nobody Fri Jan 17 19:44:30 2025 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 4YZVYV4Xv1z5lMvs; Fri, 17 Jan 2025 19:44:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZVYV3sNsz3xfj; Fri, 17 Jan 2025 19:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737143070; 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=2NQK1c3QXFq20sn50UrrDIg9aFr9qjYh8fReZRYKRcU=; b=muvcWXipJylmhnKEXJm3PNXsVtFhoTqRt5U7Fqb6LC8o/FZkdC9w25zLb4cGdqF7WHt+yn uV+tuXem2+UXuPApxGS3KQLr9SToNdlQDJmMjbON1vh4LkVvULZekZdNy/KJ4BNVtmOePk SACBpnqzLteMjGxMzLUWYLidHPK3rmnmEAVIFMgmpG0//AbiwWtdhD2dAR0yr3XHVea9cu 9hDPJavxi95a0CWRom+cNAINZUj/fCVRMVprn00l1ML+GHVtxS72nqHYdcxLN6KZEPQ0k0 Ym0F2J90vXO8eFlj23YMIuI/MMTVa8/mZoePzi3IKm/3ofbBTBky+6xqpj+/ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737143070; 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=2NQK1c3QXFq20sn50UrrDIg9aFr9qjYh8fReZRYKRcU=; b=dbvXZZxgSNBp9lG3pYnh+tajBjnmBhdSoMU3dJqiGpBDvOfKGXYYpk/Z3+DzYs52EvMrlC XxZuwhaiByQNWOk5Afu2SZZayf9/AXg55QrLcK4pe0KgkIqfxzFrbe7qPQjn6XqcZBE1Vc sIsB+vZMDXqSnQHEDpivWOwiLMD4e+6/rTM1ISlqhkH3Q454vEwkrspLHls4yCB3NEXsOr r/Wr42/w26FA8h8SuS2bNgOHUU7atu5cF6yOy6MgC+cYDaR+0owtTmzBpsvBiyjzq28z53 YML/9TKJAyCGswKOrfeDdxiLD2l5yB6sK7ug2UDY1gugEUdV4/IJet+CD3h/TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737143070; a=rsa-sha256; cv=none; b=sRkfh5MXZ2uwqakLJNtzv/DcUWL/qf719k6ZEl34UnDya1AFP/VaJsbB2yIGCGfwbdJzsj IXS+ljP1mIVH8YL4mcYoQOtEXhhNvfKvB+yQ0XCy5O3iuwoGGRw0glrWAn+URY/k9qDuw0 jWPvHentF/w2kAD80xYokpzs+NJWF+8VmEvNxpVzuov2EQQILPpYyEVP6P2WiBgUDLvqHK T3k1E76uGHBQJSk0hLLuvpOeefKqXVslv6WFbapbplRerGbEDSSM7IpWLoT5Pd8CBFQxUo nxATyKmopU0SOTRat12swIbF1mBpNpLPxrGkMzczL4+LSYIdIh8o6ZeDCAdJbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZVYV3DkzzXYQ; Fri, 17 Jan 2025 19:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HJiUx1061379; Fri, 17 Jan 2025 19:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HJiUJZ061376; Fri, 17 Jan 2025 19:44:30 GMT (envelope-from git) Date: Fri, 17 Jan 2025 19:44:30 GMT Message-Id: <202501171944.50HJiUJZ061376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c348cdf13257 - stable/14 - sockets: virtualize kern.ipc.soacceptqueue 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c348cdf132572ab821f7c75a97453c1d238239b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c348cdf132572ab821f7c75a97453c1d238239b9 commit c348cdf132572ab821f7c75a97453c1d238239b9 Author: Gleb Smirnoff AuthorDate: 2025-01-13 18:08:51 +0000 Commit: Eugene Grosbein CommitDate: 2025-01-17 19:44:15 +0000 sockets: virtualize kern.ipc.soacceptqueue PR: 219655 Differential Revision: https://reviews.freebsd.org/D48314 (cherry picked from commit 4155be454c46bc1ab725aca5c6969b064b74be38) --- sys/kern/uipc_socket.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 1e49b9b20588..fcec1ef166fc 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -240,38 +240,39 @@ struct splice32 { * NB: The original sysctl somaxconn is still available but hidden * to prevent confusion about the actual purpose of this number. */ -static u_int somaxconn = SOMAXCONN; +VNET_DEFINE_STATIC(u_int, somaxconn) = SOMAXCONN; +#define V_somaxconn VNET(somaxconn) static int sysctl_somaxconn(SYSCTL_HANDLER_ARGS) { int error; - int val; + u_int val; - val = somaxconn; + val = V_somaxconn; error = sysctl_handle_int(oidp, &val, 0, req); if (error || !req->newptr ) return (error); /* * The purpose of the UINT_MAX / 3 limit, is so that the formula - * 3 * so_qlimit / 2 + * 3 * sol_qlimit / 2 * below, will not overflow. */ if (val < 1 || val > UINT_MAX / 3) return (EINVAL); - somaxconn = val; + V_somaxconn = val; return (0); } SYSCTL_PROC(_kern_ipc, OID_AUTO, soacceptqueue, - CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, sizeof(int), - sysctl_somaxconn, "I", + CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_VNET, 0, sizeof(u_int), + sysctl_somaxconn, "IU", "Maximum listen socket pending connection accept queue size"); SYSCTL_PROC(_kern_ipc, KIPC_SOMAXCONN, somaxconn, - CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_SKIP | CTLFLAG_MPSAFE, 0, - sizeof(int), sysctl_somaxconn, "I", + CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_SKIP | CTLFLAG_MPSAFE | CTLFLAG_VNET, 0, + sizeof(u_int), sysctl_somaxconn, "IU", "Maximum listen socket pending connection accept queue size (compat)"); static u_int numopensockets; @@ -1516,8 +1517,8 @@ solisten_proto(struct socket *so, int backlog) so->so_options |= SO_ACCEPTCONN; listening: - if (backlog < 0 || backlog > somaxconn) - backlog = somaxconn; + if (backlog < 0 || backlog > V_somaxconn) + backlog = V_somaxconn; so->sol_qlimit = backlog; mtx_unlock(&so->so_snd_mtx);