* [PATCH net] net: mdiobus: get rid of a BUG_ON()
@ 2021-05-15 10:01 Dan Carpenter
2021-05-15 10:15 ` Russell King (Oracle)
2021-05-15 14:06 ` [PATCH net] " Andrew Lunn
0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2021-05-15 10:01 UTC (permalink / raw)
To: Andrew Lunn
Cc: Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski,
netdev, linux-kernel, kernel-janitors
We spotted a bug recently during a review where a driver was
unregistering a bus that wasn't registered, which would trigger this
BUG_ON(). Let's handle that situation more gracefully, and just print
a warning and return.
Reported-by: Russell King <linux@armlinux.org.uk>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/phy/mdio_bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index dadf75ff3ab9..6045ad3def12 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -607,7 +607,8 @@ void mdiobus_unregister(struct mii_bus *bus)
struct mdio_device *mdiodev;
int i;
- BUG_ON(bus->state != MDIOBUS_REGISTERED);
+ if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED))
+ return;
bus->state = MDIOBUS_UNREGISTERED;
for (i = 0; i < PHY_MAX_ADDR; i++) {
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: mdiobus: get rid of a BUG_ON()
2021-05-15 10:01 [PATCH net] net: mdiobus: get rid of a BUG_ON() Dan Carpenter
@ 2021-05-15 10:15 ` Russell King (Oracle)
2021-05-17 9:04 ` [PATCH net v2] " Dan Carpenter
2021-05-15 14:06 ` [PATCH net] " Andrew Lunn
1 sibling, 1 reply; 5+ messages in thread
From: Russell King (Oracle) @ 2021-05-15 10:15 UTC (permalink / raw)
To: Dan Carpenter
Cc: Andrew Lunn, Heiner Kallweit, David S. Miller, Jakub Kicinski,
netdev, linux-kernel, kernel-janitors
On Sat, May 15, 2021 at 01:01:11PM +0300, Dan Carpenter wrote:
> We spotted a bug recently during a review where a driver was
> unregistering a bus that wasn't registered, which would trigger this
> BUG_ON(). Let's handle that situation more gracefully, and just print
> a warning and return.
>
> Reported-by: Russell King <linux@armlinux.org.uk>
This probably ought to be updated to:
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
now please.
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
> drivers/net/phy/mdio_bus.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
> index dadf75ff3ab9..6045ad3def12 100644
> --- a/drivers/net/phy/mdio_bus.c
> +++ b/drivers/net/phy/mdio_bus.c
> @@ -607,7 +607,8 @@ void mdiobus_unregister(struct mii_bus *bus)
> struct mdio_device *mdiodev;
> int i;
>
> - BUG_ON(bus->state != MDIOBUS_REGISTERED);
> + if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED))
> + return;
> bus->state = MDIOBUS_UNREGISTERED;
>
> for (i = 0; i < PHY_MAX_ADDR; i++) {
> --
> 2.30.2
>
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: mdiobus: get rid of a BUG_ON()
2021-05-15 10:01 [PATCH net] net: mdiobus: get rid of a BUG_ON() Dan Carpenter
2021-05-15 10:15 ` Russell King (Oracle)
@ 2021-05-15 14:06 ` Andrew Lunn
1 sibling, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2021-05-15 14:06 UTC (permalink / raw)
To: Dan Carpenter
Cc: Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski,
netdev, linux-kernel, kernel-janitors
On Sat, May 15, 2021 at 01:01:11PM +0300, Dan Carpenter wrote:
> We spotted a bug recently during a review where a driver was
> unregistering a bus that wasn't registered, which would trigger this
> BUG_ON(). Let's handle that situation more gracefully, and just print
> a warning and return.
>
> Reported-by: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net v2] net: mdiobus: get rid of a BUG_ON()
2021-05-15 10:15 ` Russell King (Oracle)
@ 2021-05-17 9:04 ` Dan Carpenter
2021-05-17 23:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2021-05-17 9:04 UTC (permalink / raw)
To: Andrew Lunn
Cc: Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski,
netdev, linux-kernel, kernel-janitors
We spotted a bug recently during a review where a driver was
unregistering a bus that wasn't registered, which would trigger this
BUG_ON(). Let's handle that situation more gracefully, and just print
a warning and return.
Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Update the Reported-by tag.
drivers/net/phy/mdio_bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index dadf75ff3ab9..6045ad3def12 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -607,7 +607,8 @@ void mdiobus_unregister(struct mii_bus *bus)
struct mdio_device *mdiodev;
int i;
- BUG_ON(bus->state != MDIOBUS_REGISTERED);
+ if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED))
+ return;
bus->state = MDIOBUS_UNREGISTERED;
for (i = 0; i < PHY_MAX_ADDR; i++) {
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net v2] net: mdiobus: get rid of a BUG_ON()
2021-05-17 9:04 ` [PATCH net v2] " Dan Carpenter
@ 2021-05-17 23:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-17 23:00 UTC (permalink / raw)
To: Dan Carpenter
Cc: andrew, hkallweit1, linux, davem, kuba, netdev, linux-kernel,
kernel-janitors
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Mon, 17 May 2021 12:04:13 +0300 you wrote:
> We spotted a bug recently during a review where a driver was
> unregistering a bus that wasn't registered, which would trigger this
> BUG_ON(). Let's handle that situation more gracefully, and just print
> a warning and return.
>
> Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
>
> [...]
Here is the summary with links:
- [net,v2] net: mdiobus: get rid of a BUG_ON()
https://git.kernel.org/netdev/net/c/1dde47a66d4f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-17 23:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-15 10:01 [PATCH net] net: mdiobus: get rid of a BUG_ON() Dan Carpenter
2021-05-15 10:15 ` Russell King (Oracle)
2021-05-17 9:04 ` [PATCH net v2] " Dan Carpenter
2021-05-17 23:00 ` patchwork-bot+netdevbpf
2021-05-15 14:06 ` [PATCH net] " Andrew Lunn
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).