Commit 4244854d authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

sctp: be more restrictive in transport selection on bundled sacks 



It was noticed recently that when we send data on a transport, its possible that
we might bundle a sack that arrived on a different transport.  While this isn't
a major problem, it does go against the SHOULD requirement in section 6.4 of RFC
2960:

 An endpoint SHOULD transmit reply chunks (e.g., SACK, HEARTBEAT ACK,
   etc.) to the same destination transport address from which it
   received the DATA or control chunk to which it is replying.  This
   rule should also be followed if the endpoint is bundling DATA chunks
   together with the reply chunk.

This patch seeks to correct that.  It restricts the bundling of sack operations
to only those transports which have moved the ctsn of the association forward
since the last sack.  By doing this we guarantee that we only bundle outbound
saks on a transport that has received a chunk since the last sack.  This brings
us into stricter compliance with the RFC.

Vlad had initially suggested that we strictly allow only sack bundling on the
transport that last moved the ctsn forward.  While this makes sense, I was
concerned that doing so prevented us from bundling in the case where we had
received chunks that moved the ctsn on multiple transports.  In those cases, the
RFC allows us to select any of the transports having received chunks to bundle
the sack on.  so I've modified the approach to allow for that, by adding a state
variable to each transport that tracks weather it has moved the ctsn since the
last sack.  This I think keeps our behavior (and performance), close enough to
our current profile that I think we can do this without a sysctl knob to
enable/disable it.

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: Vlad Yaseivch <vyasevich@gmail.com>
CC: David S. Miller <davem@davemloft.net>
CC: linux-sctp@vger.kernel.org
Reported-by: default avatarMichele Baldessari <michele@redhat.com>
Reported-by: default avatarsorin serban <sserban@redhat.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e90b49c

include/net/sctp/structs.h

+4 −0
Original line number Diff line number Diff line
@@ -912,6 +912,9 @@ struct sctp_transport { 
		/* Is this structure kfree()able? */

		malloced:1;



	/* Has this transport moved the ctsn since we last sacked */

	__u32 sack_generation;



	struct flowi fl;



	/* This is the peer's IP address and port. */
@@ -1584,6 +1587,7 @@ struct sctp_association { 
		 */

		__u8    sack_needed;     /* Do we need to sack the peer? */

		__u32	sack_cnt;

		__u32	sack_generation;



		/* These are capabilities which our peer advertised.  */

		__u8	ecn_capable:1,	    /* Can peer do ECN? */

include/net/sctp/tsnmap.h

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ void sctp_tsnmap_free(struct sctp_tsnmap *map); 
int sctp_tsnmap_check(const struct sctp_tsnmap *, __u32 tsn);



/* Mark this TSN as seen.  */

int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn);

int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn,

		     struct sctp_transport *trans);



/* Mark this TSN and all lower as seen. */

void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn);

net/sctp/associola.c

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 
	 */

	asoc->peer.sack_needed = 1;

	asoc->peer.sack_cnt = 0;

	asoc->peer.sack_generation = 1;



	/* Assume that the peer will tell us if he recognizes ASCONF

	 * as part of INIT exchange.

net/sctp/output.c

+5 −0
Original line number Diff line number Diff line
@@ -248,6 +248,11 @@ static sctp_xmit_t sctp_packet_bundle_sack(struct sctp_packet *pkt, 
		/* If the SACK timer is running, we have a pending SACK */

		if (timer_pending(timer)) {

			struct sctp_chunk *sack;



			if (pkt->transport->sack_generation !=

			    pkt->transport->asoc->peer.sack_generation)

				return retval;



			asoc->a_rwnd = asoc->rwnd;

			sack = sctp_make_sack(asoc);

			if (sack) {

net/sctp/sm_make_chunk.c

+16 −0
Original line number Diff line number Diff line
@@ -734,8 +734,10 @@ struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc) 
	int len;

	__u32 ctsn;

	__u16 num_gabs, num_dup_tsns;

	struct sctp_association *aptr = (struct sctp_association *)asoc;

	struct sctp_tsnmap *map = (struct sctp_tsnmap *)&asoc->peer.tsn_map;

	struct sctp_gap_ack_block gabs[SCTP_MAX_GABS];

	struct sctp_transport *trans;



	memset(gabs, 0, sizeof(gabs));

	ctsn = sctp_tsnmap_get_ctsn(map);
@@ -805,6 +807,20 @@ struct sctp_chunk *sctp_make_sack(const struct sctp_association *asoc) 
		sctp_addto_chunk(retval, sizeof(__u32) * num_dup_tsns,

				 sctp_tsnmap_get_dups(map));



	/* Once we have a sack generated, check to see what our sack

	 * generation is, if its 0, reset the transports to 0, and reset

	 * the association generation to 1

	 *

	 * The idea is that zero is never used as a valid generation for the

	 * association so no transport will match after a wrap event like this,

	 * Until the next sack

	 */

	if (++aptr->peer.sack_generation == 0) {

		list_for_each_entry(trans, &asoc->peer.transport_addr_list,

				    transports)

			trans->sack_generation = 0;

		aptr->peer.sack_generation = 1;

	}

nodata:

	return retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE