Commit 51446780 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: fix identification of new acks for SFR-CACC 



It's currently written as:

if (!tchunk->tsn_gap_acked) {   [1]
	tchunk->tsn_gap_acked = 1;
	...
}

if (TSN_lte(tsn, sack_ctsn)) {
	if (!tchunk->tsn_gap_acked) {
		/* SFR-CACC processing */
		...
	}
}

Which causes the SFR-CACC processing on ack reception to never process,
as tchunk->tsn_gap_acked is always true by then. Block [1] was
moved to that position by the commit marked below.

This patch fixes it by doing SFR-CACC processing earlier, before
tsn_gap_acked is set to true.

Fixes: 31b02e15 ("sctp: Failover transmitted list on transport delete")
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reviewed-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47b3ba51

net/sctp/outqueue.c

+23 −25
Original line number Original line Diff line number Diff line
@@ -1457,7 +1457,7 @@ static void sctp_check_transmitted(struct sctp_outq *q, 
			 * the outstanding bytes for this chunk, so only

			 * the outstanding bytes for this chunk, so only

			 * count bytes associated with a transport.

			 * count bytes associated with a transport.

			 */

			 */

			if (transport) {

			if (transport && !tchunk->tsn_gap_acked) {

				/* If this chunk is being used for RTT

				/* If this chunk is being used for RTT

				 * measurement, calculate the RTT and update

				 * measurement, calculate the RTT and update

				 * the RTO using this value.

				 * the RTO using this value.
@@ -1469,14 +1469,34 @@ static void sctp_check_transmitted(struct sctp_outq *q, 
				 * first instance of the packet or a later

				 * first instance of the packet or a later

				 * instance).

				 * instance).

				 */

				 */

				if (!tchunk->tsn_gap_acked &&

				if (!sctp_chunk_retransmitted(tchunk) &&

				    !sctp_chunk_retransmitted(tchunk) &&

				    tchunk->rtt_in_progress) {

				    tchunk->rtt_in_progress) {

					tchunk->rtt_in_progress = 0;

					tchunk->rtt_in_progress = 0;

					rtt = jiffies - tchunk->sent_at;

					rtt = jiffies - tchunk->sent_at;

					sctp_transport_update_rto(transport,

					sctp_transport_update_rto(transport,

								  rtt);

								  rtt);

				}

				}



				if (TSN_lte(tsn, sack_ctsn)) {

					/*

					 * SFR-CACC algorithm:

					 * 2) If the SACK contains gap acks

					 * and the flag CHANGEOVER_ACTIVE is

					 * set the receiver of the SACK MUST

					 * take the following action:

					 *

					 * B) For each TSN t being acked that

					 * has not been acked in any SACK so

					 * far, set cacc_saw_newack to 1 for

					 * the destination that the TSN was

					 * sent to.

					 */

					if (sack->num_gap_ack_blocks &&

					    q->asoc->peer.primary_path->cacc.

					    changeover_active)

						transport->cacc.cacc_saw_newack

							= 1;

				}

			}

			}





			/* If the chunk hasn't been marked as ACKED,

			/* If the chunk hasn't been marked as ACKED,
@@ -1508,28 +1528,6 @@ static void sctp_check_transmitted(struct sctp_outq *q, 
				restart_timer = 1;

				restart_timer = 1;

				forward_progress = true;

				forward_progress = true;





				if (!tchunk->tsn_gap_acked) {

					/*

					 * SFR-CACC algorithm:

					 * 2) If the SACK contains gap acks

					 * and the flag CHANGEOVER_ACTIVE is

					 * set the receiver of the SACK MUST

					 * take the following action:

					 *

					 * B) For each TSN t being acked that

					 * has not been acked in any SACK so

					 * far, set cacc_saw_newack to 1 for

					 * the destination that the TSN was

					 * sent to.

					 */

					if (transport &&

					    sack->num_gap_ack_blocks &&

					    q->asoc->peer.primary_path->cacc.

					    changeover_active)

						transport->cacc.cacc_saw_newack

							= 1;

				}



				list_add_tail(&tchunk->transmitted_list,

				list_add_tail(&tchunk->transmitted_list,

					      &q->sacked);

					      &q->sacked);

			} else {

			} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE