sctp: update from rfc7829
Subsystems (4)
Xin Long
maintainerv4 cover sctp: update from rfc7829
SCTP-PF was implemented based on a Internet-Draft in 2012:
https://tools.ietf.org/html/draft-nishida-tsvwg-sctp-failover-05
It's been updated quite a few by rfc7829 in 2016.
This patchset adds the following features:
1. add SCTP_ADDR_POTENTIALLY_FAILED notification
2. add pf_expose per netns/sock/asoc
3. add SCTP_EXPOSE_POTENTIALLY_FAILED_STATE sockopt
4. add ps_retrans per netns/sock/asoc/transport (Primary Path Switchover)
5. add spt_pathcpthld for SCTP_PEER_ADDR_THLDS sockopt
v1->v2:
- See Patch 2/5 and Patch 5/5.v2->v3:
- See Patch 1/5, 2/5 and 3/5.v3->v4:
- See Patch 1/5, 2/5, 3/5 and 4/5.
Xin Long (5):
sctp: add pf_expose per netns and sock and asoc
sctp: add SCTP_ADDR_POTENTIALLY_FAILED notification
sctp: add SCTP_EXPOSE_POTENTIALLY_FAILED_STATE sockopt
sctp: add support for Primary Path Switchover
sctp: add SCTP_PEER_ADDR_THLDS_V2 sockopt
Documentation/networking/ip-sysctl.txt | 34 ++++++++ include/net/netns/sctp.h | 14 ++++ include/net/sctp/constants.h | 12 +++ include/net/sctp/structs.h | 13 ++- include/uapi/linux/sctp.h | 15 ++++ net/sctp/associola.c | 36 ++++---- net/sctp/protocol.c | 6 ++ net/sctp/sm_sideeffect.c | 5 ++ net/sctp/socket.c | 147 +++++++++++++++++++++++++++++---- net/sctp/sysctl.c | 22 ++++- 10 files changed, 266 insertions(+), 38 deletions(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 1/5 sctp: add pf_expose per netns and sock and asoc
As said in rfc7829, section 3, point 12:
The SCTP stack SHOULD expose the PF state of its destination addresses to the ULP as well as provide the means to notify the ULP of state transitions of its destination addresses from active to PF, and vice versa. However, it is recommended that an SCTP stack implementing SCTP-PF also allows for the ULP to be kept ignorant of the PF state of its destinations and the associated state transitions, thus allowing for retention of the simpler state transition model of [RFC4960] in the ULP.
Not only does it allow to expose the PF state to ULP, but also allow to ignore sctp-pf to ULP.
So this patch is to add pf_expose per netns, sock and asoc. And in sctp_assoc_control_transport(), ulp_notify will be set to false if asoc->expose is not 'enabled' in next patch.
It also allows a user to change pf_expose per netns by sysctl, and pf_expose per sock and asoc will be initialized with it.
Note that pf_expose also works for SCTP_GET_PEER_ADDR_INFO sockopt, to not allow a user to query the state of a sctp-pf peer address when pf_expose is 'disabled', as said in section 7.3.
v1->v2:
- Fix a build warning noticed by Nathan Chancellor.v2->v3:
- set pf_expose to UNUSED by default to keep compatible with old applications.v3->v4:
- add a new entry for pf_expose on ip-sysctl.txt, as Marcelo suggested.
- change this patch to 1/5, and move sctp_assoc_control_transport change into 2/5, as Marcelo suggested.
- use SCTP_PF_EXPOSE_UNSET instead of SCTP_PF_EXPOSE_UNUSED, and set SCTP_PF_EXPOSE_UNSET to 0 in enum, as Marcelo suggested.
--- Documentation/networking/ip-sysctl.txt | 22 ++++++++++++++++++++++ include/net/netns/sctp.h | 8 ++++++++ include/net/sctp/constants.h | 10 ++++++++++ include/net/sctp/structs.h | 2 ++ include/uapi/linux/sctp.h | 1 + net/sctp/associola.c | 1 + net/sctp/protocol.c | 3 +++ net/sctp/socket.c | 13 +++++++++++-- net/sctp/sysctl.c | 10 ++++++++++ 9 files changed, 68 insertions(+), 2 deletions(-)
Documentation/networking/ip-sysctl.txt +22 -0
@@ -2088,6 +2088,28 @@ pf_enable - INTEGER Default: 1 +pf_expose - INTEGER + Unset or enable/disable pf (pf is short for potentially failed) state + exposure. Applications can control the exposure of the PF path state + in the SCTP_PEER_ADDR_CHANGE event and the SCTP_GET_PEER_ADDR_INFO + sockopt. When it's unset, no SCTP_PEER_ADDR_CHANGE event with + SCTP_ADDR_PF state will be sent and a SCTP_PF-state transport info + can be got via SCTP_GET_PEER_ADDR_INFO sockopt; When it's enabled, + a SCTP_PEER_ADDR_CHANGE event will be sent for a transport becoming + SCTP_PF state and a SCTP_PF-state transport info can be got via + SCTP_GET_PEER_ADDR_INFO sockopt; When it's diabled, no + SCTP_PEER_ADDR_CHANGE event will be sent and it returns -EACCES when + trying to get a SCTP_PF-state transport info via SCTP_GET_PEER_ADDR_INFO + sockopt. + + 0: Unset pf state exposure, Compatible with old applications. + + 1: Disable pf state exposure. + + 2: Enable pf state exposure. + + Default: 0 + addip_noauth_enable - BOOLEAN Dynamic Address Reconfiguration (ADD-IP) requires the use of authentication to protect the operations of adding or removing new
include/net/netns/sctp.h +8 -0
@@ -97,6 +97,14 @@ struct netns_sctp {int pf_enable;/* +* Disable Potentially-Failed state exposure, ignored by default +* pf_expose - 0 : compatible with old applications (by default) +* - 1 : disable pf state exposure +* - 2 : enable pf state exposure +*/ +int pf_expose; + +/* * Policy for preforming sctp/socket accounting * 0 - do socket level accounting, all assocs share sk_sndbuf * 1 - do sctp accounting, each asoc may use sk_sndbuf bytes
include/net/sctp/constants.h +10 -0
@@ -286,6 +286,16 @@ enum { SCTP_MAX_GABS = 16 };* functions simpler to write. */ +/* These are the values for pf exposure, UNUSED is to keep compatible with old +* applications by default. +*/ +enum { +SCTP_PF_EXPOSE_UNSET , +SCTP_PF_EXPOSE_DISABLE , +SCTP_PF_EXPOSE_ENABLE , +}; +#define SCTP_PF_EXPOSE_MAX SCTP_PF_EXPOSE_ENABLE +/* These return values describe the success or failure of a number of * routines which form the lower interface to SCTP_outqueue. */
include/net/sctp/structs.h +2 -0
@@ -215,6 +215,7 @@ struct sctp_sock {__u32 adaptation_ind;__u32 pd_point; __u16 nodelay:1, + pf_expose:2, reuse:1, disable_fragments:1, v4mapped:1,
@@ -2053,6 +2054,7 @@ struct sctp_association { __u8 need_ecne:1, /* Need to send an ECNE Chunk? */ temp:1, /* Is it a temporary association? */ + pf_expose:2, /* Expose pf state? */ force_delay:1;__u8 strreset_enable;
include/uapi/linux/sctp.h +1 -0
@@ -933,6 +933,7 @@ struct sctp_paddrinfo {enum sctp_spinfo_state {SCTP_INACTIVE ,SCTP_PF , +#define SCTP_POTENTIALLY_FAILED SCTP_PF SCTP_ACTIVE,SCTP_UNCONFIRMED ,SCTP_UNKNOWN =0xffff /* Value used for transport state unknown */
net/sctp/associola.c +1 -0
@@ -86,6 +86,7 @@ static struct sctp_association *sctp_association_init(*/ asoc->max_retrans = sp->assocparams.sasoc_asocmaxrxt; asoc->pf_retrans = sp->pf_retrans; + asoc->pf_expose = sp->pf_expose; asoc->rto_initial =msecs_to_jiffies (sp->rtoinfo.srto_initial); asoc->rto_max =msecs_to_jiffies (sp->rtoinfo.srto_max);
net/sctp/protocol.c +3 -0
@@ -1220,6 +1220,9 @@ static int __net_init sctp_defaults_init(struct net *net)/* Enable pf state by default */ net->sctp.pf_enable =1 ; +/* Ignore pf exposure feature by default */ + net->sctp.pf_expose =SCTP_PF_EXPOSE_UNSET ; +/* Association.Max.Retrans - 10 attempts * Path.Max.Retrans - 5 attempts (per destination address) * Max.Init.Retransmits - 8 attempts
net/sctp/socket.c +11 -2
@@ -5041,6 +5041,7 @@ static int sctp_init_sock(struct sock *sk) sp->hbinterval = net->sctp.hb_interval; sp->pathmaxrxt = net->sctp.max_retrans_path; sp->pf_retrans = net->sctp.pf_retrans; + sp->pf_expose = net->sctp.pf_expose; sp->pathmtu =0 ;/* allow default discovery */ sp->sackdelay = net->sctp.sack_timeout; sp->sackfreq =2 ;
@@ -5521,8 +5522,16 @@ static int sctp_getsockopt_peer_addr_info(struct sock *sk, int len, transport =sctp_addr_id2transport (sk, &pinfo.spinfo_address, pinfo.spinfo_assoc_id); -if (!transport) -return -EINVAL ; +if (!transport) { + retval = -EINVAL ; + goto out; + } + +if (transport->state =SCTP_PF && + transport->asoc->pf_expose =SCTP_PF_EXPOSE_DISABLE ) { + retval = -EACCES ; + goto out; + } pinfo.spinfo_assoc_id =sctp_assoc2id (transport->asoc); pinfo.spinfo_state = transport->state;
net/sctp/sysctl.c +1 -0
@@ -34,6 +34,7 @@ static int rto_alpha_min = 0;static int rto_beta_min =0 ;static int rto_alpha_max =1000 ;static int rto_beta_max =1000 ; +static int pf_expose_max =SCTP_PF_EXPOSE_MAX ;static unsigned long max_autoclose_min =0 ; static unsigned long max_autoclose_max @@ -318,6 +319,15 @@ static struct ctl_table sctp_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
+ {
+ .procname = "pf_expose",
+ .data = &init_net.sctp.pf_expose,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = SYSCTL_ZERO,
+ .extra2 = &pf_expose_max,
+ },
{ /* sentinel */ }
};
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 2/5 sctp: add SCTP_ADDR_POTENTIALLY_FAILED notification
SCTP Quick failover draft section 5.1, point 5 has been removed from rfc7829. Instead, "the sender SHOULD (i) notify the Upper Layer Protocol (ULP) about this state transition", as said in section 3.2, point 8.
So this patch is to add SCTP_ADDR_POTENTIALLY_FAILED, defined in section 7.1, "which is reported if the affected address becomes PF". Also remove transport cwnd's update when moving from PF back to ACTIVE , which is no longer in rfc7829 either.
Note that ulp_notify will be set to false if asoc->expose is not 'enabled', according to last patch.
v2->v3:
- define SCTP_ADDR_PF SCTP_ADDR_POTENTIALLY_FAILED.v3->v4:
- initialize spc_state with SCTP_ADDR_AVAILABLE, as Marcelo suggested.
- check asoc->pf_expose in sctp_assoc_control_transport(), as Marcelo suggested.
--- include/uapi/linux/sctp.h | 2 ++ net/sctp/associola.c | 32 ++++++++++++++------------------ 2 files changed, 16 insertions(+), 18 deletions(-)
include/uapi/linux/sctp.h +2 -0
@@ -410,6 +410,8 @@ enum sctp_spc_state {SCTP_ADDR_ADDED ,SCTP_ADDR_MADE_PRIM ,SCTP_ADDR_CONFIRMED , +SCTP_ADDR_POTENTIALLY_FAILED , +#define SCTP_ADDR_PF SCTP_ADDR_POTENTIALLY_FAILED };
net/sctp/associola.c +14 -18
@@ -787,8 +787,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,enum sctp_transport_cmd command, sctp_sn_error_t error) { + int spc_state = SCTP_ADDR_AVAILABLE;bool ulp_notify = true; -int spc_state =0 ;/* Record the transition on the transport. */ switch (command) {
@@ -797,19 +797,13 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,* to heartbeat success, report the SCTP_ADDR_CONFIRMED * state to the user, otherwise report SCTP_ADDR_AVAILABLE. */ -if (SCTP_UNCONFIRMED = transport->state && -SCTP_HEARTBEAT_SUCCESS = error) - spc_state =SCTP_ADDR_CONFIRMED ; -else - spc_state =SCTP_ADDR_AVAILABLE ; -/* Don't inform ULP about transition from PF to -* active state and set cwnd to 1 MTU, see SCTP -* Quick failover draft section 5.1, point 5 -*/ -if (transport->state =SCTP_PF ) { +if (transport->state =SCTP_PF && + asoc->pf_expose !=SCTP_PF_EXPOSE_ENABLE ) ulp_notify = false; - transport->cwnd = asoc->pathmtu; - } +else if (transport->state =SCTP_UNCONFIRMED && + error =SCTP_HEARTBEAT_SUCCESS ) + spc_state =SCTP_ADDR_CONFIRMED ; + transport->state =SCTP_ACTIVE ;break ;
@@ -818,19 +812,21 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,* to inactive state. Also, release the cached route since * there may be a better route next time. */ -if (transport->state !=SCTP_UNCONFIRMED ) +if (transport->state !=SCTP_UNCONFIRMED ) { transport->state =SCTP_INACTIVE ; -else { + spc_state =SCTP_ADDR_UNREACHABLE ; + }else {sctp_transport_dst_release (transport); ulp_notify = false; } - - spc_state =SCTP_ADDR_UNREACHABLE ;break ;case SCTP_TRANSPORT_PF : transport->state =SCTP_PF ; - ulp_notify = false; +if (asoc->pf_expose !=SCTP_PF_EXPOSE_ENABLE ) + ulp_notify = false; +else + spc_state =SCTP_ADDR_POTENTIALLY_FAILED ;break ;default :
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 3/5 sctp: add SCTP_EXPOSE_POTENTIALLY_FAILED_STATE sockopt
This is a sockopt defined in section 7.3 of rfc7829: "Exposing the Potentially Failed Path State", by which users can change pf_expose per sock and asoc.
The new sockopt SCTP_EXPOSE_POTENTIALLY_FAILED_STATE is also known as SCTP_EXPOSE_PF_STATE for short.
v2->v3:
- return -EINVAL if params.assoc_value > SCTP_PF_EXPOSE_MAX.
- define SCTP_EXPOSE_PF_STATE SCTP_EXPOSE_POTENTIALLY_FAILED_STATE.v3->v4:
- improve changelog.
--- include/uapi/linux/sctp.h | 2 ++ net/sctp/socket.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+)
include/uapi/linux/sctp.h +2 -0
@@ -137,6 +137,8 @@ typedef __s32 sctp_assoc_t;#define SCTP_ASCONF_SUPPORTED 128#define SCTP_AUTH_SUPPORTED 129#define SCTP_ECN_SUPPORTED 130 +#define SCTP_EXPOSE_POTENTIALLY_FAILED_STATE 131 +#define SCTP_EXPOSE_PF_STATE SCTP_EXPOSE_POTENTIALLY_FAILED_STATE/* PR-SCTP policies */ #define SCTP_PR_SCTP_NONE 0x0000
net/sctp/socket.c +79 -0
103 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 4/5 sctp: add support for Primary Path Switchover
This is a new feature defined in section 5 of rfc7829: "Primary Path Switchover". By introducing a new tunable parameter:
Primary.Switchover.Max.Retrans (PSMR)
The primary path will be changed to another active path when the path error counter on the old primary path exceeds PSMR, so that "the SCTP sender is allowed to continue data transmission on a new working path even when the old primary destination address becomes active again".
This patch is to add this tunable parameter, 'ps_retrans' per netns, sock, asoc and transport. It also allows a user to change ps_retrans per netns by sysctl, and ps_retrans per sock/asoc/transport will be initialized with it.
The check will be done in sctp_do_8_2_transport_strike() when this feature is enabled.
Note this feature is disabled by initializing 'ps_retrans' per netns as 0xffff by default, and its value can't be less than 'pf_retrans' when changing by sysctl.
v3->v4:
- add define SCTP_PS_RETRANS_MAX 0xffff, and use it on extra2 of sysctl 'ps_retrans'.
- add a new entry for ps_retrans on ip-sysctl.txt.
--- Documentation/networking/ip-sysctl.txt | 12 ++++++++++++ include/net/netns/sctp.h | 6 ++++++ include/net/sctp/constants.h | 2 ++ include/net/sctp/structs.h | 11 ++++++++--- net/sctp/associola.c | 3 +++ net/sctp/protocol.c | 3 +++ net/sctp/sm_sideeffect.c | 5 +++++ net/sctp/socket.c | 1 + net/sctp/sysctl.c | 12 +++++++++++- 9 files changed, 51 insertions(+), 4 deletions(-)
Documentation/networking/ip-sysctl.txt +12 -0
@@ -2192,6 +2192,18 @@ pf_retrans - INTEGER Default: 0 +ps_retrans - INTEGER + Primary.Switchover.Max.Retrans (PSMR), it's a tunable parameter coming + from section-5 "Primary Path Switchover" in rfc7829. The primary path + will be changed to another active path when the path error counter on + the old primary path exceeds PSMR, so that "the SCTP sender is allowed + to continue data transmission on a new working path even when the old + primary destination address becomes active again". Note this feature + is disabled by initializing 'ps_retrans' per netns as 0xffff by default, + and its value can't be less than 'pf_retrans' when changing by sysctl. + + Default: 0xffff + rto_initial - INTEGER The initial round trip timeout value in milliseconds that will be used in calculating round trip times. This is the initial time interval
include/net/netns/sctp.h +6 -0
@@ -89,6 +89,12 @@ struct netns_sctp {*/ int pf_retrans; +/* Primary.Switchover.Max.Retrans sysctl value +* taken from: +* https://tools.ietf.org/html/rfc7829 +*/ +int ps_retrans; +/* * Disable Potentially-Failed feature, the feature is enabled by default * pf_enable - 0 : disable pf
include/net/sctp/constants.h +2 -0
@@ -296,6 +296,8 @@ enum { };#define SCTP_PF_EXPOSE_MAX SCTP_PF_EXPOSE_ENABLE +#define SCTP_PS_RETRANS_MAX 0xffff +/* These return values describe the success or failure of a number of * routines which form the lower interface to SCTP_outqueue. */
include/net/sctp/structs.h +8 -3
@@ -184,7 +184,8 @@ struct sctp_sock {__u32 flowlabel;__u8 dscp; -int pf_retrans; +__u16 pf_retrans; +__u16 ps_retrans;/* The initial Path MTU to use for new associations. */ __u32 pathmtu;
@@ -897,7 +898,9 @@ struct sctp_transport {* and will be initialized from the assocs value. This can be changed * using the SCTP_PEER_ADDR_THLDS socket option */ -int pf_retrans; +__u16 pf_retrans; +/* Used for primary path switchover. */ +__u16 ps_retrans;/* PMTU : The current known path MTU. */ __u32 pathmtu;
@@ -1773,7 +1776,9 @@ struct sctp_association {* and will be initialized from the assocs value. This can be * changed using the SCTP_PEER_ADDR_THLDS socket option */ -int pf_retrans; +__u16 pf_retrans; +/* Used for primary path switchover. */ +__u16 ps_retrans;/* Maximum number of times the endpoint will retransmit INIT */ __u16 max_init_attempts;
net/sctp/associola.c +3 -0
@@ -86,6 +86,7 @@ static struct sctp_association *sctp_association_init(*/ asoc->max_retrans = sp->assocparams.sasoc_asocmaxrxt; asoc->pf_retrans = sp->pf_retrans; + asoc->ps_retrans = sp->ps_retrans; asoc->pf_expose = sp->pf_expose; asoc->rto_initial =msecs_to_jiffies (sp->rtoinfo.srto_initial);
@@ -628,6 +629,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,/* And the partial failure retrans threshold */ peer->pf_retrans = asoc->pf_retrans; +/* And the primary path switchover retrans threshold */ + peer->ps_retrans = asoc->ps_retrans;/* Initialize the peer's SACK delay timeout based on the * association configured value.
net/sctp/protocol.c +3 -0
@@ -1217,6 +1217,9 @@ static int __net_init sctp_defaults_init(struct net *net)/* Max.Burst - 4 */ net->sctp.max_burst =SCTP_DEFAULT_MAX_BURST ; +/* Disable of Primary Path Switchover by default */ + net->sctp.ps_retrans =SCTP_PS_RETRANS_MAX ; +/* Enable pf state by default */ net->sctp.pf_enable =1 ;
net/sctp/sm_sideeffect.c +5 -0
@@ -567,6 +567,11 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands, SCTP_FAILED_THRESHOLD); } +if (transport->error_count > transport->ps_retrans && + asoc->peer.primary_path = transport && + asoc->peer.active_path != transport) +sctp_assoc_set_primary (asoc, asoc->peer.active_path); +/* E2) For the destination address for which the timer * expires, set RTO <- RTO * 2 ("back off the timer"). The * maximum value discussed in rule C7 above (RTO.max) may be
net/sctp/socket.c +1 -0
@@ -5078,6 +5078,7 @@ static int sctp_init_sock(struct sock *sk) sp->hbinterval = net->sctp.hb_interval; sp->pathmaxrxt = net->sctp.max_retrans_path; sp->pf_retrans = net->sctp.pf_retrans; + sp->ps_retrans = net->sctp.ps_retrans; sp->pf_expose = net->sctp.pf_expose; sp->pathmtu =0 ;/* allow default discovery */ sp->sackdelay = net->sctp.sack_timeout;
net/sctp/sysctl.c +1 -0
@@ -35,6 +35,7 @@ static int rto_beta_min = 0;static int rto_alpha_max =1000 ;static int rto_beta_max =1000 ;static int pf_expose_max =SCTP_PF_EXPOSE_MAX ; +static int ps_retrans_max =SCTP_PS_RETRANS_MAX ;static unsigned long max_autoclose_min =0 ; static unsigned long max_autoclose_max @@ -213,7 +214,16 @@ static struct ctl_table sctp_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = SYSCTL_INT_MAX,
+ .extra2 = &init_net.sctp.ps_retrans,
+ },
+ {
+ .procname = "ps_retrans",
+ .data = &init_net.sctp.ps_retrans,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &init_net.sctp.pf_retrans,
+ .extra2 = &ps_retrans_max,
},
{
.procname = "sndbuf_policy",
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v4 5/5 sctp: add SCTP_PEER_ADDR_THLDS_V2 sockopt
Section 7.2 of rfc7829: "Peer Address Thresholds (SCTP_PEER_ADDR_THLDS) Socket Option" extends 'struct sctp_paddrthlds' with 'spt_pathcpthld' added to allow a user to change ps_retrans per sock/asoc/transport, as other 2 paddrthlds: pf_retrans, pathmaxrxt.
Note: to not break the user's program, here to support pf_retrans dump and setting by adding a new sockopt SCTP_PEER_ADDR_THLDS_V2, and a new structure sctp_paddrthlds_v2 instead of extending sctp_paddrthlds.
Also, when setting ps_retrans, the value is not allowed to be greater than pf_retrans.
v1->v2:
- use SCTP_PEER_ADDR_THLDS_V2 to set/get pf_retrans instead, as Marcelo and David Laight suggested.
--- include/uapi/linux/sctp.h | 10 +++++++++ net/sctp/socket.c | 54 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 14 deletions(-)
include/uapi/linux/sctp.h +10 -0
@@ -105,6 +105,7 @@ typedef __s32 sctp_assoc_t;#define SCTP_DEFAULT_SNDINFO 34#define SCTP_AUTH_DEACTIVATE_KEY 35#define SCTP_REUSE_PORT 36 +#define SCTP_PEER_ADDR_THLDS_V2 37/* Internal Socket Options. Some of the sctp library functions are * implemented using these socket options.
@@ -1087,6 +1088,15 @@ struct sctp_paddrthlds {__u16 spt_pathpfthld; }; +/* Use a new structure with spt_pathcpthld for back compatibility */ +struct sctp_paddrthlds_v2 { +sctp_assoc_t spt_assoc_id; +struct sockaddr_storage spt_address; +__u16 spt_pathmaxrxt; +__u16 spt_pathpfthld; +__u16 spt_pathcpthld; +}; +/* * Socket Option for Getting the Association/Stream-Specific PR-SCTP Status */
net/sctp/socket.c +40 -14
130 lines not on this page · raw message
Signature · 1 line
2.1.0
David Miller
maintainerFrom: Xin Long <[email protected]>
Date: Fri, 8 Nov 2019 13:20:31 +0800
Quoted 15 lines
SCTP-PF was implemented based on a Internet-Draft in 2012:
https://tools.ietf.org/html/draft-nishida-tsvwg-sctp-failover-05
It's been updated quite a few by rfc7829 in 2016.
This patchset adds the following features:
1. add
SCTP_ADDR_POTENTIALLY_FAILEDnotification
2. addpf_exposeper netns/sock/asoc
3. addSCTP_EXPOSE_POTENTIALLY_FAILED_STATEsockopt
4. addps_retransper netns/sock/asoc/transport (Primary Path Switchover)
5. addspt_pathcpthldforSCTP_PEER_ADDR_THLDSsockopt
Quoted 6 lines
v1->v2:
- See Patch 2/5 and Patch 5/5.v2->v3:
- See Patch 1/5, 2/5 and 3/5.v3->v4:
- See Patch 1/5, 2/5, 3/5 and 4/5.
Series applied, thank you.