From nobody Tue Jul 20 00:59:30 2021 X-Original-To: freebsd-hackers@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 562C212A28D2 for ; Tue, 20 Jul 2021 01:00:14 +0000 (UTC) (envelope-from darius@dons.net.au) Received: from midget.dons.net.au (midget.dons.net.au [IPv6:2403:5800:5101:0:225:90ff:fe47:39b4]) (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 ECDSA (P-384) client-digest SHA384) (Client CN "dons.net.au", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GTL3d4p97z3Q31 for ; Tue, 20 Jul 2021 01:00:12 +0000 (UTC) (envelope-from darius@dons.net.au) Received: from midget.dons.net.au (localhost [127.0.0.1]) by midget.dons.net.au (8.16.1/8.16.1) with ESMTPS id 16K0xmrd076647 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Tue, 20 Jul 2021 10:29:49 +0930 (ACST) (envelope-from darius@dons.net.au) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dons.net.au; s=default; t=1626742798; bh=S6cfXaw5ZvHulV1x47xIXiRwuENOihtDJET6/M2gNgk=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=SdCbyb++Og6tjSV4FR6rvnIfcThVAimwMVgbN8R0rwPG1pk0mLX6b2ULezlT/wodu b3D7DVQytuZd+F0AIO63jgfyTGHsv/7giqkkndDBPlLv3UaUgWSDCnuVXvplp0rDJt d994g2P42TLdZLmJQeCP961T+nz3//3rcZZ2Nxew= Received: (from mailnull@localhost) by midget.dons.net.au (8.16.1/8.16.1/Submit) id 16K0xUT8076634 for ; Tue, 20 Jul 2021 10:29:30 +0930 (ACST) (envelope-from darius@dons.net.au) X-MIMEDefang-Relay-f0f0b4ff001831caa5b8ac39868c4c7e9b4d12fc: 2403:5800:5101:0:3ce6:5390:cd95:408c Received: from smtpclient.apple ([IPv6:2403:5800:5101:0:3ce6:5390:cd95:408c] [2403:5800:5101:0:3ce6:5390:cd95:408c]) by midget.dons.net.au (envelope-sender ) (MIMEDefang) with ESMTP id 16K0xUR9076629; Tue, 20 Jul 2021 10:29:30 +0930 Content-Type: text/plain; charset=us-ascii List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.100.0.2.22\)) Subject: Re: git: a730d82378d3 - main - tcp: fix RACK and BBR when using VIMAGE enabled kernel In-Reply-To: <202107192233.16JMX0k4044018@gitrepo.freebsd.org> Date: Tue, 20 Jul 2021 10:29:30 +0930 Cc: "O'Connor, Daniel via freebsd-hackers" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202107192233.16JMX0k4044018@gitrepo.freebsd.org> To: Michael Tuexen X-Mailer: Apple Mail (2.3654.100.0.2.22) X-Spam-Score: -1 () No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.4 X-Scanned-By: MIMEDefang 2.83 on 10.0.2.1 X-Rspamd-Queue-Id: 4GTL3d4p97z3Q31 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Reply-To: darius@dons.net.au From: Daniel O'Connor via freebsd-hackers X-Original-From: Daniel O'Connor X-ThisMailContainsUnwantedMimeParts: N > On 20 Jul 2021, at 08:03, Michael Tuexen wrote: >=20 > The branch main has been updated by tuexen: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da730d82378d3cdf5356775ec0c23ad2c= a40c5edb >=20 > diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c = b/sys/netinet/tcp_stacks/rack_bbr_common.c > index baa267b43752..bf93359368f9 100644 > --- a/sys/netinet/tcp_stacks/rack_bbr_common.c > +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c > @@ -508,16 +508,18 @@ skip_vnet: > m_freem(m); > m =3D m_save; > } > - if (no_vn =3D=3D 0) > + if (no_vn =3D=3D 0) { > CURVNET_RESTORE(); > + } > INP_UNLOCK_ASSERT(inp); > return(retval); > } > skipped_pkt: > m =3D m_save; > } > - if (no_vn =3D=3D 0) > + if (no_vn =3D=3D 0) { > CURVNET_RESTORE(); > + } > return(retval); > } Not to pick on this particular commit, but does anyone know why = CURVNET_RESTORE os not defined such that it doesn't require wrapping = with {}? Looking through vnet.h I see that VNET_ASSERT, = VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG, and = VNET_GLOBAL_EVENTHANDLER_REGISTER have a do { } while(0) wrapper but = CURVNET_SET_QUIET, CURVNET_SET_VERBOSE, CURVNET_RESTORE, VNET_SYSINIT, = and VNET_SYSUNINIT don't. -- Daniel O'Connor "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum