diff mbox series

[V3,net,2/3] net: hns3: fix kernel crash when devlink reload during pf initialization

Message ID 20240318132948.3624333-3-shaojijie@huawei.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series There are some bugfix for the HNS3 ethernet driver | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 939 this patch: 939
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers fail 2 blamed authors not CCed: huangguangbin2@huawei.com moyufeng@huawei.com; 2 maintainers not CCed: huangguangbin2@huawei.com moyufeng@huawei.com
netdev/build_clang success Errors and warnings before: 956 this patch: 956
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 956 this patch: 956
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 11 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-03-19--18-00 (tests: 907)

Commit Message

Jijie Shao March 18, 2024, 1:29 p.m. UTC 
From: Yonglong Liu <liuyonglong@huawei.com>

The devlink reload process will access the hardware resources,
but the register operation is done before the hardware is initialized.
so, if process the devlink reload during initialization, may lead to kernel
crash. This patch fixes this by checking whether the NIC is initialized.

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>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Michal Kubiak March 18, 2024, 2:25 p.m. UTC | #1 
On Mon, Mar 18, 2024 at 09:29:47PM +0800, Jijie Shao wrote:
> From: Yonglong Liu <liuyonglong@huawei.com>
> 
> The devlink reload process will access the hardware resources,
> but the register operation is done before the hardware is initialized.
> so, if process the devlink reload during initialization, may lead to kernel

This sentence still seems not so clear. How about:
"So, processing the devlink reload during initialization may lead to kernel
crash."

Thanks,
Michal
Jiri Pirko March 19, 2024, 11:17 a.m. UTC | #2 
Mon, Mar 18, 2024 at 02:29:47PM CET, shaojijie@huawei.com wrote:
>From: Yonglong Liu <liuyonglong@huawei.com>
>
>The devlink reload process will access the hardware resources,
>but the register operation is done before the hardware is initialized.
>so, if process the devlink reload during initialization, may lead to kernel
>crash. This patch fixes this by checking whether the NIC is initialized.

Fix your locking, you should take devl_lock during your init. That would
disallow reload to race with it.

pw-bot: cr

>
>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>
>---
> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
>index 9a939c0b217f..80db4f7b05f6 100644
>--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
>+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
>@@ -40,8 +40,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;
> 	}
> 
>-- 
>2.30.0
>
>
Jijie Shao March 25, 2024, 12:51 p.m. UTC | #3 
on 2024/3/19 19:17, Jiri Pirko wrote:
> Mon, Mar 18, 2024 at 02:29:47PM CET, shaojijie@huawei.com wrote:
>> From: Yonglong Liu <liuyonglong@huawei.com>
>>
>> The devlink reload process will access the hardware resources,
>> but the register operation is done before the hardware is initialized.
>> so, if process the devlink reload during initialization, may lead to kernel
>> crash. This patch fixes this by checking whether the NIC is initialized.
> Fix your locking, you should take devl_lock during your init. That would
> disallow reload to race with it.
>
> pw-bot: cr

Thanks，

   We have fixed this in v4.

   Jijie Shao
diff mbox series

Patch

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
index 9a939c0b217f..80db4f7b05f6 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
@@ -40,8 +40,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;
 	}