Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs

Browse Source 
Currently the driver uses local_bh_disable()/local_bh_enable() in its
IRQ handler to avoid triggering net_rx_action() softirq on exit from
netif_rx(). The net_rx_action() could trigger this driver .start_xmit
callback, which is protected by the same lock as the IRQ handler, so
calling the .start_xmit from netif_rx() from the IRQ handler critical
section protected by the lock could lead to an attempt to claim the
already claimed lock, and a hang.

The local_bh_disable()/local_bh_enable() approach works only in case
the IRQ handler is protected by a spinlock, but does not work if the
IRQ handler is protected by mutex, i.e. this works for KS8851 with
Parallel bus interface, but not for KS8851 with SPI bus interface.

Remove the BH manipulation and instead of calling netif_rx() inside
the IRQ handler code protected by the lock, queue all the received
SKBs in the IRQ handler into a queue first, and once the IRQ handler
exits the critical section protected by the lock, dequeue all the
queued SKBs and push them all into netif_rx(). At this point, it is
safe to trigger the net_rx_action() softirq, since the netif_rx()
call is outside of the lock that protects the IRQ handler.

Fixes: be0384bf59 ("net: ks8851: Handle softirqs at the end of IRQ thread to fix hang")
Tested-by: Ronald Wahl <ronald.wahl@raritan.com> # KS8851 SPI
Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240502183436.117117-1-marex@denx.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Marek Vasut 2024-05-02 20:32:59 +02:00 committed by Jakub Kicinski
parent f2db7230f7
commit e0863634bf
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/micrel/ks8851_common.c
View File

@ -234,12 +234,13 @@ static void ks8851_dbg_dumpkkt(struct ks8851_net *ks, u8 *rxpkt)
/** /**
* ks8851_rx_pkts - receive packets from the host * ks8851_rx_pkts - receive packets from the host
* @ks: The device information. * @ks: The device information.
* @rxq: Queue of packets received in this function.
* *
* This is called from the IRQ work queue when the system detects that there * This is called from the IRQ work queue when the system detects that there
* are packets in the receive queue. Find out how many packets there are and * are packets in the receive queue. Find out how many packets there are and
* read them from the FIFO. * read them from the FIFO.
*/ */
static void ks8851_rx_pkts(struct ks8851_net *ks) static void ks8851_rx_pkts(struct ks8851_net *ks, struct sk_buff_head *rxq)
{ {
struct sk_buff *skb; struct sk_buff *skb;
unsigned rxfc; unsigned rxfc;
@ -299,7 +300,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
ks8851_dbg_dumpkkt(ks, rxpkt); ks8851_dbg_dumpkkt(ks, rxpkt);
skb->protocol = eth_type_trans(skb, ks->netdev); skb->protocol = eth_type_trans(skb, ks->netdev);
__netif_rx(skb); __skb_queue_tail(rxq, skb);
ks->netdev->stats.rx_packets++; ks->netdev->stats.rx_packets++;
ks->netdev->stats.rx_bytes += rxlen; ks->netdev->stats.rx_bytes += rxlen;
@ -326,11 +327,11 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
static irqreturn_t ks8851_irq(int irq, void *_ks) static irqreturn_t ks8851_irq(int irq, void *_ks)
{ {
struct ks8851_net *ks = _ks; struct ks8851_net *ks = _ks;
struct sk_buff_head rxq;
unsigned handled = 0; unsigned handled = 0;
unsigned long flags; unsigned long flags;
unsigned int status; unsigned int status;
struct sk_buff *skb;
local_bh_disable();
ks8851_lock(ks, &flags); ks8851_lock(ks, &flags);
@ -384,7 +385,8 @@ static irqreturn_t ks8851_irq(int irq, void *_ks)
* from the device so do not bother masking just the RX * from the device so do not bother masking just the RX
* from the device. */ * from the device. */
ks8851_rx_pkts(ks); __skb_queue_head_init(&rxq);
ks8851_rx_pkts(ks, &rxq);
} }
/* if something stopped the rx process, probably due to wanting /* if something stopped the rx process, probably due to wanting
@ -408,7 +410,9 @@ static irqreturn_t ks8851_irq(int irq, void *_ks)
if (status & IRQ_LCI) if (status & IRQ_LCI)
mii_check_link(&ks->mii); mii_check_link(&ks->mii);
local_bh_enable(); if (status & IRQ_RXI)
while ((skb = __skb_dequeue(&rxq)))
netif_rx(skb);
return IRQ_HANDLED; return IRQ_HANDLED;
} }