hinic: fix a bug of ndo_stop
Subsystems (3)
PATCH 1/1 hinic: fix a bug of ndo_stop
if some function in ndo_stop interface returns failure because of hardware fault, must go on excuting rest steps rather than return failure directly, otherwise will cause memory leak
--- .../net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 28 ++++++++++++++----- .../net/ethernet/huawei/hinic/hinic_main.c | 16 ++--------- 2 files changed, 23 insertions(+), 21 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c +21 -7
@@ -45,6 +45,10 @@#define MGMT_MSG_TIMEOUT 5000 +#define SET_FUNC_PORT_MBOX_TIMEOUT 30000 + +#define SET_FUNC_PORT_MGMT_TIMEOUT 25000 +#define mgmt_to_pfhwdev (pf_mgmt) \ container_of(pf_mgmt, struct hinic_pfhwdev, pf_to_mgmt)
@@ -238,12 +242,13 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, u8 *buf_in, u16 in_size, u8 *buf_out, u16 *out_size, enum mgmt_direction_type direction, - u16 resp_msg_id) + u16 resp_msg_id, u32 timeout) { struct hinic_hwif *hwif = pf_to_mgmt->hwif;struct pci_dev *pdev = hwif->pdev;struct hinic_recv_msg *recv_msg;struct completion *recv_done; +ulong timeo;u16 msg_id;int err;
@@ -267,8 +272,9 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, goto unlock_sync_msg; } -if (!wait_for_completion_timeout (recv_done, -msecs_to_jiffies (MGMT_MSG_TIMEOUT ))) { + timeo =msecs_to_jiffies (timeout ? timeout :MGMT_MSG_TIMEOUT ); + +if (!wait_for_completion_timeout (recv_done, timeo)) {dev_err (&pdev->dev,"MGMT timeout, MSG id = %d\n" , msg_id); err = -ETIMEDOUT ; goto unlock_sync_msg;
@@ -342,6 +348,7 @@ int hinic_msg_to_mgmt(struct hinic_pf_to_mgmt *pf_to_mgmt, {struct hinic_hwif *hwif = pf_to_mgmt->hwif;struct pci_dev *pdev = hwif->pdev; +u32 timeout =0 ;if (sync !=HINIC_MGMT_MSG_SYNC ) {dev_err (&pdev->dev,"Invalid MGMT msg type\n" );
@@ -353,13 +360,20 @@ int hinic_msg_to_mgmt(struct hinic_pf_to_mgmt *pf_to_mgmt,return -EINVAL ; } -if (HINIC_IS_VF (hwif)) +if (HINIC_IS_VF (hwif)) { +if (cmd ==HINIC_PORT_CMD_SET_FUNC_STATE ) + timeout =SET_FUNC_PORT_MBOX_TIMEOUT ; +return hinic_mbox_to_pf (pf_to_mgmt->hwdev, mod, cmd, buf_in, - in_size, buf_out, out_size,0 ); -else + in_size, buf_out, out_size, timeout); + }else { +if (cmd ==HINIC_PORT_CMD_SET_FUNC_STATE ) + timeout =SET_FUNC_PORT_MGMT_TIMEOUT ; +return msg_to_mgmt_sync (pf_to_mgmt, mod, cmd, buf_in, in_size, buf_out, out_size,MGMT_DIRECT_SEND , -MSG_NOT_RESP ); +MSG_NOT_RESP , timeout); + } }/**
drivers/net/ethernet/huawei/hinic/hinic_main.c +2 -14
@@ -487,7 +487,6 @@ static int hinic_close(struct net_device *netdev) {struct hinic_dev *nic_dev =netdev_priv (netdev);unsigned int flags; -int err;down (&nic_dev->mgmt_lock);
@@ -504,20 +503,9 @@ static int hinic_close(struct net_device *netdev)if (!HINIC_IS_VF (nic_dev->hwdev->hwif))hinic_notify_all_vfs_link_changed (nic_dev->hwdev,0 ); - err =hinic_port_set_func_state (nic_dev,HINIC_FUNC_PORT_DISABLE ); -if (err) { -netif_err (nic_dev, drv, netdev, -"Failed to set func port state\n" ); - nic_dev->flags |= (flags &HINIC_INTF_UP ); -return err; - } +hinic_port_set_state (nic_dev,HINIC_PORT_DISABLE ); - err =hinic_port_set_state (nic_dev,HINIC_PORT_DISABLE ); -if (err) { -netif_err (nic_dev, drv, netdev,"Failed to set port state\n" ); - nic_dev->flags |= (flags &HINIC_INTF_UP ); -return err; - } +hinic_port_set_func_state (nic_dev,HINIC_FUNC_PORT_DISABLE );if (nic_dev->flags &HINIC_RSS_ENABLE ) {hinic_rss_deinit (nic_dev);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Luo bin <[email protected]>
Date: Thu, 7 May 2020 04:32:22 +0000
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, · line 251
Quoted 1 line
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c +1
-0+ulong timeo;
Please fully spell out "unsigned long" for this type.
The same problem exists in your net-next patch submission as well.
Thank you.
All right,will fix.
Quoted 10 lines · David Miller
From: Luo bin <[email protected]>
Date: Thu, 7 May 2020 04:32:22 +0000drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, · line 251
Quoted 1 line
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c +1
-0+ulong timeo;Please fully spell out "unsigned long" for this type.
The same problem exists in your net-next patch submission as well.
Thank you.
.