git: 81a72d997e22 - stable/13 - tcp: virtualise net.inet.tcp.msl sysctl.
Date: Fri, 13 Jan 2023 21:24:53 UTC
The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=81a72d997e22f37ac15a009090a5a15a6c279900 commit 81a72d997e22f37ac15a009090a5a15a6c279900 Author: Alexander V. Chernikov <melifaro@FreeBSD.org> AuthorDate: 2021-12-04 22:02:44 +0000 Commit: Alexander V. Chernikov <melifaro@FreeBSD.org> 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;