[PATCH] 8139too NAPI for net-drivers-2.5-exp

Jeff Garzik <jgarzik@pobox.com> writes:

> Stephen Hemminger wrote:
> > Here is the 8139too version in net-drivers-2.5-exp modified for NAPI.
> > Also:
> > 	64k receive ring - has to handle wrap for that case;
> > 	   the NoWrap flag does nothing if using this big ring.
> > 	assert() -> BUG_ON()
> >
> > To deal with the races with tx_timeout, put back in the rx_lock from earlier versions.

> +		local_irq_disable();
> +		netif_rx_complete(dev);
> +		RTL_W16_F(IntrMask, rtl8139_intr_mask);
> +		local_irq_enable();

Probably, by my mistake in previous mail. Sorry.  This still has the
races condition. It can trigger the same problem by shared interrupt
on SMP.

Probably the following ISR style should use the below combination.

   in ISR
	if (netif_rx_schedule_prep(dev)) {
		RTL_W16 (IntrMask, rtl8139_norx_intr_mask);
		__netif_rx_schedule(dev);
	}

   in ->poll
	local_irq_disable();
	RTL_W16_F(IntrMask, rtl8139_intr_mask);
	__netif_rx_complete(dev);
	local_irq_enable();


And another one should use the below combination.  (this style can
change the flags of __LINK_STATE_RX_SCHED or __LINK_STATE_START anytime)

   in ISR
	if (status & RxAckBits) {
		RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
		netif_rx_schedule (dev);
	}

   in ->poll
	local_irq_disable();
	__netif_rx_complete(dev);
	RTL_W16_F(IntrMask, rtl8139_intr_mask);
	local_irq_enable();

   If happen the shared interrupt, the this ISR style may lose a
   chance of netif_rx_schedule().


Anyway, the following patch should fix the problem. Please apply.

Thanks.
--
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

 drivers/net/8139too.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

drivers/net/8139too.c

@@ -2112,8 +2112,8 @@ static int rtl8139_poll(struct net_device *dev, int *budget)
 		 * again when we think we are done.
 		 */
 		local_irq_disable();
-		netif_rx_complete(dev);
 		RTL_W16_F(IntrMask, rtl8139_intr_mask);
+		__netif_rx_complete(dev);
 		local_irq_enable();
 	}
 	spin_unlock(&tp->rx_lock);