From patchwork Thu Mar 26 00:05:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 25124 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 1C066DDDA5 for ; Thu, 26 Mar 2009 11:06:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755869AbZCZAF3 (ORCPT ); Wed, 25 Mar 2009 20:05:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753555AbZCZAF2 (ORCPT ); Wed, 25 Mar 2009 20:05:28 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:45582 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752699AbZCZAF1 (ORCPT ); Wed, 25 Mar 2009 20:05:27 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id C1A97C8D971; Wed, 25 Mar 2009 17:05:15 -0700 (PDT) Date: Wed, 25 Mar 2009 17:05:15 -0700 (PDT) Message-Id: <20090325.170515.175107737.davem@davemloft.net> To: adam_richter2004@yahoo.com Cc: netdev@vger.kernel.org, berkley@cs.wustl.edu Subject: Re: 2.6.29 forcedeth hang W/O NAPI enabled From: David Miller In-Reply-To: <774003.62326.qm@web57708.mail.re3.yahoo.com> References: <774003.62326.qm@web57708.mail.re3.yahoo.com> X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Adam Richter Date: Wed, 25 Mar 2009 16:24:47 -0700 (PDT) > When I can find some time, I plan to try to narrow the problem > with git bisect, but that may not be today. We're pretty sure we know exactly what commit causes this. Can you try playing with a patch Jarek P. just posted in the thread where this bug is being discussed? (Subject: Revert "gro: Fix legacy path napi_complete crash"): --- 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/net/core/dev.c b/net/core/dev.c index e3fe5c7..cf53c24 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2589,7 +2589,11 @@ static int process_backlog(struct napi_struct *napi, int quota) skb = __skb_dequeue(&queue->input_pkt_queue); if (!skb) { local_irq_enable(); - napi_complete(napi); + napi_gro_flush(napi); + local_irq_disable(); + if (skb_queue_empty(&queue->input_pkt_queue)) + __napi_complete(napi); + local_irq_enable(); goto out; } local_irq_enable();