[pve-devel] [PATCH pve-common v2 1/1] fix #7153: iproute2: consider bonds as physical bridge ports

[Stefan Hanreich <s.hanreich@proxmox.com>]

The new check did not consider bonds, since ip_link_is_physical only
returns true for physical interfaces - but not bonds. Add a new
function to check for bonds explicitly and use it when checking for
bridge ports in activate_bridge_vlan.

This bug caused VMs with network devices with VLAN tags, on
non-vlan-aware bridges, to not get started / migrated.

Fixes: 057f62f7
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
Changes from v1:
* improved commit message
* add missing definedness check

 src/PVE/IPRoute2.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/PVE/IPRoute2.pm b/src/PVE/IPRoute2.pm
index 5208d93..c60a91d 100644
--- a/src/PVE/IPRoute2.pm
+++ b/src/PVE/IPRoute2.pm
@@ -32,6 +32,14 @@ sub ip_link_is_physical($ip_link) {
         && (!defined($ip_link->{linkinfo}) || !defined($ip_link->{linkinfo}->{info_kind}));
 }
 
+sub ip_link_is_bond($ip_link) {
+    return
+        $ip_link->{link_type} eq 'ether'
+        && defined($ip_link->{linkinfo})
+        && defined($ip_link->{linkinfo}->{info_kind})
+        && $ip_link->{linkinfo}->{info_kind} eq 'bond';
+}
+
 sub ip_link_is_bridge($ip_link) {
     return
         defined($ip_link->{linkinfo})
@@ -67,7 +75,8 @@ sub get_physical_bridge_ports($bridge, $ip_links = undef) {
     }
 
     return grep {
-        ip_link_is_physical($ip_links->{$_}) && $ip_links->{$_}->{master} eq $bridge
+        (ip_link_is_physical($ip_links->{$_}) || ip_link_is_bond($ip_links->{$_}))
+            && defined($ip_links->{$_}->{master}) && $ip_links->{$_}->{master} eq $bridge
     } keys $ip_links->%*;
 }
 
-- 
2.47.3


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel