From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 821FE1FF17C for ; Tue, 30 Dec 2025 17:23:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 16B5EF73B; Tue, 30 Dec 2025 17:24:57 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 30 Dec 2025 17:23:45 +0100 Message-ID: <20251230162415.665391-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1767111835102 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [188.114.96.3] Subject: [pve-devel] [PATCH common/stable-8] backport: fix #7193: allow vlan-interfaces as physical bridge ports X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" the bug addressed in: https://lore.proxmox.com/pve-devel/20251230160730.641868-1-s.ivanov@proxmox.com/T/#u is also affecting current PVE 8.4 installations. This patch backports the changes for 9 to PVE 8 (backport consists of moving the code to PVE/Network.pm as PVE/IPRoute2.pm was introduced in PVE 9 and adapting to the lack of `use v5.36;` in PVE8). short summary of the cause of the issue: 057f62f ("fix #7118: fix bridge port detection when plugging netdev with vlan") did not address that ports in the form of eno1.1234 (vlan 1234 on eno1) were allowed as bridge-ports. Signed-off-by: Stoiko Ivanov --- minimally tested on a PVE 8 VM with a debian container, refusing to start without the patch, starting with it. src/PVE/Network.pm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index bdc1627..9583549 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -943,7 +943,7 @@ sub is_linux_bridge { my ($iface_name) = @_; check_iface_name($iface_name); - die "interface $iface_name does not exist\n" if ! -l "/sys/class/net/$iface_name"; + die "interface $iface_name does not exist\n" if !-l "/sys/class/net/$iface_name"; return -d "/sys/class/net/$iface_name/bridge"; } @@ -970,7 +970,9 @@ sub get_physical_bridge_ports { $ip_links = ip_link_details() if !defined($ip_links); return grep { - (ip_link_is_physical($ip_links->{$_}) || ip_link_is_bond($ip_links->{$_})) + (ip_link_is_physical($ip_links->{$_}) + || ip_link_is_bond($ip_links->{$_}) + || ip_link_is_vlan($ip_links->{$_})) && defined($ip_links->{$_}->{master}) && $ip_links->{$_}->{master} eq $bridge } keys $ip_links->%*; @@ -983,7 +985,7 @@ sub ip_link_details { ['ip', '-details', '-json', 'link', 'show'], outfunc => sub { $link_json .= shift; - } + }, ); my $links = JSON::decode_json($link_json); @@ -1010,6 +1012,15 @@ sub ip_link_is_bond { && $ip_link->{linkinfo}->{info_kind} eq 'bond'; } +sub ip_link_is_vlan { + my ($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 "vlan"; +} + sub altname_mapping { my ($ip_links) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel