From nobody Fri Nov 12 19:19:12 2021 X-Original-To: dev-commits-src-main@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 E88C31849E48; Fri, 12 Nov 2021 19:19:12 +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 4HrT0c4zY0z3NJx; Fri, 12 Nov 2021 19:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6E3F2251CE; Fri, 12 Nov 2021 19:19:12 +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 1ACJJCAF056584; Fri, 12 Nov 2021 19:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACJJCbF056583; Fri, 12 Nov 2021 19:19:12 GMT (envelope-from git) Date: Fri, 12 Nov 2021 19:19:12 GMT Message-Id: <202111121919.1ACJJCbF056583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 034a924009bc - main - tcp: Ensure that vnets have an initialized V_default_cc_ptr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 034a924009bc9cab371f6aa1623bc2aa2ea80cc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=034a924009bc9cab371f6aa1623bc2aa2ea80cc7 commit 034a924009bc9cab371f6aa1623bc2aa2ea80cc7 Author: Mark Johnston AuthorDate: 2021-11-12 18:44:12 +0000 Commit: Warner Losh CommitDate: 2021-11-12 19:18:12 +0000 tcp: Ensure that vnets have an initialized V_default_cc_ptr This causes new vnets to inherit the cc algorithm from vnet0. This is a temporary patch to fix vnet jail creation. With encouragement from: glebius Fixes: b8d60729deef ("tcp: Congestion control cleanup.") Differential Revision: https://reviews.freebsd.org/D32970 --- sys/netinet/cc/cc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index df0efcac24be..457f5a6e55e1 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -316,6 +316,23 @@ cc_register_algo(struct cc_algo *add_cc) return (err); } +static void +vnet_cc_sysinit(void *arg) +{ + struct cc_algo *cc; + + if (IS_DEFAULT_VNET(curvnet)) + return; + + CURVNET_SET(vnet0); + cc = V_default_cc_ptr; + CURVNET_RESTORE(); + + V_default_cc_ptr = cc; +} +VNET_SYSINIT(vnet_cc_sysinit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, + vnet_cc_sysinit, NULL); + /* * Perform any necessary tasks before we exit congestion recovery. */