From nobody Fri Jan 13 21:24:53 2023 X-Original-To: dev-commits-src-branches@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 4NtvZY543Hz2qkcn; Fri, 13 Jan 2023 21:24:53 +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 4NtvZY3BG6z40kP; Fri, 13 Jan 2023 21:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645093; 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=N29Q8zb+rQ804Vt+GzEVm0lr4pXE2lRTTvLKIOXYENc=; b=j5sCe/uU0N8Dm0rn05/OmvtWsvXtBIwYX8HK9cux/wEHUegUj2Mb+NTmHBo2Hl2/e3uMFE LiLfACUYYik3eQceq6TXtqnSx8a4AvRS5m35uzTD9sY26sigAFCNjOPA1zCMQ8CTNOT2ue 1z+zRBOoVpurS0yCIbPBw3ebl5H9Q9V1/A4OxvBA5f83vVTlDF80rMfR9JpE4VQIOBJWbA g+3olLmL6ISFQYqfSgefqh6CXDIcXxILjS4Kltsgnp9Sp9/z6rKfzBw3skM/0UFtWsZc4j 6IsacbluuwHgy1OgMBgBHuUakdHqFMlo41XfInLdrAyOIUNFlMJjCQLleEaung== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645093; 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=N29Q8zb+rQ804Vt+GzEVm0lr4pXE2lRTTvLKIOXYENc=; b=LyykFx+Zn4TF6rtPNPfzmKcduY1IKDg3dP/qZrHTuRblKFoNUaUxcrmTJmtGtvYsbuJZnu j/wCMLimFlFi+pieKB8OzWW7Sgk+1VoeNXNpQK1E28h2tjozpZMDEIeOBt2bGd2cz8XSIK i4aqiO/MFiwpJYk4HN+gebVrzmNSEnL2Ns2pYnd4bDqR6vepRi5/qJx6t6l7IulHJ6DlKC WPD3D4VR5EbSQtrynRV+mTkC95hPb/yDM8VCu8RyFG34m1L3Lg7EEoQc7K5Jzy+tqvSsir ojbFaXo9UuoyAMoeeQuIV1dtm9r7DYTLBT95NM8IMsUPlZo7HWJy3s3KtkbDvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645093; a=rsa-sha256; cv=none; b=Z8dr/mzMa2eQvNSYk6PrO6e5yleekNGnqOI5OaaCBTXnRSenEhqYdhAFyaa1ID/CRIspPo T/fXjA+IpuhSI2eIqmXK8lCdi4G2QB3UxBPmlWrHOCPjmalHv5BcSI2+Kl0RlChe76+fu+ YjKeTYZXiWd7MFcKWEtXWDsjnBpZw65vURZ9wFp8nu4PDfC569nMtNuKGmIYy2S31irXrB HbvAaeB5PUUcD6vfIY16AWqdWypygx0TOoScf22+hy4Mq7WqcnE4OU98gwXC7gbnZ/nLZb qGgpuqoWaqoacn1xJnGNO86qyDgagIs+iKd6IcuSwDu/dI9HhHITIJcMwtMsPw== 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 4NtvZY2FkbzMv7; Fri, 13 Jan 2023 21:24:53 +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 30DLOrO9040955; Fri, 13 Jan 2023 21:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOrE7040954; Fri, 13 Jan 2023 21:24:53 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:53 GMT Message-Id: <202301132124.30DLOrE7040954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 81a72d997e22 - stable/13 - tcp: virtualise net.inet.tcp.msl sysctl. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 81a72d997e22f37ac15a009090a5a15a6c279900 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=81a72d997e22f37ac15a009090a5a15a6c279900 commit 81a72d997e22f37ac15a009090a5a15a6c279900 Author: Alexander V. Chernikov AuthorDate: 2021-12-04 22:02:44 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:26 +0000 tcp: virtualise net.inet.tcp.msl sysctl. VNET teardown waits 2*MSL (60 seconds by default) before expiring tcp PCBs. These PCBs holds references to nexthops, which, in turn, reference ifnets. This chain results in VNET interfaces being destroyed and moved to default VNET only after 60 seconds. Allow tcp_msl to be set in jail by virtualising net.inet.tcp.msl sysctl, permitting more predictable VNET tests outcomes. MFC after: 1 week Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D33270 (cherry picked from commit c2c8e360d8c0b8712158d334686d88f052aef819) --- sys/netinet/tcp_subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 62042df50d18..dfbdf99f21eb 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1453,6 +1453,8 @@ tcp_init(void) V_tcp_msl = TCPTV_MSL; + V_tcp_msl = TCPTV_MSL; + /* Skip initialization of globals for non-default instances. */ if (!IS_DEFAULT_VNET(curvnet)) return;