| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Nathan Fontenot <nfont@linux.vnet.ibm.com> |
| Date: Wed, 11 Apr 2018 10:09:38 -0500 |
| Subject: ibmvnic: Do not notify peers on parameter change resets |
| |
| From: Nathan Fontenot <nfont@linux.vnet.ibm.com> |
| |
| [ Upstream commit ebc701b796a67a5785399dcbc83d90e3b5f1e02f ] |
| |
| When attempting to change the driver parameters, such as the MTU |
| value or number of queues, do not call netdev_notify_peers(). |
| Doing so will deadlock on the rtnl_lock. |
| |
| Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/ibm/ibmvnic.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/ibm/ibmvnic.c |
| +++ b/drivers/net/ethernet/ibm/ibmvnic.c |
| @@ -1711,7 +1711,8 @@ static int do_reset(struct ibmvnic_adapt |
| for (i = 0; i < adapter->req_rx_queues; i++) |
| napi_schedule(&adapter->napi[i]); |
| |
| - if (adapter->reset_reason != VNIC_RESET_FAILOVER) |
| + if (adapter->reset_reason != VNIC_RESET_FAILOVER && |
| + adapter->reset_reason != VNIC_RESET_CHANGE_PARAM) |
| netdev_notify_peers(netdev); |
| |
| netif_carrier_on(netdev); |
