ath9k: fix possible hang on flush
PATCH 1/2 ath9k: fix possible hang on flush
If a flush is requested, make sure to clear the descriptor once we've processed it.
This resolves a hang that will occur if all RX descriptors are full when a flush is requested.
--- drivers/net/wireless/ath/ath9k/recv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/recv.c +2 -3
@@ -1113,14 +1113,13 @@ requeue_drop_frag: } requeue:list_add_tail (&bf->list, &sc->rx.rxbuf); -if (flush) -continue ;if (edma) {ath_rx_edma_buf_link (sc, qtype); }else {ath_rx_buf_relink (sc, bf); -ath9k_hw_rxena (ah); +if (!flush) +ath9k_hw_rxena (ah); } }while (1 );
Signature · 1 line
1.8.3.2
PATCH 1/2 ath9k: fix possible hang on flush
Quoted 33 lines · Tim Harvey
If a flush is requested, make sure to clear the descriptor once we've processed it.
This resolves a hang that will occur if all RX descriptors are full when a flush is requested.
Signed-off-by Tim Harvey <[email protected]>--- drivers/net/wireless/ath/ath9k/recv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/net/wireless/ath/ath9k/recv.c +2
-4@@ -1113,14 +1113,13 @@ requeue_drop_frag: } requeue:list_add_tail (&bf->list, &sc->rx.rxbuf); -if (flush) -continue ;if (edma) {ath_rx_edma_buf_link (sc, qtype); }else {ath_rx_buf_relink (sc, bf); -ath9k_hw_rxena (ah); +if (!flush) +ath9k_hw_rxena (ah); } }while (1 ); --
Quoted 2 lines
1.8.3.2
+cc ath9k-devel at lists.ath9k.org
Tim
PATCH 2/2 ath9k: add a recv budget
In reply to Tim HarveyImplement a recv budget so that in cases of high traffic we still allow other taskets to get processed.
Without this, we can encounter a host of issues during high wireless traffic reception depending on system load including rcu stall's detected (ARM), soft lockups, failure to service critical tasks such as watchdog resets, and triggering of the tx stuck tasklet.
The same thing was proposed previously by Ben:
http://www.spinics.net/lists/linux-wireless/msg112891.html
The only difference here is that I make sure only processed packets are counted in the budget by checking at the end of the rx loop.
--- drivers/net/wireless/ath/ath9k/recv.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/recv.c +4 -0
@@ -975,6 +975,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)u64 tsf =0 ;unsigned long flags;dma_addr_t new_buf_addr; +unsigned int budget =512 ;if (edma) dma_type =DMA_BIDIRECTIONAL ;
@@ -1121,6 +1122,9 @@ requeue:if (!flush)ath9k_hw_rxena (ah); } + +if (!budget--) +break ; }while (1 );if (!(ah->imask &ATH9K_INT_RXEOL )) {
Signature · 1 line
1.8.3.2
Re: [PATCH 2/2] ath9k: add a recv budget
Quoted 8 lines · Tim Harvey
Implement a recv budget so that in cases of high traffic we still allow other taskets to get processed.
Without this, we can encounter a host of issues during high wireless traffic reception depending on system load including rcu stall's detected (ARM), soft lockups, failure to service critical tasks such as watchdog resets, and triggering of the tx stuck tasklet.
Quoted 7 lines
The same thing was proposed previously by Ben:
http://www.spinics.net/lists/linux-wireless/msg112891.htmlThe only difference here is that I make sure only processed packets are counted in the budget by checking at the end of the rx loop.
Signed-off-by Tim Harvey <[email protected]>
For both patches:
PATCH 2/2 ath9k: add a recv budget
Quoted 12 lines · Felix Fietkau
Quoted 11 lines · Tim Harvey
Implement a recv budget so that in cases of high traffic we still allow other taskets to get processed.
Without this, we can encounter a host of issues during high wireless traffic reception depending on system load including rcu stall's detected (ARM), soft lockups, failure to service critical tasks such as watchdog resets, and triggering of the tx stuck tasklet.
The same thing was proposed previously by Ben:
http://www.spinics.net/lists/linux-wireless/msg112891.html
Quoted 7 lines
Quoted 4 lines
The only difference here is that I make sure only processed packets are counted in the budget by checking at the end of the rx loop.
Signed-off-by Tim Harvey <[email protected]>For both patches:
Acked-by Felix Fietkau <[email protected]>
+cc ath9k-devel at lists.ath9k.org
+cc Ben Greear
Any other ack's or comments on these? These address some fairly long-standing bugs.
Tim
PATCH 2/2 ath9k: add a recv budget
Quoted 24 lines · Tim Harvey
Quoted 19 lines · Felix Fietkau
Quoted 8 lines · Tim Harvey
Implement a recv budget so that in cases of high traffic we still allow other taskets to get processed.
Without this, we can encounter a host of issues during high wireless traffic reception depending on system load including rcu stall's detected (ARM), soft lockups, failure to service critical tasks such as watchdog resets, and triggering of the tx stuck tasklet.
Quoted 7 lines
The same thing was proposed previously by Ben:
http://www.spinics.net/lists/linux-wireless/msg112891.htmlThe only difference here is that I make sure only processed packets are counted in the budget by checking at the end of the rx loop.
Signed-off-by Tim Harvey <[email protected]>For both patches:
Acked-by Felix Fietkau <[email protected]>(quoted diff) +2
-0+cc ath9k-devel at lists.ath9k.org +cc Ben Greear
Quoted 2 lines
Any other ack's or comments on these? These address some fairly long-standing bugs.
No need for further ack's or comments, since the change has been picked up by John already.
- Felix
Re: [PATCH 2/2] ath9k: add a recv budget
In reply to Tim HarveyQuoted 7 lines · Tim Harvey
Implement a recv budget so that in cases of high traffic we still allow other taskets to get processed.
Without this, we can encounter a host of issues during high wireless traffic reception depending on system load including rcu stall's detected (ARM), soft lockups, failure to service critical tasks such as watchdog resets, and triggering of the tx stuck tasklet.
Are you also force rescheduling the Rx tasklet if you break?
You can definitely hit a race condition where you get RXEOL and RXDESC before you run the scheduled RX tasklet. In that instance you may not get any further interrupts until you re-poke the RX DMA engine. Adding a FIFO entry may be enough, but it certainly isn't enough (ie, no FIFOs) on pre-AR93xx chips.
(I've done the same thing in FreeBSD for the same reasons. It's .. delicate to get right.)
-a