From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
To: olteanv@gmail.com
Cc: p.rosenberger@kunbus.com, woojung.huh@microchip.com,
UNGLinuxDriver@microchip.com, andrew@lunn.ch,
vivien.didelot@gmail.com, f.fainelli@gmail.com,
davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Lino Sanfilippo <LinoSanfilippo@gmx.de>
Subject: [PATCH 3/3] net: dsa: microchip: tear down DSA tree at system shutdown
Date: Thu, 9 Sep 2021 11:53:24 +0200 [thread overview]
Message-ID: <20210909095324.12978-4-LinoSanfilippo@gmx.de> (raw)
In-Reply-To: <20210909095324.12978-1-LinoSanfilippo@gmx.de>
Shutting down the system with registered KSZ9477 slave devices results in a
system hang. Additionally the message "unregister_netdevice: waiting for
ETH to become free. Usage count = X" is dumped into the kernel log (with
ETH being the DSA master device and X the number of registered slave
devices).
The reason for this issue are pending references to the DSA master device
which are still held by the slave devices at the time master device is
unregistered.
While these references are supposed to be released in ksz_switch_remove()
this function never gets the chance to be called due to the earlier system
hang at the master device deregistration.
Fix this deadlock situation by deregistering the switch (and thus releasing
the master device references) in the KSZ9477 shutdown handler. Since this
handler is called before the master device deregistration all references to
the master device are released at the time of deregistration and thus the
deadlock does not occur.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
---
drivers/net/dsa/microchip/ksz9477.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 854e25f43fa7..5db82898b737 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -229,6 +229,16 @@ static int ksz9477_reset_switch(struct ksz_device *dev)
return 0;
}
+static int ksz9477_shutdown(struct ksz_device *dev)
+{
+ int ret;
+
+ ret = ksz9477_reset_switch(dev);
+ ksz_switch_shutdown(dev);
+
+ return ret;
+}
+
static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,
u64 *cnt)
{
@@ -1601,7 +1611,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = {
.r_mib_pkt = ksz9477_r_mib_pkt,
.freeze_mib = ksz9477_freeze_mib,
.port_init_cnt = ksz9477_port_init_cnt,
- .shutdown = ksz9477_reset_switch,
+ .shutdown = ksz9477_shutdown,
.detect = ksz9477_switch_detect,
.init = ksz9477_switch_init,
.exit = ksz9477_switch_exit,
--
2.33.0
next prev parent reply other threads:[~2021-09-09 9:54 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 9:53 [PATCH 0/3] Fix for KSZ DSA switch shutdown Lino Sanfilippo
2021-09-09 9:53 ` [PATCH 1/3] net: dsa: introduce function dsa_tree_shutdown() Lino Sanfilippo
2021-09-09 9:53 ` [PATCH 2/3] net: dsa: microchip: provide the function ksz_switch_shutdown() Lino Sanfilippo
2021-09-09 9:53 ` Lino Sanfilippo [this message]
2021-09-09 10:14 ` [PATCH 0/3] Fix for KSZ DSA switch shutdown Vladimir Oltean
2021-09-09 11:08 ` Lino Sanfilippo
2021-09-09 11:42 ` Vladimir Oltean
2021-09-09 12:56 ` Vladimir Oltean
2021-09-09 13:19 ` Aw: " Lino Sanfilippo
2021-09-09 14:29 ` Lino Sanfilippo
2021-09-09 15:17 ` Andrew Lunn
2021-09-09 16:41 ` Lino Sanfilippo
2021-09-09 15:11 ` Andrew Lunn
2021-09-09 16:46 ` Lino Sanfilippo
2021-09-09 17:55 ` Andrew Lunn
2021-09-09 15:47 ` Vladimir Oltean
2021-09-09 16:00 ` Florian Fainelli
2021-09-10 1:32 ` Saravana Kannan
2021-09-09 16:37 ` Lino Sanfilippo
2021-09-09 16:44 ` Florian Fainelli
2021-09-09 17:07 ` Lino Sanfilippo
2021-09-09 22:54 ` Vladimir Oltean
2021-09-09 23:23 ` Vladimir Oltean
2021-09-10 1:08 ` Vladimir Oltean
2021-09-10 2:15 ` Florian Fainelli
2021-09-10 11:51 ` Andrew Lunn
2021-09-10 14:58 ` Vladimir Oltean
2021-09-11 11:44 ` Vladimir Oltean
2021-09-12 20:19 ` Lino Sanfilippo
2021-09-12 20:29 ` Vladimir Oltean
2021-09-13 10:32 ` Aw: " Lino Sanfilippo
2021-09-13 10:44 ` Vladimir Oltean
2021-09-13 11:01 ` Aw: " Lino Sanfilippo
2021-09-14 18:48 ` Vladimir Oltean
2021-09-15 5:42 ` Lino Sanfilippo
2021-09-18 19:37 ` Lino Sanfilippo
2021-09-18 22:04 ` Vladimir Oltean
2021-09-19 0:29 ` Vladimir Oltean
2021-09-09 12:40 ` Andrew Lunn
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=20210909095324.12978-4-LinoSanfilippo@gmx.de \
--to=linosanfilippo@gmx.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=p.rosenberger@kunbus.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.com \
/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;
as well as URLs for NNTP newsgroup(s).