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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 830116CAC7 for ; Fri, 24 Sep 2021 10:51:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A7512F0DB for ; Fri, 24 Sep 2021 10:51:03 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47CED2F0B4 for ; Fri, 24 Sep 2021 10:51:02 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 300AC109A57; Fri, 24 Sep 2021 10:51:02 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 24 Sep 2021 10:50:59 +0200 Message-Id: <20210924085101.3078775-3-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210924085101.3078775-1-aderumier@odiso.com> References: <20210924085101.3078775-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.865 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [zones.pm, vlanplugin.pm, plugin.pm, qinqplugin.pm] Subject: [pve-devel] [PATCH pve-network 2/4] zones : tap_plug: add support for disable bridge 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: Fri, 24 Sep 2021 08:51:33 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Zones.pm | 4 +++- PVE/Network/SDN/Zones/Plugin.pm | 2 +- PVE/Network/SDN/Zones/QinQPlugin.pm | 1 + PVE/Network/SDN/Zones/VlanPlugin.pm | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm index a4d81e3..c59a724 100644 --- a/PVE/Network/SDN/Zones.pm +++ b/PVE/Network/SDN/Zones.pm @@ -307,7 +307,9 @@ sub tap_plug { my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1); if (!$vnet) { # fallback for classic bridge - PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate); + my $interfaces_config = PVE::INotify::read_file('interfaces'); + my $disablelearning = 1 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'}; + PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $disablelearning); return; } diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm index ed14a50..1f5b5c2 100644 --- a/PVE/Network/SDN/Zones/Plugin.pm +++ b/PVE/Network/SDN/Zones/Plugin.pm @@ -227,7 +227,7 @@ sub tap_plug { my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$vnetid/bridge/vlan_filtering"); die "vm vlans are not allowed on vnet $vnetid" if !$vlan_aware && ($tag || $trunks); - PVE::Network::tap_plug($iface, $vnetid, $tag, $firewall, $trunks, $rate); + PVE::Network::tap_plug($iface, $vnetid, $tag, $firewall, $trunks, $rate, $plugin_config->{'bridge-disable-mac-learning'}); } #helper diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm index 7b75476..f4d12bc 100644 --- a/PVE/Network/SDN/Zones/QinQPlugin.pm +++ b/PVE/Network/SDN/Zones/QinQPlugin.pm @@ -39,6 +39,7 @@ sub options { nodes => { optional => 1}, 'tag' => { optional => 0 }, 'bridge' => { optional => 0 }, + 'bridge-disable-mac-learning' => { optional => 1 }, 'mtu' => { optional => 1 }, 'vlan-protocol' => { optional => 1 }, dns => { optional => 1 }, diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm index fbfbdcc..0bb6b8a 100644 --- a/PVE/Network/SDN/Zones/VlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VlanPlugin.pm @@ -25,6 +25,10 @@ sub properties { 'bridge' => { type => 'string', }, + 'bridge-disable-mac-learning' => { + type => 'boolean', + description => "Disable auto mac learning.", + } }; } @@ -33,6 +37,7 @@ sub options { return { nodes => { optional => 1}, 'bridge' => { optional => 0 }, + 'bridge-disable-mac-learning' => { optional => 1 }, mtu => { optional => 1 }, dns => { optional => 1 }, reversedns => { optional => 1 }, -- 2.30.2