tcp: Remove unrequired operations in tcp_push()
Subsystems (3)
PATCH 2/3 tcp: Remove unrequired operations in tcp_push()
From: Krishna Kumar <[email protected]>
Remove unrequired operations in tcp_push()
Changelog:
Removed a temporary skb variable from tcp_push()
--- net/ipv4/tcp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
net/ipv4/tcp.c +6 -7
@@ -536,8 +536,7 @@ static inline void skb_entail(struct soc tp->nonagle &= ~TCP_NAGLE_PUSH ; } -static inline void tcp_mark_urg (struct tcp_sock *tp,int flags, -struct sk_buff *skb) +static inline void tcp_mark_urg (struct tcp_sock *tp,int flags) {if (flags &MSG_OOB ) tp->snd_up = tp->write_seq;
@@ -546,13 +545,13 @@ static inline void tcp_mark_urg(struct tstatic inline void tcp_push (struct sock *sk,int flags,int mss_now,int nonagle) { -struct tcp_sock *tp =tcp_sk (sk); -if (tcp_send_head (sk)) { -struct sk_buff *skb =tcp_write_queue_tail (sk); +struct tcp_sock *tp =tcp_sk (sk); +if (!(flags &MSG_MORE ) ||forced_push (tp)) -tcp_mark_push (tp, skb); -tcp_mark_urg (tp, flags, skb); +tcp_mark_push (tp,tcp_write_queue_tail (sk)); + +tcp_mark_urg (tp, flags);__tcp_push_pending_frames (sk, mss_now, (flags &MSG_MORE ) ?TCP_NAGLE_CORK : nonagle); }
PATCH 3/3 tcp: Slightly optimize tcp_sendmsg
From: Krishna Kumar <[email protected]>
Slightly optimize tcp_sendmsg since NETIF_F_SG is used many times iteratively in the loop. The only other modification is to change:
} else if (i == MAX_SKB_FRAGS ||
(!i &&
!(sk->sk_route_caps & NETIF_F_SG))) {
to:
} else if (i == MAX_SKB_FRAGS || !sg) {The reason why this change is correct: this code (other than the MAX_SKB_FRAGS case) executes only due to the else part
of: "if (skb_tailroom(skb) > 0) {" - i.e. there was no space in the skb to put the data inline. Hence SG is false is a sufficient condition, and there is no way a fragment can be added to the skb.
Changelog:
- Added the above explanation for the change
--- net/ipv4/tcp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
net/ipv4/tcp.c +9 -8
@@ -876,12 +876,12 @@ ssize_t tcp_sendpage(struct socket *sock#define TCP_PAGE (sk) (sk->sk_sndmsg_page)#define TCP_OFF (sk) (sk->sk_sndmsg_off) -static inline int select_size (struct sock *sk) +static inline int select_size (struct sock *sk,int sg) {struct tcp_sock *tp =tcp_sk (sk);int tmp = tp->mss_cache; -if (sk->sk_route_caps &NETIF_F_SG ) { +if (sg) {if (sk_can_gso (sk)) tmp =0 ;else {
@@ -905,7 +905,7 @@ int tcp_sendmsg(struct kiocb *iocb, strustruct sk_buff *skb;int iovlen, flags;int mss_now, size_goal; -int err, copied; +int sg, err, copied;long timeo;lock_sock (sk);
@@ -933,6 +933,8 @@ int tcp_sendmsg(struct kiocb *iocb, struif (sk->sk_err || (sk->sk_shutdown &SEND_SHUTDOWN )) goto out_err; + sg = sk->sk_route_caps &NETIF_F_SG ; +while (--iovlen >=0 ) {int seglen = iov->iov_len;unsigned char __user *from = iov->iov_base;
@@ -958,8 +960,9 @@ new_segment:if (!sk_stream_memory_free (sk)) goto wait_for_sndbuf; - skb =sk_stream_alloc_skb (sk,select_size (sk), - sk->sk_allocation); + skb =sk_stream_alloc_skb (sk, +select_size (sk, sg), + sk->sk_allocation);if (!skb) goto wait_for_memory;
@@ -996,9 +999,7 @@ new_segment:/* We can extend the last page * fragment. */ merge =1 ; - }else if (i ==MAX_SKB_FRAGS || - (!i && - !(sk->sk_route_caps &NETIF_F_SG ))) { + }else if (i ==MAX_SKB_FRAGS || !sg) {/* Need to add new fragment and cannot * do this because interface is non-SG, * or because all the page slots are
Re: [PATCH 3/3 Ver2] tcp: Slightly optimize tcp_sendmsg
From: Krishna Kumar <[email protected]>
Date: Thu, 10 Dec 2009 22:46:59 +0530
Quoted 18 lines
From: Krishna Kumar <[email protected]>
Slightly optimize
tcp_sendmsgsinceNETIF_F_SGis used many times iteratively in the loop. The only other modification is to change:} else if (i == MAX_SKB_FRAGS || (!i && !(sk->sk_route_caps & NETIF_F_SG))) { to: } else if (i == MAX_SKB_FRAGS || !sg) {The reason why this change is correct: this code (other than the
MAX_SKB_FRAGScase) executes only due to the else part
of: "if (skb_tailroom(skb)> 0) {" - i.e. there was no space in the skb to put the data inline. Hence SG is false is a sufficient condition, and there is no way a fragment can be added to the skb.
Quoted 5 lines
Changelog:
- Added the above explanation for the changeSigned-off-by Krishna Kumar <[email protected]>Acked-by Ilpo Järvinen <[email protected]>
Applied.
From: Krishna Kumar <[email protected]>
Date: Thu, 10 Dec 2009 22:46:52 +0530
Quoted 9 lines
From: Krishna Kumar <[email protected]>
Remove unrequired operations in
tcp_push()Changelog:
Removed a temporary skb variable fromtcp_push()Signed-off-by Krishna Kumar <[email protected]>Acked-by Ilpo Järvinen <[email protected]>
Applied.