iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: helpers to send special DCTCP ack

Browse Source 
[ Upstream commit 2987babb69 ]

Refactor and create helpers to send the special ACK in DCTCP.

Signed-off-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yuchung Cheng
2018-07-18 13:56:34 -07:00
committed by Greg Kroah-Hartman
parent 500e03f463
commit 17fea38e74
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/ipv4/tcp_output.c
View File

@ -901,8 +901,8 @@ out:
* 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, static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,
gfp_t gfp_mask) int clone_it, gfp_t gfp_mask, u32 rcv_nxt)
{ {
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;
@ -962,7 +962,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
th->source = inet->inet_sport; th->source = inet->inet_sport;
th->dest = inet->inet_dport; th->dest = inet->inet_dport;
th->seq = htonl(tcb->seq); th->seq = htonl(tcb->seq);
th->ack_seq = htonl(tp->rcv_nxt); th->ack_seq = htonl(rcv_nxt);
*(((__be16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | *(((__be16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) |
tcb->tcp_flags); tcb->tcp_flags);
@ -1036,6 +1036,13 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
return net_xmit_eval(err); return net_xmit_eval(err);
} }
static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
gfp_t gfp_mask)
{
return __tcp_transmit_skb(sk, skb, clone_it, gfp_mask,
tcp_sk(sk)->rcv_nxt);
}
/* This routine just queues the buffer for sending. /* This routine just queues the buffer for sending.
* *
* 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,
@ -3354,7 +3361,7 @@ void tcp_send_delayed_ack(struct sock *sk)
} }
/* This routine sends an ack and also updates the window. */ /* This routine sends an ack and also updates the window. */
void tcp_send_ack(struct sock *sk) void __tcp_send_ack(struct sock *sk, u32 rcv_nxt)
{ {
struct sk_buff *buff; struct sk_buff *buff;
@ -3391,7 +3398,12 @@ void tcp_send_ack(struct sock *sk)
/* Send it off, this clears delayed acks for us. */ /* Send it off, this clears delayed acks for us. */
skb_mstamp_get(&buff->skb_mstamp); skb_mstamp_get(&buff->skb_mstamp);
tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC)); __tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC), rcv_nxt);
}
void tcp_send_ack(struct sock *sk)
{
__tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt);
} }
EXPORT_SYMBOL_GPL(tcp_send_ack); EXPORT_SYMBOL_GPL(tcp_send_ack);