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 3B2AA92741 for ; Mon, 13 Feb 2023 14:57:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C59224624 for ; Mon, 13 Feb 2023 14:57:08 +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 ; Mon, 13 Feb 2023 14:57:07 +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 0342C46F52 for ; Mon, 13 Feb 2023 14:57:07 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 13 Feb 2023 14:56:59 +0100 Message-Id: <20230213135700.502195-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213135700.502195-1-c.heiss@proxmox.com> References: <20230213135700.502195-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.138 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 Subject: [pve-devel] [PATCH container 1/2] net: 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: Mon, 13 Feb 2023 13:57:38 -0000 If this network option is set, the host-side link will be forced down. This has the effect that the interface inside the container has LOWERLAYERDOWN set, which basically means that the PHY is considered down, thus effectivly being "unplugged". Also fix some trailing whitespace while touching the file. Signed-off-by: Christoph Heiss --- src/PVE/LXC.pm | 20 +++++++++++++------- src/PVE/LXC/Config.pm | 5 +++++ src/lxcnetaddbr | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index ce6d5a5..039a476 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -668,7 +668,7 @@ sub update_lxc_config { # some init scripts expect a linux terminal (turnkey). $raw .= "lxc.environment = TERM=linux\n"; - + my $utsname = $conf->{hostname} || "CT$vmid"; $raw .= "lxc.uts.name = $utsname\n"; @@ -932,8 +932,9 @@ sub update_net { my $oldnet = PVE::LXC::Config->parse_lxc_network($oldnetcfg); if (safe_string_ne($oldnet->{hwaddr}, $newnet->{hwaddr}) || - safe_string_ne($oldnet->{name}, $newnet->{name})) { - + safe_string_ne($oldnet->{name}, $newnet->{name}) || + defined($oldnet->{link_down}) != defined($newnet->{link_down}) + ) { PVE::Network::veth_delete($veth); delete $conf->{$opt}; PVE::LXC::Config->write_config($vmid, $conf); @@ -1010,6 +1011,11 @@ sub hotplug_net { $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'link', 'set', $eth ,'up' ]; PVE::Tools::run_command($cmd); + # In case the network device should be disconnected, force the host-link down + if (defined($newnet->{link_down})) { + PVE::Tools::run_command(['/sbin/ip', 'link', 'set', 'dev', $veth, 'down']); + } + my $done = { type => 'veth' }; foreach (qw(bridge tag firewall hwaddr name)) { $done->{$_} = $newnet->{$_} if $newnet->{$_}; @@ -1703,14 +1709,14 @@ sub __mountpoint_mount { my $type = $mountpoint->{type}; my $quota = !$snapname && !$mountpoint->{ro} && $mountpoint->{quota}; my $mounted_dev; - + return if !$volid || !$mount; $mount =~ s!/+!/!g; my $mount_path; my ($mpfd, $parentfd, $last_dir); - + if (defined($rootdir)) { ($rootdir, $mount_path, $mpfd, $parentfd, $last_dir) = __mount_prepare_rootdir($rootdir, $mount, $rootuid, $rootgid); @@ -1719,7 +1725,7 @@ sub __mountpoint_mount { if (defined($stage_mount)) { $mount_path = $rootdir; } - + my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1); die "unknown snapshot path for '$volid'" if !$storage && defined($snapname); @@ -1828,7 +1834,7 @@ sub __mountpoint_mount { warn "cannot enable quota control for bind mounts\n" if $quota; return wantarray ? ($volid, 0, undef) : $volid; } - + die "unsupported storage"; } diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index af25a96..1d4362e 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -814,6 +814,11 @@ our $netconf_desc = { description => "Apply rate limiting to the interface", optional => 1, }, + 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 83052e1..d8c6767 100755 --- a/src/lxcnetaddbr +++ b/src/lxcnetaddbr @@ -58,7 +58,8 @@ 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"); if ($have_sdn) { -- 2.39.1