[PATCH 0/8] Use SLAB_PANIC when creating critical slab cache

[PATCH 0/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

The following trivial patches update networking code to use the SLAB_PANIC
flag when creating a critical slab cache instead of doing localized calls
to panic().  This brings networking inline with other core kernel code.

 core/flow.c       |    5 +----
 core/skbuff.c     |    4 +---
 decnet/dn_route.c |    9 +++------
 ipv4/inetpeer.c   |    5 +----
 ipv4/ipmr.c       |    5 +----
 ipv6/ip6_fib.c    |    4 +---
 ipv6/route.c      |    9 +++------
 xfrm/xfrm_input.c |    4 +---
 8 files changed, 12 insertions(+), 33 deletions(-)

thanks,
-chris

[PATCH 1/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/core/flow.c 1.20 vs edited =====
--- 1.20/net/core/flow.c	2004-03-16 18:10:10 -08:00
+++ edited/net/core/flow.c	2004-10-29 14:22:54 -07:00
@@ -343,11 +343,8 @@ static int __init flow_cache_init(void)
 
 	flow_cachep = kmem_cache_create("flow_cache",
 					sizeof(struct flow_cache_entry),
-					0, SLAB_HWCACHE_ALIGN,
+					0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 					NULL, NULL);
-
-	if (!flow_cachep)
-		panic("NET: failed to allocate flow cache slab\n");
 
 	flow_hash_shift = 10;
 	flow_lwm = 2 * flow_hash_size;

[PATCH 2/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/core/skbuff.c 1.39 vs edited =====
--- 1.39/net/core/skbuff.c	2004-10-19 21:56:24 -07:00
+++ edited/net/core/skbuff.c	2004-10-29 14:23:43 -07:00
@@ -1430,10 +1430,8 @@ void __init skb_init(void)
 	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
 					      sizeof(struct sk_buff),
 					      0,
-					      SLAB_HWCACHE_ALIGN,
+					      SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 					      NULL, NULL);
-	if (!skbuff_head_cache)
-		panic("cannot create skbuff cache");
 }
 
 EXPORT_SYMBOL(___pskb_trim);

[PATCH 3/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/decnet/dn_route.c 1.29 vs edited =====
--- 1.29/net/decnet/dn_route.c	2004-11-09 16:44:25 -08:00
+++ edited/net/decnet/dn_route.c	2004-11-10 17:48:58 -08:00
@@ -1778,12 +1778,9 @@ void __init dn_route_init(void)
 	int i, goal, order;
 
 	dn_dst_ops.kmem_cachep = kmem_cache_create("dn_dst_cache",
-						   sizeof(struct dn_route),
-						   0, SLAB_HWCACHE_ALIGN,
-						   NULL, NULL);
-
-	if (!dn_dst_ops.kmem_cachep)
-		panic("DECnet: Failed to allocate dn_dst_cache\n");
+						  sizeof(struct dn_route), 0,
+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+						  NULL, NULL);
 
 	init_timer(&dn_route_timer);
 	dn_route_timer.function = dn_dst_check_expire;

[PATCH 4/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/ipv4/inetpeer.c 1.9 vs edited =====
--- 1.9/net/ipv4/inetpeer.c	2004-02-23 15:09:14 -08:00
+++ edited/net/ipv4/inetpeer.c	2004-10-29 14:17:33 -07:00
@@ -126,11 +126,8 @@ void __init inet_initpeers(void)
 
 	peer_cachep = kmem_cache_create("inet_peer_cache",
 			sizeof(struct inet_peer),
-			0, SLAB_HWCACHE_ALIGN,
+			0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 			NULL, NULL);
-
-	if (!peer_cachep)
-		panic("cannot create inet_peer_cache");
 
 	/* All the timers, started at system startup tend
 	   to synchronize. Perturb it a bit.

[PATCH 5/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/ipv4/ipmr.c 1.45 vs edited =====
--- 1.45/net/ipv4/ipmr.c	2004-07-20 14:55:34 -07:00
+++ edited/net/ipv4/ipmr.c	2004-10-29 14:11:57 -07:00
@@ -1885,11 +1885,8 @@ void __init ip_mr_init(void)
 {
 	mrt_cachep = kmem_cache_create("ip_mrt_cache",
 				       sizeof(struct mfc_cache),
-				       0, SLAB_HWCACHE_ALIGN,
+				       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 				       NULL, NULL);
-	if (!mrt_cachep)
-		panic("cannot allocate ip_mrt_cache");
-
 	init_timer(&ipmr_expire_timer);
 	ipmr_expire_timer.function=ipmr_expire_process;
 	register_netdevice_notifier(&ip_mr_notifier);

[PATCH 6/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/ipv6/ip6_fib.c 1.33 vs edited =====
--- 1.33/net/ipv6/ip6_fib.c	2004-11-09 22:57:03 -08:00
+++ edited/net/ipv6/ip6_fib.c	2004-11-14 11:56:01 -08:00
@@ -1242,10 +1242,8 @@ void __init fib6_init(void)
 {
 	fib6_node_kmem = kmem_cache_create("fib6_nodes",
 					   sizeof(struct fib6_node),
-					   0, SLAB_HWCACHE_ALIGN,
+					   0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 					   NULL, NULL);
-	if (!fib6_node_kmem)
-		panic("cannot create fib6_nodes cache");
 }
 
 void __exit fib6_gc_cleanup(void)

[PATCH 7/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/ipv6/route.c 1.101 vs edited =====
--- 1.101/net/ipv6/route.c	2004-11-11 15:07:25 -08:00
+++ edited/net/ipv6/route.c	2004-11-14 11:56:41 -08:00
@@ -2069,12 +2069,9 @@ void __init ip6_route_init(void)
 	struct proc_dir_entry *p;
 
 	ip6_dst_ops.kmem_cachep = kmem_cache_create("ip6_dst_cache",
-						     sizeof(struct rt6_info),
-						     0, SLAB_HWCACHE_ALIGN,
-						     NULL, NULL);
-	if (!ip6_dst_ops.kmem_cachep)
-		panic("cannot create ip6_dst_cache");
-
+						  sizeof(struct rt6_info), 0,
+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+						  NULL, NULL);
 	fib6_init();
 #ifdef 	CONFIG_PROC_FS
 	p = proc_net_create("ipv6_route", 0, rt6_proc_info);

[PATCH 8/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

Use SLAB_PANIC when creating a critical slab cache.

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== net/xfrm/xfrm_input.c 1.13 vs edited =====
--- 1.13/net/xfrm/xfrm_input.c	2003-07-27 19:22:27 -07:00
+++ edited/net/xfrm/xfrm_input.c	2004-10-29 14:57:20 -07:00
@@ -78,8 +78,6 @@ void __init xfrm_input_init(void)
 {
 	secpath_cachep = kmem_cache_create("secpath_cache",
 					   sizeof(struct sec_path),
-					   0, SLAB_HWCACHE_ALIGN,
+					   0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
 					   NULL, NULL);
-	if (!secpath_cachep)
-		panic("XFRM: failed to allocate secpath_cache\n");
 }

Re: [PATCH 6/8] Use SLAB_PANIC when creating critical slab cache

[Arnaldo Carvalho de Melo]

Chris,

	I think somebody proposed this in the past and it was refused
because we better get rid of the panics and return an error, propagate
it and refuse to load the module, better have the machine still alive
but without networking than panic it.

- Arnaldo

Chris Wright wrote:
> Use SLAB_PANIC when creating a critical slab cache.
> 
> Signed-off-by: Chris Wright <chrisw@osdl.org>
> 
> ===== net/ipv6/ip6_fib.c 1.33 vs edited =====
> --- 1.33/net/ipv6/ip6_fib.c	2004-11-09 22:57:03 -08:00
> +++ edited/net/ipv6/ip6_fib.c	2004-11-14 11:56:01 -08:00
> @@ -1242,10 +1242,8 @@ void __init fib6_init(void)
>  {
>  	fib6_node_kmem = kmem_cache_create("fib6_nodes",
>  					   sizeof(struct fib6_node),
> -					   0, SLAB_HWCACHE_ALIGN,
> +					   0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
>  					   NULL, NULL);
> -	if (!fib6_node_kmem)
> -		panic("cannot create fib6_nodes cache");
>  }
>  
>  void __exit fib6_gc_cleanup(void)
> 
> 

Re: [PATCH 6/8] Use SLAB_PANIC when creating critical slab cache

[Chris Wright]

* Arnaldo Carvalho de Melo (acme@conectiva.com.br) wrote:
> Chris,
> 
> 	I think somebody proposed this in the past and it was refused
> because we better get rid of the panics and return an error, propagate
> it and refuse to load the module, better have the machine still alive
> but without networking than panic it.

Sounds good too.  Part of my thinking was that these patches would be a
good chance to review if these are necessarily panic conditions.  What was
the plan on error return, since I expect some caches are interdependent?

thanks,
-chris

Re: [PATCH 0/8] Use SLAB_PANIC when creating critical slab cache

[Christoph Hellwig]

On Sun, Nov 14, 2004 at 12:18:37PM -0800, Chris Wright wrote:
> The following trivial patches update networking code to use the SLAB_PANIC
> flag when creating a critical slab cache instead of doing localized calls
> to panic().  This brings networking inline with other core kernel code.
> 
>  core/flow.c       |    5 +----
>  core/skbuff.c     |    4 +---
>  decnet/dn_route.c |    9 +++------
>  ipv4/inetpeer.c   |    5 +----
>  ipv4/ipmr.c       |    5 +----
>  ipv6/ip6_fib.c    |    4 +---
>  ipv6/route.c      |    9 +++------
>  xfrm/xfrm_input.c |    4 +---

decnet, ipv6 and xfrm can be modular, so using SLAB_PANIC there is bogus.

Re: [PATCH 6/8] Use SLAB_PANIC when creating critical slab cache

[Arnaldo Carvalho de Melo]

Chris Wright wrote:
> * Arnaldo Carvalho de Melo (acme@conectiva.com.br) wrote:
> 
>>Chris,
>>
>>	I think somebody proposed this in the past and it was refused
>>because we better get rid of the panics and return an error, propagate
>>it and refuse to load the module, better have the machine still alive
>>but without networking than panic it.
> 
> 
> Sounds good too.  Part of my thinking was that these patches would be a
> good chance to review if these are necessarily panic conditions.  What was
> the plan on error return, since I expect some caches are interdependent?

I lost track, perhaps we should push this to the janitor mailing list?

:-)

- Arnaldo