Commit 2cbf5b42 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-sender-stream-reconf-reset-add-streams' 



Xin Long says:

====================
sctp: add sender-side procedures for stream reconf asoc reset and add streams

Patch 4/6 is to implement sender-side procedures for the SSN/TSN Reset
Request Parameter described in rfc6525 section 5.1.4, patch 3/6 is
ahead of it to define a function to make the request chunk for it.

Patch 6/6 is to implement sender-side procedures for the Add Incoming
and Outgoing Streams Request Parameter Request Parameter described in
rfc6525 section 5.1.5 and 5.1.6, patch 5/6 is ahead of it to define a
function to make the request chunk for it.

Patch 2/6 is a fix to recover streams states when it fails to send
request and Patch 1/6 is to drop some unncessary __packed from some
old structures.

v1->v2:
  - put these into a smaller group.
  - rename some temporary variables in the codes.
  - rename the titles of the commits and improve some changelogs.
v2->v3:
  - re-split the patchset and make sure it has no dead codes for review.
  - move some codes into stream.c from socket.c.
v3->v4:
  - add one more patch to fix a send reset stream request issue.
  - doing actual work only when request is sent successfully.
  - reduce some indents in sctp_send_add_streams.
v4->v5:
  - close streams before sending request and recover them when sending
    fails in patch 1/5 and patch 3/5
v5->v6:
  - add patch 1/6 to drop some unncessary __packed from some old structures.
  - remove __packed from some new structures in patch 3/6 and 5/6.
  - define unsigned int outcnt and incnt to make codes smaller in patch 6/6.
  - use krealloc instead of kcalloc and remove ksize check in patch 6/6, as
    ksize check is acutally used in krealloc already.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents caa2858c 242bd2d5

include/linux/sctp.h

+15 −3
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ struct sctp_infox { 
struct sctp_reconf_chunk {

	sctp_chunkhdr_t chunk_hdr;

	__u8 params[0];

} __packed;

};



struct sctp_strreset_outreq {

	sctp_paramhdr_t param_hdr;
@@ -729,12 +729,24 @@ struct sctp_strreset_outreq { 
	__u32 response_seq;

	__u32 send_reset_at_tsn;

	__u16 list_of_streams[0];

} __packed;

};



struct sctp_strreset_inreq {

	sctp_paramhdr_t param_hdr;

	__u32 request_seq;

	__u16 list_of_streams[0];

} __packed;

};



struct sctp_strreset_tsnreq {

	sctp_paramhdr_t param_hdr;

	__u32 request_seq;

};



struct sctp_strreset_addstrm {

	sctp_paramhdr_t param_hdr;

	__u32 request_seq;

	__u16 number_of_streams;

	__u16 reserved;

};



#endif /* __LINUX_SCTP_H__ */

include/net/sctp/sctp.h

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ int sctp_offload_init(void); 
 */

int sctp_send_reset_streams(struct sctp_association *asoc,

			    struct sctp_reset_streams *params);

int sctp_send_reset_assoc(struct sctp_association *asoc);

int sctp_send_add_streams(struct sctp_association *asoc,

			  struct sctp_add_streams *params);



/*

 * Module global variables

include/net/sctp/sm.h

+5 −0
Original line number Diff line number Diff line
@@ -265,6 +265,11 @@ struct sctp_chunk *sctp_make_strreset_req( 
				const struct sctp_association *asoc,

				__u16 stream_num, __u16 *stream_list,

				bool out, bool in);

struct sctp_chunk *sctp_make_strreset_tsnreq(

				const struct sctp_association *asoc);

struct sctp_chunk *sctp_make_strreset_addstrm(

				const struct sctp_association *asoc,

				__u16 out, __u16 in);

void sctp_chunk_assign_tsn(struct sctp_chunk *);

void sctp_chunk_assign_ssn(struct sctp_chunk *);

include/uapi/linux/sctp.h

+8 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ typedef __s32 sctp_assoc_t; 
#define SCTP_PR_ASSOC_STATUS	115

#define SCTP_ENABLE_STREAM_RESET	118

#define SCTP_RESET_STREAMS	119

#define SCTP_RESET_ASSOC	120

#define SCTP_ADD_STREAMS	121



/* PR-SCTP policies */

#define SCTP_PR_SCTP_NONE	0x0000
@@ -1026,4 +1028,10 @@ struct sctp_reset_streams { 
	uint16_t srs_stream_list[];	/* list if srs_num_streams is not 0 */

};



struct sctp_add_streams {

	sctp_assoc_t sas_assoc_id;

	uint16_t sas_instrms;

	uint16_t sas_outstrms;

};



#endif /* _UAPI_SCTP_H */

net/sctp/sm_make_chunk.c

+75 −0
Original line number Diff line number Diff line
@@ -3658,3 +3658,78 @@ struct sctp_chunk *sctp_make_strreset_req( 


	return retval;

}



/* RE-CONFIG 4.3 (SSN/TSN RESET ALL)

 *   0                   1                   2                   3

 *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |     Parameter Type = 15       |      Parameter Length = 8     |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |         Re-configuration Request Sequence Number              |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct sctp_chunk *sctp_make_strreset_tsnreq(

				const struct sctp_association *asoc)

{

	struct sctp_strreset_tsnreq tsnreq;

	__u16 length = sizeof(tsnreq);

	struct sctp_chunk *retval;



	retval = sctp_make_reconf(asoc, length);

	if (!retval)

		return NULL;



	tsnreq.param_hdr.type = SCTP_PARAM_RESET_TSN_REQUEST;

	tsnreq.param_hdr.length = htons(length);

	tsnreq.request_seq = htonl(asoc->strreset_outseq);



	sctp_addto_chunk(retval, sizeof(tsnreq), &tsnreq);



	return retval;

}



/* RE-CONFIG 4.5/4.6 (ADD STREAM)

 *   0                   1                   2                   3

 *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |     Parameter Type = 17       |      Parameter Length = 12    |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |          Re-configuration Request Sequence Number             |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |      Number of new streams    |         Reserved              |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct sctp_chunk *sctp_make_strreset_addstrm(

				const struct sctp_association *asoc,

				__u16 out, __u16 in)

{

	struct sctp_strreset_addstrm addstrm;

	__u16 size = sizeof(addstrm);

	struct sctp_chunk *retval;



	retval = sctp_make_reconf(asoc, (!!out + !!in) * size);

	if (!retval)

		return NULL;



	if (out) {

		addstrm.param_hdr.type = SCTP_PARAM_RESET_ADD_OUT_STREAMS;

		addstrm.param_hdr.length = htons(size);

		addstrm.number_of_streams = htons(out);

		addstrm.request_seq = htonl(asoc->strreset_outseq);

		addstrm.reserved = 0;



		sctp_addto_chunk(retval, size, &addstrm);

	}



	if (in) {

		addstrm.param_hdr.type = SCTP_PARAM_RESET_ADD_IN_STREAMS;

		addstrm.param_hdr.length = htons(size);

		addstrm.number_of_streams = htons(in);

		addstrm.request_seq = htonl(asoc->strreset_outseq + !!out);

		addstrm.reserved = 0;



		sctp_addto_chunk(retval, size, &addstrm);

	}



	return retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE