[PATCH 1/7] [NET]: uninline skb_put, de-bloats a lot

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andrew Morton <akpm@...>, David Miller <davem@...>, <netdev@...>, <linux-kernel@...>
Cc: Arnaldo Carvalho de Melo <acme@...>, Ilpo J <ilpo.jarvinen@...>
Date: Thursday, March 27, 2008 - 8:38 am

Allyesconfig (v2.6.24-mm1):

~500 files changed
...
 869 funcs, 198 +, 111003 -, diff: -110805 --- skb_put
  skb_put                       | +104

Without number of debug related CONFIGs (v2.6.25-rc2-mm1):

-60744  855 funcs, 861 +, 61605 -, diff: -60744 --- skb_put
  skb_put                       |  +57

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 include/linux/skbuff.h |   21 +--------------------
 net/core/skbuff.c      |   21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7beb239..f085955 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -892,6 +892,7 @@ static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset)
 /*
  *	Add data to an sk_buff
  */
+extern unsigned char *skb_put(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
 {
 	unsigned char *tmp = skb_tail_pointer(skb);
@@ -901,26 +902,6 @@ static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
 	return tmp;
 }
 
-/**
- *	skb_put - add data to a buffer
- *	@skb: buffer to use
- *	@len: amount of data to add
- *
- *	This function extends the used data area of the buffer. If this would
- *	exceed the total buffer size the kernel will panic. A pointer to the
- *	first byte of the extra data is returned.
- */
-static inline unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
-{
-	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, current_text_addr());
-	return tmp;
-}
-
 static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
 {
 	skb->data -= len;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0d0fd28..3402eca 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -857,6 +857,27 @@ free_skb:
 	return err;
 }
 
+/**
+ *	skb_put - add data to a buffer
+ *	@skb: buffer to use
+ *	@len: amount of data to add
+ *
+ *	This function extends the used data area of the buffer. If this would
+ *	exceed the total buffer size the kernel will panic. A pointer to the
+ *	first byte of the extra data is returned.
+ */
+unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
+{
+	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));
+	return tmp;
+}
+EXPORT_SYMBOL(skb_put);
+
 /* Trims skb to length len. It can change skb pointers.
  */
 
-- 
1.5.2.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/7] [NET]: uninline skb_put, de-bloats a lot, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
Re: [PATCH 1/7] [NET]: uninline skb_put, de-bloats a lot, Ilpo Järvinen, (Fri Mar 28, 3:56 pm)
[PATCH 2/7] [NET]: uninline skb_pull, de-bloats a lot, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
[PATCH 3/7] [NET]: uninline dev_alloc_skb, de-bloats a lot, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
Re: [PATCH 3/7] [NET]: uninline dev_alloc_skb, de-bloats a lot, Arnaldo Carvalho de Melo, (Thu Mar 27, 9:42 pm)
[PATCH 4/7] [NET]: uninline skb_push, de-bloats a lot, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
[PATCH 5/7] [NET]: uninline dst_release, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
Re: [PATCH 5/7] [NET]: uninline dst_release, David Miller, (Thu Mar 27, 8:53 pm)
[PATCH 6/7] [NET]: uninline skb_trim, de-bloats, Ilpo Järvinen, (Thu Mar 27, 8:38 am)
Re: [PATCH 6/7] [NET]: uninline skb_trim, de-bloats, David Miller, (Thu Mar 27, 8:54 pm)
[PATCH 7/7] [SCTP]: Remove sctp_add_cmd_sf wrapper bloat, Ilpo Järvinen, (Thu Mar 27, 8:38 am)