Commit 304ea9a0 authored by Yonglong Liu's avatar Yonglong Liu Committed by Hao Chen
Browse files

net: hns3: fix kernel crash when devlink reload during initialization 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9NZTZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=35d92abfbad8



----------------------------------------------------------------------

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 registering the devlink after
hardware initialization.

Fixes: cd624299 ("net: hns3: add support for registering devlink for VF")
Fixes: 93305b77ffcb ("net: hns3: fix kernel crash when devlink reload during pf initialization")
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 9f5765c3

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+5 −12
Original line number Diff line number Diff line
@@ -12406,16 +12406,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	if (ret)

		goto out;



	ret = hclge_devlink_init(hdev);

	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)

		goto err_devlink_uninit;

		goto err_pci_uninit;



	/* Firmware command initialize */

	hclge_comm_cmd_init_ops(&hdev->hw.hw, &hclge_cmq_ops);
@@ -12584,6 +12578,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
		dev_warn(&pdev->dev,

			 "failed to wake on lan init, ret = %d\n", ret);



	ret = hclge_devlink_init(hdev);

	if (ret)

		goto err_ptp_uninit;



	hclge_state_init(hdev);

	hdev->last_reset_time = jiffies;
@@ -12591,8 +12589,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
		 HCLGE_DRIVER_NAME);



	hclge_task_schedule(hdev, round_jiffies_relative(HZ));



	devl_unlock(hdev->devlink);

	return 0;



err_ptp_uninit:
@@ -12606,9 +12602,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	pci_free_irq_vectors(pdev);

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);

	pci_release_regions(pdev);

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+4 −6
Original line number Diff line number Diff line
@@ -2953,10 +2953,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) 
	if (ret)

		return ret;



	ret = hclgevf_devlink_init(hdev);

	if (ret)

		goto err_devlink_init;



	ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);

	if (ret)

		goto err_cmd_queue_init;
@@ -3053,6 +3049,10 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) 


	hclgevf_init_rxd_adv_layout(hdev);



	ret = hclgevf_devlink_init(hdev);

	if (ret)

		goto err_config;



	set_bit(HCLGEVF_STATE_SERVICE_INITED, &hdev->state);



	hdev->last_reset_time = jiffies;
@@ -3072,8 +3072,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) 
err_cmd_init:

	hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);

err_cmd_queue_init:

	hclgevf_devlink_uninit(hdev);

err_devlink_init:

	hclgevf_pci_uninit(hdev);

	clear_bit(HCLGEVF_STATE_IRQ_INITED, &hdev->state);

	return ret;