sctp: implement the sender side for SACK-IMMEDIATELY
Subsystems (2)
PATCH 3/3 sctp: implement the sender side for SACK-IMMEDIATELY
This patch implement the sender side for SACK-IMMEDIATELY extension.
Section 4.1. Sender Side Considerations
Whenever the sender of a DATA chunk can benefit from the corresponding SACK chunk being sent back without delay, the sender MAY set the I-bit in the DATA chunk header.
Reasons for setting the I-bit include
o The sender has not enough queued user data to send the remaining DATA chunks due to the Nagle algorithm.
o The sending of a DATA chunk fills the congestion or receiver window.
o The sender is in the SHUTDOWN-PENDING state.
--- include/net/sctp/structs.h | 2 ++ net/sctp/output.c | 12 ++++++++++++ net/sctp/outqueue.c | 19 ++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletions(-)
include/net/sctp/structs.h +2 -0
@@ -764,6 +764,7 @@ struct sctp_chunk { has_asconf:1, /* IN: have seen an asconf before */ tsn_missing_report:2, /* Data chunk missing counter. */ fast_retransmit:2; /* Is this chunk fast retransmitted? */ +unsigned nagle_qlen;/* Queued data length due to Nagle. */ };void sctp_chunk_hold (struct sctp_chunk *);
@@ -826,6 +827,7 @@ struct sctp_packet { has_sack:1, /* This packet contains a SACK chunk. */ has_auth:1, /* This packet contains an AUTH chunk */ has_data:1, /* This packet contains at least 1 DATA chunk */ + has_iflag:1, /* This packet need I-Flag for last DATA chunk */ ipfragok:1, /* So let ip fragment this packet */ malloced:1; /* Is it malloced? */ };
net/sctp/output.c +12 -0
@@ -75,6 +75,7 @@ static void sctp_packet_reset(struct sctp_packet *packet) packet->has_cookie_echo =0 ; packet->has_sack =0 ; packet->has_data =0 ; + packet->has_iflag =0 ; packet->has_auth =0 ; packet->ipfragok =0 ; packet->auth =NULL ;
@@ -447,6 +448,10 @@ int sctp_packet_transmit(struct sctp_packet *packet) }else chunk->resent =1 ; +if (packet->has_iflag && +list_empty (&packet->chunk_list)) + chunk->chunk_hdr->flags |=SCTP_DATA_SACK_IMM ; + has_data =1 ; }
@@ -743,6 +748,13 @@ static void sctp_packet_append_data(struct sctp_packet *packet,else rwnd =0 ; +/* Reasons for setting the I-bit include +* - The sending of a DATA chunk fills the congestion or +* receiver window. +*/ +if (rwnd =0 || transport->flight_size >= transport->cwnd) + packet->has_iflag =1 ; + asoc->peer.rwnd = rwnd;/* Has been accepted for transmission. */ if (!asoc->peer.prsctp_capable)
net/sctp/outqueue.c +18 -1
@@ -995,10 +995,21 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)/* Add the chunk to the packet. */ status =sctp_packet_transmit_chunk (packet, chunk,0 ); +/* The sender is in the SHUTDOWN-PENDING state, +* The sender MAY set the I-bit in the DATA +* chunk header. +*/ +if (asoc->state =SCTP_STATE_SHUTDOWN_PENDING ) + packet->has_iflag =1 ; +switch (status) { +case SCTP_XMIT_NAGLE_DELAY : +/* mark this chunks not be sent due to Nagle +* algorithm +*/ + chunk->nagle_qlen = q->out_qlen +1 ;case SCTP_XMIT_PMTU_FULL :case SCTP_XMIT_RWND_FULL : -case SCTP_XMIT_NAGLE_DELAY :/* We could not append this chunk, so put * the chunk back on the output queue. */
@@ -1011,6 +1022,12 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)break ;case SCTP_XMIT_OK : +/* The sender has not enough queued user data +* to send the remaining DATA chunks due to the +* Nagle algorithm. +*/ +if (chunk->nagle_qlen = q->out_qlen +1 ) + packet->has_iflag =1 ;break ;default :
Signature · 1 line
1.6.2.2
Quoted 9 lines · Wei Yongjun
This patch implement the sender side for SACK-IMMEDIATELY extension.
Section 4.1. Sender Side Considerations
Whenever the sender of a DATA chunk can benefit from the corresponding SACK chunk being sent back without delay, the sender MAY set the I-bit in the DATA chunk header.
Quoted 7 lines
Reasons for setting the I-bit include
o The sender has not enough queued user data to send the remaining DATA chunks due to the Nagle algorithm.
o The sending of a DATA chunk fills the congestion or receiver window.
These reasons are still up for debate and BSD hasn't implemented them either. For example, if the congestion window is filled, setting I bit is pointless since either there are gaps and you'll get an immediate SACK anyway, or there is sufficient DATA in flight that you'll get a SACK soon.
Setting if for the 0-window event is kind of useless too.
The Nagle algorithm is debatable as well. With recent changes, Nagle doesn't apply to large writes. So the only time, this might be worth it is if an application can't fill pathmtu within 200ms SACK timer.
Quoted 2 lines
o The sender is in the SHUTDOWN-PENDING state.
This is really the only valid state. Also, when SCTP_EOF is set on the message. This part is actually something we don't do right. It should be possible to write a message and set SCTP_EOF at the same time, but we don't support it yet.
Also, please do the API patch along with it. That's just exposing the flag in sctp/user.h and honoring it.
Some more comments below.
Quoted 21 lines
Signed-off-by Wei Yongjun <[email protected]>--- include/net/sctp/structs.h | 2 ++ net/sctp/output.c | 12 ++++++++++++ net/sctp/outqueue.c | 19 ++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletions(-)include/net/sctp/structs.h +1
-0@@ -764,6 +764,7 @@ struct sctp_chunk { has_asconf:1, /* IN: have seen an asconf before */ tsn_missing_report:2, /* Data chunk missing counter. */ fast_retransmit:2; /* Is this chunk fast retransmitted? */ +unsigned nagle_qlen;/* Queued data length due to Nagle. */ };void sctp_chunk_hold (struct sctp_chunk *);
include/net/sctp/structs.h struct sctp_packet { · line 830
Quoted 4 lines
include/net/sctp/structs.h +1
-0@@ -826,6 +827,7 @@ struct sctp_packet { has_sack:1, /* This packet contains a SACK chunk. */ has_auth:1, /* This packet contains an AUTH chunk */ has_data:1, /* This packet contains at least 1 DATA chunk */ + has_iflag:1, /* This packet need I-Flag for last DATA chunk */
You should be able to set this more then once per packet, so the packet flag isn't the right way to do it.
Quoted 16 lines
include/net/sctp/structs.h +0
-0ipfragok:1 ,/* So let ip fragment this packet */ malloced:1; /* Is it malloced? */ };net/sctp/output.c +1
-0@@ -75,6 +75,7 @@ static void sctp_packet_reset(struct sctp_packet *packet) packet->has_cookie_echo =0 ; packet->has_sack =0 ; packet->has_data =0 ; + packet->has_iflag =0 ; packet->has_auth =0 ; packet->ipfragok =0 ; packet->auth =NULL ;
net/sctp/output.c int sctp_packet_transmit(struct sctp_packet *packet) · line 454
Quoted 7 lines
net/sctp/output.c +4
-0@@ -447,6 +448,10 @@ int sctp_packet_transmit(struct sctp_packet *packet) }else chunk->resent =1 ; +if (packet->has_iflag && +list_empty (&packet->chunk_list)) + chunk->chunk_hdr->flags |=SCTP_DATA_SACK_IMM ; +
The setting of the bit should probably be done at chunk creation and when the chunk is added to the packet (sctp_packet_append_data).
Quoted 22 lines
net/sctp/output.c +7
-0has_data =1 ; }@@ -743,6 +748,13 @@ static void sctp_packet_append_data(struct sctp_packet *packet,else rwnd =0 ; +/* Reasons for setting the I-bit include +* - The sending of a DATA chunk fills the congestion or +* receiver window. +*/ +if (rwnd =0 || transport->flight_size >= transport->cwnd) + packet->has_iflag =1 ; + asoc->peer.rwnd = rwnd;/* Has been accepted for transmission. */ if (!asoc->peer.prsctp_capable)net/sctp/outqueue.c +0
-0
net/sctp/outqueue.c static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) · line 1004
Quoted 10 lines
net/sctp/outqueue.c +7
-0@@ -995,10 +995,21 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)/* Add the chunk to the packet. */ status =sctp_packet_transmit_chunk (packet, chunk,0 ); +/* The sender is in the SHUTDOWN-PENDING state, +* The sender MAY set the I-bit in the DATA +* chunk header. +*/ +if (asoc->state =SCTP_STATE_SHUTDOWN_PENDING ) + packet->has_iflag =1 ; +
Set the bit per chunk when adding it to packet.
-vlad
Quoted 25 lines
net/sctp/outqueue.c +11
-1switch (status) { +case SCTP_XMIT_NAGLE_DELAY : +/* mark this chunks not be sent due to Nagle +* algorithm +*/ + chunk->nagle_qlen = q->out_qlen +1 ;case SCTP_XMIT_PMTU_FULL :case SCTP_XMIT_RWND_FULL : -case SCTP_XMIT_NAGLE_DELAY :/* We could not append this chunk, so put * the chunk back on the output queue. */ @@ -1011,6 +1022,12 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)break ;case SCTP_XMIT_OK : +/* The sender has not enough queued user data +* to send the remaining DATA chunks due to the +* Nagle algorithm. +*/ +if (chunk->nagle_qlen = q->out_qlen +1 ) + packet->has_iflag =1 ;break ;default :
Quoted 25 lines · Vlad Yasevich
Quoted 9 lines · Wei Yongjun
This patch implement the sender side for SACK-IMMEDIATELY extension.
Section 4.1. Sender Side Considerations
Whenever the sender of a DATA chunk can benefit from the corresponding SACK chunk being sent back without delay, the sender MAY set the I-bit in the DATA chunk header.
Quoted 8 lines
Reasons for setting the I-bit include
o The sender has not enough queued user data to send the remaining DATA chunks due to the Nagle algorithm.
o The sending of a DATA chunk fills the congestion or receiver window.
These reasons are still up for debate and BSD hasn't implemented them either. For example, if the congestion window is filled, setting I bit is pointless since either there are gaps and you'll get an immediate SACK anyway, or there is sufficient DATA in flight that you'll get a SACK soon.
Quoted 6 lines
Setting if for the 0-window event is kind of useless too.
The Nagle algorithm is debatable as well. With recent changes, Nagle doesn't apply to large writes. So the only time, this might be worth it is if an application can't fill pathmtu within 200ms SACK timer.
I will remove those code in the next version.
Quoted 9 lines
Quoted 3 lines
o The sender is in the SHUTDOWN-PENDING state.
This is really the only valid state. Also, when
SCTP_EOFis set on the message. This part is actually something we don't do right. It should be possible to write a message and setSCTP_EOFat the same time, but we don't support it yet.
I will fix SCTP_EOF to enable write a message and set SCTP_EOF at the same time.
Quoted 3 lines
Also, please do the API patch along with it. That's just exposing the flag in
sctp/user.hand honoring it.
Do you means add a new flag like SCTP_NODSACK or something else, and it can be specified in sendmsg()'s arguments like SCTP_EOF?
Regards,
Wei Yongjun
Quoted 132 lines
Some more comments below.
Quoted 20 lines
Signed-off-by Wei Yongjun <[email protected]>--- include/net/sctp/structs.h | 2 ++ net/sctp/output.c | 12 ++++++++++++ net/sctp/outqueue.c | 19 ++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletions(-)include/net/sctp/structs.h +1
-0@@ -764,6 +764,7 @@ struct sctp_chunk { has_asconf:1, /* IN: have seen an asconf before */ tsn_missing_report:2, /* Data chunk missing counter. */ fast_retransmit:2; /* Is this chunk fast retransmitted? */ +unsigned nagle_qlen;/* Queued data length due to Nagle. */ };void sctp_chunk_hold (struct sctp_chunk *);include/net/sctp/structs.h struct sctp_packet { · line 831
Quoted 5 lines
include/net/sctp/structs.h +1
-0@@ -826,6 +827,7 @@ struct sctp_packet { has_sack:1, /* This packet contains a SACK chunk. */ has_auth:1, /* This packet contains an AUTH chunk */ has_data:1, /* This packet contains at least 1 DATA chunk */ + has_iflag:1, /* This packet need I-Flag for last DATA chunk */You should be able to set this more then once per packet, so the packet flag isn't the right way to do it.
Quoted 16 lines
include/net/sctp/structs.h +0
-0ipfragok:1 ,/* So let ip fragment this packet */ malloced:1; /* Is it malloced? */};
net/sctp/output.c +1
-0@@ -75,6 +75,7 @@ static void sctp_packet_reset(struct sctp_packet *packet) packet->has_cookie_echo =0 ; packet->has_sack =0 ; packet->has_data =0 ; + packet->has_iflag =0 ; packet->has_auth =0 ; packet->ipfragok =0 ; packet->auth =NULL ;net/sctp/output.c int sctp_packet_transmit(struct sctp_packet *packet) · line 455
Quoted 8 lines
net/sctp/output.c +4
-0@@ -447,6 +448,10 @@ int sctp_packet_transmit(struct sctp_packet *packet) }else chunk->resent =1 ; +if (packet->has_iflag && +list_empty (&packet->chunk_list)) + chunk->chunk_hdr->flags |=SCTP_DATA_SACK_IMM ; +The setting of the bit should probably be done at chunk creation and when the chunk is added to the packet (
sctp_packet_append_data).Quoted 23 lines
net/sctp/output.c +7
-0has_data =1 ; }@@ -743,6 +748,13 @@ static void sctp_packet_append_data(struct sctp_packet *packet,else rwnd =0 ; +/* Reasons for setting the I-bit include +* - The sending of a DATA chunk fills the congestion or +* receiver window. +*/ +if (rwnd =0 || transport->flight_size >= transport->cwnd) + packet->has_iflag =1 ; + asoc->peer.rwnd = rwnd;/* Has been accepted for transmission. */ if (!asoc->peer.prsctp_capable)net/sctp/outqueue.c +0
-0@@ -995,10 +995,21 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)/* Add the chunk to the packet. */ net/sctp/outqueue.c static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) · line 1005
Quoted 10 lines
net/sctp/outqueue.c +7
-0status =sctp_packet_transmit_chunk (packet, chunk,0 ); +/* The sender is in the SHUTDOWN-PENDING state, +* The sender MAY set the I-bit in the DATA +* chunk header. +*/ +if (asoc->state =SCTP_STATE_SHUTDOWN_PENDING ) + packet->has_iflag =1 ; +Set the bit per chunk when adding it to packet.
-vlad
Quoted 26 lines
net/sctp/outqueue.c +5
-1switch (status) { +case SCTP_XMIT_NAGLE_DELAY : +/* mark this chunks not be sent due to Nagle +* algorithm +*/ + chunk->nagle_qlen = q->out_qlen +1 ;case SCTP_XMIT_PMTU_FULL :case SCTP_XMIT_RWND_FULL : -case SCTP_XMIT_NAGLE_DELAY :/* We could not append this chunk, so put * the chunk back on the output queue. net/sctp/outqueue.c +6
-0*/ @@ -1011,6 +1022,12 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)break ;case SCTP_XMIT_OK : +/* The sender has not enough queued user data +* to send the remaining DATA chunks due to the +* Nagle algorithm. +*/ +if (chunk->nagle_qlen = q->out_qlen +1 ) + packet->has_iflag =1 ;break ;default :
Quoted 46 lines · Wei Yongjun
Quoted 24 lines · Vlad Yasevich
Quoted 9 lines · Wei Yongjun
This patch implement the sender side for SACK-IMMEDIATELY extension.
Section 4.1. Sender Side Considerations
Whenever the sender of a DATA chunk can benefit from the corresponding SACK chunk being sent back without delay, the sender MAY set the I-bit in the DATA chunk header.
Quoted 8 lines
Reasons for setting the I-bit include
o The sender has not enough queued user data to send the remaining DATA chunks due to the Nagle algorithm.
o The sending of a DATA chunk fills the congestion or receiver window.
These reasons are still up for debate and BSD hasn't implemented them either. For example, if the congestion window is filled, setting I bit is pointless since either there are gaps and you'll get an immediate SACK anyway, or there is sufficient DATA in flight that you'll get a SACK soon.
Quoted 6 lines
Setting if for the 0-window event is kind of useless too.
The Nagle algorithm is debatable as well. With recent changes, Nagle doesn't apply to large writes. So the only time, this might be worth it is if an application can't fill pathmtu within 200ms SACK timer.
I will remove those code in the next version.
Quoted 8 lines
Quoted 3 lines
o The sender is in the SHUTDOWN-PENDING state.
This is really the only valid state. Also, when
SCTP_EOFis set on the message. This part is actually something we don't do right. It should be possible to write a message and setSCTP_EOFat the same time, but we don't support it yet.I will fix
SCTP_EOFto enable write a message and setSCTP_EOFat the same time.
Quoted 6 lines
Quoted 3 lines
Also, please do the API patch along with it. That's just exposing the flag in
sctp/user.hand honoring it.Do you means add a new flag like
SCTP_NODSACKor something else, and it can be specified in sendmsg()'s arguments likeSCTP_EOF?
Yep. See http://tools.ietf.org/html/draft-tuexen-tsvwg-sctp-sack-immediately-02.
-vlad
Quoted 135 lines
Regards,
Wei Yongjun
Quoted 128 lines
Some more comments below.
Quoted 20 lines
Signed-off-by Wei Yongjun <[email protected]>--- include/net/sctp/structs.h | 2 ++ net/sctp/output.c | 12 ++++++++++++ net/sctp/outqueue.c | 19 ++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletions(-)include/net/sctp/structs.h +1
-0@@ -764,6 +764,7 @@ struct sctp_chunk { has_asconf:1, /* IN: have seen an asconf before */ tsn_missing_report:2, /* Data chunk missing counter. */ fast_retransmit:2; /* Is this chunk fast retransmitted? */ +unsigned nagle_qlen;/* Queued data length due to Nagle. */ };void sctp_chunk_hold (struct sctp_chunk *);include/net/sctp/structs.h struct sctp_packet { · line 831
Quoted 5 lines
include/net/sctp/structs.h +1
-0@@ -826,6 +827,7 @@ struct sctp_packet { has_sack:1, /* This packet contains a SACK chunk. */ has_auth:1, /* This packet contains an AUTH chunk */ has_data:1, /* This packet contains at least 1 DATA chunk */ + has_iflag:1, /* This packet need I-Flag for last DATA chunk */You should be able to set this more then once per packet, so the packet flag isn't the right way to do it.
Quoted 16 lines
include/net/sctp/structs.h +0
-0ipfragok:1 ,/* So let ip fragment this packet */ malloced:1; /* Is it malloced? */};
net/sctp/output.c +1
-0@@ -75,6 +75,7 @@ static void sctp_packet_reset(struct sctp_packet *packet) packet->has_cookie_echo =0 ; packet->has_sack =0 ; packet->has_data =0 ; + packet->has_iflag =0 ; packet->has_auth =0 ; packet->ipfragok =0 ; packet->auth =NULL ;net/sctp/output.c int sctp_packet_transmit(struct sctp_packet *packet) · line 455
Quoted 8 lines
net/sctp/output.c +4
-0@@ -447,6 +448,10 @@ int sctp_packet_transmit(struct sctp_packet *packet) }else chunk->resent =1 ; +if (packet->has_iflag && +list_empty (&packet->chunk_list)) + chunk->chunk_hdr->flags |=SCTP_DATA_SACK_IMM ; +The setting of the bit should probably be done at chunk creation and when the chunk is added to the packet (
sctp_packet_append_data).Quoted 23 lines
net/sctp/output.c +7
-0has_data =1 ; }@@ -743,6 +748,13 @@ static void sctp_packet_append_data(struct sctp_packet *packet,else rwnd =0 ; +/* Reasons for setting the I-bit include +* - The sending of a DATA chunk fills the congestion or +* receiver window. +*/ +if (rwnd =0 || transport->flight_size >= transport->cwnd) + packet->has_iflag =1 ; + asoc->peer.rwnd = rwnd;/* Has been accepted for transmission. */ if (!asoc->peer.prsctp_capable)net/sctp/outqueue.c +0
-0@@ -995,10 +995,21 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)/* Add the chunk to the packet. */ net/sctp/outqueue.c static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) · line 1005
Quoted 10 lines
net/sctp/outqueue.c +7
-0status =sctp_packet_transmit_chunk (packet, chunk,0 ); +/* The sender is in the SHUTDOWN-PENDING state, +* The sender MAY set the I-bit in the DATA +* chunk header. +*/ +if (asoc->state =SCTP_STATE_SHUTDOWN_PENDING ) + packet->has_iflag =1 ; +Set the bit per chunk when adding it to packet.
-vlad
Quoted 26 lines
net/sctp/outqueue.c +5
-1switch (status) { +case SCTP_XMIT_NAGLE_DELAY : +/* mark this chunks not be sent due to Nagle +* algorithm +*/ + chunk->nagle_qlen = q->out_qlen +1 ;case SCTP_XMIT_PMTU_FULL :case SCTP_XMIT_RWND_FULL : -case SCTP_XMIT_NAGLE_DELAY :/* We could not append this chunk, so put * the chunk back on the output queue. net/sctp/outqueue.c +6
-0*/ @@ -1011,6 +1022,12 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)break ;case SCTP_XMIT_OK : +/* The sender has not enough queued user data +* to send the remaining DATA chunks due to the +* Nagle algorithm. +*/ +if (chunk->nagle_qlen = q->out_qlen +1 ) + packet->has_iflag =1 ;break ;default :