From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5FEB98E6D5 for ; Sat, 12 Nov 2022 17:25:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 42FCDCC4F for ; Sat, 12 Nov 2022 17:24:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Sat, 12 Nov 2022 17:24:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1B0F743B43; Sat, 12 Nov 2022 17:24:43 +0100 (CET) Message-ID: <2e003ee3-23aa-06d7-cece-fa87154eb462@proxmox.com> Date: Sat, 12 Nov 2022 17:24:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:107.0) Gecko/20100101 Thunderbird/107.0 Content-Language: en-GB To: Proxmox VE development discussion , Alexandre Derumier References: <20220824162644.1632804-1-aderumier@odiso.com> <20220824162644.1632804-4-aderumier@odiso.com> From: Thomas Lamprecht In-Reply-To: <20220824162644.1632804-4-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.032 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH V3 qemu-server 1/3] tap_plug: add support for bridge disable learning X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2022 16:25:20 -0000 Am 24/08/2022 um 18:26 schrieb Alexandre Derumier: > This disabling mac learning && unicast flood for the tap interface > > for vmstart, we don't add mac directly to fdb. > We set it latter if it's a migration or a fresh start. > > for nic hotplug, we directly add mac to fdb > > Signed-off-by: Alexandre Derumier > --- > PVE/QemuServer.pm | 8 +++++++- > vm-network-scripts/pve-bridge | 6 +++++- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index c706653..0114d06 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -5137,8 +5137,14 @@ sub vmconfig_update_net { > > if ($have_sdn) { > PVE::Network::SDN::Zones::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate}); > + PVE::Network::SDN::Zones::add_bridge_fdb($iface, $newnet->{macaddr}, $newnet->{bridge}, $newnet->{firewall}); > } else { > - PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate}); > + my $interfaces_config = PVE::INotify::read_file('interfaces'); > + my $bridge = $newnet->{bridge}; > + my $opts = {}; > + $opts->{learning} = 0 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'}; > + PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate}, $opts); > + PVE::Network::add_bridge_fdb($iface, $newnet->{macaddr}, $newnet->{firewall}) if defined($opts->{learning}) && !$opts->{learning}; > } > } elsif (safe_num_ne($oldnet->{rate}, $newnet->{rate})) { > # Rate can be applied on its own but any change above needs to > diff --git a/vm-network-scripts/pve-bridge b/vm-network-scripts/pve-bridge > index d37ce33..38cf2f6 100755 > --- a/vm-network-scripts/pve-bridge > +++ b/vm-network-scripts/pve-bridge > @@ -47,8 +47,12 @@ if ($have_sdn) { > PVE::Network::SDN::Zones::tap_create($iface, $net->{bridge}); > PVE::Network::SDN::Zones::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall}, $net->{trunks}, $net->{rate}); > } else { > + my $interfaces_config = PVE::INotify::read_file('interfaces'); > + my $bridge = $net->{bridge}; > + my $opts = {}; > + $opts->{learning} = 0 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'}; > PVE::Network::tap_create($iface, $net->{bridge}); > - PVE::Network::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall}, $net->{trunks}, $net->{rate}); > + PVE::Network::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall}, $net->{trunks}, $net->{rate}, $opts); > } > > exit 0; what about moving this into pve-common instead? IOW. something like: diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index c468e40..cc2403c 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -460,7 +460,12 @@ sub tap_plug { $opts = {} if !defined($opts); - my $no_learning = defined($opts->{learning}) && !$opts->{learning}; # default to learning on + if (!defined($opts->{learning})) { # auto-detect + my $interfaces_config = PVE::INotify::read_file('interfaces'); + my $bridge = $interfaces_config->{ifaces}->{$bridge}; + $opts->{learning} = !($bridge && $bridge->{'bridge-disable-mac-learning'}); # default learning to on + } + my $no_learning = !$opts->{learning}; # cleanup old port config from any openvswitch bridge eval { That way we'd not need to touch all call sites and avoid forgetting it on new ones.