From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 2/4] zones : tap_plug: add support for disable bridge learning
Date: Fri, 24 Sep 2021 10:50:59 +0200 [thread overview]
Message-ID: <20210924085101.3078775-3-aderumier@odiso.com> (raw)
In-Reply-To: <20210924085101.3078775-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
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
next prev parent reply other threads:[~2021-09-24 8:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 8:50 [pve-devel] [PATCH pve-network 0/4] add disable bridge learning feature Alexandre Derumier
2021-09-24 8:50 ` [pve-devel] [PATCH pve-network 1/4] vnets: fix get_vnet Alexandre Derumier
2021-09-24 8:50 ` Alexandre Derumier [this message]
2021-09-24 8:51 ` [pve-devel] [PATCH pve-network 3/4] zones: add add_bridge_fdb Alexandre Derumier
2021-09-24 8:51 ` [pve-devel] [PATCH pve-network 4/4] zones: add del_bridge_fdb Alexandre Derumier
2022-03-16 15:41 ` [pve-devel] applied-series: [PATCH pve-network 0/4] add disable bridge learning feature Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210924085101.3078775-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox