OSDN Git Service

net: axienet: Fix race condition causing TX hang
authorRobert Hancock <hancock@sedsystems.ca>
Thu, 6 Jun 2019 22:28:17 +0000 (16:28 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2019 07:34:45 +0000 (09:34 +0200)
commit3746962349336219f3678ec403dee108df3ea995
treef140ead8e5e002905ba50aa676f934a20cbe9eaf
parentb5133a8463acbba4aad7d90d8dcb39110d67cc7a
net: axienet: Fix race condition causing TX hang

[ Upstream commit 7de44285c1f69ccfbe8be1d6a16fcd956681fee6 ]

It is possible that the interrupt handler fires and frees up space in
the TX ring in between checking for sufficient TX ring space and
stopping the TX queue in axienet_start_xmit. If this happens, the
queue wake from the interrupt handler will occur before the queue is
stopped, causing a lost wakeup and the adapter's transmit hanging.

To avoid this, after stopping the queue, check again whether there is
sufficient space in the TX ring. If so, wake up the queue again.

Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/xilinx/xilinx_axienet_main.c