Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Neil 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: David S. Miller <davem@davemloft.net>

authored by

Neil Horman and committed by
David S. Miller
1c4d5f51 42e6cae1

+5
+5
drivers/net/vmxnet3/vmxnet3_drv.c
··· 2962 2962 /* we need to enable NAPI, otherwise dev_close will deadlock */ 2963 2963 for (i = 0; i < adapter->num_rx_queues; i++) 2964 2964 napi_enable(&adapter->rx_queue[i].napi); 2965 + /* 2966 + * Need to clear the quiesce bit to ensure that vmxnet3_close 2967 + * can quiesce the device properly 2968 + */ 2969 + clear_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state); 2965 2970 dev_close(adapter->netdev); 2966 2971 } 2967 2972