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 0EAB51FF0B6 for ; Thu, 12 Nov 2026 13:43:38 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 13D612167F; Thu, 12 Nov 2026 13:42:37 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v7 11/21] sdn: zones: report interface plugs and unplugs to the DHCP backends Date: Thu, 12 Nov 2026 13:41:51 +0100 Message-ID: <20261112124201.2844423-12-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: 1794487342595 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.293 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: FHC35A3LDNEKSM3F6VTYBO6EPNIVMIXZ X-Message-ID-Hash: FHC35A3LDNEKSM3F6VTYBO6EPNIVMIXZ 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: The ebpf DHCP backend answers on each guest interface rather than on the bridge, so the zone layer now reports every plug to the DHCP backends. The plug takes the guest's MAC along, since the address to hand out is recorded per MAC. A plug onto a plain bridge is reported too, since a running guest's interface can move there from a vnet. A failing backend only warns and the plug goes ahead. A hotplug moves an interface while its new bridge is still a pending change in the guest config. A plug marked as pending therefore only reports the interface as gone, and a separate call reports it once the change is applied. So the backends never serve from a pending change. The zone layer also gains an unplug and a veth removal, which report the interface to the backends as gone. Signed-off-by: Hannes Laimer --- src/PVE/Network/SDN/Zones.pm | 42 +++++- src/test/run_test_vnets_blackbox.pl | 191 ++++++++++++++++++++++++++++ 2 files changed, 229 insertions(+), 4 deletions(-) diff --git a/src/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm index c189652a79eb..f8dfce12733e 100644 --- a/src/PVE/Network/SDN/Zones.pm +++ b/src/PVE/Network/SDN/Zones.pm @@ -333,16 +333,22 @@ sub veth_create { } sub tap_plug { - my ($iface, $bridge, $tag, $firewall, $trunks, $rate) = @_; + my ($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts) = @_; + + # during a hotplug the new bridge is still pending in the guest config. The dhcp backends + # only drop the interface here and hear of it again in tap_commit + PVE::Network::SDN::Dhcp::tap_unplug($iface) if $opts->{pending}; my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge, 1); if (!$vnet) { # fallback for classic bridge my $interfaces_config = PVE::INotify::read_file('interfaces'); - my $opts = {}; - $opts->{learning} = 0 + my $bridge_opts = {}; + $bridge_opts->{learning} = 0 if $interfaces_config->{ifaces}->{$bridge} && $interfaces_config->{ifaces}->{$bridge}->{'bridge-disable-mac-learning'}; - PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $opts); + PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, $bridge_opts); + # the dhcp backends hear of an interface moving onto a plain bridge as well + PVE::Network::SDN::Dhcp::tap_plug($bridge, $iface, $opts->{mac}) if !$opts->{pending}; return; } @@ -353,7 +359,35 @@ sub tap_plug { if $plugin_config->{nodes} && !defined($plugin_config->{nodes}->{$nodename}); my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type}); + $plugin->tap_plug($plugin_config, $vnet, $tag, $iface, $bridge, $firewall, $trunks, $rate); + # the dhcp backends hear of the interface after it joined the bridge, since a full pass + # skips one that is not on its bridge. Dhcp.pm comes in through Vnets.pm, since a use of it + # here would create a load-order cycle + PVE::Network::SDN::Dhcp::tap_plug($bridge, $iface, $opts->{mac}) if !$opts->{pending}; +} + +# the dhcp backends hear of a hotplugged interface once its change is applied to the guest +# config. An error only warns, since the hotplug is done by then +sub tap_commit { + my ($iface, $bridge, $mac) = @_; + + eval { PVE::Network::SDN::Dhcp::tap_plug($bridge, $iface, $mac) }; + warn "could not plug $iface into the dhcp backends: $@" if $@; +} + +sub tap_unplug { + my ($iface) = @_; + + PVE::Network::SDN::Dhcp::tap_unplug($iface); + PVE::Network::tap_unplug($iface); +} + +sub veth_delete { + my ($veth) = @_; + + PVE::Network::SDN::Dhcp::tap_unplug($veth); + PVE::Network::veth_delete($veth); } sub add_bridge_fdb { diff --git a/src/test/run_test_vnets_blackbox.pl b/src/test/run_test_vnets_blackbox.pl index 23d1844274d7..a3a6547313ce 100755 --- a/src/test/run_test_vnets_blackbox.pl +++ b/src/test/run_test_vnets_blackbox.pl @@ -2372,6 +2372,197 @@ sub test_ebpf_backend_edge_cases { } run_test(\&test_ebpf_backend); + +sub test_zone_tap_plug { + my $test_name = (split(/::/, (caller(0))[3]))[-1]; + my $zoneid = "TESTZONE"; + my $vnetid = "testvnet"; + my $mac = "da:65:8f:18:9b:6f"; + + # the zone plug hands the MAC on to the dhcp backends, and a plug onto a + # plain bridge tells them where the interface went + create_zone({ + type => "simple", + dhcp => "ebpf", + ipam => "pve", + zone => $zoneid, + }); + create_vnet({ + type => "vnet", + zone => $zoneid, + vnet => $vnetid, + }); + create_subnet({ + type => "subnet", + vnet => $vnetid, + subnet => "10.0.0.0/24", + gateway => "10.0.0.1", + 'dhcp-range' => ["start-address=10.0.0.100,end-address=10.0.0.200"], + }); + create_ip({ + zone => $zoneid, + vnet => $vnetid, + mac => $mac, + ip => "10.0.0.100", + }); + my $bridged = []; + my $unplugged = []; + $mocked_sdn_zones_super_plugin->mock( + tap_plug => sub { + push @$bridged, $_[5]; + push $test_state->{order}->@*, 'bridge'; + }, + ); + my $mocked_pve_network = Test::MockModule->new('PVE::Network'); + $mocked_pve_network->mock( + tap_plug => sub { + push @$bridged, $_[1]; + push $test_state->{order}->@*, 'bridge'; + }, + tap_unplug => sub { push @$unplugged, $_[0]; }, + veth_delete => sub { push @$unplugged, $_[0]; }, + ); + $mocked_pve_inotify->mock(read_file => sub { return { ifaces => {} }; }); + take_ebpf_calls(); + take_order(); + + PVE::Network::SDN::Zones::tap_plug('tap999i0', $vnetid, undef, 0, undef, undef, + { mac => $mac }); + eq_or_diff($bridged, [$vnetid], "$test_name: the zone plugin plugs the interface"); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'attach', args => ['tap999i0', $mac, $ebpf_record->("10.0.0.100")] }], + "$test_name: and the dhcp backend attaches it with the MAC's record", + ); + is_deeply( + take_order(), + ['bridge', 'lock', 'refresh', 'write'], + "$test_name: the interface joins the bridge before the responder attaches", + ); + + # during a hotplug the new bridge is still pending in the guest config + @$bridged = (); + PVE::Network::SDN::Zones::tap_plug( + 'tap999i0', + $vnetid, + undef, + 0, + undef, + undef, + { mac => $mac, pending => 1 }, + ); + eq_or_diff($bridged, [$vnetid], "$test_name: a pending plug still joins the bridge"); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'detach', args => ['tap999i0'] }], + "$test_name: and the dhcp backends only drop the interface", + ); + is_deeply(take_order(), ['bridge'], "$test_name: and plug it into none of them"); + PVE::Network::SDN::Zones::tap_commit('tap999i0', $vnetid, $mac); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'attach', args => ['tap999i0', $mac, $ebpf_record->("10.0.0.100")] }], + "$test_name: once the change is applied the interface is attached with the MAC's record", + ); + + # by then the hotplug is done, so a failed plug only warns + my $mocked_sdn_dhcp = Test::MockModule->new('PVE::Network::SDN::Dhcp'); + $mocked_sdn_dhcp->mock(tap_plug => sub { die "no responder\n"; }); + my @warnings; + eval { + local $SIG{__WARN__} = sub { push @warnings, $_[0]; }; + PVE::Network::SDN::Zones::tap_commit('tap999i0', $vnetid, $mac); + }; + is($@, '', "$test_name: a failed plug after the change is applied does not die"); + $mocked_sdn_dhcp->unmock('tap_plug'); + is( + scalar(grep { m/could not plug tap999i0 into the dhcp backends: no responder/ } @warnings), + 1, + "$test_name: and warns", + ); + + @$bridged = (); + PVE::Network::SDN::Zones::tap_plug('tap999i0', 'vmbr0', undef, 0, undef, undef, + { mac => $mac }); + eq_or_diff($bridged, ['vmbr0'], "$test_name: a plain bridge is plugged the classic way"); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'detach', args => ['tap999i0'] }], + "$test_name: and the ebpf backend drops the interface", + ); + + # the same holds for a vnet of another backend + create_zone({ + type => "simple", + dhcp => "dnsmasq", + ipam => "pve", + zone => "DNSZONE", + }); + create_vnet({ + type => "vnet", + zone => "DNSZONE", + vnet => "dnsvnet", + }); + @$bridged = (); + PVE::Network::SDN::Zones::tap_plug( + 'tap999i0', + 'dnsvnet', + undef, + 0, + undef, + undef, + { mac => $mac }, + ); + eq_or_diff( + $bridged, + ['dnsvnet'], + "$test_name: a vnet of another backend is plugged by its zone", + ); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'detach', args => ['tap999i0'] }], + "$test_name: and the ebpf backend drops the interface there too", + ); + + # the backend a plug was handed to came from a config read before the + # responder's lock, an apply may have switched it since + take_order(); + PVE::Network::SDN::Dhcp::Ebpf->tap_unplug('tap999i0', { vnet => $vnetid, mac => $mac }); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'attach', args => ['tap999i0', $mac, $ebpf_record->("10.0.0.100")] }], + "$test_name: a move onto a vnet that uses ebpf by now attaches", + ); + is_deeply( + take_order(), + ['lock', 'refresh', 'write'], + "$test_name: and reads the zone under the responder's lock", + ); + PVE::Network::SDN::Dhcp::Ebpf->tap_plug('DNSZONE', 'dnsvnet', 'tap999i0', $mac); + eq_or_diff( + take_ebpf_calls(), + [{ method => 'detach', args => ['tap999i0'] }], + "$test_name: a plug onto a vnet that left ebpf by now detaches", + ); + + # the zone unplug and the veth delete report the interface gone before + # the classic ones run + PVE::Network::SDN::Zones::tap_unplug('tap999i0'); + PVE::Network::SDN::Zones::veth_delete('veth999i0'); + eq_or_diff($unplugged, ['tap999i0', 'veth999i0'], "$test_name: the classic unplugs run"); + eq_or_diff( + take_ebpf_calls(), + [ + { method => 'detach', args => ['tap999i0'] }, + { method => 'detach', args => ['veth999i0'] }, + ], + "$test_name: and the dhcp backends hear the interfaces are gone", + ); + $mocked_sdn_zones_super_plugin->unmock('tap_plug'); + $mocked_pve_inotify->unmock('read_file'); +} + +run_test(\&test_zone_tap_plug); run_test(\&test_ebpf_backend_edge_cases); sub test_ebpf_mac_case { -- 2.47.3