[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230721141956.29842-1-asmaa@nvidia.com>
Date: Fri, 21 Jul 2023 10:19:56 -0400
From: Asmaa Mnebhi <asmaa@...dia.com>
To: <davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>,
<pabeni@...hat.com>
CC: Asmaa Mnebhi <asmaa@...dia.com>, <netdev@...r.kernel.org>,
<sridhar.samudrala@...el.com>, <maciej.fijalkowski@...el.com>,
<olteanv@...il.com>, <davthompson@...dia.com>
Subject: [PATCH net v4 1/1] mlxbf_gige: Fix kernel panic at shutdown
There is a race condition happening during shutdown due to pending
napi transactions. Since mlxbf_gige_poll is still running, it tries
to access a NULL pointer and as a result causes a kernel panic.
To fix this during shutdown, invoke mlxbf_gige_remove to disable and
dequeue napi.
Fixes: f92e1869d74e ("Add Mellanox BlueField Gigabit Ethernet driver")
Signed-off-by: Asmaa Mnebhi <asmaa@...dia.com>
---
v3-v4:
- replace .remove with .remove_new to be able to return a void to
.shutdown as well.
v2-v3:
- remove mlxbf_gige_shutdown() since it is redundant with mlxbf_gige_remove().
v1->v2:
- fixed the tag from net-next to net
- check that the "priv" pointer is not NULL in mlxbf_gige_remove()
.../mellanox/mlxbf_gige/mlxbf_gige_main.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index 694de9513b9f..5e677bd32956 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -471,24 +471,19 @@ static int mlxbf_gige_probe(struct platform_device *pdev)
return err;
}
-static int mlxbf_gige_remove(struct platform_device *pdev)
+static void mlxbf_gige_remove(struct platform_device *pdev)
{
struct mlxbf_gige *priv = platform_get_drvdata(pdev);
+ if (!priv)
+ return;
+
unregister_netdev(priv->netdev);
phy_disconnect(priv->netdev->phydev);
mlxbf_gige_mdio_remove(priv);
platform_set_drvdata(pdev, NULL);
- return 0;
-}
-
-static void mlxbf_gige_shutdown(struct platform_device *pdev)
-{
- struct mlxbf_gige *priv = platform_get_drvdata(pdev);
-
- writeq(0, priv->base + MLXBF_GIGE_INT_EN);
- mlxbf_gige_clean_port(priv);
+ return;
}
static const struct acpi_device_id __maybe_unused mlxbf_gige_acpi_match[] = {
@@ -499,8 +494,8 @@ MODULE_DEVICE_TABLE(acpi, mlxbf_gige_acpi_match);
static struct platform_driver mlxbf_gige_driver = {
.probe = mlxbf_gige_probe,
- .remove = mlxbf_gige_remove,
- .shutdown = mlxbf_gige_shutdown,
+ .remove_new = mlxbf_gige_remove,
+ .shutdown = mlxbf_gige_remove,
.driver = {
.name = KBUILD_MODNAME,
.acpi_match_table = ACPI_PTR(mlxbf_gige_acpi_match),
--
2.30.1
Powered by blists - more mailing lists