hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcmfmac: block the correct flowring when backup queue overflow 

brcmf_flowring_block blocks the last active flowring under the same
interface instead of the one provided by caller. This could lead to a
dead lock of netif stop if there are more than one flowring under the
interface and the traffic is high enough so brcmf_flowring_enqueue can
not unblock the ring right away.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Franky Lin 2015-08-20 22:06:06 +02:00 committed by Kalle Valo
parent 39504a2d21
commit b02bf1932a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/brcm80211/brcmfmac/flowring.c
View File

@ -194,11 +194,15 @@ static void brcmf_flowring_block(struct brcmf_flowring *flow, u8 flowid,
spin_lock_irqsave(&flow->block_lock, flags); spin_lock_irqsave(&flow->block_lock, flags);
ring = flow->rings[flowid]; ring = flow->rings[flowid];
if (ring->blocked == blocked) {
spin_unlock_irqrestore(&flow->block_lock, flags);
return;
}
ifidx = brcmf_flowring_ifidx_get(flow, flowid); ifidx = brcmf_flowring_ifidx_get(flow, flowid);
currently_blocked = false; currently_blocked = false;
for (i = 0; i < flow->nrofrings; i++) { for (i = 0; i < flow->nrofrings; i++) {
if (flow->rings[i]) { if ((flow->rings[i]) && (i != flowid)) {
ring = flow->rings[i]; ring = flow->rings[i];
if ((ring->status == RING_OPEN) && if ((ring->status == RING_OPEN) &&
(brcmf_flowring_ifidx_get(flow, i) == ifidx)) { (brcmf_flowring_ifidx_get(flow, i) == ifidx)) {
@ -209,8 +213,8 @@ static void brcmf_flowring_block(struct brcmf_flowring *flow, u8 flowid,
} }
} }
} }
ring->blocked = blocked; flow->rings[flowid]->blocked = blocked;
if (currently_blocked == blocked) { if (currently_blocked) {
spin_unlock_irqrestore(&flow->block_lock, flags); spin_unlock_irqrestore(&flow->block_lock, flags);
return; return;
} }