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 8A75F93836 for ; Tue, 21 Feb 2023 09:06:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 719192F62C for ; Tue, 21 Feb 2023 09:06:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Feb 2023 09:06:01 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 445E547EA3 for ; Tue, 21 Feb 2023 09:06:01 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 21 Feb 2023 09:05:49 +0100 Message-Id: <20230221080550.43336-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221080550.43336-1-c.heiss@proxmox.com> References: <20230221080550.43336-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.108 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [lxc.pm, config.pm] Subject: [pve-devel] [PATCH v3 container 3/4] lxc: Add `link_down` config to allow setting interfaces as disconnected 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: Tue, 21 Feb 2023 08:06:32 -0000 If this network option is set, the host-side link will be forced down and the interface won't be connected to the bridge. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * Split trailing whitespace fix into separate patch * Rename option to kebap-case * Proper option comparison using `safe_boolean_ne` * Copy option to new network conf like the other options * Remove the veth interface from the bridge when disconnected Changes v2 -> v3: * Rename option to snake_case again * Moved option hotplug-handling before LXC attach again src/PVE/LXC.pm | 41 ++++++++++++++++++++++++++++++++++------- src/PVE/LXC/Config.pm | 6 ++++++ src/lxcnetaddbr | 7 +++++-- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index d419124..2c10108 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -956,7 +956,8 @@ sub update_net { } else { if (safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) || safe_num_ne($oldnet->{tag}, $newnet->{tag}) || - safe_num_ne($oldnet->{firewall}, $newnet->{firewall}) + safe_num_ne($oldnet->{firewall}, $newnet->{firewall}) || + safe_boolean_ne($oldnet->{link_down}, $newnet->{link_down}) ) { if ($oldnet->{bridge}) { @@ -969,10 +970,28 @@ sub update_net { } my ($bridge, $mac, $firewall, $rate) = $newnet->@{'bridge', 'hwaddr', 'firewall', 'rate'}; - PVE::LXC::net_tap_plug($veth, $bridge, $newnet->{tag}, $firewall, $newnet->{trunks}, $rate, { mac => $mac }); + + if (defined($newnet->{link_down})) { + # The interface must not be connected to the designated + # bridge if the link was requested to be disconnected. + # Otherwise it could get re-enabled by something like + # `ifreload`. + # + # Thus only force the host-side link down here and skip + # adding it to the bridge. + PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $veth, 'down']); + } else { + # Connect the interface to the bridge + PVE::LXC::net_tap_plug( + $veth, $bridge, $newnet->{tag}, $firewall, $newnet->{trunks}, $rate, { mac => $mac }); + + # Force the host-side link up if it was previously down. + PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $veth, 'up']) + if defined($oldnet->{link_down}); + } # This includes the rate: - foreach (qw(bridge tag firewall rate)) { + foreach (qw(bridge tag firewall rate link_down)) { $oldnet->{$_} = $newnet->{$_} if $newnet->{$_}; } } elsif (safe_string_ne($oldnet->{rate}, $newnet->{rate})) { @@ -1003,9 +1022,17 @@ sub hotplug_net { } else { PVE::Network::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr}); } - PVE::LXC::net_tap_plug( - $veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, - $newnet->{rate}, { mac => $newnet->{hwaddr} }); + + if (defined($newnet->{link_down})) { + # In case the network device should be disconnected, force the host-link down .. + PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $veth, 'down']); + } else { + # .. otherwise, connect it normally to the bridge. + # The interface is already up from creation. + PVE::LXC::net_tap_plug( + $veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, + $newnet->{rate}, { mac => $newnet->{hwaddr} }); + } # attach peer in container my $cmd = ['lxc-device', '-n', $vmid, 'add', $vethpeer, "$eth" ]; @@ -1016,7 +1043,7 @@ sub hotplug_net { PVE::Tools::run_command($cmd); my $done = { type => 'veth' }; - foreach (qw(bridge tag firewall hwaddr name)) { + foreach (qw(bridge tag firewall hwaddr name link_down)) { $done->{$_} = $newnet->{$_} if $newnet->{$_}; } $conf->{$opt} = PVE::LXC::Config->print_lxc_network($done); diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index af25a96..746df7b 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -814,6 +814,12 @@ our $netconf_desc = { description => "Apply rate limiting to the interface", optional => 1, }, + # TODO: Rename to link-down for PVE 8.0 + link_down => { + type => 'boolean', + description => 'Whether this interface should be disconnected (like pulling the plug).', + optional => 1, + }, }; PVE::JSONSchema::register_format('pve-lxc-network', $netconf_desc); diff --git a/src/lxcnetaddbr b/src/lxcnetaddbr index ebd6baa..0940206 100755 --- a/src/lxcnetaddbr +++ b/src/lxcnetaddbr @@ -52,10 +52,13 @@ if (-d "/sys/class/net/$iface") { #avoid insecure dependency; ($bridgemtu) = $bridgemtu =~ /(\d+)/; - PVE::Tools::run_command("/sbin/ip link set dev $iface up mtu $bridgemtu"); + my $linkstate = defined($net->{link_down}) ? 'down' : 'up'; + PVE::Tools::run_command("/sbin/ip link set dev $iface $linkstate mtu $bridgemtu"); PVE::Tools::run_command("/sbin/ip addr add 0.0.0.0/0 dev $iface"); - PVE::LXC::net_tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, { mac => $hwaddr }); + # Only plug the interface into the bridge if it is not set as disconnected by the user. + PVE::LXC::net_tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate, { mac => $hwaddr }) + if !defined($net->{link_down}); } exit 0; -- 2.39.1