From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Alexandre Derumier <aderumier@odiso.com>
Subject: Re: [pve-devel] [PATCH V3 qemu-server 1/3] tap_plug: add support for bridge disable learning
Date: Sat, 12 Nov 2022 17:24:41 +0100 [thread overview]
Message-ID: <2e003ee3-23aa-06d7-cece-fa87154eb462@proxmox.com> (raw)
In-Reply-To: <20220824162644.1632804-4-aderumier@odiso.com>
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 <aderumier@odiso.com>
> ---
> 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.
next prev parent reply other threads:[~2022-11-12 16:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-24 16:26 [pve-devel] [PATCH qemu-server/container/network 0/3] implement " Alexandre Derumier
2022-08-24 16:26 ` [pve-devel] [PATCH V2 pve-network 1/1] bridge-disable-mac-learning : use $opts for tap_plug Alexandre Derumier
2022-11-13 9:46 ` [pve-devel] applied: " Thomas Lamprecht
2022-08-24 16:26 ` [pve-devel] [PATCH V3 pve-container 1/1] net : add support for bridge disable mac learning Alexandre Derumier
2022-08-24 16:26 ` [pve-devel] [PATCH V3 qemu-server 1/3] tap_plug: add support for bridge disable learning Alexandre Derumier
2022-11-09 14:19 ` Mira Limbeck
2022-11-11 8:36 ` DERUMIER, Alexandre
2022-11-11 9:05 ` Mira Limbeck
2022-11-12 16:24 ` Thomas Lamprecht [this message]
2022-08-24 16:26 ` [pve-devel] [PATCH V3 qemu-server 2/3] vm_start/vm_resume : add_nets_bridge_fdb Alexandre Derumier
2022-11-12 16:32 ` Thomas Lamprecht
2022-08-24 16:26 ` [pve-devel] [PATCH V3 qemu-server 3/3] migration : add del_nets_bridge_fdb Alexandre Derumier
2022-11-07 12:41 ` Mira Limbeck
2022-11-10 8:12 ` DERUMIER, Alexandre
2022-11-13 15:10 ` [pve-devel] [PATCH qemu-server/container/network 0/3] implement bridge disable learning 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=2e003ee3-23aa-06d7-cece-fa87154eb462@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=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