Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb10a781 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by David S. Miller
Browse files

forcedeth: napi schedule lock fix 



This patch fixes a potential race condition between scheduling napi and
completing napi poll. The call to netif_rx_schedule should be under
protection of the lock (as is the completion), otherwise, interrupts
could be masked off.

Signed-off-by: default avatarAyaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b6725de

drivers/net/forcedeth.c

+2 −2
Original line number Diff line number Diff line
@@ -3405,10 +3405,10 @@ static irqreturn_t nv_nic_irq(int foo, void *data) 


#ifdef CONFIG_FORCEDETH_NAPI

		if (events & NVREG_IRQ_RX_ALL) {

			spin_lock(&np->lock);

			netif_rx_schedule(&np->napi);



			/* Disable furthur receive irq's */

			spin_lock(&np->lock);

			np->irqmask &= ~NVREG_IRQ_RX_ALL;



			if (np->msi_flags & NV_MSI_X_ENABLED)
@@ -3522,10 +3522,10 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) 


#ifdef CONFIG_FORCEDETH_NAPI

		if (events & NVREG_IRQ_RX_ALL) {

			spin_lock(&np->lock);

			netif_rx_schedule(&np->napi);



			/* Disable furthur receive irq's */

			spin_lock(&np->lock);

			np->irqmask &= ~NVREG_IRQ_RX_ALL;



			if (np->msi_flags & NV_MSI_X_ENABLED)