d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use callout_init_mtx() to close various callout-related races.

Browse Source 
- Drain the two timers in detach.
- Check IFF_DRV_RUNNING in the link task and bail w/o doing anything if
  it is clear.

Reviewed by:	jfv, scottl
This commit is contained in:
John Baldwin 2006-10-31 17:05:02 +00:00
parent 72f0301fef
commit 7b2d1aabb1
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/em/if_em.c
View File

@ -255,7 +255,6 @@ static int em_82547_fifo_workaround(struct adapter *, int);
static void em_82547_update_fifo_head(struct adapter *, int); static void em_82547_update_fifo_head(struct adapter *, int);
static int em_82547_tx_fifo_reset(struct adapter *); static int em_82547_tx_fifo_reset(struct adapter *);
static void em_82547_move_tail(void *arg); static void em_82547_move_tail(void *arg);
static void em_82547_move_tail_locked(struct adapter *);
static int em_dma_malloc(struct adapter *, bus_size_t, static int em_dma_malloc(struct adapter *, bus_size_t,
struct em_dma_alloc *, int); struct em_dma_alloc *, int);
static void em_dma_free(struct adapter *, struct em_dma_alloc *); static void em_dma_free(struct adapter *, struct em_dma_alloc *);
@ -421,8 +420,8 @@ em_attach(device_t dev)
OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, OID_AUTO, "stats", CTLTYPE_INT|CTLFLAG_RW, adapter, 0,
em_sysctl_stats, "I", "Statistics"); em_sysctl_stats, "I", "Statistics");
callout_init(&adapter->timer, CALLOUT_MPSAFE); callout_init_mtx(&adapter->timer, &adapter->mtx, 0);
callout_init(&adapter->tx_fifo_timer, CALLOUT_MPSAFE); callout_init_mtx(&adapter->tx_fifo_timer, &adapter->mtx, 0);
/* Determine hardware revision */ /* Determine hardware revision */
em_identify_hardware(adapter); em_identify_hardware(adapter);
@ -628,6 +627,9 @@ em_detach(device_t dev)
EM_UNLOCK(adapter); EM_UNLOCK(adapter);
ether_ifdetach(adapter->ifp); ether_ifdetach(adapter->ifp);
callout_drain(&adapter->timer);
callout_drain(&adapter->tx_fifo_timer);
em_free_pci_resources(adapter); em_free_pci_resources(adapter);
bus_generic_detach(dev); bus_generic_detach(dev);
if_free(ifp); if_free(ifp);
@ -1249,6 +1251,10 @@ em_handle_link(void *context, int pending)
ifp = adapter->ifp; ifp = adapter->ifp;
EM_LOCK(adapter); EM_LOCK(adapter);
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
EM_UNLOCK(adapter);
return;
}
callout_stop(&adapter->timer); callout_stop(&adapter->timer);
adapter->hw.get_link_status = 1; adapter->hw.get_link_status = 1;
@ -1765,7 +1771,7 @@ em_encap(struct adapter *adapter, struct mbuf **m_headp)
if (adapter->hw.mac_type == em_82547 && if (adapter->hw.mac_type == em_82547 &&
adapter->link_duplex == HALF_DUPLEX) adapter->link_duplex == HALF_DUPLEX)
em_82547_move_tail_locked(adapter); em_82547_move_tail(adapter);
else { else {
E1000_WRITE_REG(&adapter->hw, TDT, i); E1000_WRITE_REG(&adapter->hw, TDT, i);
if (adapter->hw.mac_type == em_82547) if (adapter->hw.mac_type == em_82547)
@ -1784,8 +1790,9 @@ em_encap(struct adapter *adapter, struct mbuf **m_headp)
* *
**********************************************************************/ **********************************************************************/
static void static void
em_82547_move_tail_locked(struct adapter *adapter) em_82547_move_tail(void *arg)
{ {
struct adapter *adapter = arg;
uint16_t hw_tdt; uint16_t hw_tdt;
uint16_t sw_tdt; uint16_t sw_tdt;
struct em_tx_desc *tx_desc; struct em_tx_desc *tx_desc;
@ -1818,16 +1825,6 @@ em_82547_move_tail_locked(struct adapter *adapter)
} }
} }
static void
em_82547_move_tail(void *arg)
{
struct adapter *adapter = arg;
EM_LOCK(adapter);
em_82547_move_tail_locked(adapter);
EM_UNLOCK(adapter);
}
static int static int
em_82547_fifo_workaround(struct adapter *adapter, int len) em_82547_fifo_workaround(struct adapter *adapter, int len)
{ {
@ -2016,7 +2013,7 @@ em_local_timer(void *arg)
struct adapter *adapter = arg; struct adapter *adapter = arg;
struct ifnet *ifp = adapter->ifp; struct ifnet *ifp = adapter->ifp;
EM_LOCK(adapter); EM_LOCK_ASSERT(adapter);
em_check_for_link(&adapter->hw); em_check_for_link(&adapter->hw);
em_update_link_status(adapter); em_update_link_status(adapter);
@ -2026,8 +2023,6 @@ em_local_timer(void *arg)
em_smartspeed(adapter); em_smartspeed(adapter);
callout_reset(&adapter->timer, hz, em_local_timer, adapter); callout_reset(&adapter->timer, hz, em_local_timer, adapter);
EM_UNLOCK(adapter);
} }
static void static void