skbuff: create skb_panic() to let caller specify panic
Subsystems (2)
PATCH v2 1/1 skbuff: create skb_panic() to let caller specify panic
Combine skb_over_panic() and skb_under_panic() into skb_panic() and let the caller specify whether it is skb_over_panic or skb_under_panic.
In skb_panic() definition, change 'int sz' and 'here' to 'unsigned int size' and 'addr' for clarity, and accommodate the output message. Rewrite kernel doc for skb_panic().
---
v2: don't split format over multiple lines as advised by Joe Perches.
net/core/skbuff.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-)
net/core/skbuff.c +15 -34
@@ -104,48 +104,27 @@ static const struct pipe_buf_operations sock_pipe_buf_ops = { .get = sock_pipe_buf_get, }; -/* -* Keep out-of-line to prevent kernel bloat. -* __builtin_return_address is not used because it is not always -* reliable. -*/ -/** -* skb_over_panic - private function -* @skb: buffer -* @sz: size -* @here: address +* skb_panic - private function for out-of-line support +* @skb: buffer +* @size: size +* @addr: address +* @panic: skb_over_panic or skb_under_panic * -* Out of line support code for skb_put(). Not user callable. -*/ -static void skb_over_panic (struct sk_buff *skb,int sz,void *here) -{ -pr_emerg ("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n" , - __func__, here, skb->len, sz, skb->head, skb->data, - (unsigned long )skb->tail, (unsigned long )skb->end, - skb->dev ? skb->dev->name :"<NULL>" ); -BUG (); -} - -/** -* skb_under_panic - private function -* @skb: buffer -* @sz: size -* @here: address -* -* Out of line support code for skb_push(). Not user callable. +* Out-of-line support for skb_put() and skb_push(). Not user callable. +* Keep out-of-line to prevent kernel bloat. +* __builtin_return_address is not used because it is not always reliable. */ - -static void skb_under_panic (struct sk_buff *skb,int sz,void *here) +static void skb_panic (struct sk_buff *skb,unsigned int size,void *addr, +const char panic[]) {pr_emerg ("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n" , - __func__, here, skb->len, sz, skb->head, skb->data, + panic, addr, skb->len, size, skb->head, skb->data, (unsigned long )skb->tail, (unsigned long )skb->end, skb->dev ? skb->dev->name :"<NULL>" );BUG (); } -/* * kmalloc_reserve is a wrapper around kmalloc_node_track_caller that tells * the caller if emergency pfmemalloc reserves are being used. If it is and
@@ -1259,12 +1238,13 @@ EXPORT_SYMBOL(skb_pad);*/ unsigned char *skb_put (struct sk_buff *skb,unsigned int len) { +const char panic[] ="skb_over_panic" ;unsigned char *tmp =skb_tail_pointer (skb);SKB_LINEAR_ASSERT (skb); skb->tail += len; skb->len += len;if (unlikely (skb->tail > skb->end)) -skb_over_panic (skb, len,__builtin_return_address (0 )); +skb_panic (skb, len,__builtin_return_address (0 ), panic);return tmp; }EXPORT_SYMBOL (skb_put);
@@ -1280,10 +1260,11 @@ EXPORT_SYMBOL(skb_put);*/ unsigned char *skb_push (struct sk_buff *skb,unsigned int len) { +const char panic[] ="skb_under_panic" ; skb->data -= len; skb->len += len;if (unlikely (skb->data<skb->head)) -skb_under_panic (skb, len,__builtin_return_address (0 )); +skb_panic (skb, len,__builtin_return_address (0 ), panic);return skb->data; }EXPORT_SYMBOL (skb_push);
Quoted 79 lines · Sun, Feb 10, 2013 at 09:23:30AM CET, [email protected] wrote:
Combine
skb_over_panic()andskb_under_panic()intoskb_panic()and let the caller specify whether it isskb_over_panicorskb_under_panic.In
skb_panic()definition, change 'int sz' and 'here' to 'unsigned int size' and 'addr' for clarity, and accommodate the output message. Rewrite kernel doc forskb_panic().Signed-off-by Jean Sacren <[email protected]>---
v2: don't split format over multiple lines as advised by Joe Perches.
net/core/skbuff.c| 49 +++++++++++++++----------------------------------1 file changed, 15 insertions(+), 34 deletions(-)net/core/skbuff.c +11
-32@@ -104,48 +104,27 @@ static const struct pipe_buf_operations sock_pipe_buf_ops = { .get = sock_pipe_buf_get, }; -/* -* Keep out-of-line to prevent kernel bloat. -* __builtin_return_address is not used because it is not always -* reliable. -*/ -/** -* skb_over_panic - private function -* @skb: buffer -* @sz: size -* @here: address +* skb_panic - private function for out-of-line support +* @skb: buffer +* @size: size +* @addr: address +* @panic: skb_over_panic or skb_under_panic * -* Out of line support code for skb_put(). Not user callable. -*/ -static void skb_over_panic (struct sk_buff *skb,int sz,void *here) -{ -pr_emerg ("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n" , - __func__, here, skb->len, sz, skb->head, skb->data, - (unsigned long )skb->tail, (unsigned long )skb->end, - skb->dev ? skb->dev->name :"<NULL>" ); -BUG (); -} - -/** -* skb_under_panic - private function -* @skb: buffer -* @sz: size -* @here: address -* -* Out of line support code for skb_push(). Not user callable. +* Out-of-line support for skb_put() and skb_push(). Not user callable. +* Keep out-of-line to prevent kernel bloat. +* __builtin_return_address is not used because it is not always reliable. */ - -static void skb_under_panic (struct sk_buff *skb,int sz,void *here) +static void skb_panic (struct sk_buff *skb,unsigned int size,void *addr, +const char panic[]) {pr_emerg ("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n" , - __func__, here, skb->len, sz, skb->head, skb->data, + panic, addr, skb->len, size, skb->head, skb->data, (unsigned long )skb->tail, (unsigned long )skb->end, skb->dev ? skb->dev->name :"<NULL>" );BUG (); } -/* * kmalloc_reserve is a wrapper around kmalloc_node_track_caller that tells * the caller if emergency pfmemalloc reserves are being used. If it is and
net/core/skbuff.c EXPORT_SYMBOL(skb_pad); · line 1241
Quoted 4 lines
net/core/skbuff.c +1
-0@@ -1259,12 +1238,13 @@ EXPORT_SYMBOL(skb_pad);*/ unsigned char *skb_put (struct sk_buff *skb,unsigned int len) { +const char panic[] ="skb_over_panic" ;
How about to leave skb_under_panic() and skb_over_panic() wrapping functions there just to wrap "skb_panic(skb, sz, addr, __func__);" call?
Seems nice that to state the name in str...
Quoted 27 lines
net/core/skbuff.c +3
-3unsigned char *tmp =skb_tail_pointer (skb);SKB_LINEAR_ASSERT (skb); skb->tail += len; skb->len += len;if (unlikely (skb->tail > skb->end)) -skb_over_panic (skb, len,__builtin_return_address (0 )); +skb_panic (skb, len,__builtin_return_address (0 ), panic);return tmp; }EXPORT_SYMBOL (skb_put);@@ -1280,10 +1260,11 @@ EXPORT_SYMBOL(skb_put);*/ unsigned char *skb_push (struct sk_buff *skb,unsigned int len) { +const char panic[] ="skb_under_panic" ; skb->data -= len; skb->len += len;if (unlikely (skb->data<skb->head)) -skb_under_panic (skb, len,__builtin_return_address (0 )); +skb_panic (skb, len,__builtin_return_address (0 ), panic);return skb->data; }EXPORT_SYMBOL (skb_push); --To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Pirko <[email protected]>
Date: Sun, 10 Feb 2013 19:24:51 +0100
Quoted 5 lines
How about to leave
skb_under_panic()andskb_over_panic()wrapping functions there just to wrap "skb_panic(skb, sz, addr, __func__);" call?Seems nice that to state the name in str...
That's really a good idea. If David drops again, I'll implement it.
Thanks a lot,
Signature · 1 line
Jean Sacren
David Miller
maintainerFrom: Jean Sacren <[email protected]>
Date: Sun, 10 Feb 2013 16:46:52 -0700
Quoted 9 lines
From: Jiri Pirko <[email protected]>
Date: Sun, 10 Feb 2013 19:24:51 +0100Quoted 5 lines
How about to leave
skb_under_panic()andskb_over_panic()wrapping functions there just to wrap "skb_panic(skb, sz, addr, __func__);" call?Seems nice that to state the name in str...
That's really a good idea. If David drops again, I'll implement it.
I like Jiri's idea, please implement it.