Skip to content

Commit

Permalink
ibmvnic: stop free_all_rwi on failed reset
Browse files Browse the repository at this point in the history
When ibmvnic fails to reset, it breaks out of the reset loop and frees
all of the remaining resets from the workqueue. Doing so prevents the
adapter from recovering if no reset is scheduled after that. Instead,
have the driver continue to process resets on the workqueue.

Remove the no longer need free_all_rwi().

Fixes: ed651a1 ("ibmvnic: Updated reset handling")
Signed-off-by: Dany Madden <drt@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Dany Madden authored and Jakub Kicinski committed Nov 28, 2020
1 parent 31d6b40 commit 18f141b
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions drivers/net/ethernet/ibm/ibmvnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -2173,17 +2173,6 @@ static struct ibmvnic_rwi *get_next_rwi(struct ibmvnic_adapter *adapter)
return rwi;
}

static void free_all_rwi(struct ibmvnic_adapter *adapter)
{
struct ibmvnic_rwi *rwi;

rwi = get_next_rwi(adapter);
while (rwi) {
kfree(rwi);
rwi = get_next_rwi(adapter);
}
}

static void __ibmvnic_reset(struct work_struct *work)
{
struct ibmvnic_rwi *rwi;
Expand Down Expand Up @@ -2252,9 +2241,9 @@ static void __ibmvnic_reset(struct work_struct *work)
else
adapter->state = reset_state;
rc = 0;
} else if (rc && rc != IBMVNIC_INIT_FAILED &&
!adapter->force_reset_recovery)
break;
}
if (rc)
netdev_dbg(adapter->netdev, "Reset failed, rc=%d\n", rc);

rwi = get_next_rwi(adapter);

Expand All @@ -2268,11 +2257,6 @@ static void __ibmvnic_reset(struct work_struct *work)
complete(&adapter->reset_done);
}

if (rc) {
netdev_dbg(adapter->netdev, "Reset failed\n");
free_all_rwi(adapter);
}

clear_bit_unlock(0, &adapter->resetting);
}

Expand Down

0 comments on commit 18f141b

Please sign in to comment.