From patchwork Tue Jun 8 07:13:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Figo.zhang" X-Patchwork-Id: 54942 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 428CCB7D69 for ; Tue, 8 Jun 2010 17:16:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754146Ab0FHHQm (ORCPT ); Tue, 8 Jun 2010 03:16:42 -0400 Received: from [61.172.199.14] ([61.172.199.14]:64091 "EHLO LC-SHMAIL-01.SHANGHAI.LEADCORETECH.COM" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752979Ab0FHHQl (ORCPT ); Tue, 8 Jun 2010 03:16:41 -0400 Received: from [172.28.8.82] ([172.28.8.82]) by LC-SHMAIL-01.SHANGHAI.LEADCORETECH.COM with Microsoft SMTPSVC(6.0.3790.4675); Tue, 8 Jun 2010 15:16:32 +0800 Subject: [PATCH v2] net8139: fix a race at the end of NAPI From: "Figo.zhang" To: "David S. Miller" Cc: netdev In-Reply-To: <1275979719.1927.4.camel@myhost> References: <1275979719.1927.4.camel@myhost> Date: Tue, 08 Jun 2010 15:13:22 +0800 Message-ID: <1275981202.1927.6.camel@myhost> Mime-Version: 1.0 X-Mailer: Evolution 2.30.1.2 X-OriginalArrivalTime: 08 Jun 2010 07:16:32.0376 (UTC) FILETIME=[8591E780:01CB06DA] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix a race at the end of NAPI complete processing, it had better do __napi_complete() first before re-enable interrupt. in v2, i motify it using vim. Signed-off-by:Figo.zhang --- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 9c14975..284a5f4 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -598,8 +598,8 @@ rx_next: goto rx_status_loop; spin_lock_irqsave(&cp->lock, flags); - cpw16_f(IntrMask, cp_intr_mask); __napi_complete(napi); + cpw16_f(IntrMask, cp_intr_mask); spin_unlock_irqrestore(&cp->lock, flags); } diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 4ba7293..a7bca8c 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -2088,8 +2088,8 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) * again when we think we are done. */ spin_lock_irqsave(&tp->lock, flags); - RTL_W16_F(IntrMask, rtl8139_intr_mask); __napi_complete(napi); + RTL_W16_F(IntrMask, rtl8139_intr_mask); spin_unlock_irqrestore(&tp->lock, flags); } spin_unlock(&tp->rx_lock);