Commit f695e308 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: rx-offload: fix order of unregistration calls" 

Marc Kleine-Budde <mkl@pengutronix.de> says:

If a driver is removed, the driver framework invokes the driver's
remove callback. A CAN driver's remove function calls
unregister_candev(), which calls net_device_ops::ndo_stop further down
in the call stack for interfaces which are in the "up" state.

With the mcp251xfd driver the removal of the module causes the
following warning:

| WARNING: CPU: 0 PID: 352 at net/core/dev.c:7342 __netif_napi_del_locked+0xc8/0xd8

as can_rx_offload_del() deletes the NAPI, while it is still active,
because the interface is still up.

To fix the warning, first unregister the network interface, which
calls net_device_ops::ndo_stop, which disables the NAPI, and then call
can_rx_offload_del().

All other driver using the rx-offload helper have been checked and the
same issue has been found in the rockchip and m_can driver. These have
been fixed, but only compile time tested. On the mcp251xfd the fix was
tested on hardware.

Link: https://patch.msgid.link/20250502-can-rx-offload-del-v1-0-59a9b131589d@pengutronix.de


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents 5e166381 0713a1b3

drivers/net/can/m_can/m_can.c

+1 −1
Original line number Diff line number Diff line
@@ -2463,9 +2463,9 @@ EXPORT_SYMBOL_GPL(m_can_class_register); 


void m_can_class_unregister(struct m_can_classdev *cdev)

{

	unregister_candev(cdev->net);

	if (cdev->is_peripheral)

		can_rx_offload_del(&cdev->offload);

	unregister_candev(cdev->net);

}

EXPORT_SYMBOL_GPL(m_can_class_unregister);

drivers/net/can/rockchip/rockchip_canfd-core.c

+1 −1
Original line number Diff line number Diff line
@@ -937,8 +937,8 @@ static void rkcanfd_remove(struct platform_device *pdev) 
	struct rkcanfd_priv *priv = platform_get_drvdata(pdev);

	struct net_device *ndev = priv->ndev;



	can_rx_offload_del(&priv->offload);

	rkcanfd_unregister(priv);

	can_rx_offload_del(&priv->offload);

	free_candev(ndev);

}

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2198,8 +2198,8 @@ static void mcp251xfd_remove(struct spi_device *spi) 
	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);

	struct net_device *ndev = priv->ndev;



	can_rx_offload_del(&priv->offload);

	mcp251xfd_unregister(priv);

	can_rx_offload_del(&priv->offload);

	spi->max_speed_hz = priv->spi_max_speed_hz_orig;

	free_candev(ndev);

}