| Message ID | 20211117173629.2734752-1-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 867ae8a7993b26fc742703f748663cc2ac421db7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: mdio: Replaced BUG_ON() with WARN() | expand |
On Wed, Nov 17, 2021 at 09:36:29AM -0800, Florian Fainelli wrote: > Killing the kernel because a certain MDIO bus object is not in the > desired state at various points in the registration or unregistration > paths is excessive and is not helping in troubleshooting or fixing > issues. Replace the BUG_ON() with WARN() and print out the MDIO bus name > to facilitate debugging. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Wed, 17 Nov 2021 09:36:29 -0800 you wrote: > Killing the kernel because a certain MDIO bus object is not in the > desired state at various points in the registration or unregistration > paths is excessive and is not helping in troubleshooting or fixing > issues. Replace the BUG_ON() with WARN() and print out the MDIO bus name > to facilitate debugging. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > > [...] Here is the summary with links: - [net-next] net: mdio: Replaced BUG_ON() with WARN() https://git.kernel.org/netdev/net-next/c/867ae8a7993b You are awesome, thank you!
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index c204067f1890..9b6f2df07211 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -176,9 +176,11 @@ static void mdiobus_release(struct device *d) { struct mii_bus *bus = to_mii_bus(d); - BUG_ON(bus->state != MDIOBUS_RELEASED && - /* for compatibility with error handling in drivers */ - bus->state != MDIOBUS_ALLOCATED); + WARN(bus->state != MDIOBUS_RELEASED && + /* for compatibility with error handling in drivers */ + bus->state != MDIOBUS_ALLOCATED, + "%s: not in RELEASED or ALLOCATED state\n", + bus->id); kfree(bus); } @@ -529,8 +531,9 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) bus->parent->of_node->fwnode.flags |= FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD; - BUG_ON(bus->state != MDIOBUS_ALLOCATED && - bus->state != MDIOBUS_UNREGISTERED); + WARN(bus->state != MDIOBUS_ALLOCATED && + bus->state != MDIOBUS_UNREGISTERED, + "%s: not in ALLOCATED or UNREGISTERED state\n", bus->id); bus->owner = owner; bus->dev.parent = bus->parent; @@ -658,7 +661,8 @@ void mdiobus_free(struct mii_bus *bus) return; } - BUG_ON(bus->state != MDIOBUS_UNREGISTERED); + WARN(bus->state != MDIOBUS_UNREGISTERED, + "%s: not in UNREGISTERED state\n", bus->id); bus->state = MDIOBUS_RELEASED; put_device(&bus->dev);
Killing the kernel because a certain MDIO bus object is not in the desired state at various points in the registration or unregistration paths is excessive and is not helping in troubleshooting or fixing issues. Replace the BUG_ON() with WARN() and print out the MDIO bus name to facilitate debugging. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/phy/mdio_bus.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)