| Message ID | alpine.LRH.2.00.1007131749030.32055@localhost.localdomain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Shreyas Bhatewara <sbhatewara@vmware.com> Date: Tue, 13 Jul 2010 17:49:52 -0700 (PDT) > > Do not reset when the device is not opened > > If a reset is scheduled, and the device goes thru close and open, it > may happen that reset and open may run in parallel. > The reset code now bails out if the device is not opened. > > Signed-off-by: Ronghua Zang <ronghua@vmware.com> > Signed-off-by: Matthieu Bucchianeri <matthieu@vmware.com> > Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com> Testing IFF_UP is just making your race hole a little smaller but it isn't fixing the problem. In fact, there really isn't any legitimate reason for a driver to test the IFF_UP state bit. netif_running() is the correct test, and asynchronous work queue things like resets should synchronize with open/close using the RTNL lock so that your test of netif_running() is a stable one. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 1e31d40..ffd6a9b 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2417,8 +2417,9 @@ vmxnet3_reset_work(struct work_struct *data) if (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)) return; - /* if the device is closed, we must leave it alone */ - if (netif_running(adapter->netdev)) { + /* if the device is closed or is being opened, we must leave it alone */ + if (netif_running(adapter->netdev) && + (adapter->netdev->flags & IFF_UP)) { printk(KERN_INFO "%s: resetting\n", adapter->netdev->name); vmxnet3_quiesce_dev(adapter); vmxnet3_reset_dev(adapter);