* [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
@ 2017-02-08 17:18 ` Xin Long
0 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-08 17:18 UTC (permalink / raw)
To: network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Vlad Yasevich, davem
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/net/sctp/sctp.h | 1 +
include/uapi/linux/sctp.h | 1 +
net/sctp/socket.c | 29 +++++++++++++++++++++++++++++
net/sctp/stream.c | 40 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 71 insertions(+)
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 480b65a..b60ca14 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -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
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 03c27ce..c0bd8c3 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -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
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a8b4252f..45a7c41 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3818,6 +3818,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
@@ -3990,6 +4016,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;
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index 6a686e3..53e49fc 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -177,3 +177,43 @@ 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;
+
+ /* 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_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;
+
+ for (i = 0; i < asoc->stream->outcnt; i++)
+ asoc->stream->out[i].state = SCTP_STREAM_OPEN;
+
+ return retval;
+ }
+
+ asoc->strreset_outstanding = 1;
+
+ return 0;
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCHv6 net-next 5/6] sctp: add support for generating stream reconf add incoming/outgoing streams
2017-02-08 17:18 ` Xin Long
@ 2017-02-08 17:18 ` Xin Long
-1 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-08 17:18 UTC (permalink / raw)
To: network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Vlad Yasevich, davem
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/linux/sctp.h | 7 +++++++
include/net/sctp/sm.h | 3 +++
net/sctp/sm_make_chunk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 71c0d41..b055788 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -742,4 +742,11 @@ struct sctp_strreset_tsnreq {
__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__ */
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index ac37c17..3675fde 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -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 *);
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 749842a..7f8dbf2 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3687,3 +3687,49 @@ struct sctp_chunk *sctp_make_strreset_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;
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCHv6 net-next 5/6] sctp: add support for generating stream reconf add incoming/outgoing streams request chunk
@ 2017-02-08 17:18 ` Xin Long
0 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-08 17:18 UTC (permalink / raw)
To: network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Vlad Yasevich, davem
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/linux/sctp.h | 7 +++++++
include/net/sctp/sm.h | 3 +++
net/sctp/sm_make_chunk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 71c0d41..b055788 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -742,4 +742,11 @@ struct sctp_strreset_tsnreq {
__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__ */
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index ac37c17..3675fde 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -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 *);
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 749842a..7f8dbf2 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3687,3 +3687,49 @@ struct sctp_chunk *sctp_make_strreset_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;
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCHv6 net-next 6/6] sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Requ
2017-02-08 17:18 ` Xin Long
@ 2017-02-08 17:18 ` Xin Long
-1 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-08 17:18 UTC (permalink / raw)
To: network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Vlad Yasevich, davem
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/net/sctp/sctp.h | 2 ++
include/uapi/linux/sctp.h | 7 +++++
net/sctp/socket.c | 29 ++++++++++++++++++
net/sctp/stream.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 115 insertions(+)
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index b60ca14..6dfc553 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -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
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index c0bd8c3..a91a9cc 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -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 */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 45a7c41..75f35ce 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3844,6 +3844,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
@@ -4019,6 +4045,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;
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index 53e49fc..eb02490 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -217,3 +217,80 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
return 0;
}
+
+int sctp_send_add_streams(struct sctp_association *asoc,
+ struct sctp_add_streams *params)
+{
+ struct sctp_stream *stream = asoc->stream;
+ struct sctp_chunk *chunk = NULL;
+ int retval = -ENOMEM;
+ __u32 outcnt, incnt;
+ __u16 out, in;
+
+ if (!asoc->peer.reconf_capable ||
+ !(asoc->strreset_enable & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
+ retval = -ENOPROTOOPT;
+ goto out;
+ }
+
+ if (asoc->strreset_outstanding) {
+ retval = -EINPROGRESS;
+ goto out;
+ }
+
+ out = params->sas_outstrms;
+ in = params->sas_instrms;
+ outcnt = stream->outcnt + out;
+ incnt = stream->incnt + in;
+ if (outcnt > SCTP_MAX_STREAM || incnt > SCTP_MAX_STREAM ||
+ (!out && !in)) {
+ retval = -EINVAL;
+ goto out;
+ }
+
+ if (out) {
+ struct sctp_stream_out *streamout;
+
+ streamout = krealloc(stream->out, outcnt * sizeof(*streamout),
+ GFP_KERNEL);
+ if (!streamout)
+ goto out;
+
+ memset(streamout + stream->outcnt, 0, out * sizeof(*streamout));
+ stream->out = streamout;
+ }
+
+ if (in) {
+ struct sctp_stream_in *streamin;
+
+ streamin = krealloc(stream->in, incnt * sizeof(*streamin),
+ GFP_KERNEL);
+ if (!streamin)
+ goto out;
+
+ memset(streamin + stream->incnt, 0, in * sizeof(*streamin));
+ stream->in = streamin;
+ }
+
+ chunk = sctp_make_strreset_addstrm(asoc, out, in);
+ if (!chunk)
+ 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;
+ }
+
+ stream->incnt = incnt;
+ stream->outcnt = outcnt;
+
+ asoc->strreset_outstanding = !!out + !!in;
+
+out:
+ return retval;
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCHv6 net-next 6/6] sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Request Parameter
@ 2017-02-08 17:18 ` Xin Long
0 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-08 17:18 UTC (permalink / raw)
To: network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Vlad Yasevich, davem
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.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
include/net/sctp/sctp.h | 2 ++
include/uapi/linux/sctp.h | 7 +++++
net/sctp/socket.c | 29 ++++++++++++++++++
net/sctp/stream.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 115 insertions(+)
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index b60ca14..6dfc553 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -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
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index c0bd8c3..a91a9cc 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -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 */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 45a7c41..75f35ce 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3844,6 +3844,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
@@ -4019,6 +4045,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;
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index 53e49fc..eb02490 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -217,3 +217,80 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
return 0;
}
+
+int sctp_send_add_streams(struct sctp_association *asoc,
+ struct sctp_add_streams *params)
+{
+ struct sctp_stream *stream = asoc->stream;
+ struct sctp_chunk *chunk = NULL;
+ int retval = -ENOMEM;
+ __u32 outcnt, incnt;
+ __u16 out, in;
+
+ if (!asoc->peer.reconf_capable ||
+ !(asoc->strreset_enable & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
+ retval = -ENOPROTOOPT;
+ goto out;
+ }
+
+ if (asoc->strreset_outstanding) {
+ retval = -EINPROGRESS;
+ goto out;
+ }
+
+ out = params->sas_outstrms;
+ in = params->sas_instrms;
+ outcnt = stream->outcnt + out;
+ incnt = stream->incnt + in;
+ if (outcnt > SCTP_MAX_STREAM || incnt > SCTP_MAX_STREAM ||
+ (!out && !in)) {
+ retval = -EINVAL;
+ goto out;
+ }
+
+ if (out) {
+ struct sctp_stream_out *streamout;
+
+ streamout = krealloc(stream->out, outcnt * sizeof(*streamout),
+ GFP_KERNEL);
+ if (!streamout)
+ goto out;
+
+ memset(streamout + stream->outcnt, 0, out * sizeof(*streamout));
+ stream->out = streamout;
+ }
+
+ if (in) {
+ struct sctp_stream_in *streamin;
+
+ streamin = krealloc(stream->in, incnt * sizeof(*streamin),
+ GFP_KERNEL);
+ if (!streamin)
+ goto out;
+
+ memset(streamin + stream->incnt, 0, in * sizeof(*streamin));
+ stream->in = streamin;
+ }
+
+ chunk = sctp_make_strreset_addstrm(asoc, out, in);
+ if (!chunk)
+ 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;
+ }
+
+ stream->incnt = incnt;
+ stream->outcnt = outcnt;
+
+ asoc->strreset_outstanding = !!out + !!in;
+
+out:
+ return retval;
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 6/6] sctp: implement sender-side procedures for Add Incoming/Outgoing Streams
2017-02-08 17:18 ` [PATCHv6 net-next 6/6] sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Request Parameter Xin Long
@ 2017-02-09 11:24 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:24 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:20AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/net/sctp/sctp.h | 2 ++
> include/uapi/linux/sctp.h | 7 +++++
> net/sctp/socket.c | 29 ++++++++++++++++++
> net/sctp/stream.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 115 insertions(+)
>
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index b60ca14..6dfc553 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -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
> diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
> index c0bd8c3..a91a9cc 100644
> --- a/include/uapi/linux/sctp.h
> +++ b/include/uapi/linux/sctp.h
> @@ -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 */
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 45a7c41..75f35ce 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -3844,6 +3844,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
> @@ -4019,6 +4045,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;
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index 53e49fc..eb02490 100644
> --- a/net/sctp/stream.c
> +++ b/net/sctp/stream.c
> @@ -217,3 +217,80 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
>
> return 0;
> }
> +
> +int sctp_send_add_streams(struct sctp_association *asoc,
> + struct sctp_add_streams *params)
> +{
> + struct sctp_stream *stream = asoc->stream;
> + struct sctp_chunk *chunk = NULL;
> + int retval = -ENOMEM;
> + __u32 outcnt, incnt;
> + __u16 out, in;
> +
> + if (!asoc->peer.reconf_capable ||
> + !(asoc->strreset_enable & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
> + retval = -ENOPROTOOPT;
> + goto out;
> + }
> +
> + if (asoc->strreset_outstanding) {
> + retval = -EINPROGRESS;
> + goto out;
> + }
> +
> + out = params->sas_outstrms;
> + in = params->sas_instrms;
> + outcnt = stream->outcnt + out;
> + incnt = stream->incnt + in;
> + if (outcnt > SCTP_MAX_STREAM || incnt > SCTP_MAX_STREAM ||
> + (!out && !in)) {
> + retval = -EINVAL;
> + goto out;
> + }
> +
> + if (out) {
> + struct sctp_stream_out *streamout;
> +
> + streamout = krealloc(stream->out, outcnt * sizeof(*streamout),
> + GFP_KERNEL);
> + if (!streamout)
> + goto out;
> +
> + memset(streamout + stream->outcnt, 0, out * sizeof(*streamout));
> + stream->out = streamout;
> + }
> +
> + if (in) {
> + struct sctp_stream_in *streamin;
> +
> + streamin = krealloc(stream->in, incnt * sizeof(*streamin),
> + GFP_KERNEL);
> + if (!streamin)
> + goto out;
> +
> + memset(streamin + stream->incnt, 0, in * sizeof(*streamin));
> + stream->in = streamin;
> + }
> +
> + chunk = sctp_make_strreset_addstrm(asoc, out, in);
> + if (!chunk)
> + 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;
> + }
> +
> + stream->incnt = incnt;
> + stream->outcnt = outcnt;
> +
> + asoc->strreset_outstanding = !!out + !!in;
> +
> +out:
> + return retval;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 6/6] sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Request Parameter
@ 2017-02-09 11:24 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:24 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:20AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/net/sctp/sctp.h | 2 ++
> include/uapi/linux/sctp.h | 7 +++++
> net/sctp/socket.c | 29 ++++++++++++++++++
> net/sctp/stream.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 115 insertions(+)
>
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index b60ca14..6dfc553 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -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
> diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
> index c0bd8c3..a91a9cc 100644
> --- a/include/uapi/linux/sctp.h
> +++ b/include/uapi/linux/sctp.h
> @@ -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 */
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 45a7c41..75f35ce 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -3844,6 +3844,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
> @@ -4019,6 +4045,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;
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index 53e49fc..eb02490 100644
> --- a/net/sctp/stream.c
> +++ b/net/sctp/stream.c
> @@ -217,3 +217,80 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)
>
> return 0;
> }
> +
> +int sctp_send_add_streams(struct sctp_association *asoc,
> + struct sctp_add_streams *params)
> +{
> + struct sctp_stream *stream = asoc->stream;
> + struct sctp_chunk *chunk = NULL;
> + int retval = -ENOMEM;
> + __u32 outcnt, incnt;
> + __u16 out, in;
> +
> + if (!asoc->peer.reconf_capable ||
> + !(asoc->strreset_enable & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
> + retval = -ENOPROTOOPT;
> + goto out;
> + }
> +
> + if (asoc->strreset_outstanding) {
> + retval = -EINPROGRESS;
> + goto out;
> + }
> +
> + out = params->sas_outstrms;
> + in = params->sas_instrms;
> + outcnt = stream->outcnt + out;
> + incnt = stream->incnt + in;
> + if (outcnt > SCTP_MAX_STREAM || incnt > SCTP_MAX_STREAM ||
> + (!out && !in)) {
> + retval = -EINVAL;
> + goto out;
> + }
> +
> + if (out) {
> + struct sctp_stream_out *streamout;
> +
> + streamout = krealloc(stream->out, outcnt * sizeof(*streamout),
> + GFP_KERNEL);
> + if (!streamout)
> + goto out;
> +
> + memset(streamout + stream->outcnt, 0, out * sizeof(*streamout));
> + stream->out = streamout;
> + }
> +
> + if (in) {
> + struct sctp_stream_in *streamin;
> +
> + streamin = krealloc(stream->in, incnt * sizeof(*streamin),
> + GFP_KERNEL);
> + if (!streamin)
> + goto out;
> +
> + memset(streamin + stream->incnt, 0, in * sizeof(*streamin));
> + stream->in = streamin;
> + }
> +
> + chunk = sctp_make_strreset_addstrm(asoc, out, in);
> + if (!chunk)
> + 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;
> + }
> +
> + stream->incnt = incnt;
> + stream->outcnt = outcnt;
> +
> + asoc->strreset_outstanding = !!out + !!in;
> +
> +out:
> + return retval;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCHv6 net-next 5/6] sctp: add support for generating stream reconf add incoming/outgoing stre
2017-02-08 17:18 ` [PATCHv6 net-next 5/6] sctp: add support for generating stream reconf add incoming/outgoing streams request chunk Xin Long
@ 2017-02-09 11:23 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:23 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:19AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/linux/sctp.h | 7 +++++++
> include/net/sctp/sm.h | 3 +++
> net/sctp/sm_make_chunk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 56 insertions(+)
>
> diff --git a/include/linux/sctp.h b/include/linux/sctp.h
> index 71c0d41..b055788 100644
> --- a/include/linux/sctp.h
> +++ b/include/linux/sctp.h
> @@ -742,4 +742,11 @@ struct sctp_strreset_tsnreq {
> __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__ */
> diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
> index ac37c17..3675fde 100644
> --- a/include/net/sctp/sm.h
> +++ b/include/net/sctp/sm.h
> @@ -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 *);
>
> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
> index 749842a..7f8dbf2 100644
> --- a/net/sctp/sm_make_chunk.c
> +++ b/net/sctp/sm_make_chunk.c
> @@ -3687,3 +3687,49 @@ struct sctp_chunk *sctp_make_strreset_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;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 5/6] sctp: add support for generating stream reconf add incoming/outgoing streams request chunk
@ 2017-02-09 11:23 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:23 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:19AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/linux/sctp.h | 7 +++++++
> include/net/sctp/sm.h | 3 +++
> net/sctp/sm_make_chunk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 56 insertions(+)
>
> diff --git a/include/linux/sctp.h b/include/linux/sctp.h
> index 71c0d41..b055788 100644
> --- a/include/linux/sctp.h
> +++ b/include/linux/sctp.h
> @@ -742,4 +742,11 @@ struct sctp_strreset_tsnreq {
> __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__ */
> diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
> index ac37c17..3675fde 100644
> --- a/include/net/sctp/sm.h
> +++ b/include/net/sctp/sm.h
> @@ -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 *);
>
> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
> index 749842a..7f8dbf2 100644
> --- a/net/sctp/sm_make_chunk.c
> +++ b/net/sctp/sm_make_chunk.c
> @@ -3687,3 +3687,49 @@ struct sctp_chunk *sctp_make_strreset_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;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Paramete
2017-02-08 17:18 ` Xin Long
@ 2017-02-08 21:48 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-08 21:48 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
Hi Xin,
On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
...
> +
> +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);
^--- refcnf = 1 (as per sctp_chunkify())
> + if (!chunk)
> + return -ENOMEM;
> +
> + /* 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_chunk = chunk;
> + sctp_chunk_hold(asoc->strreset_chunk);
^--- refcnf = 2
> +
> + retval = sctp_send_reconf(asoc, chunk);
> + if (retval) {
> + sctp_chunk_put(asoc->strreset_chunk);
^--- refcnf = 1
Won't we leak the chunk here?
> + asoc->strreset_chunk = NULL;
> +
> + for (i = 0; i < asoc->stream->outcnt; i++)
> + asoc->stream->out[i].state = SCTP_STREAM_OPEN;
> +
> + return retval;
> + }
> +
> + asoc->strreset_outstanding = 1;
> +
> + return 0;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
@ 2017-02-08 21:48 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-08 21:48 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
Hi Xin,
On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
...
> +
> +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);
^--- refcnf = 1 (as per sctp_chunkify())
> + if (!chunk)
> + return -ENOMEM;
> +
> + /* 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_chunk = chunk;
> + sctp_chunk_hold(asoc->strreset_chunk);
^--- refcnf = 2
> +
> + retval = sctp_send_reconf(asoc, chunk);
> + if (retval) {
> + sctp_chunk_put(asoc->strreset_chunk);
^--- refcnf = 1
Won't we leak the chunk here?
> + asoc->strreset_chunk = NULL;
> +
> + for (i = 0; i < asoc->stream->outcnt; i++)
> + asoc->stream->out[i].state = SCTP_STREAM_OPEN;
> +
> + return retval;
> + }
> +
> + asoc->strreset_outstanding = 1;
> +
> + return 0;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Paramete
2017-02-08 21:48 ` [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter Marcelo Ricardo Leitner
@ 2017-02-08 21:50 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-08 21:50 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Wed, Feb 08, 2017 at 07:48:01PM -0200, Marcelo Ricardo Leitner wrote:
> Hi Xin,
>
> On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> > 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.
> >
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ...
> > +
> > +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);
> ^--- refcnf = 1 (as per sctp_chunkify())
>
> > + if (!chunk)
> > + return -ENOMEM;
> > +
> > + /* 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_chunk = chunk;
> > + sctp_chunk_hold(asoc->strreset_chunk);
> ^--- refcnf = 2
> > +
> > + retval = sctp_send_reconf(asoc, chunk);
> > + if (retval) {
> > + sctp_chunk_put(asoc->strreset_chunk);
> ^--- refcnf = 1
>
> Won't we leak the chunk here?
No we won't, sctp_send_reconf() frees it for us, aye.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
@ 2017-02-08 21:50 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-08 21:50 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Wed, Feb 08, 2017 at 07:48:01PM -0200, Marcelo Ricardo Leitner wrote:
> Hi Xin,
>
> On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> > 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.
> >
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ...
> > +
> > +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);
> ^--- refcnf = 1 (as per sctp_chunkify())
>
> > + if (!chunk)
> > + return -ENOMEM;
> > +
> > + /* 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_chunk = chunk;
> > + sctp_chunk_hold(asoc->strreset_chunk);
> ^--- refcnf = 2
> > +
> > + retval = sctp_send_reconf(asoc, chunk);
> > + if (retval) {
> > + sctp_chunk_put(asoc->strreset_chunk);
> ^--- refcnf = 1
>
> Won't we leak the chunk here?
No we won't, sctp_send_reconf() frees it for us, aye.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Paramete
2017-02-08 21:50 ` [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter Marcelo Ricardo Leitner
@ 2017-02-09 7:58 ` Xin Long
-1 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-09 7:58 UTC (permalink / raw)
To: Marcelo Ricardo Leitner
Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 9, 2017 at 5:50 AM, Marcelo Ricardo Leitner
<marcelo.leitner@gmail.com> wrote:
> On Wed, Feb 08, 2017 at 07:48:01PM -0200, Marcelo Ricardo Leitner wrote:
>> Hi Xin,
>>
>> On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
>> > 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.
>> >
>> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>> ...
>> > +
>> > +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);
>> ^--- refcnf = 1 (as per sctp_chunkify())
>>
>> > + if (!chunk)
>> > + return -ENOMEM;
>> > +
>> > + /* 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_chunk = chunk;
>> > + sctp_chunk_hold(asoc->strreset_chunk);
>> ^--- refcnf = 2
>> > +
>> > + retval = sctp_send_reconf(asoc, chunk);
>> > + if (retval) {
>> > + sctp_chunk_put(asoc->strreset_chunk);
>> ^--- refcnf = 1
>>
>> Won't we leak the chunk here?
>
> No we won't, sctp_send_reconf() frees it for us, aye.
yups. :)
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
@ 2017-02-09 7:58 ` Xin Long
0 siblings, 0 replies; 38+ messages in thread
From: Xin Long @ 2017-02-09 7:58 UTC (permalink / raw)
To: Marcelo Ricardo Leitner
Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 9, 2017 at 5:50 AM, Marcelo Ricardo Leitner
<marcelo.leitner@gmail.com> wrote:
> On Wed, Feb 08, 2017 at 07:48:01PM -0200, Marcelo Ricardo Leitner wrote:
>> Hi Xin,
>>
>> On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
>> > 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.
>> >
>> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>> ...
>> > +
>> > +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);
>> ^--- refcnf = 1 (as per sctp_chunkify())
>>
>> > + if (!chunk)
>> > + return -ENOMEM;
>> > +
>> > + /* 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_chunk = chunk;
>> > + sctp_chunk_hold(asoc->strreset_chunk);
>> ^--- refcnf = 2
>> > +
>> > + retval = sctp_send_reconf(asoc, chunk);
>> > + if (retval) {
>> > + sctp_chunk_put(asoc->strreset_chunk);
>> ^--- refcnf = 1
>>
>> Won't we leak the chunk here?
>
> No we won't, sctp_send_reconf() frees it for us, aye.
yups. :)
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Paramete
2017-02-08 17:18 ` Xin Long
@ 2017-02-09 11:23 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:23 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/net/sctp/sctp.h | 1 +
> include/uapi/linux/sctp.h | 1 +
> net/sctp/socket.c | 29 +++++++++++++++++++++++++++++
> net/sctp/stream.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 71 insertions(+)
>
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index 480b65a..b60ca14 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -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
> diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
> index 03c27ce..c0bd8c3 100644
> --- a/include/uapi/linux/sctp.h
> +++ b/include/uapi/linux/sctp.h
> @@ -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
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index a8b4252f..45a7c41 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -3818,6 +3818,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
> @@ -3990,6 +4016,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;
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index 6a686e3..53e49fc 100644
> --- a/net/sctp/stream.c
> +++ b/net/sctp/stream.c
> @@ -177,3 +177,43 @@ 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;
> +
> + /* 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_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;
> +
> + for (i = 0; i < asoc->stream->outcnt; i++)
> + asoc->stream->out[i].state = SCTP_STREAM_OPEN;
> +
> + return retval;
> + }
> +
> + asoc->strreset_outstanding = 1;
> +
> + return 0;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCHv6 net-next 4/6] sctp: implement sender-side procedures for SSN/TSN Reset Request Parameter
@ 2017-02-09 11:23 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 38+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-02-09 11:23 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, Neil Horman, Vlad Yasevich, davem
On Thu, Feb 09, 2017 at 01:18:18AM +0800, Xin Long wrote:
> 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.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> include/net/sctp/sctp.h | 1 +
> include/uapi/linux/sctp.h | 1 +
> net/sctp/socket.c | 29 +++++++++++++++++++++++++++++
> net/sctp/stream.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 71 insertions(+)
>
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index 480b65a..b60ca14 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -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
> diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
> index 03c27ce..c0bd8c3 100644
> --- a/include/uapi/linux/sctp.h
> +++ b/include/uapi/linux/sctp.h
> @@ -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
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index a8b4252f..45a7c41 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -3818,6 +3818,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
> @@ -3990,6 +4016,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;
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index 6a686e3..53e49fc 100644
> --- a/net/sctp/stream.c
> +++ b/net/sctp/stream.c
> @@ -177,3 +177,43 @@ 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;
> +
> + /* 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_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;
> +
> + for (i = 0; i < asoc->stream->outcnt; i++)
> + asoc->stream->out[i].state = SCTP_STREAM_OPEN;
> +
> + return retval;
> + }
> +
> + asoc->strreset_outstanding = 1;
> +
> + return 0;
> +}
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 38+ messages in thread