Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a963052e authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: bugfix for rtnl_lock's range in the hclge_reset() 



Since hclge_reset_wait() is used to wait for the hardware to complete
the reset, it is not necessary to hold the rtnl_lock during
hclge_reset_wait(). So this patch releases the lock for the duration
of hclge_reset_wait().

Fixes: 6d4fab39 ("net: hns3: Reset net device with rtnl_lock")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c88ed1d

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

+3 −0
Original line number Diff line number Diff line
@@ -2470,14 +2470,17 @@ static void hclge_reset(struct hclge_dev *hdev) 
	handle = &hdev->vport[0].nic;

	rtnl_lock();

	hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);

	rtnl_unlock();



	if (!hclge_reset_wait(hdev)) {

		rtnl_lock();

		hclge_notify_client(hdev, HNAE3_UNINIT_CLIENT);

		hclge_reset_ae_dev(hdev->ae_dev);

		hclge_notify_client(hdev, HNAE3_INIT_CLIENT);



		hclge_clear_reset_cause(hdev);

	} else {

		rtnl_lock();

		/* schedule again to check pending resets later */

		set_bit(hdev->reset_type, &hdev->reset_pending);

		hclge_reset_task_schedule(hdev);