From: Phil Sutter <phil@nwl.cc>
To: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>,
David Ahern <dsahern@kernel.org>,
netdev@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH net] rtnetlink: allow to set iface down before enslaving it
Date: Mon, 1 Jan 2024 23:10:05 +0100 [thread overview]
Message-ID: <ZZM4Pa3KuD0uaTkx@orbyte.nwl.cc> (raw)
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 <nicolas.dichtel@6wind.com>
> ---
> 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
next prev parent reply other threads:[~2024-01-01 22:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-29 10:08 [PATCH net] rtnetlink: allow to set iface down before enslaving it Nicolas Dichtel
2023-12-31 16:36 ` David Ahern
2024-01-02 12:14 ` Nicolas Dichtel
2024-01-01 22:10 ` Phil Sutter [this message]
2024-01-02 12:14 ` Nicolas Dichtel
2024-01-02 22:03 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZZM4Pa3KuD0uaTkx@orbyte.nwl.cc \
--to=phil@nwl.cc \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox