Unverified Commit d7b58db0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8107 [OLK 6.6]net: hns3: fix kernel crash when devlink reload during pf/vf initialization 

Merge Pull Request from: @chen-hao418 
 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9SQ3Q
CVE: NA
 
 
Link:https://gitee.com/openeuler/kernel/pulls/8107

 

Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b1acaf02 7715d5e5

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

+3 −2
Original line number Diff line number Diff line
@@ -78,8 +78,9 @@ static int hclge_devlink_reload_down(struct devlink *devlink, bool netns_change, 
	struct pci_dev *pdev = hdev->pdev;

	int ret;



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state)) {

		dev_err(&pdev->dev, "reset is handling\n");

	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state) ||

	    !test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state)) {

		dev_err(&pdev->dev, "reset is handling or driver removed\n");

		return -EBUSY;

	}

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

+3 −2
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ static int hclgevf_devlink_reload_down(struct devlink *devlink, 
	struct pci_dev *pdev = hdev->pdev;

	int ret;



	if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state)) {

		dev_err(&pdev->dev, "reset is handling\n");

	if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state) ||

	    !test_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state)) {

		dev_err(&pdev->dev, "reset is handling or driver removed\n");

		return -EBUSY;

	}