Commit 7b9438de authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: add stream reconf timer 



This patch is to add a per transport timer based on sctp timer frame
for stream reconf chunk retransmission. It would start after sending
a reconf request chunk, and stop after receiving the response chunk.

If the timer expires, besides retransmitting the reconf request chunk,
it would also do the same thing with data RTO timer. like to increase
the appropriate error counts, and perform threshold management, possibly
destroying the asoc if sctp retransmission thresholds are exceeded, just
as section 5.1.1 describes.

This patch is also to add asoc strreset_chunk, it is used to save the
reconf request chunk, so that it can be retransmitted, and to check if
the response is really for this request by comparing the information
inside with the response chunk as well.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc16f00f

include/net/sctp/constants.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ typedef enum { 
	SCTP_EVENT_TIMEOUT_T4_RTO,

	SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD,

	SCTP_EVENT_TIMEOUT_HEARTBEAT,

	SCTP_EVENT_TIMEOUT_RECONF,

	SCTP_EVENT_TIMEOUT_SACK,

	SCTP_EVENT_TIMEOUT_AUTOCLOSE,

} sctp_event_timeout_t;

include/net/sctp/sm.h

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ sctp_state_fn_t sctp_sf_cookie_wait_icmp_abort; 


/* Prototypes for timeout event state functions.  */

sctp_state_fn_t sctp_sf_do_6_3_3_rtx;

sctp_state_fn_t sctp_sf_send_reconf;

sctp_state_fn_t sctp_sf_do_6_2_sack;

sctp_state_fn_t sctp_sf_autoclose_timer_expire;
@@ -278,6 +279,7 @@ int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype, 
/* 2nd level prototypes */

void sctp_generate_t3_rtx_event(unsigned long peer);

void sctp_generate_heartbeat_event(unsigned long peer);

void sctp_generate_reconf_event(unsigned long peer);

void sctp_generate_proto_unreach_event(unsigned long peer);



void sctp_ootb_pkt_free(struct sctp_packet *);

include/net/sctp/structs.h

+6 −0
Original line number Diff line number Diff line
@@ -877,6 +877,9 @@ struct sctp_transport { 
	/* Timer to handle ICMP proto unreachable envets */

	struct timer_list proto_unreach_timer;



	/* Timer to handler reconf chunk rtx */

	struct timer_list reconf_timer;



	/* Since we're using per-destination retransmission timers

	 * (see above), we're also using per-destination "transmitted"

	 * queues.  This probably ought to be a private struct
@@ -935,6 +938,7 @@ void sctp_transport_pmtu(struct sctp_transport *, struct sock *sk); 
void sctp_transport_free(struct sctp_transport *);

void sctp_transport_reset_t3_rtx(struct sctp_transport *);

void sctp_transport_reset_hb_timer(struct sctp_transport *);

void sctp_transport_reset_reconf_timer(struct sctp_transport *transport);

int sctp_transport_hold(struct sctp_transport *);

void sctp_transport_put(struct sctp_transport *);

void sctp_transport_update_rto(struct sctp_transport *, __u32);
@@ -1868,6 +1872,8 @@ struct sctp_association { 
	__u32 strreset_outseq; /* Update after receiving response */

	__u32 strreset_inseq; /* Update after receiving request */



	struct sctp_chunk *strreset_chunk; /* save request chunk */



	struct sctp_priv_assoc_stats stats;



	int sent_cnt_removable;

net/sctp/associola.c

+9 −0
Original line number Diff line number Diff line
@@ -362,6 +362,9 @@ void sctp_association_free(struct sctp_association *asoc) 
	/* Free stream information. */

	sctp_stream_free(asoc->stream);



	if (asoc->strreset_chunk)

		sctp_chunk_free(asoc->strreset_chunk);



	/* Clean up the bound address list. */

	sctp_bind_addr_free(&asoc->base.bind_addr);
@@ -520,6 +523,12 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc, 
	if (asoc->peer.last_data_from == peer)

		asoc->peer.last_data_from = transport;



	if (asoc->strreset_chunk &&

	    asoc->strreset_chunk->transport == peer) {

		asoc->strreset_chunk->transport = transport;

		sctp_transport_reset_reconf_timer(transport);

	}



	/* If we remove the transport an INIT was last sent to, set it to

	 * NULL. Combined with the update of the retran path above, this

	 * will cause the next INIT to be sent to the next available

net/sctp/sm_sideeffect.c

+32 −0
Original line number Diff line number Diff line
@@ -436,6 +436,37 @@ out_unlock: 
	sctp_association_put(asoc);

}



 /* Handle the timeout of the RE-CONFIG timer. */

void sctp_generate_reconf_event(unsigned long data)

{

	struct sctp_transport *transport = (struct sctp_transport *)data;

	struct sctp_association *asoc = transport->asoc;

	struct sock *sk = asoc->base.sk;

	struct net *net = sock_net(sk);

	int error = 0;



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk)) {

		pr_debug("%s: sock is busy\n", __func__);



		/* Try again later.  */

		if (!mod_timer(&transport->reconf_timer, jiffies + (HZ / 20)))

			sctp_transport_hold(transport);

		goto out_unlock;

	}



	error = sctp_do_sm(net, SCTP_EVENT_T_TIMEOUT,

			   SCTP_ST_TIMEOUT(SCTP_EVENT_TIMEOUT_RECONF),

			   asoc->state, asoc->ep, asoc,

			   transport, GFP_ATOMIC);



	if (error)

		sk->sk_err = -error;



out_unlock:

	bh_unlock_sock(sk);

	sctp_transport_put(transport);

}



/* Inject a SACK Timeout event into the state machine.  */

static void sctp_generate_sack_event(unsigned long data)
@@ -453,6 +484,7 @@ sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = { 
	sctp_generate_t4_rto_event,

	sctp_generate_t5_shutdown_guard_event,

	NULL,

	NULL,

	sctp_generate_sack_event,

	sctp_generate_autoclose_event,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE