| From e57f3ee82409a3e9ef11a3184cef762b8dec6616 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 5 Sep 2019 17:30:01 -0400 |
| Subject: net/ibmvnic: free reset work of removed device from queue |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Juliet Kim <julietk@linux.vnet.ibm.com> |
| |
| [ Upstream commit 1c2977c094998de032fee6e898c88b4a05483d08 ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/ibm/ibmvnic.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c |
| index fa4bb940665c2..6644cabc8e756 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(); |
| -- |
| 2.20.1 |
| |