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

sctp: introduce stream scheduler foundations 

This patch introduces the hooks necessary to do stream scheduling, as
per RFC Draft ndata.  It also introduces the first scheduler, which is
what we do today but now factored out: first come first served (FCFS).

With stream scheduling now we have to track which chunk was enqueued on
which stream and be able to select another other than the in front of
the main outqueue. So we introduce a list on sctp_stream_out_ext
structure for this purpose.

We reuse sctp_chunk->transmitted_list space for the list above, as the
chunk cannot belong to the two lists at the same time. By using the
union in there, we can have distinct names for these moments.

sctp_sched_ops are the operations expected to be implemented by each
scheduler. The dequeueing is a bit particular to this implementation but
it is to match how we dequeue packets today. We first dequeue and then
check if it fits the packet and if not, we requeue it at head. Thus why
we don't have a peek operation but have dequeue_done instead, which is
called once the chunk can be safely considered as transmitted.

The check removed from sctp_outq_flush is now performed by
sctp_stream_outq_migrate, which is only called during assoc setup.
(sctp_sendmsg() also checks for it)

The only operation that is foreseen but not yet added here is a way to
signalize that a new packet is starting or that the packet is done, for
round robin scheduler per packet, but is intentionally left to the
patch that actually implements it.

Support for I-DATA chunks, also described in this RFC, with user message
interleaving is straightforward as it just requires the schedulers to
probe for the feature and ignore datamsg boundaries when dequeueing.

See-also: https://tools.ietf.org/html/draft-ietf-tsvwg-sctp-ndata-13


Tested-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fc019f7

include/net/sctp/stream_sched.h

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/* SCTP kernel implementation

 * (C) Copyright Red Hat Inc. 2017

 *

 * These are definitions used by the stream schedulers, defined in RFC

 * draft ndata (https://tools.ietf.org/html/draft-ietf-tsvwg-sctp-ndata-11)

 *

 * This SCTP implementation is free software;

 * you can redistribute it and/or modify it under the terms of

 * the GNU General Public License as published by

 * the Free Software Foundation; either version 2, or (at your option)

 * any later version.

 *

 * This SCTP implementation  is distributed in the hope that it

 * will be useful, but WITHOUT ANY WARRANTY; without even the implied

 *                 ************************

 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 * See the GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with GNU CC; see the file COPYING.  If not, see

 * <http://www.gnu.org/licenses/>.

 *

 * Please send any bug reports or fixes you make to the

 * email addresses:

 *    lksctp developers <linux-sctp@vger.kernel.org>

 *

 * Written or modified by:

 *   Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

 */



#ifndef __sctp_stream_sched_h__

#define __sctp_stream_sched_h__



struct sctp_sched_ops {

	/* Property handling for a given stream */

	int (*set)(struct sctp_stream *stream, __u16 sid, __u16 value,

		   gfp_t gfp);

	int (*get)(struct sctp_stream *stream, __u16 sid, __u16 *value);



	/* Init the specific scheduler */

	int (*init)(struct sctp_stream *stream);

	/* Init a stream */

	int (*init_sid)(struct sctp_stream *stream, __u16 sid, gfp_t gfp);

	/* Frees the entire thing */

	void (*free)(struct sctp_stream *stream);



	/* Enqueue a chunk */

	void (*enqueue)(struct sctp_outq *q, struct sctp_datamsg *msg);

	/* Dequeue a chunk */

	struct sctp_chunk *(*dequeue)(struct sctp_outq *q);

	/* Called only if the chunk fit the packet */

	void (*dequeue_done)(struct sctp_outq *q, struct sctp_chunk *chunk);

	/* Sched all chunks already enqueued */

	void (*sched_all)(struct sctp_stream *steam);

	/* Unched all chunks already enqueued */

	void (*unsched_all)(struct sctp_stream *steam);

};



int sctp_sched_set_sched(struct sctp_association *asoc,

			 enum sctp_sched_type sched);

int sctp_sched_get_sched(struct sctp_association *asoc);

