Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755514AbXKXSV2 (ORCPT ); Sat, 24 Nov 2007 13:21:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753149AbXKXSVS (ORCPT ); Sat, 24 Nov 2007 13:21:18 -0500 Received: from waste.org ([66.93.16.53]:60361 "EHLO waste.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034AbXKXSVR (ORCPT ); Sat, 24 Nov 2007 13:21:17 -0500 Date: Sat, 24 Nov 2007 12:19:53 -0600 From: Matt Mackall To: Simon Arlott Cc: Andrew Morton , Linux Kernel Mailing List , netdev@vger.kernel.org, Ingo Molnar , Evgeniy Polyakov Subject: Re: 2.6.23 WARNING: at kernel/softirq.c:139 local_bh_enable() Message-ID: <20071124181953.GI17536@waste.org> References: <4745DCD7.8070805@simon.arlott.org.uk> <20071123002157.cb27f4a1.akpm@linux-foundation.org> <20071123105518.GA22062@2ka.mipt.ru> <20071123170756.GV19691@waste.org> <20071123175757.GA23991@2ka.mipt.ru> <20071123184851.GA14415@2ka.mipt.ru> <20071123185101.GA17582@2ka.mipt.ru> <20071123185906.GA23710@2ka.mipt.ru> <20071123191120.GA19691@waste.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071123191120.GA19691@waste.org> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1357 Lines: 51 Simon, can you test this patch? I think it's the most straightforward 2.6.24 fix. diff -r c60016ba6237 net/core/netpoll.c --- a/net/core/netpoll.c Tue Nov 13 09:09:36 2007 -0800 +++ b/net/core/netpoll.c Fri Nov 23 13:10:28 2007 -0600 @@ -203,6 +203,12 @@ static void refill_skbs(void) spin_unlock_irqrestore(&skb_pool.lock, flags); } +/* used to mark an skb as owned by netpoll */ +static void netpoll_skb_destroy(struct sk_buff *skb) +{ + return; +} + static void zap_completion_queue(void) { unsigned long flags; @@ -219,10 +225,12 @@ static void zap_completion_queue(void) while (clist != NULL) { struct sk_buff *skb = clist; clist = clist->next; - if (skb->destructor) + if (skb->destructor == netpoll_skb_destroy) { + skb->destructor = NULL; + __kfree_skb(skb); + } + else dev_kfree_skb_any(skb); /* put this one back */ - else - __kfree_skb(skb); } } @@ -252,6 +260,7 @@ repeat: atomic_set(&skb->users, 1); skb_reserve(skb, reserve); + skb->destructor = netpoll_skb_destroy; return skb; } -- Mathematics is the supreme nostalgia of our time. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/