Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4d5f51 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

vmxnet3: ensure that adapter is in proper state during force_close 



There are several paths in vmxnet3, where settings changes cause the
adapter to be brought down and back up (vmxnet3_set_ringparam among
them).  Should part of the reset operation fail, these paths call
vmxnet3_force_close, which enables all napi instances prior to calling
dev_close (with the expectation that vmxnet3_close will then properly
disable them again).  However, vmxnet3_force_close neglects to clear
VMXNET3_STATE_BIT_QUIESCED prior to calling dev_close.  As a result
vmxnet3_quiesce_dev (called from vmxnet3_close), returns early, and
leaves all the napi instances in a enabled state while the device itself
is closed.  If a device in this state is activated again, napi_enable
will be called on already enabled napi_instances, leading to a BUG halt.

The fix is to simply enausre that the QUIESCED bit is cleared in
vmxnet3_force_close to allow quesence to be completed properly on close.

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: Shrikrishna Khare <skhare@vmware.com>
CC: "VMware, Inc." <pv-drivers@vmware.com>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42e6cae1

drivers/net/vmxnet3/vmxnet3_drv.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -2962,6 +2962,11 @@ vmxnet3_force_close(struct vmxnet3_adapter *adapter) 
	/* we need to enable NAPI, otherwise dev_close will deadlock */

	/* we need to enable NAPI, otherwise dev_close will deadlock */

	for (i = 0; i < adapter->num_rx_queues; i++)

	for (i = 0; i < adapter->num_rx_queues; i++)

		napi_enable(&adapter->rx_queue[i].napi);

		napi_enable(&adapter->rx_queue[i].napi);

	/*

	 * Need to clear the quiesce bit to ensure that vmxnet3_close

	 * can quiesce the device properly

	 */

	clear_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);

	dev_close(adapter->netdev);

	dev_close(adapter->netdev);

}

}