Commit 0dde3e16 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[NET]: uninline skb_put, de-bloats a lot 



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: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f95165d

include/linux/skbuff.h

+1 −20
Original line number Diff line number Diff line
@@ -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;

net/core/skbuff.c

+21 −0
Original line number Diff line number Diff line
@@ -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.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE