From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 9940D1FF0B6 for ; Thu, 12 Nov 2026 13:43:55 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 308B6216EC; Thu, 12 Nov 2026 13:43:20 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-container v7 15/21] net: report NIC plugs and removals to the SDN DHCP backends Date: Thu, 12 Nov 2026 13:41:55 +0100 Message-ID: <20261112124201.2844423-16-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261112124201.2844423-1-h.laimer@proxmox.com> References: <20261112124201.2844423-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794487347018 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.291 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: PI3XS7NABPV4MVYD2JQDWJJMSDPRTIPY X-Message-ID-Hash: PI3XS7NABPV4MVYD2JQDWJJMSDPRTIPY X-MailFrom: h.laimer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: An SDN DHCP backend answers a guest NIC with the address IPAM holds for its MAC. A NIC joining its bridge now hands its MAC to the SDN plug, so the backend of its vnet can answer it. Deleting a veth also reports it as gone to the backends, since their state for an interface can outlive it. A hotplug moves the veth while its new bridge is still a pending change in the config. So it marks its plug as pending, and the NIC is reported to the backends again once the change is applied. On a running container, a bridge change now pushes the DHCP mapping for the new vnet, as adding a NIC or changing its MAC already does. Signed-off-by: Hannes Laimer --- src/PVE/LXC.pm | 33 +++++++++++++++++++++++++++------ src/PVE/LXC/Config.pm | 3 ++- src/lxc-pve-poststop-hook | 6 +++--- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 59d803d2592c..aea41a545abe 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1074,8 +1074,8 @@ sub vm_stop_cleanup { kill_dhclients($vmid); } -sub net_tap_plug : prototype($$) { - my ($iface, $net) = @_; +sub net_tap_plug : prototype($$;$) { + my ($iface, $net, $pending) = @_; if ($net->{link_down}) { PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $iface, 'down']); @@ -1090,13 +1090,27 @@ sub net_tap_plug : prototype($$) { my $create_firewall_bridges = $net->{firewall} && PVE::Firewall::Helpers::needs_fwbr($bridge); PVE::Network::SDN::Zones::tap_plug( - $iface, $bridge, $tag, $create_firewall_bridges, $trunks, $rate, + $iface, + $bridge, + $tag, + $create_firewall_bridges, + $trunks, + $rate, + { mac => $hwaddr, pending => $pending }, ); PVE::Network::SDN::Zones::add_bridge_fdb($iface, $hwaddr, $bridge); PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $iface, 'up']); } +# the SDN DHCP backends serve a hotplugged NIC only once its change is applied to the config +sub net_tap_commit { + my ($iface, $net) = @_; + + return if $net->{link_down} || !$net->{bridge}; + PVE::Network::SDN::Zones::tap_commit($iface, $net->{bridge}, $net->{hwaddr}); +} + sub update_net { my ($vmid, $conf, $opt, $newnet, $netid, $rootdir) = @_; @@ -1116,7 +1130,7 @@ sub update_net { || safe_string_ne($oldnet->{name}, $newnet->{name}) ) { - PVE::Network::veth_delete($veth); + PVE::Network::SDN::Zones::veth_delete($veth); if (safe_string_ne($oldnet->{hwaddr}, $newnet->{hwaddr})) { eval { @@ -1171,8 +1185,11 @@ sub update_net { PVE::Network::SDN::Vnets::add_next_free_cidr( $newnet->{bridge}, $conf->{hostname}, $newnet->{hwaddr}, $vmid, undef, 1, ); + PVE::Network::SDN::Vnets::add_dhcp_mapping( + $newnet->{bridge}, $newnet->{hwaddr}, $vmid, $conf->{hostname}, + ); } - eval { PVE::LXC::net_tap_plug($veth, $newnet) }; + eval { PVE::LXC::net_tap_plug($veth, $newnet, 1) }; if (my $err = $@) { eval { PVE::LXC::net_tap_plug($veth, $oldnet) }; warn "restoring old network due to hot-plug failure for $veth failed - $@" @@ -1192,6 +1209,8 @@ sub update_net { } $conf->{$opt} = PVE::LXC::Config->print_lxc_network($oldnet); PVE::LXC::Config->write_config($vmid, $conf); + # $oldnet keeps a link_down that the change cleared + net_tap_commit($veth, $newnet); } } else { PVE::Network::SDN::Vnets::add_next_free_cidr( @@ -1218,7 +1237,7 @@ sub hotplug_net { $veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}, ); - PVE::LXC::net_tap_plug($veth, $newnet); + PVE::LXC::net_tap_plug($veth, $newnet, 1); # attach peer in container my $cmd = ['lxc-device', '-n', $vmid, 'add', $vethpeer, "$eth"]; @@ -1236,6 +1255,8 @@ sub hotplug_net { $conf->{$opt} = PVE::LXC::Config->print_lxc_network($done); PVE::LXC::Config->write_config($vmid, $conf); + + net_tap_commit($veth, $newnet); } sub get_interfaces { diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index b2f623394b21..14bc60a22b8d 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -12,6 +12,7 @@ use PVE::GuestHelpers; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option); use PVE::Network::SDN::Vnets; +use PVE::Network::SDN::Zones; use PVE::RESTEnvironment; use PVE::Tools; @@ -1699,7 +1700,7 @@ sub vmconfig_hotplug_pending { my $net = $class->parse_lxc_network($conf->{$opt}); PVE::LXC::kill_dhclients($vmid, $net->{name}) if $net->{'host-managed'}; - PVE::Network::veth_delete("veth${vmid}i$netid"); + PVE::Network::SDN::Zones::veth_delete("veth${vmid}i$netid"); print "delete ips from $opt\n"; eval { PVE::Network::SDN::Vnets::del_ips_from_mac( diff --git a/src/lxc-pve-poststop-hook b/src/lxc-pve-poststop-hook index c8bbb7972156..c5d1059fae02 100755 --- a/src/lxc-pve-poststop-hook +++ b/src/lxc-pve-poststop-hook @@ -11,7 +11,7 @@ use PVE::GuestHelpers; use PVE::LXC::Config; use PVE::LXC::Tools; use PVE::LXC; -use PVE::Network; +use PVE::Network::SDN::Zones; use PVE::RESTEnvironment; use PVE::Storage; use PVE::Tools; @@ -49,8 +49,8 @@ PVE::LXC::Tools::lxc_hook( my $ind = $1; my $net = PVE::LXC::Config->parse_lxc_network($conf->{$k}); next if $net->{type} ne 'veth'; - # veth_delete tests with '-d /sys/class/net/$name' before running the command - PVE::Network::veth_delete("veth${vmid}i$ind"); + # reports the unplug and deletes the veth only where it still exists + PVE::Network::SDN::Zones::veth_delete("veth${vmid}i$ind"); } my $config_updated = 0; -- 2.47.3