sctp: add sender-side procedures for stream reconf asoc reset and add streams
Subsystems (3)
Xin Long
maintainerv4 cover sctp: add sender-side procedures for stream reconf asoc reset and add streams
Patch 3/5 is to implement sender-side procedures for the SSN/TSN Reset Request Parameter described in rfc6525 section 5.1.4, patch 2/5 is ahead of it to define a function to make the request chunk for it.
Patch 5/5 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 4/5 is ahead of it to define a function to make the request chunk for it.
Patch 1/5 is a fix to make streams be closed only when request is sent successfully.
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.
Xin Long (5):
sctp: streams should be closed when stream reset request is sent
successfully.
sctp: add support for generating stream reconf ssn/tsn reset request
chunk
sctp: implement sender-side procedures for SSN/TSN Reset Request
Parameter
sctp: add support for generating stream reconf add incoming/outgoing
streams request chunk
sctp: implement sender-side procedures for Add Incoming/Outgoing
Streams Request Parameter
include/linux/sctp.h | 12 +++++ include/net/sctp/sctp.h | 3 ++ include/net/sctp/sm.h | 5 ++ include/uapi/linux/sctp.h | 8 +++ net/sctp/sm_make_chunk.c | 75 ++++++++++++++++++++++++++++ net/sctp/socket.c | 58 ++++++++++++++++++++++ net/sctp/stream.c | 124 +++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 284 insertions(+), 1 deletion(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 1/5 sctp: streams should be closed when stream reset request is sent successfully.
Now when sending stream reset request, it closes the streams to block further xmit of data until this request is completed, then calls sctp_send_reconf to send the chunk.
But if sctp_send_reconf returns err, which means the request chunk would not be queued and sent, so the asoc will get stuck, streams are closed and no packet was even queued.
This patch is to fix it by closing streams only when request is sent successfully, it is also to fix a return value.
--- net/sctp/stream.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/sctp/stream.c +13 -9
@@ -136,8 +136,20 @@ int sctp_send_reset_streams(struct sctp_association *asoc, goto out; chunk =sctp_make_strreset_req (asoc, str_nums, str_list, out, in); -if (!chunk) +if (!chunk) { + retval = -ENOMEM ; goto out; + } + + asoc->strreset_chunk = chunk; +sctp_chunk_hold (asoc->strreset_chunk); + + retval =sctp_send_reconf (asoc, chunk); +if (retval) { +sctp_chunk_put (asoc->strreset_chunk); + asoc->strreset_chunk =NULL ; + goto out; + }if (out) {if (str_nums)
@@ -150,14 +162,6 @@ int sctp_send_reset_streams(struct sctp_association *asoc, } asoc->strreset_outstanding = out + in; - asoc->strreset_chunk = chunk; -sctp_chunk_hold (asoc->strreset_chunk); - - retval =sctp_send_reconf (asoc, chunk); -if (retval) { -sctp_chunk_put (asoc->strreset_chunk); - asoc->strreset_chunk =NULL ; - } out:return retval;
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 2/5 sctp: add support for generating stream reconf ssn/tsn reset request chunk
This patch is to define SSN/TSN Reset Request Parameter described in rfc6525 section 4.3.
--- include/linux/sctp.h | 5 +++++ include/net/sctp/sm.h | 2 ++ net/sctp/sm_make_chunk.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)
include/linux/sctp.h +5 -0
@@ -737,4 +737,9 @@ struct sctp_strreset_inreq { __u16 list_of_streams[0]; } __packed; +struct sctp_strreset_tsnreq { +sctp_paramhdr_t param_hdr; +__u32 request_seq; +} __packed; +#endif /* __LINUX_SCTP_H__ */
include/net/sctp/sm.h +2 -0
@@ -265,6 +265,8 @@ 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);void sctp_chunk_assign_tsn (struct sctp_chunk *);void sctp_chunk_assign_ssn (struct sctp_chunk *);
net/sctp/sm_make_chunk.c +29 -0
@@ -3660,3 +3660,32 @@ 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; +}
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 3/5 sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
This patch is to implement Sender-Side Procedures for the SSN/TSN Reset Request Parameter descibed in rfc6525 section 5.1.4.
It is also to add sockopt SCTP_RESET_ASSOC in rfc6525 section 6.3.3 for users.
--- include/net/sctp/sctp.h | 1 + include/uapi/linux/sctp.h | 1 + net/sctp/socket.c | 29 +++++++++++++++++++++++++++++ net/sctp/stream.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+)
include/net/sctp/sctp.h +1 -0
@@ -198,6 +198,7 @@ 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);/* * Module global variables
include/uapi/linux/sctp.h +1 -0
@@ -117,6 +117,7 @@ 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/* PR-SCTP policies */ #define SCTP_PR_SCTP_NONE 0x0000
net/sctp/socket.c +29 -0
@@ -3812,6 +3812,32 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,return retval; } +static int sctp_setsockopt_reset_assoc (struct sock *sk, +char __user *optval, +unsigned int optlen) +{ +struct sctp_association *asoc; +sctp_assoc_t associd; +int retval = -EINVAL ; + +if (optlen !=sizeof (associd)) + goto out; + +if (copy_from_user (&associd, optval, optlen)) { + retval = -EFAULT ; + goto out; + } + + asoc =sctp_id2assoc (sk, associd); +if (!asoc) + goto out; + + retval =sctp_send_reset_assoc (asoc); + +out: +return retval; +} +/* API 6.2 setsockopt(), getsockopt() * * Applications use setsockopt() and getsockopt() to set or retrieve
@@ -3984,6 +4010,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,case SCTP_RESET_STREAMS : retval =sctp_setsockopt_reset_streams (sk, optval, optlen);break ; +case SCTP_RESET_ASSOC : + retval =sctp_setsockopt_reset_assoc (sk, optval, optlen); +break ;default : retval = -ENOPROTOOPT ;break ;
net/sctp/stream.c +37 -0
@@ -166,3 +166,40 @@ int sctp_send_reset_streams(struct sctp_association *asoc, out:return retval; } + +int sctp_send_reset_assoc (struct sctp_association *asoc) +{ +struct sctp_chunk *chunk =NULL ; +int retval; +__u16 i; + +if (!asoc->peer.reconf_capable || + !(asoc->strreset_enable &SCTP_ENABLE_RESET_ASSOC_REQ )) +return -ENOPROTOOPT ; + +if (asoc->strreset_outstanding) +return -EINPROGRESS ; + + chunk =sctp_make_strreset_tsnreq (asoc); +if (!chunk) +return -ENOMEM ; + + asoc->strreset_chunk = chunk; +sctp_chunk_hold (asoc->strreset_chunk); + + retval =sctp_send_reconf (asoc, chunk); +if (retval) { +sctp_chunk_put (asoc->strreset_chunk); + asoc->strreset_chunk =NULL ; + +return retval; + } + +/* Block further xmit of data until this request is completed */ +for (i =0 ; i < asoc->stream->outcnt; i++) + asoc->stream->out[i].state =SCTP_STREAM_CLOSED ; + + asoc->strreset_outstanding =1 ; + +return 0 ; +}
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 4/5 sctp: add support for generating stream reconf add incoming/outgoing streams request chunk
This patch is to define Add Incoming/Outgoing Streams Request Parameter described in rfc6525 section 4.5 and 4.6. They can be in one same chunk trunk as rfc6525 section 3.1-7 describes, so make them in one function.
--- include/linux/sctp.h | 7 +++++++ include/net/sctp/sm.h | 3 +++ net/sctp/sm_make_chunk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+)
include/linux/sctp.h +7 -0
@@ -742,4 +742,11 @@ struct sctp_strreset_tsnreq { __u32 request_seq; } __packed; +struct sctp_strreset_addstrm { +sctp_paramhdr_t param_hdr; +__u32 request_seq; +__u16 number_of_streams; +__u16 reserved; +} __packed; +#endif /* __LINUX_SCTP_H__ */
include/net/sctp/sm.h +3 -0
@@ -267,6 +267,9 @@ struct sctp_chunk *sctp_make_strreset_req( 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 *);
net/sctp/sm_make_chunk.c +46 -0
49 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 5/5 sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Request Parameter
This patch is to implement Sender-Side Procedures for the Add Outgoing and Incoming Streams Request Parameter described in rfc6525 section 5.1.5-5.1.6.
It is also to add sockopt SCTP_ADD_STREAMS in rfc6525 section 6.3.4 for users.
--- include/net/sctp/sctp.h | 2 ++ include/uapi/linux/sctp.h | 7 ++++ net/sctp/socket.c | 29 +++++++++++++++++ net/sctp/stream.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+)
include/net/sctp/sctp.h +2 -0
@@ -199,6 +199,8 @@ 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/uapi/linux/sctp.h +7 -0
@@ -118,6 +118,7 @@ typedef __s32 sctp_assoc_t;#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
@@ -1027,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/socket.c +29 -0
@@ -3838,6 +3838,32 @@ static int sctp_setsockopt_reset_assoc(struct sock *sk,return retval; } +static int sctp_setsockopt_add_streams (struct sock *sk, +char __user *optval, +unsigned int optlen) +{ +struct sctp_association *asoc; +struct sctp_add_streams params; +int retval = -EINVAL ; + +if (optlen !=sizeof (params)) + goto out; + +if (copy_from_user (¶ms, optval, optlen)) { + retval = -EFAULT ; + goto out; + } + + asoc =sctp_id2assoc (sk, params.sas_assoc_id); +if (!asoc) + goto out; + + retval =sctp_send_add_streams (asoc, ¶ms); + +out: +return retval; +} +/* API 6.2 setsockopt(), getsockopt() * * Applications use setsockopt() and getsockopt() to set or retrieve
@@ -4013,6 +4039,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,case SCTP_RESET_ASSOC : retval =sctp_setsockopt_reset_assoc (sk, optval, optlen);break ; +case SCTP_ADD_STREAMS : + retval =sctp_setsockopt_add_streams (sk, optval, optlen); +break ;default : retval = -ENOPROTOOPT ;break ;
net/sctp/stream.c +81 -0
84 lines not on this page · raw message
Signature · 1 line
2.1.0
Marcelo Ricardo Leitner
maintainerRe: [PATCHv4 net-next 3/5] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
In reply to Xin LongQuoted 115 lines · Xin Long
This patch is to implement Sender-Side Procedures for the SSN/TSN Reset Request Parameter descibed in rfc6525 section 5.1.4.
It is also to add sockopt
SCTP_RESET_ASSOCin rfc6525 section 6.3.3 for users.Signed-off-by Xin Long <[email protected]>--- include/net/sctp/sctp.h | 1 + include/uapi/linux/sctp.h | 1 + net/sctp/socket.c | 29 +++++++++++++++++++++++++++++ net/sctp/stream.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+)include/net/sctp/sctp.h +1
-0@@ -198,6 +198,7 @@ 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);/* * Module global variables include/uapi/linux/sctp.h +1
-0@@ -117,6 +117,7 @@ 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/* PR-SCTP policies */ #define SCTP_PR_SCTP_NONE 0x0000net/sctp/socket.c +29
-0@@ -3812,6 +3812,32 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,return retval; } +static int sctp_setsockopt_reset_assoc (struct sock *sk, +char __user *optval, +unsigned int optlen) +{ +struct sctp_association *asoc; +sctp_assoc_t associd; +int retval = -EINVAL ; + +if (optlen !=sizeof (associd)) + goto out; + +if (copy_from_user (&associd, optval, optlen)) { + retval = -EFAULT ; + goto out; + } + + asoc =sctp_id2assoc (sk, associd); +if (!asoc) + goto out; + + retval =sctp_send_reset_assoc (asoc); + +out: +return retval; +} +/* API 6.2 setsockopt(), getsockopt() * * Applications use setsockopt() and getsockopt() to set or retrieve @@ -3984,6 +4010,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,case SCTP_RESET_STREAMS : retval =sctp_setsockopt_reset_streams (sk, optval, optlen);break ; +case SCTP_RESET_ASSOC : + retval =sctp_setsockopt_reset_assoc (sk, optval, optlen); +break ;default : retval = -ENOPROTOOPT ;break ;net/sctp/stream.c +22
-0@@ -166,3 +166,40 @@ int sctp_send_reset_streams(struct sctp_association *asoc, out:return retval; } + +int sctp_send_reset_assoc (struct sctp_association *asoc) +{ +struct sctp_chunk *chunk =NULL ; +int retval; +__u16 i; + +if (!asoc->peer.reconf_capable || + !(asoc->strreset_enable &SCTP_ENABLE_RESET_ASSOC_REQ )) +return -ENOPROTOOPT ; + +if (asoc->strreset_outstanding) +return -EINPROGRESS ; + + chunk =sctp_make_strreset_tsnreq (asoc); +if (!chunk) +return -ENOMEM ; + + asoc->strreset_chunk = chunk; +sctp_chunk_hold (asoc->strreset_chunk); + + retval =sctp_send_reconf (asoc, chunk);
net/sctp/stream.c int sctp_send_reset_streams(struct sctp_association *asoc, · line 200
Quoted 10 lines
net/sctp/stream.c +10
-0+if (retval) { +sctp_chunk_put (asoc->strreset_chunk); + asoc->strreset_chunk =NULL ; + +return retval; + } + +/* Block further xmit of data until this request is completed */ +for (i =0 ; i < asoc->stream->outcnt; i++) + asoc->stream->out[i].state =SCTP_STREAM_CLOSED ;
I talked offline with Xin about this and we cannot do it this way. Unfortunatelly we will have to take the long road here, because then we may send data while sending the request, as the streams are not closed yet.
We really need to close team, send the request, and re-open if the send fails.
Marcelo
Quoted 13 lines
net/sctp/stream.c +5
-0+ + asoc->strreset_outstanding =1 ; + +return 0 ; +}Signature · 6 lines
2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerRe: [PATCHv4 net-next 3/5] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
From: Marcelo Ricardo Leitner <[email protected]>
Date: Fri, 20 Jan 2017 16:25:22 -0200
Quoted 5 lines
I talked offline with Xin about this and we cannot do it this way. Unfortunatelly we will have to take the long road here, because then we may send data while sending the request, as the streams are not closed yet. We really need to close team, send the request, and re-open if the send fails.
I am expecting another spin of this series, correct?
[email protected]
maintainerRe: [PATCHv4 net-next 3/5] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
Quoted 10 lines · David Miller
From: Marcelo Ricardo Leitner <[email protected]>
Date: Fri, 20 Jan 2017 16:25:22 -0200Quoted 5 lines
I talked offline with Xin about this and we cannot do it this way. Unfortunatelly we will have to take the long road here, because then we may send data while sending the request, as the streams are not closed yet. We really need to close team, send the request, and re-open if the send fails.
I am expecting another spin of this series, correct?
Yes.