sctp: add SCTP_ECN_SUPPORTED sockopt
Subsystems (3)
Xin Long
maintainercover sctp: add SCTP_ECN_SUPPORTED sockopt
This patchset is to make ecn flag per netns and endpoint and then add SCTP_ECN_SUPPORTED sockopt, as does for other feature flags.
Xin Long (3):
sctp: make ecn flag per netns and endpoint
sctp: allow users to set netns ecn flag with sysctl
sctp: allow users to set ep ecn flag by sockopt
include/net/netns/sctp.h | 3 ++ include/net/sctp/structs.h | 3 +- include/uapi/linux/sctp.h | 1 + net/sctp/endpointola.c | 1 + net/sctp/protocol.c | 3 ++ net/sctp/sm_make_chunk.c | 16 +++++++--- net/sctp/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ net/sctp/sysctl.c | 7 +++++ 8 files changed, 102 insertions(+), 5 deletions(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 1/3 sctp: make ecn flag per netns and endpoint
This patch is to add ecn flag for both netns_sctp and sctp_endpoint, net->sctp.ecn_enable is set 1 by default, and ep->ecn_enable will be initialized with net->sctp.ecn_enable.
asoc->peer.ecn_capable will be set during negotiation only when ep->ecn_enable is set on both sides.
--- include/net/netns/sctp.h | 3 +++ include/net/sctp/structs.h | 3 ++- net/sctp/endpointola.c | 1 + net/sctp/protocol.c | 3 +++ net/sctp/sm_make_chunk.c | 16 ++++++++++++---- 5 files changed, 21 insertions(+), 5 deletions(-)
include/net/netns/sctp.h +3 -0
@@ -128,6 +128,9 @@ struct netns_sctp {/* Flag to indicate if stream interleave is enabled */ int intl_enable; +/* Flag to indicate if ecn is enabled */ +int ecn_enable; +/* * Policy to control SCTP IPv4 address scoping * 0 - Disable IPv4 address scoping
include/net/sctp/structs.h +2 -1
@@ -1322,7 +1322,8 @@ struct sctp_endpoint {/* SCTP-AUTH: endpoint shared keys */ struct list_head endpoint_shared_keys;__u16 active_key_id; - __u8 auth_enable:1, + __u8 ecn_enable:1, + auth_enable:1, intl_enable:1, prsctp_enable:1, asconf_enable:1,
net/sctp/endpointola.c +1 -0
@@ -106,6 +106,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,*/ ep->prsctp_enable = net->sctp.prsctp_enable; ep->reconf_enable = net->sctp.reconf_enable; + ep->ecn_enable = net->sctp.ecn_enable;/* Remember who we are attached to. */ ep->base.sk = sk;
net/sctp/protocol.c +3 -0
@@ -1254,6 +1254,9 @@ static int __net_init sctp_defaults_init(struct net *net)/* Disable AUTH by default. */ net->sctp.auth_enable =0 ; +/* Enable ECN by default. */ + net->sctp.ecn_enable =1 ; +/* Set SCOPE policy to enabled */ net->sctp.scope_policy =SCTP_SCOPE_POLICY_ENABLE ;
net/sctp/sm_make_chunk.c +12 -4
@@ -244,7 +244,9 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, chunksize =sizeof (init) + addrs_len; chunksize +=SCTP_PAD4 (SCTP_SAT_LEN (num_types)); - chunksize +=sizeof (ecap_param); + +if (asoc->ep->ecn_enable) + chunksize +=sizeof (ecap_param);if (asoc->ep->prsctp_enable) chunksize +=sizeof (prsctp_param);
@@ -335,7 +337,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,sctp_addto_chunk (retval,sizeof (sat), &sat);sctp_addto_chunk (retval, num_types *sizeof (__u16), &types); -sctp_addto_chunk (retval,sizeof (ecap_param), &ecap_param); +if (asoc->ep->ecn_enable) +sctp_addto_chunk (retval,sizeof (ecap_param), &ecap_param);/* Add the supported extensions parameter. Be nice and add this * fist before addiding the parameters for the extensions themselves
@@ -2597,8 +2600,13 @@ static int sctp_process_param(struct sctp_association *asoc,break ;case SCTP_PARAM_ECN_CAPABLE : - asoc->peer.ecn_capable =1 ; -break ; +if (asoc->ep->ecn_enable) { + asoc->peer.ecn_capable =1 ; +break ; + } +/* Fall Through */ + goto fall_through; +case SCTP_PARAM_ADAPTATION_LAYER_IND : asoc->peer.adaptation_ind =ntohl (param.aind->adaptation_ind);
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 2/3 sctp: allow users to set netns ecn flag with sysctl
sysctl net.sctp.ecn_enable is added in this patch. It will allow users to change the default sctp ecn flag, net.sctp.ecn_enable.
This feature was also required on this thread:
http://lkml.iu.edu/hypermail/linux/kernel/0812.1/01858.html
--- net/sctp/sysctl.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/sctp/sysctl.c +7 -0
@@ -278,6 +278,13 @@ static struct ctl_table sctp_net_table[] = { .proc_handler = proc_dointvec, }, { + .procname = "ecn_enable", + .data = &init_net.sctp.ecn_enable, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { .procname = "addr_scope_policy", .data = &init_net.sctp.scope_policy, .maxlen = sizeof(int),
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 3/3 sctp: allow users to set ep ecn flag by sockopt
SCTP_ECN_SUPPORTED sockopt will be added to allow users to change ep ecn flag, and it's similar with other feature flags.
--- include/uapi/linux/sctp.h | 1 + net/sctp/socket.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+)
include/uapi/linux/sctp.h +1 -0
@@ -136,6 +136,7 @@ typedef __s32 sctp_assoc_t;#define SCTP_EVENT 127#define SCTP_ASCONF_SUPPORTED 128#define SCTP_AUTH_SUPPORTED 129 +#define SCTP_ECN_SUPPORTED 130/* PR-SCTP policies */ #define SCTP_PR_SCTP_NONE 0x0000
net/sctp/socket.c +73 -0
97 lines not on this page · raw message
Signature · 1 line
2.1.0
Quoted 8 lines · Xin Long
This patchset is to make ecn flag per netns and endpoint and then add
SCTP_ECN_SUPPORTEDsockopt, as does for other feature flags.Xin Long (3):
sctp: make ecn flag per netns and endpoint
sctp: allow users to set netns ecn flag with sysctl
sctp: allow users to set ep ecn flag by sockopt
Quoted 14 lines
include/net/netns/sctp.h | 3 ++ include/net/sctp/structs.h | 3 +- include/uapi/linux/sctp.h | 1 + net/sctp/endpointola.c | 1 + net/sctp/protocol.c | 3 ++ net/sctp/sm_make_chunk.c | 16 +++++++--- net/sctp/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ net/sctp/sysctl.c | 7 +++++ 8 files changed, 102 insertions(+), 5 deletions(-)Signature · 1 line
2.1.0
Series
David Miller
maintainerFrom: Neil Horman <[email protected]>
Date: Mon, 26 Aug 2019 07:02:21 -0400
Quoted 8 lines · Xin Long
Quoted 7 lines
This patchset is to make ecn flag per netns and endpoint and then add
SCTP_ECN_SUPPORTEDsockopt, as does for other feature flags.Xin Long (3):
sctp: make ecn flag per netns and endpoint
sctp: allow users to set netns ecn flag with sysctl
sctp: allow users to set ep ecn flag by sockopt
...
Quoted 2 lines
Series
Acked-by Neil Horman <[email protected]>
Series applied to net-next, thanks.