From nobody Sat May 17 21:18:24 2025 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 4b0GyV585cz5wDDZ; Sat, 17 May 2025 21:18:26 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b0GyV0BMgz3p1V; Sat, 17 May 2025 21:18:26 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747516706; 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: in-reply-to:in-reply-to:references:references; bh=ZqBpBG853o52IGf2hWXrlxhCpFxEiMlDHwM2KvGSkx8=; b=RgCkT1WACnGQVoLv49NqLgUaada4COrPBBPIXYCUWB+Hlyc4WVV5En90TtywJ946lm88Zs pD//WpanAdNJgClK5lYfecl7QWGYLDZo+wxEAr1jY6i1ICuCrqd3cti0p5zVArMWkcOgLE wJXuzgE5KSH62ptCazfxW3S5A7yU+E4c5xlkaX0+G4DkiBH3vZf1uC5NhoAeYhNovURnLx PgtbL8ZATfY/uFw+5OSqX6B9u9Xyn/m3/bUoUf4bu5YONJeX8xWRc4z/HTBg3qAv30psqg Q8ewZopYpiQdAjqLJ0wxf2CwAAuKrvBIQWbqmkWuKRdoTr1SdASs9s35mOnafA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747516706; 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: in-reply-to:in-reply-to:references:references; bh=ZqBpBG853o52IGf2hWXrlxhCpFxEiMlDHwM2KvGSkx8=; b=efY9haV7tV42uys86eaxQsOnLuduRm3KocOuMeQuli+ZXDXnbf82SREFw94/LvkiLvqQWX AKRNUlYYUb/Zq3ptDplKx/2dM376sLn3IuXDZTFDWWf66lMWiTOoeEEgljhVO12QLp4AL1 xC1nLY9Q5/rFAjfV/HMDI+y0Z5stDZ8aXYfmuh1uoRlAP2HEows6Vvo3qxUt0FxsIGtiCN BevHUa/rNjD/uY4HxU6hbgP+uiT2kdIgx+3vKtnzqkD18dPDjgUYsjzS8/eb2klRlkb2yS uFq1rmcfiEJAPZtcYrn+9rs+i4mvZK/W163FUXcujOuc+pKOT/wDIW4+euINcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747516706; a=rsa-sha256; cv=none; b=yxHlaay/ZnU7Vp60kjSYtubBpBSvEBCtqgBIDFJ/Hk3PB8XD9c190MVdhZat79hx+A7mdo HvKuzGIEV2MRC9fjZIi3Q3HZDFt9ClV1mpYv39uTZtTJTpmtxxjjNWg9bA1AOp5GIbVwWu ZhDSGJ7Z/BVgUfhJhWhReOsNdwUuUG5UwvcDbOB9mZwJ/bWrkzjhsxqPKejWoRpoGySyZt XA4kMw+GtGqzHabSkmGAffTcJkDCM7j1kC7DbbnIJPCitDJuucM6i+OMGX3GDdVVHxS7S3 sLJ6pccVAGktxFfk0+qciB/eHxl+OnWf7sb5KMVSHxU//J/4Jj76/4j5erb6iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.151] (hlfxns018gw-134-41-55-251.dhcp-dynamic.fibreop.ns.bellaliant.net [134.41.55.251]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b0GyT4zGKzMZh; Sat, 17 May 2025 21:18:25 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: Date: Sat, 17 May 2025 18:18:24 -0300 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: b61850c4e6f6 - main - bridge(4): default net.link.bridge.member_ifaddrs to false To: Lexi Winter , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505150004.54F04FhR046897@gitrepo.freebsd.org> Content-Language: en-CA From: Mitchell Horne In-Reply-To: <202505150004.54F04FhR046897@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/14/25 21:04, Lexi Winter wrote: > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b61850c4e6f6b0f21b36da7238db969d9090309e > > commit b61850c4e6f6b0f21b36da7238db969d9090309e > Author: Lexi Winter > AuthorDate: 2025-05-14 14:26:24 +0000 > Commit: Lexi Winter > CommitDate: 2025-05-15 00:02:52 +0000 > > bridge(4): default net.link.bridge.member_ifaddrs to false > > As discussed on arch@, this behaviour is broken and confuses users, so > disable it by default. For 15.0-RELEASE, allow it to be re-enabled > using a sysctl, but the sysctl will be removed in 16.0R. > Hi Lexi, I just updated my workstation past this commit. I found that my main ethernet interface didn't receive an IP address, and had to set the sysctl to proceed as before. I have the following network configuration lines in my rc.conf: ifconfig_re0="DHCP" cloned_interfaces="bridge0 tap0" ifconfig_bridge0="addm re0 addm tap0 up" The simple setup is so that I can pass the tap0 device to QEMU/bhyve VMs for networking. What adjustment do I need to make to the above configuration to achieve the intended result "correctly"? I understand it is probably an easy fix, but I have a neanderthal's understanding of ifconfig :) Many thanks, Mitchell > Relnotes: yes > Reviewed by: kp, des > Approved by: des (mentor) > Differential Revision: https://reviews.freebsd.org/D50328 > --- > UPDATING | 5 +++++ > share/man/man4/bridge.4 | 18 ++++++++++++------ > sys/net/if_bridge.c | 4 ++-- > 3 files changed, 19 insertions(+), 8 deletions(-) > > diff --git a/UPDATING b/UPDATING > index d46db9e13794..ce2b60ea9353 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20250513: > + The bridge(4) sysctl net.link.bridge.member_ifaddrs now defaults to 0, > + meaning that interfaces added to a bridge may not have IP addresses > + assigned. Refer to bridge(4) for more information. > + > 20250507: > UMASS quirks and auto-quirk probing has been overhauled. CAM now won't > send SYNCHRONIZE CACHE unless MODE PAGE 8 is present and valid. This > diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 > index 2c3bfd6aedfa..45dea82325bc 100644 > --- a/share/man/man4/bridge.4 > +++ b/share/man/man4/bridge.4 > @@ -36,7 +36,7 @@ > .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > .\" POSSIBILITY OF SUCH DAMAGE. > .\" > -.Dd May 5, 2025 > +.Dd May 13, 2025 > .Dt IF_BRIDGE 4 > .Os > .Sh NAME > @@ -163,14 +163,20 @@ To allow the host to communicate with bridge members, IP addresses > should be assigned to the > .Nm > interface itself, not to the bridge's member interfaces. > -Assigning IP addresses to bridge member interfaces is unsupported, but > -for backward compatibility, it is permitted if the > +Attempting to assign an IP address to a bridge member interface, or add > +a member interface with an assigned IP address to a bridge, will return > +an > +.Dv EINVAL > +.Dq ( "Invalid argument" ) > +error. > +For compatibility with older releases where this was permitted, setting > +the > .Xr sysctl 8 > variable > .Va net.link.bridge.member_ifaddrs > -is set to 1, which is the default. > -In a future release, this sysctl may be set to 0 by default, or may be > -removed entirely. > +to 1 will permit this configuration. > +This sysctl variable will be removed in > +.Fx 16.0. > .Sh IPV6 SUPPORT > .Nm > supports the > diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c > index 199418c4aa99..475977adf68a 100644 > --- a/sys/net/if_bridge.c > +++ b/sys/net/if_bridge.c > @@ -504,10 +504,10 @@ SYSCTL_BOOL(_net_link_bridge, OID_AUTO, log_mac_flap, > "Log MAC address port flapping"); > > /* allow IP addresses on bridge members */ > -VNET_DEFINE_STATIC(bool, member_ifaddrs) = true; > +VNET_DEFINE_STATIC(bool, member_ifaddrs) = false; > #define V_member_ifaddrs VNET(member_ifaddrs) > SYSCTL_BOOL(_net_link_bridge, OID_AUTO, member_ifaddrs, > - CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(member_ifaddrs), true, > + CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(member_ifaddrs), false, > "Allow layer 3 addresses on bridge members"); > > static bool