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 A6B35929E8 for ; Tue, 14 Feb 2023 10:30:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8157D5621 for ; Tue, 14 Feb 2023 10:29:33 +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, 14 Feb 2023 10:29:32 +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 86E374712E for ; Tue, 14 Feb 2023 10:29:32 +0100 (CET) Date: Tue, 14 Feb 2023 10:29:30 +0100 From: Christoph Heiss To: Wolfgang Bumiller Cc: pve-devel@lists.proxmox.com Message-ID: <20230214092930.obliwrvhmdfpakga@maui.proxmox.com> References: <20230213135700.502195-1-c.heiss@proxmox.com> <20230213135700.502195-2-c.heiss@proxmox.com> <20230213143132.oiv552fz6rk6kiqt@casey.proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230213143132.oiv552fz6rk6kiqt@casey.proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.133 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. [uts.name, lxc.pm] Subject: Re: [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: Tue, 14 Feb 2023 09:30:03 -0000 Thanks for the review! On Mon, Feb 13, 2023 at 03:31:32PM +0100, Wolfgang Bumiller wrote: > On Mon, Feb 13, 2023 at 02:56:59PM +0100, Christoph Heiss wrote: > > [..] > > > > 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}) > > Doing this here would cause the interface to be deleted and recreated in > a "down" state, which is much more disruptive than it needs to be. > Instead, this should be treated more like we do changing the 'bridge' > property (the 'else' case just below this), and stop after the > `tap_unplug` for the 'down' case. Ack. I see, that's a good point. > > > + ) { > > 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']); > > These interfaces are usually part of a bridge, and therefore the next > `ifreload` (and probably some other things) would re-enable them > automatically. I did not know this, thanks for explaining! > > We do need to actually "unplug" them from the bridge (tap_unplug) to > avoid this. Will rework that for v2 and do it properly. > > > + } > > + > > my $done = { type => 'veth' }; > > foreach (qw(bridge tag firewall hwaddr name)) { > > $done->{$_} = $newnet->{$_} if $newnet->{$_}; > > > > [..] > > 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'; > > We need to skip the rest altogether if the link is supposed to stay down > reliably. As mentioned above, a 'down' interface that is still plugged > into a bridge will get activated sooner or later... Funnily enough, in my first draft I actually had it like that, so that it wasn't connected to the brigde at all. Now I know what cases to also test for v2. > > > + 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