Messages in this thread Patch in this message | | | Date | Fri, 23 Nov 2007 21:59:06 +0300 | From | Evgeniy Polyakov <> | Subject | Re: 2.6.23 WARNING: at kernel/softirq.c:139 local_bh_enable() |
| |
On Fri, Nov 23, 2007 at 09:51:01PM +0300, Evgeniy Polyakov (johnpol@2ka.mipt.ru) wrote: > On Fri, Nov 23, 2007 at 09:48:51PM +0300, Evgeniy Polyakov (johnpol@2ka.mipt.ru) wrote: > > Stop, we are trying to free skb without destructor and catch connection > > tracking, so it is not a solution. To fix the problem we need to check > > if it is not netfilter related, kind of this (not tested), Simon please > > give it a try: > > And to be really cool we need to bypass skbs with xfrm attached, since > its freeing also assumes BH context.
What about compile options?
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 758dafe..adb3c54 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -196,10 +196,25 @@ static void zap_completion_queue(void) while (clist != NULL) { struct sk_buff *skb = clist; clist = clist->next; - if (skb->destructor) + if (skb->destructor) { dev_kfree_skb_any(skb); /* put this one back */ - else - __kfree_skb(skb); + continue; + } + +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + if (skb->nfct || skb->nfct_reasm) { + dev_kfree_skb_any(skb); /* put this one back */ + continue; + } +#endif + +#ifdef CONFIG_XFRM + if (skb->sp) { + dev_kfree_skb_any(skb); /* put this one back */ + continue; + } +#endif + __kfree_skb(skb); } } -- Evgeniy Polyakov - 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/
| |