Re: crash in death_by_timeout()

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]

BORBELY Zoltan wrote:
> Hi,
> 
> On Tue, Nov 18, 2008 at 02:27:44PM +0100, Patrick McHardy wrote:
>> Could you try whether this patch fixes the problem?
>>
> We didn't see any kernel crashes during a half day heavy work (without the
> patch the kernel crashed in 3-4 hours every time), but we found a lot of
> BUG messages in the log (maybe for every new entry):
> 
>     Nov 24 14:45:43 test kernel: BUG: sleeping function called from invalid context at mm/slab.c:3043
>     Nov 24 14:45:43 test kernel: in_atomic():1, irqs_disabled():0
>     Nov 24 14:45:43 test kernel: 3 locks held by test/3586:
>     Nov 24 14:45:43 test kernel:  #0:  (nfnl_mutex){--..}, at: [<d081500f>] nfnetlink_rcv+0xf/0x30 [nfnetlink]
>     Nov 24 14:45:43 test kernel:  #1:  (nf_conntrack_lock){-+..}, at: [<d08c979f>] ctnetlink_new_conntrack+0x7f/0x770 [nf_conntrack_netlink]
>     Nov 24 14:45:43 test kernel:  #2:  (rcu_read_lock){..--}, at: [<d08c98ee>] ctnetlink_new_conntrack+0x1ce/0x770 [nf_conntrack_netlink]

Crap, I missed a spot. Does this patch help?



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 425 bytes --]

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 3b009a3..5f4a651 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1138,7 +1138,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
 		}
 	}
 
-	nf_ct_acct_ext_add(ct, GFP_KERNEL);
+	nf_ct_acct_ext_add(ct, GFP_ATOMIC);
 
 #if defined(CONFIG_NF_CONNTRACK_MARK)
 	if (cda[CTA_MARK])