From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from orbyte.nwl.cc (orbyte.nwl.cc [151.80.46.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48054E54D; Mon, 1 Jan 2024 22:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nwl.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nwl.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nwl.cc header.i=@nwl.cc header.b="Bi+EMzJu" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nwl.cc; s=mail2022; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=WzE+7UWIzKuUxCweY/khq4/xWZsw/9PPWQykX2hyH6A=; b=Bi+EMzJur/rwE7Vl92/duaXADw hgi38A7FSUz4btk3VdXWnsCZGOTgTP4EEIFvmPLNLbtws8qqhaj1kpv+g+60MT5ODHJLdbi+eJ2VB jj2D669P+wutWsrKFKZ/jy4jeSKd54pNDWaL6AlHb+jVhTF9WATJwK+KW8UKYH8Y0f5de2wi55MEB 28Y6gf7Yoz++wAa2sJmjI2QeT3UBYQ3Anxiv8Ec9axpeIIt8PQHc4+Svr9NdANmd59nqnW+ucliw2 9SfRvWPZS+Gl6dU8nVPdQTSefkaruycpPTIG7r2mnYgbSIp3hMCmgqNoMrf0cCvgSTV9EdvqhO/r0 1w7Gj5+w==; Received: from n0-1 by orbyte.nwl.cc with local (Exim 4.97) (envelope-from ) id 1rKQU1-000000007qB-3ZEJ; Mon, 01 Jan 2024 23:10:05 +0100 Date: Mon, 1 Jan 2024 23:10:05 +0100 From: Phil Sutter To: Nicolas Dichtel Cc: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , David Ahern , netdev@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH net] rtnetlink: allow to set iface down before enslaving it Message-ID: Mail-Followup-To: Phil Sutter , Nicolas Dichtel , "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , David Ahern , netdev@vger.kernel.org, stable@vger.kernel.org References: <20231229100835.3996906-1-nicolas.dichtel@6wind.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231229100835.3996906-1-nicolas.dichtel@6wind.com> On Fri, Dec 29, 2023 at 11:08:35AM +0100, Nicolas Dichtel wrote: > The below commit adds support for: > > ip link set dummy0 down > > ip link set dummy0 master bond0 up > > but breaks the opposite: > > ip link set dummy0 up > > ip link set dummy0 master bond0 down > > Let's add a workaround to have both commands working. > > Cc: stable@vger.kernel.org > Fixes: a4abfa627c38 ("net: rtnetlink: Enslave device before bringing it up") > Signed-off-by: Nicolas Dichtel > --- > net/core/rtnetlink.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c > index e8431c6c8490..dd79693c2d91 100644 > --- a/net/core/rtnetlink.c > +++ b/net/core/rtnetlink.c > @@ -2905,6 +2905,14 @@ static int do_setlink(const struct sk_buff *skb, > call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); > } > > + /* Backward compat: enable to set interface down before enslaving it */ > + if (!(ifm->ifi_flags & IFF_UP) && ifm->ifi_change & IFF_UP) { > + err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm), > + extack); > + if (err < 0) > + goto errout; > + } > + > if (tb[IFLA_MASTER]) { > err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack); > if (err) Doesn't this merely revert to the old behaviour of setting the interface up before enslaving if both IFF_UP and IFLA_MASTER are present? Did you test this with a bond-type master? Cheers, Phil