blob: 3b630377f9a918dc87319c71d8d8da4631063e59 [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +08001From 9d5ef190e5615a7b63af89f88c4106a5bc127974 Mon Sep 17 00:00:00 2001
2From: Vladimir Oltean <vladimir.oltean@nxp.com>
3Date: Fri, 5 Feb 2021 15:37:10 +0200
4Subject: [PATCH] net: dsa: automatically bring up DSA master when opening user
5 port
6
7DSA wants the master interface to be open before the user port is due to
8historical reasons. The promiscuity of interfaces that are down used to
9have issues, as referenced Lennert Buytenhek in commit df02c6ff2e39
10("dsa: fix master interface allmulti/promisc handling").
11
12The bugfix mentioned there, commit b6c40d68ff64 ("net: only invoke
13dev->change_rx_flags when device is UP"), was basically a "don't do
14that" approach to working around the promiscuity while down issue.
15
16Further work done by Vlad Yasevich in commit d2615bf45069 ("net: core:
17Always propagate flag changes to interfaces") has resolved the
18underlying issue, and it is strictly up to the DSA and 8021q drivers
19now, it is no longer mandated by the networking core that the master
20interface must be up when changing its promiscuity.
21
22From DSA's point of view, deciding to error out in dsa_slave_open
23because the master isn't up is
24(a) a bad user experience and
25(b) knocking at an open door.
26Even if there still was an issue with promiscuity while down, DSA could
27still just open the master and avoid it.
28
29Doing it this way has the additional benefit that user space can now
30remove DSA-specific workarounds, like systemd-networkd with BindCarrier:
31https://github.com/systemd/systemd/issues/7478
32
33And we can finally remove one of the 2 bullets in the "Common pitfalls
34using DSA setups" chapter.
35
36Tested with two cascaded DSA switches:
37
38$ ip link set sw0p2 up
39fsl_enetc 0000:00:00.2 eno2: configuring for fixed/internal link mode
40fsl_enetc 0000:00:00.2 eno2: Link is Up - 1Gbps/Full - flow control rx/tx
41mscc_felix 0000:00:00.5 swp0: configuring for fixed/sgmii link mode
42mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Full - flow control off
438021q: adding VLAN 0 to HW filter on device swp0
44sja1105 spi2.0 sw0p2: configuring for phy/rgmii-id link mode
45IPv6: ADDRCONF(NETDEV_CHANGE): eno2: link becomes ready
46IPv6: ADDRCONF(NETDEV_CHANGE): swp0: link becomes ready
47
48Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
49Reviewed-by: Andrew Lunn <andrew@lunn.ch>
50Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
51Signed-off-by: Jakub Kicinski <kuba@kernel.org>
52---
53 Documentation/networking/dsa/dsa.rst | 4 ----
54 net/dsa/slave.c | 7 +++++--
55 2 files changed, 5 insertions(+), 6 deletions(-)
56
57--- a/Documentation/networking/dsa/dsa.rst
58+++ b/Documentation/networking/dsa/dsa.rst
59@@ -273,10 +273,6 @@ will not make us go through the switch t
60 the Ethernet switch on the other end, expecting a tag will typically drop this
61 frame.
62
63-Slave network devices check that the master network device is UP before allowing
64-you to administratively bring UP these slave network devices. A common
65-configuration mistake is forgetting to bring UP the master network device first.
66-
67 Interactions with other subsystems
68 ==================================
69
70--- a/net/dsa/slave.c
71+++ b/net/dsa/slave.c
72@@ -68,8 +68,11 @@ static int dsa_slave_open(struct net_dev
73 struct dsa_port *dp = dsa_slave_to_port(dev);
74 int err;
75
76- if (!(master->flags & IFF_UP))
77- return -ENETDOWN;
78+ err = dev_open(master, NULL);
79+ if (err < 0) {
80+ netdev_err(dev, "failed to open master %s\n", master->name);
81+ goto out;
82+ }
83
84 if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) {
85 err = dev_uc_add(master, dev->dev_addr);