Commit f00394ce authored by Yousuk Seung's avatar Yousuk Seung Committed by David S. Miller

tcp: count sacked packets in tcp_sacktag_state

Add sack_delivered to tcp_sacktag_state and count the number of sacked
and dsacked packets. This is pure refactor for future patches to improve
tracking delivered counts.
Signed-off-by: default avatarYousuk Seung <ysseung@google.com>
Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c634e34f
...@@ -1138,6 +1138,7 @@ struct tcp_sacktag_state { ...@@ -1138,6 +1138,7 @@ struct tcp_sacktag_state {
struct rate_sample *rate; struct rate_sample *rate;
int flag; int flag;
unsigned int mss_now; unsigned int mss_now;
u32 sack_delivered;
}; };
/* Check if skb is fully within the SACK block. In presence of GSO skbs, /* Check if skb is fully within the SACK block. In presence of GSO skbs,
...@@ -1259,6 +1260,7 @@ static u8 tcp_sacktag_one(struct sock *sk, ...@@ -1259,6 +1260,7 @@ static u8 tcp_sacktag_one(struct sock *sk,
state->flag |= FLAG_DATA_SACKED; state->flag |= FLAG_DATA_SACKED;
tp->sacked_out += pcount; tp->sacked_out += pcount;
tp->delivered += pcount; /* Out-of-order packets delivered */ tp->delivered += pcount; /* Out-of-order packets delivered */
state->sack_delivered += pcount;
/* Lost marker hint past SACKed? Tweak RFC3517 cnt */ /* Lost marker hint past SACKed? Tweak RFC3517 cnt */
if (tp->lost_skb_hint && if (tp->lost_skb_hint &&
...@@ -1685,6 +1687,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, ...@@ -1685,6 +1687,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
if (found_dup_sack) { if (found_dup_sack) {
state->flag |= FLAG_DSACKING_ACK; state->flag |= FLAG_DSACKING_ACK;
tp->delivered++; /* A spurious retransmission is delivered */ tp->delivered++; /* A spurious retransmission is delivered */
state->sack_delivered++;
} }
/* Eliminate too old ACKs, but take into /* Eliminate too old ACKs, but take into
...@@ -3586,6 +3589,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) ...@@ -3586,6 +3589,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
sack_state.first_sackt = 0; sack_state.first_sackt = 0;
sack_state.rate = &rs; sack_state.rate = &rs;
sack_state.sack_delivered = 0;
/* We very likely will need to access rtx queue. */ /* We very likely will need to access rtx queue. */
prefetch(sk->tcp_rtx_queue.rb_node); prefetch(sk->tcp_rtx_queue.rb_node);
......
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