From nobody Fri Jan 17 19:41:41 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 4YZVVG0bT3z5lMpK; Fri, 17 Jan 2025 19:41:42 +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 4YZVVG076cz3ww5; Fri, 17 Jan 2025 19:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737142902; 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=RsSxk9tk7k17E6SyMzYkuAerTaQOtA8JrEw88YeE2T8=; b=pgME/nylpWGQBPS/4BUmMP3vRmBHNM1ZWBxdMFibHTZP9CVFFzXqsw7iQw1/gcQhdUj4XM Stcex2xz2nYGtae152adLcgYzXX4iGLjKRNMpDYK3oe8HPvFOR8g4JPxH3mQy9poQvrZAk eRnxZVFszvdMoxtZ2FR2ukGp+Fwd1UdSKXMjd6KdZcJHnImxou//TSNG6CehyoqUEnOggA 22sne0sAzTgx3aIg1Q0IO0KXoV7RPa5h2Vitj0ouqZPNKklNs/0FZRgMiMdfNYooeMfd/Z TZvQjA3KkGUlpkgPNDmz5mS/RnObURiGZplR9AWord0Wb19pEGnQSLthGOurNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737142902; 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=RsSxk9tk7k17E6SyMzYkuAerTaQOtA8JrEw88YeE2T8=; b=iQ9chaKZXd/TSk6lzbEF/SIyKYcSZSjxAnpieu9zHLmNPtRmSCcTedX20EqrDPwRHBe7tz ICUMeWmYyT38P5K1gaWP/FIcodXapBcnIWo4Bs3wA6rVfGCS0kmVevDTHJzz6DkldlfOBr ebMVSSb6XwY12qQY4YDhEJu+ZIIgHjXLsk2/y7Q/+5F3U3ySQu2RC19tVxRL3dj74UFFPe ndl2xlOo+paQBFpDi7RKiADLsAfu9a87s1ne9wG+56T/BPSOzNpX0hSMkcambwn4DYHLSI nDFFUQPYR7rCLAKMVRpqxMI9jQauniABNIYhb+k1qSDfsNp2UqhkQ28hzxbuvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737142902; a=rsa-sha256; cv=none; b=JxSTv5spa8FewSpSIAcnJO7LzqZOFfvE/SWrUuNtS7li7U1EO1gCi/Gl9Z1ei3iVqlQUsM nNw45pLTGxKF5MZCgpsvUlI4Ut2RoQrine9pbf2AbcuU8RB65Vah3YaK/vfb/zd/6mbwvC 0C5IABRd82MQHGsPdfacrY/XQp68gvAFwf6vFIJgag0St+seryGP5w5KzOW/n07L0KhKJp yPfA/McZy1SYczkPLSeYpZMvyFgxjbJ9Czxn6O4mdLzTUJvsnbYTky2jvDu8ca9w6g06tS GfgEG+QyoNj6UXjwQYoYOzbPMadM6+ivwbC20B1StTRgWKd2M26+LxUBCtAYMQ== 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 4YZVVF6kMbzXbX; Fri, 17 Jan 2025 19:41:41 +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 50HJffmf054900; Fri, 17 Jan 2025 19:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HJff6F054897; Fri, 17 Jan 2025 19:41:41 GMT (envelope-from git) Date: Fri, 17 Jan 2025 19:41:41 GMT Message-Id: <202501171941.50HJff6F054897@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: 797bb39ccd5f - stable/14 - sockets: virtualize kern.ipc.numopensockets 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: 797bb39ccd5f57c3206665949d3cba35328cfdeb Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=797bb39ccd5f57c3206665949d3cba35328cfdeb commit 797bb39ccd5f57c3206665949d3cba35328cfdeb Author: Gleb Smirnoff AuthorDate: 2025-01-13 18:08:58 +0000 Commit: Eugene Grosbein CommitDate: 2025-01-17 19:34:16 +0000 sockets: virtualize kern.ipc.numopensockets To avoid breaking POLA on the host machine it reports the same value as before. In a VNET jail it now reports number of sockets in this jail. PR: 219655 Differential Revision: https://reviews.freebsd.org/D48315 (cherry picked from commit 59498e099cc055da7afca8266087b7668be6d7cb) --- sys/kern/uipc_socket.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 162c489ea6fe..1e49b9b20588 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -274,9 +274,23 @@ SYSCTL_PROC(_kern_ipc, KIPC_SOMAXCONN, somaxconn, sizeof(int), sysctl_somaxconn, "I", "Maximum listen socket pending connection accept queue size (compat)"); -static int numopensockets; -SYSCTL_INT(_kern_ipc, OID_AUTO, numopensockets, CTLFLAG_RD, - &numopensockets, 0, "Number of open sockets"); +static u_int numopensockets; +static int +sysctl_numopensockets(SYSCTL_HANDLER_ARGS) +{ + u_int val; + +#ifdef VIMAGE + if(!IS_DEFAULT_VNET(curvnet)) + val = curvnet->vnet_sockcnt; + else +#endif + val = numopensockets; + return (sysctl_handle_int(oidp, &val, 0, req)); +} +SYSCTL_PROC(_kern_ipc, OID_AUTO, numopensockets, + CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_VNET, 0, sizeof(u_int), + sysctl_numopensockets, "IU", "Number of open sockets"); /* * so_global_mtx protects so_gencnt, numopensockets, and the per-socket