sctp: tidy up some ep and asoc feature flags
Subsystems (3)
Xin Long
maintainercover sctp: tidy up some ep and asoc feature flags
This patchset is to remove some unnecessary feature flags from sctp_assocation and move some others to the right places.
Xin Long (4):
sctp: remove reconf_enable from asoc
sctp: remove prsctp_enable from asoc
sctp: rename asoc intl_enable to asoc peer.intl_capable
sctp: rename sp strm_interleave to ep intl_enable
include/net/sctp/structs.h | 37 ++++++++++++++++++------------------- net/sctp/associola.c | 2 -- net/sctp/sm_make_chunk.c | 21 ++++++++++----------- net/sctp/socket.c | 19 ++++++++----------- net/sctp/stream_interleave.c | 4 ++-- net/sctp/stream_sched.c | 2 +- 6 files changed, 39 insertions(+), 46 deletions(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 1/4 sctp: remove reconf_enable from asoc
asoc's reconf support is actually decided by the 4-shakehand negotiation, not something that users can set by sockopt. asoc->peer.reconf_capable is working for this. So remove it from asoc.
--- include/net/sctp/structs.h | 3 +-- net/sctp/associola.c | 1 - net/sctp/sm_make_chunk.c | 5 ++--- net/sctp/socket.c | 7 ++----- 4 files changed, 5 insertions(+), 11 deletions(-)
include/net/sctp/structs.h +1 -2
@@ -2051,8 +2051,7 @@ struct sctp_association { temp:1, /* Is it a temporary association? */ force_delay:1, intl_enable:1, - prsctp_enable:1, - reconf_enable:1; + prsctp_enable:1;__u8 strreset_enable;__u8 strreset_outstanding;/* request param count on the fly */
net/sctp/associola.c +0 -1
@@ -262,7 +262,6 @@ static struct sctp_association *sctp_association_init( asoc->active_key_id = ep->active_key_id; asoc->prsctp_enable = ep->prsctp_enable; - asoc->reconf_enable = ep->reconf_enable; asoc->strreset_enable = ep->strreset_enable;/* Save the hmacs and chunks list into this association */
net/sctp/sm_make_chunk.c +2 -3
@@ -261,7 +261,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, num_ext +=2 ; } -if (asoc->reconf_enable) { +if (asoc->ep->reconf_enable) { extensions[num_ext] =SCTP_CID_RECONF ; num_ext +=1 ; }
@@ -2007,8 +2007,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc,for (i =0 ; i < num_ext; i++) {switch (param.ext->chunks[i]) {case SCTP_CID_RECONF : -if (asoc->reconf_enable && - !asoc->peer.reconf_capable) +if (asoc->ep->reconf_enable) asoc->peer.reconf_capable =1 ;break ;case SCTP_CID_FWD_TSN :
net/sctp/socket.c +2 -5
@@ -4226,10 +4226,7 @@ static int sctp_setsockopt_reconfig_supported(struct sock *sk, sctp_style(sk, UDP)) goto out; -if (asoc) - asoc->reconf_enable = !!params.assoc_value; -else -sctp_sk (sk)->ep->reconf_enable = !!params.assoc_value; +sctp_sk (sk)->ep->reconf_enable = !!params.assoc_value; retval =0 ;
@@ -7554,7 +7551,7 @@ static int sctp_getsockopt_reconfig_supported(struct sock *sk, int len, goto out; } - params.assoc_value = asoc ? asoc->reconf_enable + params.assoc_value = asoc ? asoc->peer.reconf_capable :sctp_sk (sk)->ep->reconf_enable;if (put_user (len, optlen))
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 2/4 sctp: remove prsctp_enable from asoc
Like reconf_enable, prsctp_enable should also be removed from asoc, as asoc->peer.prsctp_capable has taken its job.
--- include/net/sctp/structs.h | 3 +-- net/sctp/associola.c | 1 - net/sctp/sm_make_chunk.c | 8 ++++---- net/sctp/socket.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-)
include/net/sctp/structs.h +1 -2
@@ -2050,8 +2050,7 @@ struct sctp_association { __u8 need_ecne:1, /* Need to send an ECNE Chunk? */ temp:1, /* Is it a temporary association? */ force_delay:1, - intl_enable:1, - prsctp_enable:1; + intl_enable:1;__u8 strreset_enable;__u8 strreset_outstanding;/* request param count on the fly */
net/sctp/associola.c +0 -1
@@ -261,7 +261,6 @@ static struct sctp_association *sctp_association_init( goto stream_free; asoc->active_key_id = ep->active_key_id; - asoc->prsctp_enable = ep->prsctp_enable; asoc->strreset_enable = ep->strreset_enable;/* Save the hmacs and chunks list into this association */
net/sctp/sm_make_chunk.c +4 -4
@@ -247,7 +247,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, chunksize +=SCTP_PAD4 (SCTP_SAT_LEN (num_types)); chunksize +=sizeof (ecap_param); -if (asoc->prsctp_enable) +if (asoc->ep->prsctp_enable) chunksize +=sizeof (prsctp_param);/* ADDIP: Section 4.2.7:
@@ -348,7 +348,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,sctp_addto_param (retval, num_ext, extensions); } -if (asoc->prsctp_enable) +if (asoc->ep->prsctp_enable)sctp_addto_chunk (retval,sizeof (prsctp_param), &prsctp_param);if (sp->adaptation_ind) {
@@ -2011,7 +2011,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc, asoc->peer.reconf_capable =1 ;break ;case SCTP_CID_FWD_TSN : -if (asoc->prsctp_enable && !asoc->peer.prsctp_capable) +if (asoc->ep->prsctp_enable) asoc->peer.prsctp_capable =1 ;break ;case SCTP_CID_AUTH :
@@ -2636,7 +2636,7 @@ static int sctp_process_param(struct sctp_association *asoc,break ;case SCTP_PARAM_FWD_TSN_SUPPORT : -if (asoc->prsctp_enable) { +if (asoc->ep->prsctp_enable) { asoc->peer.prsctp_capable =1 ;break ; }
net/sctp/socket.c +1 -1
@@ -7343,7 +7343,7 @@ static int sctp_getsockopt_pr_supported(struct sock *sk, int len, goto out; } - params.assoc_value = asoc ? asoc->prsctp_enable + params.assoc_value = asoc ? asoc->peer.prsctp_capable :sctp_sk (sk)->ep->prsctp_enable;if (put_user (len, optlen))
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 3/4 sctp: rename asoc intl_enable to asoc peer.intl_capable
To keep consistent with other asoc features, we move intl_enable to peer.intl_capable in asoc.
--- include/net/sctp/structs.h | 33 +++++++++++++++++---------------- net/sctp/sm_make_chunk.c | 4 ++-- net/sctp/socket.c | 2 +- net/sctp/stream_interleave.c | 4 ++-- net/sctp/stream_sched.c | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-)
include/net/sctp/structs.h +17 -16
@@ -1679,28 +1679,30 @@ struct sctp_association {__be16 addip_disabled_mask;/* These are capabilities which our peer advertised. */ - __u8 ecn_capable:1, /* Can peer do ECN? */ + __u16 ecn_capable:1, /* Can peer do ECN? */ ipv4_address:1, /* Peer understands IPv4 addresses? */ ipv6_address:1, /* Peer understands IPv6 addresses? */ hostname_address:1, /* Peer understands DNS addresses? */ asconf_capable:1, /* Does peer support ADDIP? */ prsctp_capable:1, /* Can peer do PR-SCTP? */ reconf_capable:1, /* Can peer do RE-CONFIG? */ - auth_capable:1; /* Is peer doing SCTP-AUTH? */ - -/* sack_needed : This flag indicates if the next received -* : packet is to be responded to with a -* : SACK. This is initialized to 0. When a packet -* : is received sack_cnt is incremented. If this value -* : reaches 2 or more, a SACK is sent and the -* : value is reset to 0. Note: This is used only -* : when no DATA chunks are received out of -* : order. When DATA chunks are out of order, -* : SACK's are not delayed (see Section 6). -*/ - __u8 sack_needed:1, /* Do we need to sack the peer? */ + intl_capable:1, /* Can peer do INTERLEAVE */ + auth_capable:1, /* Is peer doing SCTP-AUTH? */ +/* sack_needed: +* This flag indicates if the next received +* packet is to be responded to with a +* SACK. This is initialized to 0. When a packet +* is received sack_cnt is incremented. If this value +* reaches 2 or more, a SACK is sent and the +* value is reset to 0. Note: This is used only +* when no DATA chunks are received out of +* order. When DATA chunks are out of order, +* SACK's are not delayed (see Section 6). +*/ + sack_needed:1, /* Do we need to sack the peer? */ sack_generation:1, zero_window_announced:1; +__u32 sack_cnt;__u32 adaptation_ind;/* Adaptation Code point. */
@@ -2049,8 +2051,7 @@ struct sctp_association { __u8 need_ecne:1, /* Need to send an ECNE Chunk? */ temp:1, /* Is it a temporary association? */ - force_delay:1, - intl_enable:1; + force_delay:1;__u8 strreset_enable;__u8 strreset_outstanding;/* request param count on the fly */
net/sctp/sm_make_chunk.c +2 -2
@@ -438,7 +438,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,if (sp->adaptation_ind) chunksize +=sizeof (aiparam); -if (asoc->intl_enable) { +if (asoc->peer.intl_capable) { extensions[num_ext] =SCTP_CID_I_DATA ; num_ext +=1 ; }
@@ -2028,7 +2028,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc,break ;case SCTP_CID_I_DATA :if (sctp_sk (asoc->base.sk)->strm_interleave) - asoc->intl_enable =1 ; + asoc->peer.intl_capable =1 ;break ;default :break ;
net/sctp/socket.c +1 -1
@@ -7710,7 +7710,7 @@ static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len, goto out; } - params.assoc_value = asoc ? asoc->intl_enable + params.assoc_value = asoc ? asoc->peer.intl_capable :sctp_sk (sk)->strm_interleave;if (put_user (len, optlen))
net/sctp/stream_interleave.c +2 -2
@@ -1358,6 +1358,6 @@ void sctp_stream_interleave_init(struct sctp_stream *stream)struct sctp_association *asoc; asoc = container_of(stream, struct sctp_association, stream); - stream->si = asoc->intl_enable ? &sctp_stream_interleave_1 - : &sctp_stream_interleave_0; + stream->si = asoc->peer.intl_capable ? &sctp_stream_interleave_1 + : &sctp_stream_interleave_0; }
net/sctp/stream_sched.c +1 -1
@@ -228,7 +228,7 @@ int sctp_sched_get_value(struct sctp_association *asoc, __u16 sid,void sctp_sched_dequeue_done (struct sctp_outq *q,struct sctp_chunk *ch) {if (!list_is_last (&ch->frag_list, &ch->msg->chunks) && - !q->asoc->intl_enable) { + !q->asoc->peer.intl_capable) {struct sctp_stream_out *sout;__u16 sid;
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH 4/4 sctp: rename sp strm_interleave to ep intl_enable
Like other endpoint features, strm_interleave should be moved to sctp_endpoint and renamed to intl_enable.
--- include/net/sctp/structs.h | 2 +- net/sctp/sm_make_chunk.c | 4 ++-- net/sctp/socket.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)
include/net/sctp/structs.h +1 -1
@@ -219,7 +219,6 @@ struct sctp_sock { disable_fragments:1, v4mapped:1, frag_interleave:1, - strm_interleave:1, recvrcvinfo:1, recvnxtinfo:1, data_ready_signalled:1;
@@ -1324,6 +1323,7 @@ struct sctp_endpoint {struct list_head endpoint_shared_keys;__u16 active_key_id; __u8 auth_enable:1, + intl_enable:1, prsctp_enable:1, reconf_enable:1;
net/sctp/sm_make_chunk.c +2 -2
@@ -269,7 +269,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,if (sp->adaptation_ind) chunksize +=sizeof (aiparam); -if (sp->strm_interleave) { +if (asoc->ep->intl_enable) { extensions[num_ext] =SCTP_CID_I_DATA ; num_ext +=1 ; }
@@ -2027,7 +2027,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc, asoc->peer.asconf_capable =1 ;break ;case SCTP_CID_I_DATA : -if (sctp_sk (asoc->base.sk)->strm_interleave) +if (asoc->ep->intl_enable) asoc->peer.intl_capable =1 ;break ;default :
net/sctp/socket.c +4 -4
@@ -1913,7 +1913,7 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc,if (err) goto err; -if (sp->strm_interleave) { +if (asoc->ep->intl_enable) { timeo =sock_sndtimeo (sk,0 ); err =sctp_wait_for_connect (asoc, &timeo);if (err) {
@@ -3581,7 +3581,7 @@ static int sctp_setsockopt_fragment_interleave(struct sock *sk,sctp_sk (sk)->frag_interleave = !!val;if (!sctp_sk (sk)->frag_interleave) -sctp_sk (sk)->strm_interleave =0 ; +sctp_sk (sk)->ep->intl_enable =0 ;return 0 ; }
@@ -4484,7 +4484,7 @@ static int sctp_setsockopt_interleaving_supported(struct sock *sk, goto out; } - sp->strm_interleave = !!params.assoc_value; + sp->ep->intl_enable = !!params.assoc_value; retval =0 ;
@@ -7711,7 +7711,7 @@ static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len, } params.assoc_value = asoc ? asoc->peer.intl_capable - :sctp_sk (sk)->strm_interleave; + :sctp_sk (sk)->ep->intl_enable;if (put_user (len, optlen)) goto out;
Signature · 1 line
2.1.0
David Miller
maintainerFrom: Xin Long <[email protected]>
Date: Tue, 9 Jul 2019 00:57:03 +0800
Quoted 2 lines
This patchset is to remove some unnecessary feature flags from
sctp_assocationand move some others to the right places.
Since I'm trying to close up the net-next tree first thing tomorrow morning I've taken the liberty of reviewing this the best that I can and it looks good.
Series applied, thanks Xin.