]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: hns3: fix kernel crash when devlink reload during pf initialization
authorYonglong Liu <liuyonglong@huawei.com>
Mon, 25 Mar 2024 12:43:10 +0000 (20:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:35:43 +0000 (16:35 +0200)
[ Upstream commit 93305b77ffcb042f1538ecc383505e87d95aa05a ]

The devlink reload process will access the hardware resources,
but the register operation is done before the hardware is initialized.
So, processing the devlink reload during initialization may lead to kernel
crash. This patch fixes this by taking devl_lock during initialization.

Fixes: b741269b2759 ("net: hns3: add support for registering devlink for PF")
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index f1ca2cda2961e0d2f95fd211e9ed0b445b69bcf4..dfd0c5f4cb9f554e28e98dc9ac7e1997635d83be 100644 (file)
@@ -11614,6 +11614,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
        if (ret)
                goto err_pci_uninit;
 
+       devl_lock(hdev->devlink);
+
        /* Firmware command queue initialize */
        ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);
        if (ret)
@@ -11793,6 +11795,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
 
        hclge_task_schedule(hdev, round_jiffies_relative(HZ));
 
+       devl_unlock(hdev->devlink);
        return 0;
 
 err_mdiobus_unreg:
@@ -11805,6 +11808,7 @@ err_msi_uninit:
 err_cmd_uninit:
        hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
 err_devlink_uninit:
+       devl_unlock(hdev->devlink);
        hclge_devlink_uninit(hdev);
 err_pci_uninit:
        pcim_iounmap(pdev, hdev->hw.hw.io_base);