From nobody Thu May 15 00:04:15 2025 X-Original-To: dev-commits-src-all@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 4ZyVnD16QJz5w26X; Thu, 15 May 2025 00:04:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyVnC30Yhz3qft; Thu, 15 May 2025 00:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267455; 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; bh=lS6BqHFh/gqWhr+FT/ZbU1yPUlYJzFKCkLfdG3sqZBc=; b=AaDowGf0qynXg7m/ryAFhIhugvMu/+5UhpfTVIxrLmMpAu/tVpxL3mY5fsxS7AofU/pEYw stSB+LMMjMAF0+Zh6b5G8RVCOjv6DCcieEULKUfoKkUwkIQLtuxVRRBBBah5pvaRbel7tW /g+TyIkIOS5qGJwA/hXtW+/AJ3Vc4Au5rDoru6fnzGsBR5fnDQubh92WwA5wpwf7y6trsW aU0UGJRKmA9ywsYpZSQdqVbq2MuZ2aMIMUTOkxYzWBKK4O2awJjEHtrghXazR/IhdzYJiX ViQ7zH7FOOJT5K5CMuPytD35zRsY4lhRVAtKCrjIOj5uYvXanGlqitbVUpCxrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267455; 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; bh=lS6BqHFh/gqWhr+FT/ZbU1yPUlYJzFKCkLfdG3sqZBc=; b=a8WVUg3HsN4CA02vhV7G7/thKaL2dv0q1lhJuaXJszKc5KAleaPL+6MFirh35sXvgJef38 dAwgKbqtlh0NsOs1gQAF64WDxWI9f0S9dUZH294V5+nvAT5Kyhv4zRYAd9V05A8V5tIXLt IAQshepxcFfKoG8AF7wGvcMfIr/Pm6i5/IheVaMo9emablEM+43uoC6e+uQseXcOu0QsuB GP7XTwMndnHobIFUfbQcDxkER3rVGHTakfLvFXYsf3tiFRwLaWcSpIcX5WZPi3EHHU6CmH XFzfPvD1qt02s3wZCvzKqFUbvYcVpilOCXIPqZP+nVYC222h3ONC7uJWDzMY2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747267455; a=rsa-sha256; cv=none; b=SbnnlKI129rsVUJ9OfYddUX4a0RWjPeHzobwo2dN2AtExRWtxA3VpK71tUaR7rP6X20IY4 P9WaA4ReSTbqdP/WZ0/t6IFtyZ88OR5Sb5GlRNFsjykdbzBmx8Zcr43IQOHcaa2qZ6veCz Dv6G1H6m4+TlxD/iFUmIPq1BVUx/MVszdFLCQZ6VykMty89jZZBRhK8ngGEzVg9Evt4hLn zXaxLAezOcU0P1wUFd9NTVLvf/YLjpsTb+W5KUxNmteOQGXT4nXd1inf50cAG66/F4Jd93 btT2ZX8HKyV1NKTdQ+UE6gyfWupsb1IbhUtIacZInIXh9KkZjvWe/bZHeAC9yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZyVnC2Y6vzvB6; Thu, 15 May 2025 00:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F04FI7046900; Thu, 15 May 2025 00:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F04FhR046897; Thu, 15 May 2025 00:04:15 GMT (envelope-from git) Date: Thu, 15 May 2025 00:04:15 GMT Message-Id: <202505150004.54F04FhR046897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: b61850c4e6f6 - main - bridge(4): default net.link.bridge.member_ifaddrs to false List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b61850c4e6f6b0f21b36da7238db969d9090309e Auto-Submitted: auto-generated 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. 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