Date: Mon, 23 Jan 2023 11:39:11 +0000 From: Alexander Chernikov <melifaro@FreeBSD.org> To: Justin Hibbits <jhibbits@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-branches@freebsd.org" <dev-commits-src-branches@FreeBSD.org> Subject: Re: git: 81a72d997e22 - stable/13 - tcp: virtualise net.inet.tcp.msl sysctl. Message-ID: <DC7404D2-4099-4098-BFBF-2CAB20664D2E@FreeBSD.org> In-Reply-To: <20230122110719.56ab1f60@ralga-linux> References: <202301132124.30DLOrE7040954@gitrepo.freebsd.org> <20230122110719.56ab1f60@ralga-linux>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 22 Jan 2023, at 16:07, Justin Hibbits <jhibbits@freebsd.org> wrote: >=20 > On Fri, 13 Jan 2023 21:24:53 GMT > "Alexander V. Chernikov" <melifaro@FreeBSD.org> wrote: >=20 >> The branch stable/13 has been updated by melifaro: >>=20 >> URL: >> = https://cgit.FreeBSD.org/src/commit/?id=3D81a72d997e22f37ac15a009090a5a15a= 6c279900 >>=20 >> 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 >>=20 >> tcp: virtualise net.inet.tcp.msl sysctl. >>=20 >> 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. >>=20 >> MFC after: 1 week >> Reviewed by: glebius >> Differential Revision: https://reviews.freebsd.org/D33270 >>=20 >> (cherry picked from commit >> c2c8e360d8c0b8712158d334686d88f052aef819) --- >> sys/netinet/tcp_subr.c | 2 ++ >> 1 file changed, 2 insertions(+) >>=20 >> 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) >>=20 >> V_tcp_msl =3D TCPTV_MSL; >>=20 >> + V_tcp_msl =3D TCPTV_MSL; >> + >> /* Skip initialization of globals for non-default instances. >> */ if (!IS_DEFAULT_VNET(curvnet)) >> return; >=20 > This looks like it was already MFC'd to stable/13 back in March last > year as 057793e6377. Indeed. Reverted. Thanks for catching it! >=20 > - Justin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DC7404D2-4099-4098-BFBF-2CAB20664D2E>