From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E5523953A9 for ; Fri, 12 Apr 2024 10:07:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7D275B90 for ; Fri, 12 Apr 2024 10:07:40 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 12 Apr 2024 10:07:39 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id DC9002C0BA2; Fri, 12 Apr 2024 10:07:38 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 10:07:32 +0200 Message-Id: <20240412080737.34521-2-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240412080737.34521-1-s.hanreich@proxmox.com> References: <20240412080737.34521-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.338 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [inotify.pm] Subject: [pve-devel] [PATCH pve-common v4 1/6] fix #545: interfaces: allow arbitrary bridge names in network config 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: , X-List-Received-Date: Fri, 12 Apr 2024 08:07:40 -0000 Similar to other interface types, we can detect a bridge by the presence of its bridge_ports attribute, rather than solely relying on the "vmbr" ifname prefix heuristic. For OVS bridges we need to examine the OVS type instead. The check needs to be moved up since other prefixes could theoretically be included in a bridge name and then would otherwise get picked up wrongly. Also added a warning for interfaces named vmbrX that are not bridges to catch possible misconfigurations. Originally-by: Jillian Morgan Reviewed-by: Fabian Grünbichler Signed-off-by: Stefan Hanreich --- src/PVE/INotify.pm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 6432295..4568593 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -22,6 +22,7 @@ use PVE::Network; use PVE::ProcFSTools; use PVE::SafeSyslog; use PVE::Tools; +use PVE::RESTEnvironment qw(log_warn); use base 'Exporter'; @@ -1033,7 +1034,17 @@ sub __read_etc_network_interfaces { foreach my $iface (sort keys %$ifaces) { my $d = $ifaces->{$iface}; $d->{type} = 'unknown'; - if ($iface =~ m/^bond\d+$/) { + if (defined $d->{'bridge_ports'}) { + $d->{type} = 'bridge'; + if (!defined ($d->{bridge_stp})) { + $d->{bridge_stp} = 'off'; + } + if (!defined($d->{bridge_fd}) && $d->{bridge_stp} eq 'off') { + $d->{bridge_fd} = 0; + } + } elsif ($d->{ovs_type} && $d->{ovs_type} eq 'OVSBridge') { + $d->{type} = $d->{ovs_type}; + } elsif ($iface =~ m/^bond\d+$/) { if (!$d->{ovs_type}) { $d->{type} = 'bond'; } elsif ($d->{ovs_type} eq 'OVSBond') { @@ -1053,18 +1064,6 @@ sub __read_etc_network_interfaces { my $tag = &$extract_ovs_option($d, 'tag'); $d->{ovs_tag} = $tag if defined($tag); } - } elsif ($iface =~ m/^vmbr\d+$/) { - if (!$d->{ovs_type}) { - $d->{type} = 'bridge'; - if (!defined ($d->{bridge_stp})) { - $d->{bridge_stp} = 'off'; - } - if (!defined($d->{bridge_fd}) && $d->{bridge_stp} eq 'off') { - $d->{bridge_fd} = 0; - } - } elsif ($d->{ovs_type} eq 'OVSBridge') { - $d->{type} = $d->{ovs_type}; - } } elsif ($iface =~ m/^(\S+):\d+$/) { $d->{type} = 'alias'; if (defined ($ifaces->{$1})) { @@ -1127,6 +1126,9 @@ sub __read_etc_network_interfaces { } } + log_warn("detected a interface $iface that is not a bridge!") + if !($d->{type} eq 'OVSBridge' || $d->{type} eq 'bridge') && $iface =~ m/^vmbr\d+$/; + # map address and netmask to cidr if (my $addr = $d->{address}) { if (_address_is_cidr($addr)) { -- 2.39.2