On Fri, Mar 13, 2009 at 09:52:13AM +0000, Sitsofe Wheeler wrote: > The dmesg and trace can be found on > http://sucs.org/~sits/test/eeepc-debug/20090313/ . Looks like the skb was reused right after it was freed by the mac80211 workqueue so that seems inline with the idea that the list is getting corrupted somehow. On top of the last patch, would you mind running this overnight? It'll dump a lot of debug info, I'm really only interested in the last 5 invocations of ath5k_debug_printrxbuffs or so before the poison. During a scan you'll see lots of rx_start/rx_stop. Hmm, I can think of another scenario that could break: if the hw updated rxdp before DMA completes, then we should check next packet's status too in case 'current' packet's status is clobbered. Someone suggested dumping the self links and deal with RXEOL, maybe a good idea :) diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index a4e385b..e21705c 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -1143,8 +1143,10 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) if (!skb) { skb = ath5k_rx_skb_alloc(sc, &bf->skbaddr); - if (!skb) + if (!skb) { + printk(KERN_DEBUG "ath5k: error exit from rxbuf_setup\n"); return -ENOMEM; + } bf->skb = skb; } @@ -1561,6 +1563,8 @@ ath5k_rx_start(struct ath5k_softc *sc) ath5k_mode_setup(sc); /* set filters, etc. */ ath5k_hw_start_rx_pcu(ah); /* re-enable PCU/DMA engine */ + printk(KERN_DEBUG "ath5k: rx_start\n"); + return 0; err: return ret; @@ -1578,8 +1582,7 @@ ath5k_rx_stop(struct ath5k_softc *sc) ath5k_hw_set_rx_filter(ah, 0); /* clear recv filter */ ath5k_hw_stop_rx_dma(ah); /* disable DMA engine */ - ath5k_debug_printrxbuffs(sc, ah); - + printk(KERN_DEBUG "ath5k: rx_stop\n"); sc->rxlink = NULL; /* just in case */ } @@ -1682,6 +1685,7 @@ ath5k_tasklet_rx(unsigned long data) int ret; int hdrlen; int padsize; + static int foo=0; spin_lock(&sc->rxbuflock); if (list_empty(&sc->rxbuf)) { @@ -1689,6 +1693,10 @@ ath5k_tasklet_rx(unsigned long data) goto unlock; } do { + /* dump list state every 8 pkts */ + if (!(foo++ & 7)) + ath5k_debug_printrxbuffs(sc, sc->ah); + rxs.flag = 0; bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list); @@ -2308,6 +2316,8 @@ ath5k_stop_locked(struct ath5k_softc *sc) } else sc->rxlink = NULL; + printk(KERN_DEBUG "ath5k: rx_stop_locked\n"); + return 0; } @@ -2430,6 +2440,8 @@ ath5k_intr(int irq, void *dev_id) * least on older hardware revs. */ sc->rxlink = NULL; + printk(KERN_DEBUG "ath5k: RXEOL\n"); + } if (status & AR5K_INT_TXURN) { /* bump tx trigger level */ diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c index ccaeb5c..c544da5 100644 --- a/drivers/net/wireless/ath5k/debug.c +++ b/drivers/net/wireless/ath5k/debug.c @@ -505,7 +505,8 @@ ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done, struct ath5k_desc *ds = bf->desc; struct ath5k_hw_all_rx_desc *rd = &ds->ud.ds_rx; - printk(KERN_DEBUG "R (%p %llx) %08x %08x %08x %08x %08x %08x %c\n", + printk(KERN_DEBUG "R %p (%p %llx) %08x %08x %08x %08x %08x %08x %c\n", + bf, ds, (unsigned long long)bf->daddr, ds->ds_link, ds->ds_data, rd->rx_ctl.rx_control_0, rd->rx_ctl.rx_control_1, @@ -518,23 +519,18 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah) { struct ath5k_desc *ds; struct ath5k_buf *bf; - struct ath5k_rx_status rs = {}; + struct ath5k_rx_status rs; int status; - if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET))) - return; - printk(KERN_DEBUG "rx queue %x, link %p\n", ath5k_hw_get_rxdp(ah), sc->rxlink); - spin_lock_bh(&sc->rxbuflock); list_for_each_entry(bf, &sc->rxbuf, list) { ds = bf->desc; + memset(&rs, 0, sizeof(struct ath5k_rx_status)); status = ah->ah_proc_rx_desc(ah, ds, &rs); - if (!status) - ath5k_debug_printrxbuf(bf, status == 0, &rs); + ath5k_debug_printrxbuf(bf, status == 0, &rs); } - spin_unlock_bh(&sc->rxbuflock); } void -- Bob Copeland %% www.bobcopeland.com -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
