diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-29 04:28:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:07 -0500 |
commit | f561d0f27d6283c49359bb96048f8ac3728c812c (patch) | |
tree | 95665f72ac84fc9c91f5c1ee568f169984631887 /net/ipv4/tcp.c | |
parent | 3015a347dcd470fcc8becf1f84b0502391a3c0e0 (diff) |
[NET]: Uninline the sk_stream_alloc_pskb
This function seems too big for inlining. Indeed, it saves
half-a-kilo when uninlined:
add/remove: 1/0 grow/shrink: 0/7 up/down: 195/-719 (-524)
function old new delta
sk_stream_alloc_pskb - 195 +195
ip_rt_init 529 525 -4
__inet_lookup_listener 284 274 -10
tcp_sendmsg 2583 2486 -97
tcp_sendpage 1449 1305 -144
tso_fragment 417 267 -150
tcp_fragment 1149 992 -157
__tcp_push_pending_frames 1998 1841 -157
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e055f25876df..6b35ab841db2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -629,6 +629,33 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, | |||
629 | return ret; | 629 | return ret; |
630 | } | 630 | } |
631 | 631 | ||
632 | struct sk_buff *sk_stream_alloc_pskb(struct sock *sk, | ||
633 | int size, int mem, gfp_t gfp) | ||
634 | { | ||
635 | struct sk_buff *skb; | ||
636 | |||
637 | /* The TCP header must be at least 32-bit aligned. */ | ||
638 | size = ALIGN(size, 4); | ||
639 | |||
640 | skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp); | ||
641 | if (skb) { | ||
642 | skb->truesize += mem; | ||
643 | if (sk_stream_wmem_schedule(sk, skb->truesize)) { | ||
644 | /* | ||
645 | * Make sure that we have exactly size bytes | ||
646 | * available to the caller, no more, no less. | ||
647 | */ | ||
648 | skb_reserve(skb, skb_tailroom(skb) - size); | ||
649 | return skb; | ||
650 | } | ||
651 | __kfree_skb(skb); | ||
652 | } else { | ||
653 | sk->sk_prot->enter_memory_pressure(); | ||
654 | sk_stream_moderate_sndbuf(sk); | ||
655 | } | ||
656 | return NULL; | ||
657 | } | ||
658 | |||
632 | static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, | 659 | static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, |
633 | size_t psize, int flags) | 660 | size_t psize, int flags) |
634 | { | 661 | { |