Re: 2.6.15-rt21, BUG at net/ipv4/netfilter/ip_conntrack_core.c:124

[Fernando Lopez-Lezcano]

On Sun, 2006-03-26 at 18:34 +0200, Ingo Molnar wrote:
> * Ingo Molnar <mingo@xxxxxxx> wrote:
> 
> > > Mar 23 15:22:48 host kernel: BUG at
> > > net/ipv4/netfilter/ip_conntrack_core.c:124!
> > 
> > does the patch below help?
> 
> updated patch below.

Thanks! I'll test later today. It may take a while to be reasonably sure
whether it makes a difference. The hangs have not been frequent. 

If I try a 2.6.16 based kernel, should I also use this patch?
-- Fernando


> Index: linux/include/linux/netfilter_ipv4/ip_conntrack.h
> ===================================================================
> --- linux.orig/include/linux/netfilter_ipv4/ip_conntrack.h
> +++ linux/include/linux/netfilter_ipv4/ip_conntrack.h
> @@ -336,7 +336,8 @@ ip_conntrack_expect_unregister_notifier(
>  }
>  
>  extern void ip_ct_deliver_cached_events(const struct ip_conntrack *ct);
> -extern void __ip_ct_event_cache_init(struct ip_conntrack *ct);
> +extern void __ip_ct_event_cache_init(struct ip_conntrack_ecache *ecache,
> +				     struct ip_conntrack *ct);
>  
>  static inline void 
>  ip_conntrack_event_cache(enum ip_conntrack_events event,
> @@ -349,7 +350,7 @@ ip_conntrack_event_cache(enum ip_conntra
>  	local_bh_disable();
>  	ecache = &get_cpu_var_locked(ip_conntrack_ecache, &cpu);
>  	if (ct != ecache->ct)
> -		__ip_ct_event_cache_init(ct);
> +		__ip_ct_event_cache_init(ecache, ct);
>  	ecache->events |= event;
>  	put_cpu_var_locked(ip_conntrack_ecache, cpu);
>  	local_bh_enable();
> Index: linux/net/ipv4/netfilter/arp_tables.c
> ===================================================================
> --- linux.orig/net/ipv4/netfilter/arp_tables.c
> +++ linux/net/ipv4/netfilter/arp_tables.c
> @@ -248,7 +248,7 @@ unsigned int arpt_do_table(struct sk_buf
>  	outdev = out ? out->name : nulldevname;
>  
>  	read_lock_bh(&table->lock);
> -	table_base = (void *)private->entries[smp_processor_id()];
> +	table_base = (void *)private->entries[raw_smp_processor_id()];
>  	e = get_entry(table_base, private->hook_entry[hook]);
>  	back = get_entry(table_base, private->underflow[hook]);
>  
> @@ -948,7 +948,7 @@ static int do_add_counters(void __user *
>  
>  	i = 0;
>  	/* Choose the copy that is on our node */
> -	loc_cpu_entry = private->entries[smp_processor_id()];
> +	loc_cpu_entry = private->entries[raw_smp_processor_id()];
>  	ARPT_ENTRY_ITERATE(loc_cpu_entry,
>  			   private->size,
>  			   add_counter_to_entry,
> Index: linux/net/ipv4/netfilter/ip_conntrack_core.c
> ===================================================================
> --- linux.orig/net/ipv4/netfilter/ip_conntrack_core.c
> +++ linux/net/ipv4/netfilter/ip_conntrack_core.c
> @@ -114,13 +114,10 @@ void ip_ct_deliver_cached_events(const s
>  	local_bh_enable();
>  }
>  
> -void __ip_ct_event_cache_init(struct ip_conntrack *ct)
> +void __ip_ct_event_cache_init(struct ip_conntrack_ecache *ecache,
> +			      struct ip_conntrack *ct)
>  {
> -	struct ip_conntrack_ecache *ecache;
> -	int cpu = raw_smp_processor_id();
> -
>  	/* take care of delivering potentially old events */
> -	ecache = &__get_cpu_var_locked(ip_conntrack_ecache, cpu);
>  	BUG_ON(ecache->ct == ct);
>  	if (ecache->ct)
>  		__ip_ct_deliver_cached_events(ecache);
> Index: linux/net/ipv4/netfilter/ip_tables.c
> ===================================================================
> --- linux.orig/net/ipv4/netfilter/ip_tables.c
> +++ linux/net/ipv4/netfilter/ip_tables.c
> @@ -246,7 +246,7 @@ ipt_do_table(struct sk_buff **pskb,
>  
>  	read_lock_bh(&table->lock);
>  	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
> -	table_base = (void *)private->entries[smp_processor_id()];
> +	table_base = (void *)private->entries[raw_smp_processor_id()];
>  	e = get_entry(table_base, private->hook_entry[hook]);
>  
>  	/* For return from builtin chain */


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/