Skip to content

L
linux
Commit 056834d9 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files
Options

[TCP]: cleanup tcp_{in,out}put.c style 

These were manually selected from indent's results which as is
are too noisy to be of any use without human reason. In addition,
some extra newlines between function and its comment were removed
too.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 058dc334
Show whitespace changes
Inline Side-by-side
Showing with 300 additions and 282 deletions
net/ipv4/tcp_input.c
View file @ 056834d9
...@@ -121,8 +121,7 @@ int sysctl_tcp_abc __read_mostly; ...@@ -121,8 +121,7 @@ int sysctl_tcp_abc __read_mostly;
/* Adapt the MSS value used to make delayed ack decision to the /* Adapt the MSS value used to make delayed ack decision to the
* real world. * real world.
*/ */
static void tcp_measure_rcv_mss(struct sock *sk, static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)
const struct sk_buff *skb)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock *icsk = inet_csk(sk);
const unsigned int lss = icsk->icsk_ack.last_seg_size; const unsigned int lss = icsk->icsk_ack.last_seg_size;
...@@ -133,7 +132,7 @@ static void tcp_measure_rcv_mss(struct sock *sk, ...@@ -133,7 +132,7 @@ static void tcp_measure_rcv_mss(struct sock *sk,
/* skb->len may jitter because of SACKs, even if peer /* skb->len may jitter because of SACKs, even if peer
* sends good full-sized frames. * sends good full-sized frames.
*/ */
len = skb_shinfo(skb)->gso_size ?: skb->len; len = skb_shinfo(skb)->gso_size ? : skb->len;
if (len >= icsk->icsk_ack.rcv_mss) { if (len >= icsk->icsk_ack.rcv_mss) {
icsk->icsk_ack.rcv_mss = len; icsk->icsk_ack.rcv_mss = len;
} else { } else {
...@@ -173,8 +172,8 @@ static void tcp_incr_quickack(struct sock *sk) ...@@ -173,8 +172,8 @@ static void tcp_incr_quickack(struct sock *sk)
struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock *icsk = inet_csk(sk);
unsigned quickacks = tcp_sk(sk)->rcv_wnd / (2 * icsk->icsk_ack.rcv_mss); unsigned quickacks = tcp_sk(sk)->rcv_wnd / (2 * icsk->icsk_ack.rcv_mss);
if (quickacks==0) if (quickacks == 0)
quickacks=2; quickacks = 2;
if (quickacks > icsk->icsk_ack.quick) if (quickacks > icsk->icsk_ack.quick)
icsk->icsk_ack.quick = min(quickacks, TCP_MAX_QUICKACKS); icsk->icsk_ack.quick = min(quickacks, TCP_MAX_QUICKACKS);
} }
...@@ -199,7 +198,7 @@ static inline int tcp_in_quickack_mode(const struct sock *sk) ...@@ -199,7 +198,7 @@ static inline int tcp_in_quickack_mode(const struct sock *sk)
static inline void TCP_ECN_queue_cwr(struct tcp_sock *tp) static inline void TCP_ECN_queue_cwr(struct tcp_sock *tp)
{ {
if (tp->ecn_flags&TCP_ECN_OK) if (tp->ecn_flags & TCP_ECN_OK)
tp->ecn_flags |= TCP_ECN_QUEUE_CWR; tp->ecn_flags |= TCP_ECN_QUEUE_CWR;
} }
...@@ -216,7 +215,7 @@ static inline void TCP_ECN_withdraw_cwr(struct tcp_sock *tp) ...@@ -216,7 +215,7 @@ static inline void TCP_ECN_withdraw_cwr(struct tcp_sock *tp)
static inline void TCP_ECN_check_ce(struct tcp_sock *tp, struct sk_buff *skb) static inline void TCP_ECN_check_ce(struct tcp_sock *tp, struct sk_buff *skb)
{ {
if (tp->ecn_flags&TCP_ECN_OK) { if (tp->ecn_flags & TCP_ECN_OK) {
if (INET_ECN_is_ce(TCP_SKB_CB(skb)->flags)) if (INET_ECN_is_ce(TCP_SKB_CB(skb)->flags))
tp->ecn_flags |= TCP_ECN_DEMAND_CWR; tp->ecn_flags |= TCP_ECN_DEMAND_CWR;
/* Funny extension: if ECT is not set on a segment, /* Funny extension: if ECT is not set on a segment,
...@@ -229,19 +228,19 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, struct sk_buff *skb) ...@@ -229,19 +228,19 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, struct sk_buff *skb)
static inline void TCP_ECN_rcv_synack(struct tcp_sock *tp, struct tcphdr *th) static inline void TCP_ECN_rcv_synack(struct tcp_sock *tp, struct tcphdr *th)
{ {
if ((tp->ecn_flags&TCP_ECN_OK) && (!th->ece || th->cwr)) if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || th->cwr))
tp->ecn_flags &= ~TCP_ECN_OK; tp->ecn_flags &= ~TCP_ECN_OK;
} }
static inline void TCP_ECN_rcv_syn(struct tcp_sock *tp, struct tcphdr *th) static inline void TCP_ECN_rcv_syn(struct tcp_sock *tp, struct tcphdr *th)
{ {
if ((tp->ecn_flags&TCP_ECN_OK) && (!th->ece || !th->cwr)) if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || !th->cwr))
tp->ecn_flags &= ~TCP_ECN_OK; tp->ecn_flags &= ~TCP_ECN_OK;
} }
static inline int TCP_ECN_rcv_ecn_echo(struct tcp_sock *tp, struct tcphdr *th) static inline int TCP_ECN_rcv_ecn_echo(struct tcp_sock *tp, struct tcphdr *th)
{ {
if (th->ece && !th->syn && (tp->ecn_flags&TCP_ECN_OK)) if (th->ece && !th->syn && (tp->ecn_flags & TCP_ECN_OK))
return 1; return 1;
return 0; return 0;
} }
...@@ -303,8 +302,7 @@ static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb) ...@@ -303,8 +302,7 @@ static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb)
return 0; return 0;
} }
static void tcp_grow_window(struct sock *sk, static void tcp_grow_window(struct sock *sk, struct sk_buff *skb)
struct sk_buff *skb)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
...@@ -318,12 +316,13 @@ static void tcp_grow_window(struct sock *sk, ...@@ -318,12 +316,13 @@ static void tcp_grow_window(struct sock *sk,
* will fit to rcvbuf in future. * will fit to rcvbuf in future.
*/ */
if (tcp_win_from_space(skb->truesize) <= skb->len) if (tcp_win_from_space(skb->truesize) <= skb->len)
incr = 2*tp->advmss; incr = 2 * tp->advmss;
else else
incr = __tcp_grow_window(sk, skb); incr = __tcp_grow_window(sk, skb);
if (incr) { if (incr) {
tp->rcv_ssthresh = min(tp->rcv_ssthresh + incr, tp->window_clamp); tp->rcv_ssthresh = min(tp->rcv_ssthresh + incr,
tp->window_clamp);
inet_csk(sk)->icsk_ack.quick |= 1; inet_csk(sk)->icsk_ack.quick |= 1;
} }
} }
...@@ -398,10 +397,9 @@ static void tcp_clamp_window(struct sock *sk) ...@@ -398,10 +397,9 @@ static void tcp_clamp_window(struct sock *sk)
sysctl_tcp_rmem[2]); sysctl_tcp_rmem[2]);
} }
if (atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf) if (atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf)
tp->rcv_ssthresh = min(tp->window_clamp, 2U*tp->advmss); tp->rcv_ssthresh = min(tp->window_clamp, 2U * tp->advmss);
} }
/* Initialize RCV_MSS value. /* Initialize RCV_MSS value.
* RCV_MSS is an our guess about MSS used by the peer. * RCV_MSS is an our guess about MSS used by the peer.
* We haven't any direct information about the MSS. * We haven't any direct information about the MSS.
...@@ -414,7 +412,7 @@ void tcp_initialize_rcv_mss(struct sock *sk) ...@@ -414,7 +412,7 @@ void tcp_initialize_rcv_mss(struct sock *sk)
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
unsigned int hint = min_t(unsigned int, tp->advmss, tp->mss_cache); unsigned int hint = min_t(unsigned int, tp->advmss, tp->mss_cache);
hint = min(hint, tp->rcv_wnd/2); hint = min(hint, tp->rcv_wnd / 2);
hint = min(hint, TCP_MIN_RCVMSS); hint = min(hint, TCP_MIN_RCVMSS);
hint = max(hint, TCP_MIN_MSS); hint = max(hint, TCP_MIN_MSS);
...@@ -471,16 +469,15 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp) ...@@ -471,16 +469,15 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp)
goto new_measure; goto new_measure;
if (before(tp->rcv_nxt, tp->rcv_rtt_est.seq)) if (before(tp->rcv_nxt, tp->rcv_rtt_est.seq))
return; return;
tcp_rcv_rtt_update(tp, tcp_rcv_rtt_update(tp, jiffies - tp->rcv_rtt_est.time, 1);
jiffies - tp->rcv_rtt_est.time,
1);
new_measure: new_measure:
tp->rcv_rtt_est.seq = tp->rcv_nxt + tp->rcv_wnd; tp->rcv_rtt_est.seq = tp->rcv_nxt + tp->rcv_wnd;
tp->rcv_rtt_est.time = tcp_time_stamp; tp->rcv_rtt_est.time = tcp_time_stamp;
} }
static inline void tcp_rcv_rtt_measure_ts(struct sock *sk, const struct sk_buff *skb) static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,
const struct sk_buff *skb)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
if (tp->rx_opt.rcv_tsecr && if (tp->rx_opt.rcv_tsecr &&
...@@ -503,8 +500,7 @@ void tcp_rcv_space_adjust(struct sock *sk) ...@@ -503,8 +500,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
goto new_measure; goto new_measure;
time = tcp_time_stamp - tp->rcvq_space.time; time = tcp_time_stamp - tp->rcvq_space.time;
if (time < (tp->rcv_rtt_est.rtt >> 3) || if (time < (tp->rcv_rtt_est.rtt >> 3) || tp->rcv_rtt_est.rtt == 0)
tp->rcv_rtt_est.rtt == 0)
return; return;
space = 2 * (tp->copied_seq - tp->rcvq_space.seq); space = 2 * (tp->copied_seq - tp->rcvq_space.seq);
...@@ -580,7 +576,7 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) ...@@ -580,7 +576,7 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)
} else { } else {
int m = now - icsk->icsk_ack.lrcvtime; int m = now - icsk->icsk_ack.lrcvtime;
if (m <= TCP_ATO_MIN/2) { if (m <= TCP_ATO_MIN / 2) {
/* The fastest case is the first. */ /* The fastest case is the first. */
icsk->icsk_ack.ato = (icsk->icsk_ack.ato >> 1) + TCP_ATO_MIN / 2; icsk->icsk_ack.ato = (icsk->icsk_ack.ato >> 1) + TCP_ATO_MIN / 2;
} else if (m < icsk->icsk_ack.ato) { } else if (m < icsk->icsk_ack.ato) {
...@@ -609,7 +605,7 @@ static u32 tcp_rto_min(struct sock *sk) ...@@ -609,7 +605,7 @@ static u32 tcp_rto_min(struct sock *sk)
u32 rto_min = TCP_RTO_MIN; u32 rto_min = TCP_RTO_MIN;
if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
rto_min = dst->metrics[RTAX_RTO_MIN-1]; rto_min = dst->metrics[RTAX_RTO_MIN - 1];
return rto_min; return rto_min;
} }
...@@ -672,14 +668,14 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt) ...@@ -672,14 +668,14 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
} }
if (after(tp->snd_una, tp->rtt_seq)) { if (after(tp->snd_una, tp->rtt_seq)) {
if (tp->mdev_max < tp->rttvar) if (tp->mdev_max < tp->rttvar)
tp->rttvar -= (tp->rttvar-tp->mdev_max)>>2; tp->rttvar -= (tp->rttvar - tp->mdev_max) >> 2;
tp->rtt_seq = tp->snd_nxt; tp->rtt_seq = tp->snd_nxt;
tp->mdev_max = tcp_rto_min(sk); tp->mdev_max = tcp_rto_min(sk);
} }
} else { } else {
/* no previous measure. */ /* no previous measure. */
tp->srtt = m<<3; /* take the measured time to be rtt */ tp->srtt = m << 3; /* take the measured time to be rtt */
tp->mdev = m<<1; /* make sure rto = 3*rtt */ tp->mdev = m << 1; /* make sure rto = 3*rtt */
tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk)); tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
tp->rtt_seq = tp->snd_nxt; tp->rtt_seq = tp->snd_nxt;
} }
...@@ -733,7 +729,7 @@ void tcp_update_metrics(struct sock *sk) ...@@ -733,7 +729,7 @@ void tcp_update_metrics(struct sock *sk)
dst_confirm(dst); dst_confirm(dst);
if (dst && (dst->flags&DST_HOST)) { if (dst && (dst->flags & DST_HOST)) {
const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_connection_sock *icsk = inet_csk(sk);
int m; int m;
...@@ -743,7 +739,7 @@ void tcp_update_metrics(struct sock *sk) ...@@ -743,7 +739,7 @@ void tcp_update_metrics(struct sock *sk)
* Reset our results. * Reset our results.
*/ */
if (!(dst_metric_locked(dst, RTAX_RTT))) if (!(dst_metric_locked(dst, RTAX_RTT)))
dst->metrics[RTAX_RTT-1] = 0; dst->metrics[RTAX_RTT - 1] = 0;
return; return;
} }
...@@ -755,9 +751,9 @@ void tcp_update_metrics(struct sock *sk) ...@@ -755,9 +751,9 @@ void tcp_update_metrics(struct sock *sk)
*/ */
if (!(dst_metric_locked(dst, RTAX_RTT))) { if (!(dst_metric_locked(dst, RTAX_RTT))) {
if (m <= 0) if (m <= 0)
dst->metrics[RTAX_RTT-1] = tp->srtt; dst->metrics[RTAX_RTT - 1] = tp->srtt;
else else
dst->metrics[RTAX_RTT-1] -= (m>>3); dst->metrics[RTAX_RTT - 1] -= (m >> 3);
} }
if (!(dst_metric_locked(dst, RTAX_RTTVAR))) { if (!(dst_metric_locked(dst, RTAX_RTTVAR))) {
...@@ -770,7 +766,7 @@ void tcp_update_metrics(struct sock *sk) ...@@ -770,7 +766,7 @@ void tcp_update_metrics(struct sock *sk)
m = tp->mdev; m = tp->mdev;
if (m >= dst_metric(dst, RTAX_RTTVAR)) if (m >= dst_metric(dst, RTAX_RTTVAR))
dst->metrics[RTAX_RTTVAR-1] = m; dst->metrics[RTAX_RTTVAR - 1] = m;
else else
dst->metrics[RTAX_RTTVAR-1] -= dst->metrics[RTAX_RTTVAR-1] -=
(dst->metrics[RTAX_RTTVAR-1] - m)>>2; (dst->metrics[RTAX_RTTVAR-1] - m)>>2;
...@@ -784,7 +780,7 @@ void tcp_update_metrics(struct sock *sk) ...@@ -784,7 +780,7 @@ void tcp_update_metrics(struct sock *sk)
dst->metrics[RTAX_SSTHRESH-1] = tp->snd_cwnd >> 1; dst->metrics[RTAX_SSTHRESH-1] = tp->snd_cwnd >> 1;
if (!dst_metric_locked(dst, RTAX_CWND) && if (!dst_metric_locked(dst, RTAX_CWND) &&
tp->snd_cwnd > dst_metric(dst, RTAX_CWND)) tp->snd_cwnd > dst_metric(dst, RTAX_CWND))
dst->metrics[RTAX_CWND-1] = tp->snd_cwnd; dst->metrics[RTAX_CWND - 1] = tp->snd_cwnd;
} else if (tp->snd_cwnd > tp->snd_ssthresh && } else if (tp->snd_cwnd > tp->snd_ssthresh &&
icsk->icsk_ca_state == TCP_CA_Open) { icsk->icsk_ca_state == TCP_CA_Open) {
/* Cong. avoidance phase, cwnd is reliable. */ /* Cong. avoidance phase, cwnd is reliable. */
...@@ -1353,12 +1349,14 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk, ...@@ -1353,12 +1349,14 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,
} }
if (in_sack <= 0) if (in_sack <= 0)
in_sack = tcp_match_skb_to_sack(sk, skb, start_seq, end_seq); in_sack = tcp_match_skb_to_sack(sk, skb, start_seq,
end_seq);
if (unlikely(in_sack < 0)) if (unlikely(in_sack < 0))
break; break;
if (in_sack) if (in_sack)
*flag |= tcp_sacktag_one(skb, sk, reord, dup_sack, *fack_count); *flag |= tcp_sacktag_one(skb, sk, reord, dup_sack,
*fack_count);
*fack_count += tcp_skb_pcount(skb); *fack_count += tcp_skb_pcount(skb);
} }
...@@ -1407,7 +1405,8 @@ static int tcp_sack_cache_ok(struct tcp_sock *tp, struct tcp_sack_block *cache) ...@@ -1407,7 +1405,8 @@ static int tcp_sack_cache_ok(struct tcp_sock *tp, struct tcp_sack_block *cache)
} }
static int static int
tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_una) tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
u32 prior_snd_una)
{ {
const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
...@@ -1417,7 +1416,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ ...@@ -1417,7 +1416,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
struct tcp_sack_block sp[4]; struct tcp_sack_block sp[4];
struct tcp_sack_block *cache; struct tcp_sack_block *cache;
struct sk_buff *skb; struct sk_buff *skb;
int num_sacks = (ptr[1] - TCPOLEN_SACK_BASE)>>3; int num_sacks = (ptr[1] - TCPOLEN_SACK_BASE) >> 3;
int used_sacks; int used_sacks;
int reord = tp->packets_out; int reord = tp->packets_out;
int flag = 0; int flag = 0;
...@@ -1484,17 +1483,17 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ ...@@ -1484,17 +1483,17 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
/* order SACK blocks to allow in order walk of the retrans queue */ /* order SACK blocks to allow in order walk of the retrans queue */
for (i = used_sacks - 1; i > 0; i--) { for (i = used_sacks - 1; i > 0; i--) {
for (j = 0; j < i; j++){ for (j = 0; j < i; j++) {
if (after(sp[j].start_seq, sp[j+1].start_seq)) { if (after(sp[j].start_seq, sp[j + 1].start_seq)) {
struct tcp_sack_block tmp; struct tcp_sack_block tmp;
tmp = sp[j]; tmp = sp[j];
sp[j] = sp[j+1]; sp[j] = sp[j + 1];
sp[j+1] = tmp; sp[j + 1] = tmp;
/* Track where the first SACK block goes to */ /* Track where the first SACK block goes to */
if (j == first_sack_index) if (j == first_sack_index)
first_sack_index = j+1; first_sack_index = j + 1;
} }
} }
} }
...@@ -1539,17 +1538,21 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ ...@@ -1539,17 +1538,21 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
/* Head todo? */ /* Head todo? */
if (before(start_seq, cache->start_seq)) { if (before(start_seq, cache->start_seq)) {
skb = tcp_sacktag_skip(skb, sk, start_seq); skb = tcp_sacktag_skip(skb, sk, start_seq);
skb = tcp_sacktag_walk(skb, sk, next_dup, start_seq, skb = tcp_sacktag_walk(skb, sk, next_dup,
cache->start_seq, dup_sack, start_seq,
&fack_count, &reord, &flag); cache->start_seq,
dup_sack, &fack_count,
&reord, &flag);
} }
/* Rest of the block already fully processed? */ /* Rest of the block already fully processed? */
if (!after(end_seq, cache->end_seq)) if (!after(end_seq, cache->end_seq))
goto advance_sp; goto advance_sp;
skb = tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq, skb = tcp_maybe_skipping_dsack(skb, sk, next_dup,
&fack_count, &reord, &flag); cache->end_seq,
&fack_count, &reord,
&flag);
/* ...tail remains todo... */ /* ...tail remains todo... */
if (tcp_highest_sack_seq(tp) == cache->end_seq) { if (tcp_highest_sack_seq(tp) == cache->end_seq) {
...@@ -1654,10 +1657,10 @@ static void tcp_remove_reno_sacks(struct sock *sk, int acked) ...@@ -1654,10 +1657,10 @@ static void tcp_remove_reno_sacks(struct sock *sk, int acked)
if (acked > 0) { if (acked > 0) {
/* One ACK acked hole. The rest eat duplicate ACKs. */ /* One ACK acked hole. The rest eat duplicate ACKs. */
if (acked-1 >= tp->sacked_out) if (acked - 1 >= tp->sacked_out)
tp->sacked_out = 0; tp->sacked_out = 0;
else else
tp->sacked_out -= acked-1; tp->sacked_out -= acked - 1;
} }
tcp_check_reno_reordering(sk, acked); tcp_check_reno_reordering(sk, acked);
tcp_verify_left_out(tp); tcp_verify_left_out(tp);
...@@ -1691,10 +1694,10 @@ int tcp_use_frto(struct sock *sk) ...@@ -1691,10 +1694,10 @@ int tcp_use_frto(struct sock *sk)
tcp_for_write_queue_from(skb, sk) { tcp_for_write_queue_from(skb, sk) {
if (skb == tcp_send_head(sk)) if (skb == tcp_send_head(sk))
break; break;
if (TCP_SKB_CB(skb)->sacked&TCPCB_RETRANS) if (TCP_SKB_CB(skb)->sacked & TCPCB_RETRANS)
return 0; return 0;
/* Short-circuit when first non-SACKed skb has been checked */ /* Short-circuit when first non-SACKed skb has been checked */
if (!(TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_ACKED)) if (!(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED))
break; break;
} }
return 1; return 1;
...@@ -1804,7 +1807,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) ...@@ -1804,7 +1807,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag)
* Count the retransmission made on RTO correctly (only when * Count the retransmission made on RTO correctly (only when
* waiting for the first ACK and did not get it)... * waiting for the first ACK and did not get it)...
*/ */
if ((tp->frto_counter == 1) && !(flag&FLAG_DATA_ACKED)) { if ((tp->frto_counter == 1) && !(flag & FLAG_DATA_ACKED)) {
/* For some reason this R-bit might get cleared? */ /* For some reason this R-bit might get cleared? */
if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS)
tp->retrans_out += tcp_skb_pcount(skb); tp->retrans_out += tcp_skb_pcount(skb);
...@@ -1817,7 +1820,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) ...@@ -1817,7 +1820,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag)
} }
/* Don't lost mark skbs that were fwd transmitted after RTO */ /* Don't lost mark skbs that were fwd transmitted after RTO */
if (!(TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_ACKED) && if (!(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED) &&
!after(TCP_SKB_CB(skb)->end_seq, tp->frto_highmark)) { !after(TCP_SKB_CB(skb)->end_seq, tp->frto_highmark)) {
TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;
tp->lost_out += tcp_skb_pcount(skb); tp->lost_out += tcp_skb_pcount(skb);
...@@ -1899,7 +1902,7 @@ void tcp_enter_loss(struct sock *sk, int how) ...@@ -1899,7 +1902,7 @@ void tcp_enter_loss(struct sock *sk, int how)
if (skb == tcp_send_head(sk)) if (skb == tcp_send_head(sk))
break; break;
if (TCP_SKB_CB(skb)->sacked&TCPCB_RETRANS) if (TCP_SKB_CB(skb)->sacked & TCPCB_RETRANS)
tp->undo_marker = 0; tp->undo_marker = 0;
TCP_SKB_CB(skb)->sacked &= (~TCPCB_TAGBITS)|TCPCB_SACKED_ACKED; TCP_SKB_CB(skb)->sacked &= (~TCPCB_TAGBITS)|TCPCB_SACKED_ACKED;
if (!(TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_ACKED) || how) { if (!(TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_ACKED) || how) {
...@@ -1943,7 +1946,7 @@ static int tcp_check_sack_reneging(struct sock *sk, int flag) ...@@ -1943,7 +1946,7 @@ static int tcp_check_sack_reneging(struct sock *sk, int flag)
static inline int tcp_fackets_out(struct tcp_sock *tp) static inline int tcp_fackets_out(struct tcp_sock *tp)
{ {
return tcp_is_reno(tp) ? tp->sacked_out+1 : tp->fackets_out; return tcp_is_reno(tp) ? tp->sacked_out + 1 : tp->fackets_out;
} }
/* Heurestics to calculate number of duplicate ACKs. There's no dupACKs /* Heurestics to calculate number of duplicate ACKs. There's no dupACKs
...@@ -2116,8 +2119,7 @@ static int tcp_time_to_recover(struct sock *sk) ...@@ -2116,8 +2119,7 @@ static int tcp_time_to_recover(struct sock *sk)
* retransmitted past LOST markings in the first place? I'm not fully sure * retransmitted past LOST markings in the first place? I'm not fully sure
* about undo and end of connection cases, which can cause R without L? * about undo and end of connection cases, which can cause R without L?
*/ */
static void tcp_verify_retransmit_hint(struct tcp_sock *tp, static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)
struct sk_buff *skb)
{ {
if ((tp->retransmit_skb_hint != NULL) && if ((tp->retransmit_skb_hint != NULL) &&
before(TCP_SKB_CB(skb)->seq, before(TCP_SKB_CB(skb)->seq,
...@@ -2223,7 +2225,7 @@ static void tcp_update_scoreboard(struct sock *sk, int fast_rexmit) ...@@ -2223,7 +2225,7 @@ static void tcp_update_scoreboard(struct sock *sk, int fast_rexmit)
static inline void tcp_moderate_cwnd(struct tcp_sock *tp) static inline void tcp_moderate_cwnd(struct tcp_sock *tp)
{ {
tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_cwnd = min(tp->snd_cwnd,
tcp_packets_in_flight(tp)+tcp_max_burst(tp)); tcp_packets_in_flight(tp) + tcp_max_burst(tp));
tp->snd_cwnd_stamp = tcp_time_stamp; tp->snd_cwnd_stamp = tcp_time_stamp;
} }
...@@ -2243,15 +2245,15 @@ static void tcp_cwnd_down(struct sock *sk, int flag) ...@@ -2243,15 +2245,15 @@ static void tcp_cwnd_down(struct sock *sk, int flag)
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
int decr = tp->snd_cwnd_cnt + 1; int decr = tp->snd_cwnd_cnt + 1;
if ((flag&(FLAG_ANY_PROGRESS|FLAG_DSACKING_ACK)) || if ((flag & (FLAG_ANY_PROGRESS | FLAG_DSACKING_ACK)) ||
(tcp_is_reno(tp) && !(flag&FLAG_NOT_DUP))) { (tcp_is_reno(tp) && !(flag & FLAG_NOT_DUP))) {
tp->snd_cwnd_cnt = decr&1; tp->snd_cwnd_cnt = decr & 1;
decr >>= 1; decr >>= 1;
if (decr && tp->snd_cwnd > tcp_cwnd_min(sk)) if (decr && tp->snd_cwnd > tcp_cwnd_min(sk))
tp->snd_cwnd -= decr; tp->snd_cwnd -= decr;
tp->snd_cwnd = min(tp->snd_cwnd, tcp_packets_in_flight(tp)+1); tp->snd_cwnd = min(tp->snd_cwnd, tcp_packets_in_flight(tp) + 1);
tp->snd_cwnd_stamp = tcp_time_stamp; tp->snd_cwnd_stamp = tcp_time_stamp;
} }
} }
...@@ -2295,7 +2297,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo) ...@@ -2295,7 +2297,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo)
if (icsk->icsk_ca_ops->undo_cwnd) if (icsk->icsk_ca_ops->undo_cwnd)
tp->snd_cwnd = icsk->icsk_ca_ops->undo_cwnd(sk); tp->snd_cwnd = icsk->icsk_ca_ops->undo_cwnd(sk);
else else
tp->snd_cwnd = max(tp->snd_cwnd, tp->snd_ssthresh<<1); tp->snd_cwnd = max(tp->snd_cwnd, tp->snd_ssthresh << 1);
if (undo && tp->prior_ssthresh > tp->snd_ssthresh) { if (undo && tp->prior_ssthresh > tp->snd_ssthresh) {
tp->snd_ssthresh = tp->prior_ssthresh; tp->snd_ssthresh = tp->prior_ssthresh;
...@@ -2314,8 +2316,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo) ...@@ -2314,8 +2316,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo)
static inline int tcp_may_undo(struct tcp_sock *tp) static inline int tcp_may_undo(struct tcp_sock *tp)
{ {
return tp->undo_marker && return tp->undo_marker && (!tp->undo_retrans || tcp_packet_delayed(tp));
(!tp->undo_retrans || tcp_packet_delayed(tp));
} }
/* People celebrate: "We love our President!" */ /* People celebrate: "We love our President!" */
...@@ -2434,7 +2435,7 @@ static void tcp_try_to_open(struct sock *sk, int flag) ...@@ -2434,7 +2435,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
if (tp->retrans_out == 0) if (tp->retrans_out == 0)
tp->retrans_stamp = 0; tp->retrans_stamp = 0;
if (flag&FLAG_ECE) if (flag & FLAG_ECE)
tcp_enter_cwr(sk, 1); tcp_enter_cwr(sk, 1);
if (inet_csk(sk)->icsk_ca_state != TCP_CA_CWR) { if (inet_csk(sk)->icsk_ca_state != TCP_CA_CWR) {
...@@ -2480,7 +2481,6 @@ static void tcp_mtup_probe_success(struct sock *sk, struct sk_buff *skb) ...@@ -2480,7 +2481,6 @@ static void tcp_mtup_probe_success(struct sock *sk, struct sk_buff *skb)
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
} }
/* Process an event, which can update packets-in-flight not trivially. /* Process an event, which can update packets-in-flight not trivially.
* Main goal of this function is to calculate new estimate for left_out, * Main goal of this function is to calculate new estimate for left_out,
* taking into account both packets sitting in receiver's buffer and * taking into account both packets sitting in receiver's buffer and
...@@ -2492,13 +2492,12 @@ static void tcp_mtup_probe_success(struct sock *sk, struct sk_buff *skb) ...@@ -2492,13 +2492,12 @@ static void tcp_mtup_probe_success(struct sock *sk, struct sk_buff *skb)
* It does _not_ decide what to send, it is made in function * It does _not_ decide what to send, it is made in function
* tcp_xmit_retransmit_queue(). * tcp_xmit_retransmit_queue().
*/ */
static void static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
int is_dupack = !(flag&(FLAG_SND_UNA_ADVANCED|FLAG_NOT_DUP)); int is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP));
int do_lost = is_dupack || ((flag&FLAG_DATA_SACKED) && int do_lost = is_dupack || ((flag & FLAG_DATA_SACKED) &&
(tcp_fackets_out(tp) > tp->reordering)); (tcp_fackets_out(tp) > tp->reordering));
int fast_rexmit = 0; int fast_rexmit = 0;
...@@ -2509,7 +2508,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) ...@@ -2509,7 +2508,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
/* Now state machine starts. /* Now state machine starts.
* A. ECE, hence prohibit cwnd undoing, the reduction is required. */ * A. ECE, hence prohibit cwnd undoing, the reduction is required. */
if (flag&FLAG_ECE) if (flag & FLAG_ECE)
tp->prior_ssthresh = 0; tp->prior_ssthresh = 0;
/* B. In all the states check for reneging SACKs. */ /* B. In all the states check for reneging SACKs. */
...@@ -2521,7 +2520,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) ...@@ -2521,7 +2520,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
before(tp->snd_una, tp->high_seq) && before(tp->snd_una, tp->high_seq) &&
icsk->icsk_ca_state != TCP_CA_Open && icsk->icsk_ca_state != TCP_CA_Open &&
tp->fackets_out > tp->reordering) { tp->fackets_out > tp->reordering) {
tcp_mark_head_lost(sk, tp->fackets_out-tp->reordering, 0); tcp_mark_head_lost(sk, tp->fackets_out - tp->reordering, 0);
NET_INC_STATS_BH(LINUX_MIB_TCPLOSS); NET_INC_STATS_BH(LINUX_MIB_TCPLOSS);
} }
...@@ -2581,7 +2580,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) ...@@ -2581,7 +2580,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
do_lost = tcp_try_undo_partial(sk, pkts_acked); do_lost = tcp_try_undo_partial(sk, pkts_acked);
break; break;
case TCP_CA_Loss: case TCP_CA_Loss:
if (flag&FLAG_DATA_ACKED) if (flag & FLAG_DATA_ACKED)
icsk->icsk_retransmits = 0; icsk->icsk_retransmits = 0;
if (!tcp_try_undo_loss(sk)) { if (!tcp_try_undo_loss(sk)) {
tcp_moderate_cwnd(tp); tcp_moderate_cwnd(tp);
...@@ -2631,7 +2630,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag) ...@@ -2631,7 +2630,7 @@ tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
tp->undo_retrans = tp->retrans_out; tp->undo_retrans = tp->retrans_out;
if (icsk->icsk_ca_state < TCP_CA_CWR) { if (icsk->icsk_ca_state < TCP_CA_CWR) {
if (!(flag&FLAG_ECE)) if (!(flag & FLAG_ECE))
tp->prior_ssthresh = tcp_current_ssthresh(sk); tp->prior_ssthresh = tcp_current_ssthresh(sk);
tp->snd_ssthresh = icsk->icsk_ca_ops->ssthresh(sk); tp->snd_ssthresh = icsk->icsk_ca_ops->ssthresh(sk);
TCP_ECN_queue_cwr(tp); TCP_ECN_queue_cwr(tp);
...@@ -2725,7 +2724,8 @@ static void tcp_rearm_rto(struct sock *sk) ...@@ -2725,7 +2724,8 @@ static void tcp_rearm_rto(struct sock *sk)
if (!tp->packets_out) { if (!tp->packets_out) {
inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
} else { } else {
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, inet_csk(sk)->icsk_rto, TCP_RTO_MAX); inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
} }
} }
...@@ -2803,8 +2803,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets) ...@@ -2803,8 +2803,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets)
flag |= FLAG_RETRANS_DATA_ACKED; flag |= FLAG_RETRANS_DATA_ACKED;
ca_seq_rtt = -1; ca_seq_rtt = -1;
seq_rtt = -1; seq_rtt = -1;
if ((flag & FLAG_DATA_ACKED) || if ((flag & FLAG_DATA_ACKED) || (acked_pcount > 1))
(acked_pcount > 1))
flag |= FLAG_NONHEAD_RETRANS_ACKED; flag |= FLAG_NONHEAD_RETRANS_ACKED;
} else { } else {
ca_seq_rtt = now - scb->when; ca_seq_rtt = now - scb->when;
...@@ -2950,8 +2949,9 @@ static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag) ...@@ -2950,8 +2949,9 @@ static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag)
/* Check that window update is acceptable. /* Check that window update is acceptable.
* The function assumes that snd_una<=ack<=snd_next. * The function assumes that snd_una<=ack<=snd_next.
*/ */
static inline int tcp_may_update_window(const struct tcp_sock *tp, const u32 ack, static inline int tcp_may_update_window(const struct tcp_sock *tp,
const u32 ack_seq, const u32 nwin) const u32 ack, const u32 ack_seq,
const u32 nwin)
{ {
return (after(ack, tp->snd_una) || return (after(ack, tp->snd_una) ||
after(ack_seq, tp->snd_wl1) || after(ack_seq, tp->snd_wl1) ||
...@@ -3020,7 +3020,7 @@ static void tcp_ratehalving_spur_to_response(struct sock *sk) ...@@ -3020,7 +3020,7 @@ static void tcp_ratehalving_spur_to_response(struct sock *sk)
static void tcp_undo_spur_to_response(struct sock *sk, int flag) static void tcp_undo_spur_to_response(struct sock *sk, int flag)
{ {
if (flag&FLAG_ECE) if (flag & FLAG_ECE)
tcp_ratehalving_spur_to_response(sk); tcp_ratehalving_spur_to_response(sk);
else else
tcp_undo_cwr(sk, 1); tcp_undo_cwr(sk, 1);
...@@ -3063,7 +3063,7 @@ static int tcp_process_frto(struct sock *sk, int flag) ...@@ -3063,7 +3063,7 @@ static int tcp_process_frto(struct sock *sk, int flag)
tcp_verify_left_out(tp); tcp_verify_left_out(tp);
/* Duplicate the behavior from Loss state (fastretrans_alert) */ /* Duplicate the behavior from Loss state (fastretrans_alert) */
if (flag&FLAG_DATA_ACKED) if (flag & FLAG_DATA_ACKED)
inet_csk(sk)->icsk_retransmits = 0; inet_csk(sk)->icsk_retransmits = 0;
if ((flag & FLAG_NONHEAD_RETRANS_ACKED) || if ((flag & FLAG_NONHEAD_RETRANS_ACKED) ||
...@@ -3080,16 +3080,16 @@ static int tcp_process_frto(struct sock *sk, int flag) ...@@ -3080,16 +3080,16 @@ static int tcp_process_frto(struct sock *sk, int flag)
* ACK isn't duplicate nor advances window, e.g., opposite dir * ACK isn't duplicate nor advances window, e.g., opposite dir
* data, winupdate * data, winupdate
*/ */
if (!(flag&FLAG_ANY_PROGRESS) && (flag&FLAG_NOT_DUP)) if (!(flag & FLAG_ANY_PROGRESS) && (flag & FLAG_NOT_DUP))
return 1; return 1;
if (!(flag&FLAG_DATA_ACKED)) { if (!(flag & FLAG_DATA_ACKED)) {
tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 0 : 3), tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 0 : 3),
flag); flag);
return 1; return 1;
} }
} else { } else {
if (!(flag&FLAG_DATA_ACKED) && (tp->frto_counter == 1)) { if (!(flag & FLAG_DATA_ACKED) && (tp->frto_counter == 1)) {
/* Prevent sending of new data. */ /* Prevent sending of new data. */
tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_cwnd = min(tp->snd_cwnd,
tcp_packets_in_flight(tp)); tcp_packets_in_flight(tp));
...@@ -3097,10 +3097,12 @@ static int tcp_process_frto(struct sock *sk, int flag) ...@@ -3097,10 +3097,12 @@ static int tcp_process_frto(struct sock *sk, int flag)
} }
if ((tp->frto_counter >= 2) && if ((tp->frto_counter >= 2) &&
(!(flag&FLAG_FORWARD_PROGRESS) || (!(flag & FLAG_FORWARD_PROGRESS) ||
((flag&FLAG_DATA_SACKED) && !(flag&FLAG_ONLY_ORIG_SACKED)))) { ((flag & FLAG_DATA_SACKED) &&
!(flag & FLAG_ONLY_ORIG_SACKED)))) {
/* RFC4138 shortcoming (see comment above) */ /* RFC4138 shortcoming (see comment above) */
if (!(flag&FLAG_FORWARD_PROGRESS) && (flag&FLAG_NOT_DUP)) if (!(flag & FLAG_FORWARD_PROGRESS) &&
(flag & FLAG_NOT_DUP))
return 1; return 1;
tcp_enter_frto_loss(sk, 3, flag); tcp_enter_frto_loss(sk, 3, flag);
...@@ -3166,13 +3168,14 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) ...@@ -3166,13 +3168,14 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
tp->bytes_acked += ack - prior_snd_una; tp->bytes_acked += ack - prior_snd_una;
else if (icsk->icsk_ca_state == TCP_CA_Loss) else if (icsk->icsk_ca_state == TCP_CA_Loss)
/* we assume just one segment left network */ /* we assume just one segment left network */
tp->bytes_acked += min(ack - prior_snd_una, tp->mss_cache); tp->bytes_acked += min(ack - prior_snd_una,
tp->mss_cache);
} }
prior_fackets = tp->fackets_out; prior_fackets = tp->fackets_out;
prior_in_flight = tcp_packets_in_flight(tp); prior_in_flight = tcp_packets_in_flight(tp);
if (!(flag&FLAG_SLOWPATH) && after(ack, prior_snd_una)) { if (!(flag & FLAG_SLOWPATH) && after(ack, prior_snd_una)) {
/* Window is constant, pure forward advance. /* Window is constant, pure forward advance.
* No more checks are required. * No more checks are required.
* Note, we use the fact that SND.UNA>=SND.WL2. * Note, we use the fact that SND.UNA>=SND.WL2.
...@@ -3224,13 +3227,14 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) ...@@ -3224,13 +3227,14 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
if ((flag & FLAG_DATA_ACKED) && !frto_cwnd && if ((flag & FLAG_DATA_ACKED) && !frto_cwnd &&
tcp_may_raise_cwnd(sk, flag)) tcp_may_raise_cwnd(sk, flag))
tcp_cong_avoid(sk, ack, prior_in_flight); tcp_cong_avoid(sk, ack, prior_in_flight);
tcp_fastretrans_alert(sk, prior_packets - tp->packets_out, flag); tcp_fastretrans_alert(sk, prior_packets - tp->packets_out,
flag);
} else { } else {
if ((flag & FLAG_DATA_ACKED) && !frto_cwnd) if ((flag & FLAG_DATA_ACKED) && !frto_cwnd)
tcp_cong_avoid(sk, ack, prior_in_flight); tcp_cong_avoid(sk, ack, prior_in_flight);
} }
if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP)) if ((flag & FLAG_FORWARD_PROGRESS) || !(flag & FLAG_NOT_DUP))
dst_confirm(sk->sk_dst_cache); dst_confirm(sk->sk_dst_cache);
return 1; return 1;
...@@ -3255,22 +3259,22 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) ...@@ -3255,22 +3259,22 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
return 0; return 0;
} }
/* Look for tcp options. Normally only called on SYN and SYNACK packets. /* Look for tcp options. Normally only called on SYN and SYNACK packets.
* But, this can also be called on packets in the established flow when * But, this can also be called on packets in the established flow when
* the fast version below fails. * the fast version below fails.
*/ */
void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, int estab) void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
int estab)
{ {
unsigned char *ptr; unsigned char *ptr;
struct tcphdr *th = tcp_hdr(skb); struct tcphdr *th = tcp_hdr(skb);
int length=(th->doff*4)-sizeof(struct tcphdr); int length = (th->doff * 4) - sizeof(struct tcphdr);
ptr = (unsigned char *)(th + 1); ptr = (unsigned char *)(th + 1);
opt_rx->saw_tstamp = 0; opt_rx->saw_tstamp = 0;
while (length > 0) { while (length > 0) {
int opcode=*ptr++; int opcode = *ptr++;
int opsize; int opsize;
switch (opcode) { switch (opcode) {
...@@ -3359,7 +3363,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, ...@@ -3359,7 +3363,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th, static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th,
struct tcp_sock *tp) struct tcp_sock *tp)
{ {
if (th->doff == sizeof(struct tcphdr)>>2) { if (th->doff == sizeof(struct tcphdr) >> 2) {
tp->rx_opt.saw_tstamp = 0; tp->rx_opt.saw_tstamp = 0;
return 0; return 0;
} else if (tp->rx_opt.tstamp_ok && } else if (tp->rx_opt.tstamp_ok &&
...@@ -3444,7 +3448,8 @@ static int tcp_disordered_ack(const struct sock *sk, const struct sk_buff *skb) ...@@ -3444,7 +3448,8 @@ static int tcp_disordered_ack(const struct sock *sk, const struct sk_buff *skb)
(s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) <= (inet_csk(sk)->icsk_rto * 1024) / HZ); (s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) <= (inet_csk(sk)->icsk_rto * 1024) / HZ);
} }
static inline int tcp_paws_discard(const struct sock *sk, const struct sk_buff *skb) static inline int tcp_paws_discard(const struct sock *sk,
const struct sk_buff *skb)
{ {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW && return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW &&
...@@ -3577,7 +3582,8 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th) ...@@ -3577,7 +3582,8 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th)
} }
} }
static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq, u32 end_seq) static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq,
u32 end_seq)
{ {
if (!after(seq, sp->end_seq) && !after(sp->start_seq, end_seq)) { if (!after(seq, sp->end_seq) && !after(sp->start_seq, end_seq)) {
if (before(seq, sp->start_seq)) if (before(seq, sp->start_seq))
...@@ -3600,7 +3606,8 @@ static void tcp_dsack_set(struct tcp_sock *tp, u32 seq, u32 end_seq) ...@@ -3600,7 +3606,8 @@ static void tcp_dsack_set(struct tcp_sock *tp, u32 seq, u32 end_seq)
tp->rx_opt.dsack = 1; tp->rx_opt.dsack = 1;
tp->duplicate_sack[0].start_seq = seq; tp->duplicate_sack[0].start_seq = seq;
tp->duplicate_sack[0].end_seq = end_seq; tp->duplicate_sack[0].end_seq = end_seq;
tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + 1, 4 - tp->rx_opt.tstamp_ok); tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + 1,
4 - tp->rx_opt.tstamp_ok);
} }
} }
...@@ -3640,12 +3647,12 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp) ...@@ -3640,12 +3647,12 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp)
{ {
int this_sack; int this_sack;
struct tcp_sack_block *sp = &tp->selective_acks[0]; struct tcp_sack_block *sp = &tp->selective_acks[0];
struct tcp_sack_block *swalk = sp+1; struct tcp_sack_block *swalk = sp + 1;
/* See if the recent change to the first SACK eats into /* See if the recent change to the first SACK eats into
* or hits the sequence space of other SACK blocks, if so coalesce. * or hits the sequence space of other SACK blocks, if so coalesce.
*/ */
for (this_sack = 1; this_sack < tp->rx_opt.num_sacks; ) { for (this_sack = 1; this_sack < tp->rx_opt.num_sacks;) {
if (tcp_sack_extend(sp, swalk->start_seq, swalk->end_seq)) { if (tcp_sack_extend(sp, swalk->start_seq, swalk->end_seq)) {
int i; int i;
...@@ -3653,16 +3660,19 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp) ...@@ -3653,16 +3660,19 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp)
* Decrease num_sacks. * Decrease num_sacks.
*/ */
tp->rx_opt.num_sacks--; tp->rx_opt.num_sacks--;
tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + tp->rx_opt.dsack, 4 - tp->rx_opt.tstamp_ok); tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks +
for (i=this_sack; i < tp->rx_opt.num_sacks; i++) tp->rx_opt.dsack,
sp[i] = sp[i+1]; 4 - tp->rx_opt.tstamp_ok);
for (i = this_sack; i < tp->rx_opt.num_sacks; i++)
sp[i] = sp[i + 1];
continue; continue;
} }
this_sack++, swalk++; this_sack++, swalk++;
} }
} }
static inline void tcp_sack_swap(struct tcp_sack_block *sack1, struct tcp_sack_block *sack2) static inline void tcp_sack_swap(struct tcp_sack_block *sack1,
struct tcp_sack_block *sack2)
{ {
__u32 tmp; __u32 tmp;
...@@ -3685,11 +3695,11 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq) ...@@ -3685,11 +3695,11 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)
if (!cur_sacks) if (!cur_sacks)
goto new_sack; goto new_sack;
for (this_sack=0; this_sack<cur_sacks; this_sack++, sp++) { for (this_sack = 0; this_sack < cur_sacks; this_sack++, sp++) {
if (tcp_sack_extend(sp, seq, end_seq)) { if (tcp_sack_extend(sp, seq, end_seq)) {
/* Rotate this_sack to the first one. */ /* Rotate this_sack to the first one. */
for (; this_sack>0; this_sack--, sp--) for (; this_sack > 0; this_sack--, sp--)
tcp_sack_swap(sp, sp-1); tcp_sack_swap(sp, sp - 1);
if (cur_sacks > 1) if (cur_sacks > 1)
tcp_sack_maybe_coalesce(tp); tcp_sack_maybe_coalesce(tp);
return; return;
...@@ -3708,14 +3718,15 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq) ...@@ -3708,14 +3718,15 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)
sp--; sp--;
} }
for (; this_sack > 0; this_sack--, sp--) for (; this_sack > 0; this_sack--, sp--)
*sp = *(sp-1); *sp = *(sp - 1);
new_sack: new_sack:
/* Build the new head SACK, and we're done. */ /* Build the new head SACK, and we're done. */
sp->start_seq = seq; sp->start_seq = seq;
sp->end_seq = end_seq; sp->end_seq = end_seq;
tp->rx_opt.num_sacks++; tp->rx_opt.num_sacks++;
tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + tp->rx_opt.dsack, 4 - tp->rx_opt.tstamp_ok); tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + tp->rx_opt.dsack,
4 - tp->rx_opt.tstamp_ok);
} }
/* RCV.NXT advances, some SACKs should be eaten. */ /* RCV.NXT advances, some SACKs should be eaten. */
...@@ -3733,7 +3744,7 @@ static void tcp_sack_remove(struct tcp_sock *tp) ...@@ -3733,7 +3744,7 @@ static void tcp_sack_remove(struct tcp_sock *tp)
return; return;
} }
for (this_sack = 0; this_sack < num_sacks; ) { for (this_sack = 0; this_sack < num_sacks;) {
/* Check if the start of the sack is covered by RCV.NXT. */ /* Check if the start of the sack is covered by RCV.NXT. */
if (!before(tp->rcv_nxt, sp->start_seq)) { if (!before(tp->rcv_nxt, sp->start_seq)) {
int i; int i;
...@@ -3752,7 +3763,9 @@ static void tcp_sack_remove(struct tcp_sock *tp) ...@@ -3752,7 +3763,9 @@ static void tcp_sack_remove(struct tcp_sock *tp)
} }
if (num_sacks != tp->rx_opt.num_sacks) { if (num_sacks != tp->rx_opt.num_sacks) {
tp->rx_opt.num_sacks = num_sacks; tp->rx_opt.num_sacks = num_sacks;
tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks + tp->rx_opt.dsack, 4 - tp->rx_opt.tstamp_ok); tp->rx_opt.eff_sacks = min(tp->rx_opt.num_sacks +
tp->rx_opt.dsack,
4 - tp->rx_opt.tstamp_ok);
} }
} }
...@@ -3805,7 +3818,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -3805,7 +3818,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq)
goto drop; goto drop;
__skb_pull(skb, th->doff*4); __skb_pull(skb, th->doff * 4);
TCP_ECN_accept_cwr(tp, skb); TCP_ECN_accept_cwr(tp, skb);
...@@ -3945,7 +3958,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -3945,7 +3958,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
tp->selective_acks[0].end_seq = tp->selective_acks[0].end_seq =
TCP_SKB_CB(skb)->end_seq; TCP_SKB_CB(skb)->end_seq;
} }
__skb_queue_head(&tp->out_of_order_queue,skb); __skb_queue_head(&tp->out_of_order_queue, skb);
} else { } else {
struct sk_buff *skb1 = tp->out_of_order_queue.prev; struct sk_buff *skb1 = tp->out_of_order_queue.prev;
u32 seq = TCP_SKB_CB(skb)->seq; u32 seq = TCP_SKB_CB(skb)->seq;
...@@ -3968,10 +3981,10 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -3968,10 +3981,10 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
if (!after(TCP_SKB_CB(skb1)->seq, seq)) if (!after(TCP_SKB_CB(skb1)->seq, seq))
break; break;
} while ((skb1 = skb1->prev) != } while ((skb1 = skb1->prev) !=
(struct sk_buff*)&tp->out_of_order_queue); (struct sk_buff *)&tp->out_of_order_queue);
/* Do skb overlap to previous one? */ /* Do skb overlap to previous one? */
if (skb1 != (struct sk_buff*)&tp->out_of_order_queue && if (skb1 != (struct sk_buff *)&tp->out_of_order_queue &&
before(seq, TCP_SKB_CB(skb1)->end_seq)) { before(seq, TCP_SKB_CB(skb1)->end_seq)) {
if (!after(end_seq, TCP_SKB_CB(skb1)->end_seq)) { if (!after(end_seq, TCP_SKB_CB(skb1)->end_seq)) {
/* All the bits are present. Drop. */ /* All the bits are present. Drop. */
...@@ -3981,7 +3994,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -3981,7 +3994,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
} }
if (after(seq, TCP_SKB_CB(skb1)->seq)) { if (after(seq, TCP_SKB_CB(skb1)->seq)) {
/* Partial overlap. */ /* Partial overlap. */
tcp_dsack_set(tp, seq, TCP_SKB_CB(skb1)->end_seq); tcp_dsack_set(tp, seq,
TCP_SKB_CB(skb1)->end_seq);
} else { } else {
skb1 = skb1->prev; skb1 = skb1->prev;
} }
...@@ -3990,14 +4004,16 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -3990,14 +4004,16 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
/* And clean segments covered by new one as whole. */ /* And clean segments covered by new one as whole. */
while ((skb1 = skb->next) != while ((skb1 = skb->next) !=
(struct sk_buff*)&tp->out_of_order_queue && (struct sk_buff *)&tp->out_of_order_queue &&
after(end_seq, TCP_SKB_CB(skb1)->seq)) { after(end_seq, TCP_SKB_CB(skb1)->seq)) {
if (before(end_seq, TCP_SKB_CB(skb1)->end_seq)) { if (before(end_seq, TCP_SKB_CB(skb1)->end_seq)) {
tcp_dsack_extend(tp, TCP_SKB_CB(skb1)->seq, end_seq); tcp_dsack_extend(tp, TCP_SKB_CB(skb1)->seq,
end_seq);
break; break;
} }
__skb_unlink(skb1, &tp->out_of_order_queue); __skb_unlink(skb1, &tp->out_of_order_queue);
tcp_dsack_extend(tp, TCP_SKB_CB(skb1)->seq, TCP_SKB_CB(skb1)->end_seq); tcp_dsack_extend(tp, TCP_SKB_CB(skb1)->seq,
TCP_SKB_CB(skb1)->end_seq);
__kfree_skb(skb1); __kfree_skb(skb1);
} }
...@@ -4021,7 +4037,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, ...@@ -4021,7 +4037,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
/* First, check that queue is collapsible and find /* First, check that queue is collapsible and find
* the point where collapsing can be useful. */ * the point where collapsing can be useful. */
for (skb = head; skb != tail; ) { for (skb = head; skb != tail;) {
/* No new bits? It is possible on ofo queue. */ /* No new bits? It is possible on ofo queue. */
if (!before(start, TCP_SKB_CB(skb)->end_seq)) { if (!before(start, TCP_SKB_CB(skb)->end_seq)) {
struct sk_buff *next = skb->next; struct sk_buff *next = skb->next;
...@@ -4059,9 +4075,9 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, ...@@ -4059,9 +4075,9 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
/* Too big header? This can happen with IPv6. */ /* Too big header? This can happen with IPv6. */
if (copy < 0) if (copy < 0)
return; return;
if (end-start < copy) if (end - start < copy)
copy = end-start; copy = end - start;
nskb = alloc_skb(copy+header, GFP_ATOMIC); nskb = alloc_skb(copy + header, GFP_ATOMIC);
if (!nskb) if (!nskb)
return; return;
...@@ -4171,7 +4187,7 @@ static int tcp_prune_queue(struct sock *sk) ...@@ -4171,7 +4187,7 @@ static int tcp_prune_queue(struct sock *sk)
tcp_collapse_ofo_queue(sk); tcp_collapse_ofo_queue(sk);
tcp_collapse(sk, &sk->sk_receive_queue, tcp_collapse(sk, &sk->sk_receive_queue,
sk->sk_receive_queue.next, sk->sk_receive_queue.next,
(struct sk_buff*)&sk->sk_receive_queue, (struct sk_buff *)&sk->sk_receive_queue,
tp->copied_seq, tp->rcv_nxt); tp->copied_seq, tp->rcv_nxt);
sk_mem_reclaim(sk); sk_mem_reclaim(sk);
...@@ -4210,7 +4226,6 @@ static int tcp_prune_queue(struct sock *sk) ...@@ -4210,7 +4226,6 @@ static int tcp_prune_queue(struct sock *sk)
return -1; return -1;
} }
/* RFC2861, slow part. Adjust cwnd, after it was not full during one rto. /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto.
* As additional protections, we do not touch cwnd in retransmission phases, * As additional protections, we do not touch cwnd in retransmission phases,
* and if application hit its sndbuf limit recently. * and if application hit its sndbuf limit recently.
...@@ -4273,7 +4288,7 @@ static void tcp_new_space(struct sock *sk) ...@@ -4273,7 +4288,7 @@ static void tcp_new_space(struct sock *sk)
MAX_TCP_HEADER + 16 + sizeof(struct sk_buff), MAX_TCP_HEADER + 16 + sizeof(struct sk_buff),
demanded = max_t(unsigned int, tp->snd_cwnd, demanded = max_t(unsigned int, tp->snd_cwnd,
tp->reordering + 1); tp->reordering + 1);
sndmem *= 2*demanded; sndmem *= 2 * demanded;
if (sndmem > sk->sk_sndbuf) if (sndmem > sk->sk_sndbuf)
sk->sk_sndbuf = min(sndmem, sysctl_tcp_wmem[2]); sk->sk_sndbuf = min(sndmem, sysctl_tcp_wmem[2]);
tp->snd_cwnd_stamp = tcp_time_stamp; tp->snd_cwnd_stamp = tcp_time_stamp;
...@@ -4314,8 +4329,7 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible) ...@@ -4314,8 +4329,7 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
/* We ACK each frame or... */ /* We ACK each frame or... */
tcp_in_quickack_mode(sk) || tcp_in_quickack_mode(sk) ||
/* We have out of order data. */ /* We have out of order data. */
(ofo_possible && (ofo_possible && skb_peek(&tp->out_of_order_queue))) {
skb_peek(&tp->out_of_order_queue))) {
/* Then ack it now */ /* Then ack it now */
tcp_send_ack(sk); tcp_send_ack(sk);
} else { } else {
...@@ -4343,7 +4357,7 @@ static inline void tcp_ack_snd_check(struct sock *sk) ...@@ -4343,7 +4357,7 @@ static inline void tcp_ack_snd_check(struct sock *sk)
* either form (or just set the sysctl tcp_stdurg). * either form (or just set the sysctl tcp_stdurg).
*/ */
static void tcp_check_urg(struct sock * sk, struct tcphdr * th) static void tcp_check_urg(struct sock *sk, struct tcphdr *th)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
u32 ptr = ntohs(th->urg_ptr); u32 ptr = ntohs(th->urg_ptr);
...@@ -4392,8 +4406,7 @@ static void tcp_check_urg(struct sock * sk, struct tcphdr * th) ...@@ -4392,8 +4406,7 @@ static void tcp_check_urg(struct sock * sk, struct tcphdr * th)
* buggy users. * buggy users.
*/ */
if (tp->urg_seq == tp->copied_seq && tp->urg_data && if (tp->urg_seq == tp->copied_seq && tp->urg_data &&
!sock_flag(sk, SOCK_URGINLINE) && !sock_flag(sk, SOCK_URGINLINE) && tp->copied_seq != tp->rcv_nxt) {
tp->copied_seq != tp->rcv_nxt) {
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
tp->copied_seq++; tp->copied_seq++;
if (skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq)) { if (skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq)) {
...@@ -4416,7 +4429,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, struct tcphdr *th) ...@@ -4416,7 +4429,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, struct tcphdr *th)
/* Check if we get a new urgent pointer - normally not. */ /* Check if we get a new urgent pointer - normally not. */
if (th->urg) if (th->urg)
tcp_check_urg(sk,th); tcp_check_urg(sk, th);
/* Do we wait for any urgent data? - normally not... */ /* Do we wait for any urgent data? - normally not... */
if (tp->urg_data == TCP_URG_NOTYET) { if (tp->urg_data == TCP_URG_NOTYET) {
...@@ -4458,7 +4471,8 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen) ...@@ -4458,7 +4471,8 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen)
return err; return err;
} }
static __sum16 __tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb) static __sum16 __tcp_checksum_complete_user(struct sock *sk,
struct sk_buff *skb)
{ {
__sum16 result; __sum16 result;
...@@ -4472,14 +4486,16 @@ static __sum16 __tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb ...@@ -4472,14 +4486,16 @@ static __sum16 __tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb
return result; return result;
} }
static inline int tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb) static inline int tcp_checksum_complete_user(struct sock *sk,
struct sk_buff *skb)
{ {
return !skb_csum_unnecessary(skb) && return !skb_csum_unnecessary(skb) &&
__tcp_checksum_complete_user(sk, skb); __tcp_checksum_complete_user(sk, skb);
} }
#ifdef CONFIG_NET_DMA #ifdef CONFIG_NET_DMA
static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb, int hlen) static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb,
int hlen)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
int chunk = skb->len - hlen; int chunk = skb->len - hlen;
...@@ -4495,7 +4511,9 @@ static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb, int hlen ...@@ -4495,7 +4511,9 @@ static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb, int hlen
if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) { if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) {
dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan, dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan,
skb, hlen, tp->ucopy.iov, chunk, tp->ucopy.pinned_list); skb, hlen,
tp->ucopy.iov, chunk,
tp->ucopy.pinned_list);
if (dma_cookie < 0) if (dma_cookie < 0)
goto out; goto out;
...@@ -4646,7 +4664,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, ...@@ -4646,7 +4664,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
eaten = 1; eaten = 1;
} }
#endif #endif
if (tp->ucopy.task == current && sock_owned_by_user(sk) && !copied_early) { if (tp->ucopy.task == current &&
sock_owned_by_user(sk) && !copied_early) {
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
if (!tcp_copy_to_iovec(sk, skb, tcp_header_len)) if (!tcp_copy_to_iovec(sk, skb, tcp_header_len))
...@@ -4693,7 +4712,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, ...@@ -4693,7 +4712,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
NET_INC_STATS_BH(LINUX_MIB_TCPHPHITS); NET_INC_STATS_BH(LINUX_MIB_TCPHPHITS);
/* Bulk data transfer: receiver */ /* Bulk data transfer: receiver */
__skb_pull(skb,tcp_header_len); __skb_pull(skb, tcp_header_len);
__skb_queue_tail(&sk->sk_receive_queue, skb); __skb_queue_tail(&sk->sk_receive_queue, skb);
skb_set_owner_r(skb, sk); skb_set_owner_r(skb, sk);
tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq; tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
...@@ -4725,7 +4744,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, ...@@ -4725,7 +4744,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
} }
slow_path: slow_path:
if (len < (th->doff<<2) || tcp_checksum_complete_user(sk, skb)) if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
goto csum_error; goto csum_error;
/* /*
...@@ -4975,7 +4994,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, ...@@ -4975,7 +4994,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
} }
/* PAWS check. */ /* PAWS check. */
if (tp->rx_opt.ts_recent_stamp && tp->rx_opt.saw_tstamp && tcp_paws_check(&tp->rx_opt, 0)) if (tp->rx_opt.ts_recent_stamp && tp->rx_opt.saw_tstamp &&
tcp_paws_check(&tp->rx_opt, 0))
goto discard_and_undo; goto discard_and_undo;
if (th->syn) { if (th->syn) {
...@@ -5010,7 +5030,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, ...@@ -5010,7 +5030,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
tcp_initialize_rcv_mss(sk); tcp_initialize_rcv_mss(sk);
tcp_send_synack(sk); tcp_send_synack(sk);
#if 0 #if 0
/* Note, we could accept data and URG from this segment. /* Note, we could accept data and URG from this segment.
...@@ -5042,7 +5061,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, ...@@ -5042,7 +5061,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
return 1; return 1;
} }
/* /*
* This function implements the receiving procedure of RFC 793 for * This function implements the receiving procedure of RFC 793 for
* all states except ESTABLISHED and TIME_WAIT. * all states except ESTABLISHED and TIME_WAIT.
...@@ -5176,8 +5194,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, ...@@ -5176,8 +5194,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
* and does not calculate rtt. * and does not calculate rtt.
* Fix it at least with timestamps. * Fix it at least with timestamps.
*/ */
if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr && if (tp->rx_opt.saw_tstamp &&
!tp->srtt) tp->rx_opt.rcv_tsecr && !tp->srtt)
tcp_ack_saw_tstamp(sk, 0); tcp_ack_saw_tstamp(sk, 0);
if (tp->rx_opt.tstamp_ok) if (tp->rx_opt.tstamp_ok)
......
net/ipv4/tcp_output.c
View file @ 056834d9
...@@ -221,14 +221,14 @@ void tcp_select_initial_window(int __space, __u32 mss, ...@@ -221,14 +221,14 @@ void tcp_select_initial_window(int __space, __u32 mss,
* following RFC2414. Senders, not following this RFC, * following RFC2414. Senders, not following this RFC,
* will be satisfied with 2. * will be satisfied with 2.
*/ */
if (mss > (1<<*rcv_wscale)) { if (mss > (1 << *rcv_wscale)) {
int init_cwnd = 4; int init_cwnd = 4;
if (mss > 1460*3) if (mss > 1460 * 3)
init_cwnd = 2; init_cwnd = 2;
else if (mss > 1460) else if (mss > 1460)
init_cwnd = 3; init_cwnd = 3;
if (*rcv_wnd > init_cwnd*mss) if (*rcv_wnd > init_cwnd * mss)
*rcv_wnd = init_cwnd*mss; *rcv_wnd = init_cwnd * mss;
} }
/* Set the clamp no higher than max representable value */ /* Set the clamp no higher than max representable value */
...@@ -278,11 +278,10 @@ static u16 tcp_select_window(struct sock *sk) ...@@ -278,11 +278,10 @@ static u16 tcp_select_window(struct sock *sk)
return new_win; return new_win;
} }
static inline void TCP_ECN_send_synack(struct tcp_sock *tp, static inline void TCP_ECN_send_synack(struct tcp_sock *tp, struct sk_buff *skb)
struct sk_buff *skb)
{ {
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_CWR; TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_CWR;
if (!(tp->ecn_flags&TCP_ECN_OK)) if (!(tp->ecn_flags & TCP_ECN_OK))
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_ECE; TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_ECE;
} }
...@@ -292,7 +291,7 @@ static inline void TCP_ECN_send_syn(struct sock *sk, struct sk_buff *skb) ...@@ -292,7 +291,7 @@ static inline void TCP_ECN_send_syn(struct sock *sk, struct sk_buff *skb)
tp->ecn_flags = 0; tp->ecn_flags = 0;
if (sysctl_tcp_ecn) { if (sysctl_tcp_ecn) {
TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_ECE|TCPCB_FLAG_CWR; TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_ECE | TCPCB_FLAG_CWR;
tp->ecn_flags = TCP_ECN_OK; tp->ecn_flags = TCP_ECN_OK;
} }
} }
...@@ -314,7 +313,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct sk_buff *skb, ...@@ -314,7 +313,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct sk_buff *skb,
if (skb->len != tcp_header_len && if (skb->len != tcp_header_len &&
!before(TCP_SKB_CB(skb)->seq, tp->snd_nxt)) { !before(TCP_SKB_CB(skb)->seq, tp->snd_nxt)) {
INET_ECN_xmit(sk); INET_ECN_xmit(sk);
if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) { if (tp->ecn_flags & TCP_ECN_QUEUE_CWR) {
tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR;
tcp_hdr(skb)->cwr = 1; tcp_hdr(skb)->cwr = 1;
skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN; skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
...@@ -431,7 +430,7 @@ static void tcp_syn_build_options(__be32 *ptr, int mss, int ts, int sack, ...@@ -431,7 +430,7 @@ static void tcp_syn_build_options(__be32 *ptr, int mss, int ts, int sack,
(TCPOPT_NOP << 16) | (TCPOPT_NOP << 16) |
(TCPOPT_MD5SIG << 8) | (TCPOPT_MD5SIG << 8) |
TCPOLEN_MD5SIG); TCPOLEN_MD5SIG);
*md5_hash = (__u8 *) ptr; *md5_hash = (__u8 *)ptr;
} }
#endif #endif
} }
...@@ -447,7 +446,8 @@ static void tcp_syn_build_options(__be32 *ptr, int mss, int ts, int sack, ...@@ -447,7 +446,8 @@ static void tcp_syn_build_options(__be32 *ptr, int mss, int ts, int sack,
* We are working here with either a clone of the original * We are working here with either a clone of the original
* SKB, or a fresh unique copy made by the retransmit engine. * SKB, or a fresh unique copy made by the retransmit engine.
*/ */
static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, gfp_t gfp_mask) static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
gfp_t gfp_mask)
{ {
const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_connection_sock *icsk = inet_csk(sk);
struct inet_sock *inet; struct inet_sock *inet;
...@@ -551,8 +551,8 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, ...@@ -551,8 +551,8 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
th->urg_ptr = 0; th->urg_ptr = 0;
if (unlikely(tp->urg_mode && if (unlikely(tp->urg_mode &&
between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF))) { between(tp->snd_up, tcb->seq + 1, tcb->seq + 0xFFFF))) {
th->urg_ptr = htons(tp->snd_up-tcb->seq); th->urg_ptr = htons(tp->snd_up - tcb->seq);
th->urg = 1; th->urg = 1;
} }
...@@ -616,7 +616,6 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, ...@@ -616,7 +616,6 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
#undef SYSCTL_FLAG_SACK #undef SYSCTL_FLAG_SACK
} }
/* This routine just queue's the buffer /* This routine just queue's the buffer
* *
* NOTE: probe0 timer is not checked, do not forget tcp_push_pending_frames, * NOTE: probe0 timer is not checked, do not forget tcp_push_pending_frames,
...@@ -634,7 +633,8 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb) ...@@ -634,7 +633,8 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb)
sk_mem_charge(sk, skb->truesize); sk_mem_charge(sk, skb->truesize);
} }
static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned int mss_now) static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb,
unsigned int mss_now)
{ {
if (skb->len <= mss_now || !sk_can_gso(sk)) { if (skb->len <= mss_now || !sk_can_gso(sk)) {
/* Avoid the costly divide in the normal /* Avoid the costly divide in the normal
...@@ -670,7 +670,8 @@ static void tcp_adjust_fackets_out(struct sock *sk, struct sk_buff *skb, ...@@ -670,7 +670,8 @@ static void tcp_adjust_fackets_out(struct sock *sk, struct sk_buff *skb,
* packet to the list. This won't be called frequently, I hope. * packet to the list. This won't be called frequently, I hope.
* Remember, these are still headerless SKBs at this point. * Remember, these are still headerless SKBs at this point.
*/ */
int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss_now) int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
unsigned int mss_now)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *buff; struct sk_buff *buff;
...@@ -708,13 +709,14 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss ...@@ -708,13 +709,14 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
/* PSH and FIN should only be set in the second packet. */ /* PSH and FIN should only be set in the second packet. */
flags = TCP_SKB_CB(skb)->flags; flags = TCP_SKB_CB(skb)->flags;
TCP_SKB_CB(skb)->flags = flags & ~(TCPCB_FLAG_FIN|TCPCB_FLAG_PSH); TCP_SKB_CB(skb)->flags = flags & ~(TCPCB_FLAG_FIN | TCPCB_FLAG_PSH);
TCP_SKB_CB(buff)->flags = flags; TCP_SKB_CB(buff)->flags = flags;
TCP_SKB_CB(buff)->sacked = TCP_SKB_CB(skb)->sacked; TCP_SKB_CB(buff)->sacked = TCP_SKB_CB(skb)->sacked;
if (!skb_shinfo(skb)->nr_frags && skb->ip_summed != CHECKSUM_PARTIAL) { if (!skb_shinfo(skb)->nr_frags && skb->ip_summed != CHECKSUM_PARTIAL) {
/* Copy and checksum data tail into the new buffer. */ /* Copy and checksum data tail into the new buffer. */
buff->csum = csum_partial_copy_nocheck(skb->data + len, skb_put(buff, nsize), buff->csum = csum_partial_copy_nocheck(skb->data + len,
skb_put(buff, nsize),
nsize, 0); nsize, 0);
skb_trim(skb, len); skb_trim(skb, len);
...@@ -781,7 +783,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len) ...@@ -781,7 +783,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)
eat = len; eat = len;
k = 0; k = 0;
for (i=0; i<skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
if (skb_shinfo(skb)->frags[i].size <= eat) { if (skb_shinfo(skb)->frags[i].size <= eat) {
put_page(skb_shinfo(skb)->frags[i].page); put_page(skb_shinfo(skb)->frags[i].page);
eat -= skb_shinfo(skb)->frags[i].size; eat -= skb_shinfo(skb)->frags[i].size;
...@@ -804,8 +806,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len) ...@@ -804,8 +806,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)
int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
{ {
if (skb_cloned(skb) && if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
return -ENOMEM; return -ENOMEM;
/* If len == headlen, we avoid __skb_pull to preserve alignment. */ /* If len == headlen, we avoid __skb_pull to preserve alignment. */
...@@ -909,7 +910,6 @@ void tcp_mtup_init(struct sock *sk) ...@@ -909,7 +910,6 @@ void tcp_mtup_init(struct sock *sk)
NOTE2. inet_csk(sk)->icsk_pmtu_cookie and tp->mss_cache NOTE2. inet_csk(sk)->icsk_pmtu_cookie and tp->mss_cache
are READ ONLY outside this function. --ANK (980731) are READ ONLY outside this function. --ANK (980731)
*/ */
unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu) unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
...@@ -922,8 +922,8 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu) ...@@ -922,8 +922,8 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu)
mss_now = tcp_mtu_to_mss(sk, pmtu); mss_now = tcp_mtu_to_mss(sk, pmtu);
/* Bound mss with half of window */ /* Bound mss with half of window */
if (tp->max_window && mss_now > (tp->max_window>>1)) if (tp->max_window && mss_now > (tp->max_window >> 1))
mss_now = max((tp->max_window>>1), 68U - tp->tcp_header_len); mss_now = max((tp->max_window >> 1), 68U - tp->tcp_header_len);
/* And store cached results */ /* And store cached results */
icsk->icsk_pmtu_cookie = pmtu; icsk->icsk_pmtu_cookie = pmtu;
...@@ -977,8 +977,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed) ...@@ -977,8 +977,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed)
inet_csk(sk)->icsk_ext_hdr_len - inet_csk(sk)->icsk_ext_hdr_len -
tp->tcp_header_len); tp->tcp_header_len);
if (tp->max_window && if (tp->max_window && (xmit_size_goal > (tp->max_window >> 1)))
(xmit_size_goal > (tp->max_window >> 1)))
xmit_size_goal = max((tp->max_window >> 1), xmit_size_goal = max((tp->max_window >> 1),
68U - tp->tcp_header_len); 68U - tp->tcp_header_len);
...@@ -990,7 +989,6 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed) ...@@ -990,7 +989,6 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed)
} }
/* Congestion window validation. (RFC2861) */ /* Congestion window validation. (RFC2861) */
static void tcp_cwnd_validate(struct sock *sk) static void tcp_cwnd_validate(struct sock *sk)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
...@@ -1017,8 +1015,7 @@ static void tcp_cwnd_validate(struct sock *sk) ...@@ -1017,8 +1015,7 @@ static void tcp_cwnd_validate(struct sock *sk)
* per input skb which could be mostly avoided here (if desired). * per input skb which could be mostly avoided here (if desired).
*/ */
static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb, static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb,
unsigned int mss_now, unsigned int mss_now, unsigned int cwnd)
unsigned int cwnd)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
u32 needed, window, cwnd_len; u32 needed, window, cwnd_len;
...@@ -1039,7 +1036,8 @@ static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb, ...@@ -1039,7 +1036,8 @@ static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb,
/* Can at least one segment of SKB be sent right now, according to the /* Can at least one segment of SKB be sent right now, according to the
* congestion window rules? If so, return how many segments are allowed. * congestion window rules? If so, return how many segments are allowed.
*/ */
static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, struct sk_buff *skb) static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp,
struct sk_buff *skb)
{ {
u32 in_flight, cwnd; u32 in_flight, cwnd;
...@@ -1059,13 +1057,12 @@ static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, struct sk_buff *sk ...@@ -1059,13 +1057,12 @@ static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, struct sk_buff *sk
/* This must be invoked the first time we consider transmitting /* This must be invoked the first time we consider transmitting
* SKB onto the wire. * SKB onto the wire.
*/ */
static int tcp_init_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned int mss_now) static int tcp_init_tso_segs(struct sock *sk, struct sk_buff *skb,
unsigned int mss_now)
{ {
int tso_segs = tcp_skb_pcount(skb); int tso_segs = tcp_skb_pcount(skb);
if (!tso_segs || if (!tso_segs || (tso_segs > 1 && tcp_skb_mss(skb) != mss_now)) {
(tso_segs > 1 &&
tcp_skb_mss(skb) != mss_now)) {
tcp_set_skb_tso_segs(sk, skb, mss_now); tcp_set_skb_tso_segs(sk, skb, mss_now);
tso_segs = tcp_skb_pcount(skb); tso_segs = tcp_skb_pcount(skb);
} }
...@@ -1085,16 +1082,13 @@ static inline int tcp_minshall_check(const struct tcp_sock *tp) ...@@ -1085,16 +1082,13 @@ static inline int tcp_minshall_check(const struct tcp_sock *tp)
* 4. Or TCP_CORK is not set, and all sent packets are ACKed. * 4. Or TCP_CORK is not set, and all sent packets are ACKed.
* With Minshall's modification: all sent small packets are ACKed. * With Minshall's modification: all sent small packets are ACKed.
*/ */
static inline int tcp_nagle_check(const struct tcp_sock *tp, static inline int tcp_nagle_check(const struct tcp_sock *tp,
const struct sk_buff *skb, const struct sk_buff *skb,
unsigned mss_now, int nonagle) unsigned mss_now, int nonagle)
{ {
return (skb->len < mss_now && return (skb->len < mss_now &&
((nonagle&TCP_NAGLE_CORK) || ((nonagle & TCP_NAGLE_CORK) ||
(!nonagle && (!nonagle && tp->packets_out && tcp_minshall_check(tp))));
tp->packets_out &&
tcp_minshall_check(tp))));
} }
/* Return non-zero if the Nagle test allows this packet to be /* Return non-zero if the Nagle test allows this packet to be
...@@ -1126,7 +1120,8 @@ static inline int tcp_nagle_test(struct tcp_sock *tp, struct sk_buff *skb, ...@@ -1126,7 +1120,8 @@ static inline int tcp_nagle_test(struct tcp_sock *tp, struct sk_buff *skb,
} }
/* Does at least the first segment of SKB fit into the send window? */ /* Does at least the first segment of SKB fit into the send window? */
static inline int tcp_snd_wnd_test(struct tcp_sock *tp, struct sk_buff *skb, unsigned int cur_mss) static inline int tcp_snd_wnd_test(struct tcp_sock *tp, struct sk_buff *skb,
unsigned int cur_mss)
{ {
u32 end_seq = TCP_SKB_CB(skb)->end_seq; u32 end_seq = TCP_SKB_CB(skb)->end_seq;
...@@ -1152,8 +1147,7 @@ static unsigned int tcp_snd_test(struct sock *sk, struct sk_buff *skb, ...@@ -1152,8 +1147,7 @@ static unsigned int tcp_snd_test(struct sock *sk, struct sk_buff *skb,
return 0; return 0;
cwnd_quota = tcp_cwnd_test(tp, skb); cwnd_quota = tcp_cwnd_test(tp, skb);
if (cwnd_quota && if (cwnd_quota && !tcp_snd_wnd_test(tp, skb, cur_mss))
!tcp_snd_wnd_test(tp, skb, cur_mss))
cwnd_quota = 0; cwnd_quota = 0;
return cwnd_quota; return cwnd_quota;
...@@ -1177,7 +1171,8 @@ int tcp_may_send_now(struct sock *sk) ...@@ -1177,7 +1171,8 @@ int tcp_may_send_now(struct sock *sk)
* know that all the data is in scatter-gather pages, and that the * know that all the data is in scatter-gather pages, and that the
* packet has never been sent out before (and thus is not cloned). * packet has never been sent out before (and thus is not cloned).
*/ */
static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, unsigned int mss_now) static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
unsigned int mss_now)
{ {
struct sk_buff *buff; struct sk_buff *buff;
int nlen = skb->len - len; int nlen = skb->len - len;
...@@ -1203,7 +1198,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, ...@@ -1203,7 +1198,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
/* PSH and FIN should only be set in the second packet. */ /* PSH and FIN should only be set in the second packet. */
flags = TCP_SKB_CB(skb)->flags; flags = TCP_SKB_CB(skb)->flags;
TCP_SKB_CB(skb)->flags = flags & ~(TCPCB_FLAG_FIN|TCPCB_FLAG_PSH); TCP_SKB_CB(skb)->flags = flags & ~(TCPCB_FLAG_FIN | TCPCB_FLAG_PSH);
TCP_SKB_CB(buff)->flags = flags; TCP_SKB_CB(buff)->flags = flags;
/* This packet was never sent out yet, so no SACK bits. */ /* This packet was never sent out yet, so no SACK bits. */
...@@ -1247,8 +1242,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) ...@@ -1247,8 +1242,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
in_flight = tcp_packets_in_flight(tp); in_flight = tcp_packets_in_flight(tp);
BUG_ON(tcp_skb_pcount(skb) <= 1 || BUG_ON(tcp_skb_pcount(skb) <= 1 || (tp->snd_cwnd <= in_flight));
(tp->snd_cwnd <= in_flight));
send_win = tcp_wnd_end(tp) - TCP_SKB_CB(skb)->seq; send_win = tcp_wnd_end(tp) - TCP_SKB_CB(skb)->seq;
...@@ -1281,7 +1275,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) ...@@ -1281,7 +1275,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
} }
/* Ok, it looks like it is advisable to defer. */ /* Ok, it looks like it is advisable to defer. */
tp->tso_deferred = 1 | (jiffies<<1); tp->tso_deferred = 1 | (jiffies << 1);
return 1; return 1;
...@@ -1293,7 +1287,8 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) ...@@ -1293,7 +1287,8 @@ static int tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb)
/* Create a new MTU probe if we are ready. /* Create a new MTU probe if we are ready.
* Returns 0 if we should wait to probe (no cwnd available), * Returns 0 if we should wait to probe (no cwnd available),
* 1 if a probe was sent, * 1 if a probe was sent,
* -1 otherwise */ * -1 otherwise
*/
static int tcp_mtu_probe(struct sock *sk) static int tcp_mtu_probe(struct sock *sk)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
...@@ -1318,7 +1313,7 @@ static int tcp_mtu_probe(struct sock *sk) ...@@ -1318,7 +1313,7 @@ static int tcp_mtu_probe(struct sock *sk)
/* Very simple search strategy: just double the MSS. */ /* Very simple search strategy: just double the MSS. */
mss_now = tcp_current_mss(sk, 0); mss_now = tcp_current_mss(sk, 0);
probe_size = 2*tp->mss_cache; probe_size = 2 * tp->mss_cache;
size_needed = probe_size + (tp->reordering + 1) * tp->mss_cache; size_needed = probe_size + (tp->reordering + 1) * tp->mss_cache;
if (probe_size > tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_high)) { if (probe_size > tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_high)) {
/* TODO: set timer for probe_converge_event */ /* TODO: set timer for probe_converge_event */
...@@ -1366,7 +1361,8 @@ static int tcp_mtu_probe(struct sock *sk) ...@@ -1366,7 +1361,8 @@ static int tcp_mtu_probe(struct sock *sk)
skb_copy_bits(skb, 0, skb_put(nskb, copy), copy); skb_copy_bits(skb, 0, skb_put(nskb, copy), copy);
else else
nskb->csum = skb_copy_and_csum_bits(skb, 0, nskb->csum = skb_copy_and_csum_bits(skb, 0,
skb_put(nskb, copy), copy, nskb->csum); skb_put(nskb, copy),
copy, nskb->csum);
if (skb->len <= copy) { if (skb->len <= copy) {
/* We've eaten all the data from this skb. /* We've eaten all the data from this skb.
...@@ -1380,7 +1376,8 @@ static int tcp_mtu_probe(struct sock *sk) ...@@ -1380,7 +1376,8 @@ static int tcp_mtu_probe(struct sock *sk)
if (!skb_shinfo(skb)->nr_frags) { if (!skb_shinfo(skb)->nr_frags) {
skb_pull(skb, copy); skb_pull(skb, copy);
if (skb->ip_summed != CHECKSUM_PARTIAL) if (skb->ip_summed != CHECKSUM_PARTIAL)
skb->csum = csum_partial(skb->data, skb->len, 0); skb->csum = csum_partial(skb->data,
skb->len, 0);
} else { } else {
__pskb_trim_head(skb, copy); __pskb_trim_head(skb, copy);
tcp_set_skb_tso_segs(sk, skb, mss_now); tcp_set_skb_tso_segs(sk, skb, mss_now);
...@@ -1414,7 +1411,6 @@ static int tcp_mtu_probe(struct sock *sk) ...@@ -1414,7 +1411,6 @@ static int tcp_mtu_probe(struct sock *sk)
return -1; return -1;
} }
/* This routine writes packets to the network. It advances the /* This routine writes packets to the network. It advances the
* send_head. This happens as incoming acks open up the remote * send_head. This happens as incoming acks open up the remote
* window for us. * window for us.
...@@ -1626,7 +1622,8 @@ u32 __tcp_select_window(struct sock *sk) ...@@ -1626,7 +1622,8 @@ u32 __tcp_select_window(struct sock *sk)
icsk->icsk_ack.quick = 0; icsk->icsk_ack.quick = 0;
if (tcp_memory_pressure) if (tcp_memory_pressure)
tp->rcv_ssthresh = min(tp->rcv_ssthresh, 4U*tp->advmss); tp->rcv_ssthresh = min(tp->rcv_ssthresh,
4U * tp->advmss);
if (free_space < mss) if (free_space < mss)
return 0; return 0;
...@@ -1659,7 +1656,7 @@ u32 __tcp_select_window(struct sock *sk) ...@@ -1659,7 +1656,7 @@ u32 __tcp_select_window(struct sock *sk)
* is too small. * is too small.
*/ */
if (window <= free_space - mss || window > free_space) if (window <= free_space - mss || window > free_space)
window = (free_space/mss)*mss; window = (free_space / mss) * mss;
else if (mss == full_space && else if (mss == full_space &&
free_space > window + (full_space >> 1)) free_space > window + (full_space >> 1))
window = free_space; window = free_space;
...@@ -1669,7 +1666,8 @@ u32 __tcp_select_window(struct sock *sk) ...@@ -1669,7 +1666,8 @@ u32 __tcp_select_window(struct sock *sk)
} }
/* Attempt to collapse two adjacent SKB's during retransmission. */ /* Attempt to collapse two adjacent SKB's during retransmission. */
static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int mss_now) static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb,
int mss_now)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *next_skb = tcp_write_queue_next(sk, skb); struct sk_buff *next_skb = tcp_write_queue_next(sk, skb);
...@@ -1762,12 +1760,12 @@ void tcp_simple_retransmit(struct sock *sk) ...@@ -1762,12 +1760,12 @@ void tcp_simple_retransmit(struct sock *sk)
if (skb == tcp_send_head(sk)) if (skb == tcp_send_head(sk))
break; break;
if (skb->len > mss && if (skb->len > mss &&
!(TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_ACKED)) { !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) {
if (TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_RETRANS) { if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) {
TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS;
tp->retrans_out -= tcp_skb_pcount(skb); tp->retrans_out -= tcp_skb_pcount(skb);
} }
if (!(TCP_SKB_CB(skb)->sacked&TCPCB_LOST)) { if (!(TCP_SKB_CB(skb)->sacked & TCPCB_LOST)) {
TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;
tp->lost_out += tcp_skb_pcount(skb); tp->lost_out += tcp_skb_pcount(skb);
lost = 1; lost = 1;
...@@ -1846,8 +1844,10 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) ...@@ -1846,8 +1844,10 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
(skb->len < (cur_mss >> 1)) && (skb->len < (cur_mss >> 1)) &&
(tcp_write_queue_next(sk, skb) != tcp_send_head(sk)) && (tcp_write_queue_next(sk, skb) != tcp_send_head(sk)) &&
(!tcp_skb_is_last(sk, skb)) && (!tcp_skb_is_last(sk, skb)) &&
(skb_shinfo(skb)->nr_frags == 0 && skb_shinfo(tcp_write_queue_next(sk, skb))->nr_frags == 0) && (skb_shinfo(skb)->nr_frags == 0 &&
(tcp_skb_pcount(skb) == 1 && tcp_skb_pcount(tcp_write_queue_next(sk, skb)) == 1) && skb_shinfo(tcp_write_queue_next(sk, skb))->nr_frags == 0) &&
(tcp_skb_pcount(skb) == 1 &&
tcp_skb_pcount(tcp_write_queue_next(sk, skb)) == 1) &&
(sysctl_tcp_retrans_collapse != 0)) (sysctl_tcp_retrans_collapse != 0))
tcp_retrans_try_collapse(sk, skb, cur_mss); tcp_retrans_try_collapse(sk, skb, cur_mss);
...@@ -1885,7 +1885,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) ...@@ -1885,7 +1885,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
tp->total_retrans++; tp->total_retrans++;
#if FASTRETRANS_DEBUG > 0 #if FASTRETRANS_DEBUG > 0
if (TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_RETRANS) { if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "retrans_out leaked.\n"); printk(KERN_DEBUG "retrans_out leaked.\n");
} }
...@@ -1927,7 +1927,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk) ...@@ -1927,7 +1927,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
if (tp->retransmit_skb_hint) { if (tp->retransmit_skb_hint) {
skb = tp->retransmit_skb_hint; skb = tp->retransmit_skb_hint;
packet_cnt = tp->retransmit_cnt_hint; packet_cnt = tp->retransmit_cnt_hint;
}else{ } else {
skb = tcp_write_queue_head(sk); skb = tcp_write_queue_head(sk);
packet_cnt = 0; packet_cnt = 0;
} }
...@@ -1954,7 +1954,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk) ...@@ -1954,7 +1954,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
return; return;
if (sacked & TCPCB_LOST) { if (sacked & TCPCB_LOST) {
if (!(sacked&(TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))) { if (!(sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))) {
if (tcp_retransmit_skb(sk, skb)) { if (tcp_retransmit_skb(sk, skb)) {
tp->retransmit_skb_hint = NULL; tp->retransmit_skb_hint = NULL;
return; return;
...@@ -2036,7 +2036,6 @@ void tcp_xmit_retransmit_queue(struct sock *sk) ...@@ -2036,7 +2036,6 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
} }
} }
/* Send a fin. The caller locks the socket for us. This cannot be /* Send a fin. The caller locks the socket for us. This cannot be
* allowed to fail queueing a FIN frame under any circumstances. * allowed to fail queueing a FIN frame under any circumstances.
*/ */
...@@ -2122,14 +2121,14 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority) ...@@ -2122,14 +2121,14 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority)
*/ */
int tcp_send_synack(struct sock *sk) int tcp_send_synack(struct sock *sk)
{ {
struct sk_buff* skb; struct sk_buff *skb;
skb = tcp_write_queue_head(sk); skb = tcp_write_queue_head(sk);
if (skb == NULL || !(TCP_SKB_CB(skb)->flags&TCPCB_FLAG_SYN)) { if (skb == NULL || !(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_SYN)) {
printk(KERN_DEBUG "tcp_send_synack: wrong queue state\n"); printk(KERN_DEBUG "tcp_send_synack: wrong queue state\n");
return -EFAULT; return -EFAULT;
} }
if (!(TCP_SKB_CB(skb)->flags&TCPCB_FLAG_ACK)) { if (!(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_ACK)) {
if (skb_cloned(skb)) { if (skb_cloned(skb)) {
struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC); struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC);
if (nskb == NULL) if (nskb == NULL)
...@@ -2153,7 +2152,7 @@ int tcp_send_synack(struct sock *sk) ...@@ -2153,7 +2152,7 @@ int tcp_send_synack(struct sock *sk)
/* /*
* Prepare a SYN-ACK. * Prepare a SYN-ACK.
*/ */
struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst, struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
struct request_sock *req) struct request_sock *req)
{ {
struct inet_request_sock *ireq = inet_rsk(req); struct inet_request_sock *ireq = inet_rsk(req);
...@@ -2372,9 +2371,10 @@ void tcp_send_delayed_ack(struct sock *sk) ...@@ -2372,9 +2371,10 @@ void tcp_send_delayed_ack(struct sock *sk)
if (ato > TCP_DELACK_MIN) { if (ato > TCP_DELACK_MIN) {
const struct tcp_sock *tp = tcp_sk(sk); const struct tcp_sock *tp = tcp_sk(sk);
int max_ato = HZ/2; int max_ato = HZ / 2;
if (icsk->icsk_ack.pingpong || (icsk->icsk_ack.pending & ICSK_ACK_PUSHED)) if (icsk->icsk_ack.pingpong ||
(icsk->icsk_ack.pending & ICSK_ACK_PUSHED))
max_ato = TCP_DELACK_MAX; max_ato = TCP_DELACK_MAX;
/* Slow path, intersegment interval is "high". */ /* Slow path, intersegment interval is "high". */
...@@ -2384,7 +2384,7 @@ void tcp_send_delayed_ack(struct sock *sk) ...@@ -2384,7 +2384,7 @@ void tcp_send_delayed_ack(struct sock *sk)
* directly. * directly.
*/ */
if (tp->srtt) { if (tp->srtt) {
int rtt = max(tp->srtt>>3, TCP_DELACK_MIN); int rtt = max(tp->srtt >> 3, TCP_DELACK_MIN);
if (rtt < max_ato) if (rtt < max_ato)
max_ato = rtt; max_ato = rtt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7