| Message ID | 20190905213001.19818-1-julietk@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/ibmvnic: free reset work of removed device from queue | expand |
From: Juliet Kim <julietk@linux.vnet.ibm.com> Date: Thu, 5 Sep 2019 17:30:01 -0400 > Commit 36f1031c51a2 ("ibmvnic: Do not process reset during or after > device removal") made the change to exit reset if the driver has been > removed, but does not free reset work items of the adapter from queue. > > Ensure all reset work items are freed when breaking out of the loop early. > > Fixes: 36f1031c51a2 ("ibmnvic: Do not process reset during or after > device removal”) Please do not break up Fixes: tags into mutliple lines, also please do not put an empty line between the Fixes: tag and other tags like the Signed-off-by: > Signed-off-by: Juliet Kim <julietk@linux.vnet.ibm.com> Applied, thanks.
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index fa4bb940665c..6644cabc8e75 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1985,7 +1985,10 @@ static void __ibmvnic_reset(struct work_struct *work) while (rwi) { if (adapter->state == VNIC_REMOVING || adapter->state == VNIC_REMOVED) - goto out; + kfree(rwi); + rc = EBUSY; + break; + } if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; @@ -2011,7 +2014,7 @@ static void __ibmvnic_reset(struct work_struct *work) netdev_dbg(adapter->netdev, "Reset failed\n"); free_all_rwi(adapter); } -out: + adapter->resetting = false; if (we_lock_rtnl) rtnl_unlock();
Commit 36f1031c51a2 ("ibmvnic: Do not process reset during or after device removal") made the change to exit reset if the driver has been removed, but does not free reset work items of the adapter from queue. Ensure all reset work items are freed when breaking out of the loop early. Fixes: 36f1031c51a2 ("ibmnvic: Do not process reset during or after device removal”) Signed-off-by: Juliet Kim <julietk@linux.vnet.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)