int sctp_sched_set_value(struct sctp_association *asoc, __u16 sid,

			 __u16 value, gfp_t gfp);

int sctp_sched_get_value(struct sctp_association *asoc, __u16 sid,

			 __u16 *value);

void sctp_sched_dequeue_done(struct sctp_outq *q, struct sctp_chunk *ch);



void sctp_sched_dequeue_common(struct sctp_outq *q, struct sctp_chunk *ch);

int sctp_sched_init_sid(struct sctp_stream *stream, __u16 sid, gfp_t gfp);

struct sctp_sched_ops *sctp_sched_ops_from_stream(struct sctp_stream *stream);



#endif /* __sctp_stream_sched_h__ */

include/net/sctp/structs.h

+12 −3
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ struct sctp_ulpq; 
struct sctp_ep_common;

struct crypto_shash;

struct sctp_stream;

struct sctp_stream_out;





#include <net/sctp/tsnmap.h>
@@ -531,8 +530,12 @@ struct sctp_chunk { 
	/* How many times this chunk have been sent, for prsctp RTX policy */

	int sent_count;



	union {

		/* This is our link to the per-transport transmitted list.  */

		struct list_head transmitted_list;

		/* List in specific stream outq */

		struct list_head stream_list;

	};



	/* This field is used by chunks that hold fragmented data.

	 * For the first fragment this is the list that holds the rest of
@@ -1019,6 +1022,9 @@ struct sctp_outq { 
	/* Data pending that has never been transmitted.  */

	struct list_head out_chunk_list;



	/* Stream scheduler being used */

	struct sctp_sched_ops *sched;



	unsigned int out_qlen;	/* Total length of queued data chunks. */



	/* Error of send failed, may used in SCTP_SEND_FAILED event. */
@@ -1325,6 +1331,7 @@ struct sctp_inithdr_host { 
struct sctp_stream_out_ext {

	__u64 abandoned_unsent[SCTP_PR_INDEX(MAX) + 1];

	__u64 abandoned_sent[SCTP_PR_INDEX(MAX) + 1];

	struct list_head outq; /* chunks enqueued by this stream */

};



struct sctp_stream_out {
@@ -1342,6 +1349,8 @@ struct sctp_stream { 
	struct sctp_stream_in *in;

	__u16 outcnt;

	__u16 incnt;

	/* Current stream being sent, if any */

	struct sctp_stream_out *out_curr;

};



#define SCTP_STREAM_CLOSED		0x00

include/uapi/linux/sctp.h

+6 −0
Original line number Diff line number Diff line
@@ -1088,4 +1088,10 @@ struct sctp_add_streams { 
	uint16_t sas_outstrms;

};



/* SCTP Stream schedulers */

enum sctp_sched_type {

	SCTP_SS_FCFS,

	SCTP_SS_MAX = SCTP_SS_FCFS

};



#endif /* _UAPI_SCTP_H */

net/sctp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ sctp-y := sm_statetable.o sm_statefuns.o sm_sideeffect.o \ 
	  inqueue.o outqueue.o ulpqueue.o \

	  tsnmap.o bind_addr.o socket.o primitive.o \

	  output.o input.o debug.o stream.o auth.o \

	  offload.o

	  offload.o stream_sched.o



sctp_probe-y := probe.o

net/sctp/outqueue.c

+32 −27
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 


#include <net/sctp/sctp.h>

#include <net/sctp/sm.h>

#include <net/sctp/stream_sched.h>



/* Declare internal functions here.  */

static int sctp_acked(struct sctp_sackhdr *sack, __u32 tsn);
@@ -74,30 +75,36 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp); 
static inline void sctp_outq_head_data(struct sctp_outq *q,

				       struct sctp_chunk *ch)

{

	struct sctp_stream_out_ext *oute;

	__u16 stream;



	list_add(&ch->list, &q->out_chunk_list);

	q->out_qlen += ch->skb->len;



	stream = sctp_chunk_stream_no(ch);

	oute = q->asoc->stream.out[stream].ext;

	list_add(&ch->stream_list, &oute->outq);

}



/* Take data from the front of the queue. */

static inline struct sctp_chunk *sctp_outq_dequeue_data(struct sctp_outq *q)

{

	struct sctp_chunk *ch = NULL;



	if (!list_empty(&q->out_chunk_list)) {

		struct list_head *entry = q->out_chunk_list.next;



		ch = list_entry(entry, struct sctp_chunk, list);

		list_del_init(entry);

		q->out_qlen -= ch->skb->len;

	}

	return ch;

	return q->sched->dequeue(q);

}



/* Add data chunk to the end of the queue. */

static inline void sctp_outq_tail_data(struct sctp_outq *q,

				       struct sctp_chunk *ch)

{

	struct sctp_stream_out_ext *oute;

	__u16 stream;



	list_add_tail(&ch->list, &q->out_chunk_list);

	q->out_qlen += ch->skb->len;



	stream = sctp_chunk_stream_no(ch);

	oute = q->asoc->stream.out[stream].ext;

	list_add_tail(&ch->stream_list, &oute->outq);

}



/*
@@ -207,6 +214,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q) 
	INIT_LIST_HEAD(&q->retransmit);

	INIT_LIST_HEAD(&q->sacked);

	INIT_LIST_HEAD(&q->abandoned);

	sctp_sched_set_sched(asoc, SCTP_SS_FCFS);

}



/* Free the outqueue structure and any related pending chunks.
@@ -258,6 +266,7 @@ static void __sctp_outq_teardown(struct sctp_outq *q) 


	/* Throw away any leftover data chunks. */

	while ((chunk = sctp_outq_dequeue_data(q)) != NULL) {

		sctp_sched_dequeue_done(q, chunk);



		/* Mark as send failure. */

		sctp_chunk_fail(chunk, q->error);
@@ -391,13 +400,14 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, 
	struct sctp_outq *q = &asoc->outqueue;

	struct sctp_chunk *chk, *temp;



	q->sched->unsched_all(&asoc->stream);



	list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) {

		if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) ||

		    chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive)

			continue;



		list_del_init(&chk->list);

		q->out_qlen -= chk->skb->len;

		sctp_sched_dequeue_common(q, chk);

		asoc->sent_cnt_removable--;

		asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;

		if (chk->sinfo.sinfo_stream < asoc->stream.outcnt) {
@@ -415,6 +425,8 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, 
			break;

	}



	q->sched->sched_all(&asoc->stream);



	return msg_len;

}
@@ -1033,22 +1045,9 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
		while ((chunk = sctp_outq_dequeue_data(q)) != NULL) {

			__u32 sid = ntohs(chunk->subh.data_hdr->stream);



			/* RFC 2960 6.5 Every DATA chunk MUST carry a valid

			 * stream identifier.

			 */

			if (chunk->sinfo.sinfo_stream >= asoc->stream.outcnt) {



				/* Mark as failed send. */

				sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM);

				if (asoc->peer.prsctp_capable &&

				    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))

					asoc->sent_cnt_removable--;

				sctp_chunk_free(chunk);

				continue;

			}



			/* Has this chunk expired? */

			if (sctp_chunk_abandoned(chunk)) {

				sctp_sched_dequeue_done(q, chunk);

				sctp_chunk_fail(chunk, 0);

				sctp_chunk_free(chunk);

				continue;
@@ -1070,6 +1069,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
				new_transport = asoc->peer.active_path;

			if (new_transport->state == SCTP_UNCONFIRMED) {

				WARN_ONCE(1, "Attempt to send packet on unconfirmed path.");

				sctp_sched_dequeue_done(q, chunk);

				sctp_chunk_fail(chunk, 0);

				sctp_chunk_free(chunk);

				continue;
@@ -1133,6 +1133,11 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
				else

					asoc->stats.oodchunks++;



				/* Only now it's safe to consider this

				 * chunk as sent, sched-wise.

				 */

				sctp_sched_dequeue_done(q, chunk);



				break;



			default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE