Skip to content

Commit bcce139

Browse files
Sean Andersongregkh
authored andcommitted
net: xilinx: axienet: Schedule NAPI in two steps
[ Upstream commit ba0da2d ] As advised by Documentation/networking/napi.rst, masking IRQs after calling napi_schedule can be racy. Avoid this by only masking/scheduling if napi_schedule_prep returns true. Fixes: 9e2bc26 ("net: axienet: Use NAPI for TX completion path") Fixes: cc37610 ("net: axienet: implement NAPI and GRO receive") Signed-off-by: Sean Anderson <sean.anderson@linux.dev> Reviewed-by: Shannon Nelson <shannon.nelson@amd.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20240913145711.2284295-1-sean.anderson@linux.dev Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 9360d07 commit bcce139

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,9 +1042,10 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
10421042
u32 cr = lp->tx_dma_cr;
10431043

10441044
cr &= ~(XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK);
1045-
axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
1046-
1047-
napi_schedule(&lp->napi_tx);
1045+
if (napi_schedule_prep(&lp->napi_tx)) {
1046+
axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
1047+
__napi_schedule(&lp->napi_tx);
1048+
}
10481049
}
10491050

10501051
return IRQ_HANDLED;
@@ -1086,9 +1087,10 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
10861087
u32 cr = lp->rx_dma_cr;
10871088

10881089
cr &= ~(XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK);
1089-
axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
1090-
1091-
napi_schedule(&lp->napi_rx);
1090+
if (napi_schedule_prep(&lp->napi_rx)) {
1091+
axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
1092+
__napi_schedule(&lp->napi_rx);
1093+
}
10921094
}
10931095

10941096
return IRQ_HANDLED;

0 commit comments

Comments
 (0)