X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsctp%2Fsctp.h;h=5f19566d240a99f384445db80cc1cc8d8804ad52;hb=eb987d3a09f669787014b1553f032219522149e1;hp=2c649c9538a6d2a47075347b8784f8f38396411d;hpb=9e09ff394ac0e731b5b33caf4d0cddff8de570b4;p=vpp.git

diff --git a/src/vnet/sctp/sctp.h b/src/vnet/sctp/sctp.h
index 2c649c9538a..5f19566d240 100644
--- a/src/vnet/sctp/sctp.h
+++ b/src/vnet/sctp/sctp.h
@@ -78,7 +78,7 @@ typedef enum _sctp_error
 #define IS_U_BIT_SET(var) ((var) & (1<<2))
 
 #define MAX_SCTP_CONNECTIONS 8
-#define MAIN_SCTP_SUB_CONN_IDX 0
+#define SCTP_PRIMARY_PATH_IDX 0
 
 #if (VLIB_BUFFER_TRACE_TRAJECTORY)
 #define sctp_trajectory_add_start(b, start)			\
@@ -93,7 +93,9 @@ enum _sctp_subconn_state
 {
   SCTP_SUBCONN_STATE_DOWN = 0,
   SCTP_SUBCONN_STATE_UP,
-  SCTP_SUBCONN_STATE_ALLOW_HB
+  SCTP_SUBCONN_STATE_ALLOW_HB,
+  SCTP_SUBCONN_AWAITING_SACK,
+  SCTP_SUBCONN_SACK_RECEIVED
 };
 
 #define SCTP_INITIAL_SSHTRESH 65535
@@ -181,9 +183,20 @@ _bytes_swap (void *pv, size_t n)
  */
 #define SUGGESTED_COOKIE_LIFE_SPAN_INCREMENT 1000
 
+typedef struct _sctp_user_configuration
+{
+  u8 never_delay_sack;
+  u8 never_bundle;
+
+} sctp_user_configuration_t;
+
 typedef struct _sctp_connection
 {
+  /** Required for pool_get_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
   sctp_sub_connection_t sub_conn[MAX_SCTP_CONNECTIONS];	/**< Common transport data. First! */
+  sctp_user_configuration_t conn_config; /**< Allows tuning of some SCTP behaviors */
 
   u8 state;			/**< SCTP state as per sctp_state_t */
   u16 flags;		/**< Chunk flag (see sctp_chunks_common_hdr_t) */
@@ -265,6 +278,8 @@ u8
 sctp_sub_connection_del_ip6 (ip6_address_t * lcl_addr,
 			     ip6_address_t * rmt_addr);
 
+u8 sctp_configure (sctp_user_configuration_t config);
+
 void sctp_connection_close (sctp_connection_t * sctp_conn);
 void sctp_connection_cleanup (sctp_connection_t * sctp_conn);
 void sctp_connection_del (sctp_connection_t * sctp_conn);
@@ -300,19 +315,18 @@ void sctp_init_mss (sctp_connection_t * sctp_conn);
 
 void sctp_prepare_initack_chunk (sctp_connection_t * sctp_conn, u8 idx,
 				 vlib_buffer_t * b, ip4_address_t * ip4_addr,
-				 ip6_address_t * ip6_addr);
-void
-sctp_prepare_initack_chunk_for_collision (sctp_connection_t * sctp_conn,
-					  u8 idx, vlib_buffer_t * b,
-					  ip4_address_t * ip4_addr,
-					  ip6_address_t * ip6_addr);
+				 u8 add_ip4, ip6_address_t * ip6_addr,
+				 u8 add_ip6);
+void sctp_prepare_initack_chunk_for_collision (sctp_connection_t * sctp_conn,
+					       u8 idx, vlib_buffer_t * b,
+					       ip4_address_t * ip4_addr,
+					       ip6_address_t * ip6_addr);
 void sctp_prepare_abort_for_collision (sctp_connection_t * sctp_conn, u8 idx,
 				       vlib_buffer_t * b,
 				       ip4_address_t * ip4_addr,
 				       ip6_address_t * ip6_addr);
-void
-sctp_prepare_operation_error (sctp_connection_t * sctp_conn, u8 idx,
-			      vlib_buffer_t * b, u8 err_cause);
+void sctp_prepare_operation_error (sctp_connection_t * sctp_conn, u8 idx,
+				   vlib_buffer_t * b, u8 err_cause);
 void sctp_prepare_cookie_echo_chunk (sctp_connection_t * sctp_conn, u8 idx,
 				     vlib_buffer_t * b, u8 reuse_buffer);
 void sctp_prepare_cookie_ack_chunk (sctp_connection_t * sctp_conn, u8 idx,
@@ -451,11 +465,12 @@ sctp_optparam_type_to_string (u8 type)
 #define SCTP_MAX_INIT_RETRANS 8	// number of attempts
 #define SCTP_HB_INTERVAL 30 * SHZ
 #define SCTP_HB_MAX_BURST 1
-
 #define SCTP_DATA_IDLE_INTERVAL 15 * SHZ	/* 15 seconds; the time-interval after which the connetion is considered IDLE */
-
 #define SCTP_TO_TIMER_TICK       SCTP_TICK*10	/* Period for converting from SCTP_TICK */
 
+#define SCTP_CONN_RECOVERY 1 << 1
+#define SCTP_FAST_RECOVERY 1 << 2
+
 typedef struct _sctp_lookup_dispatch
 {
   u8 next, error;
@@ -546,7 +561,7 @@ sctp_half_open_connection_get (u32 conn_index)
   clib_spinlock_lock_if_init (&sctp_main.half_open_lock);
   if (!pool_is_free_index (sctp_main.half_open_connections, conn_index))
     tc = pool_elt_at_index (sctp_main.half_open_connections, conn_index);
-  tc->sub_conn[MAIN_SCTP_SUB_CONN_IDX].subconn_idx = MAIN_SCTP_SUB_CONN_IDX;
+  tc->sub_conn[SCTP_PRIMARY_PATH_IDX].subconn_idx = SCTP_PRIMARY_PATH_IDX;
   clib_spinlock_unlock_if_init (&sctp_main.half_open_lock);
   return tc;
 }
@@ -561,7 +576,7 @@ sctp_half_open_connection_del (sctp_connection_t * tc)
   sctp_main_t *sctp_main = vnet_get_sctp_main ();
   clib_spinlock_lock_if_init (&sctp_main->half_open_lock);
   pool_put_index (sctp_main->half_open_connections,
-		  tc->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_c_index);
+		  tc->sub_conn[SCTP_PRIMARY_PATH_IDX].c_c_index);
   if (CLIB_DEBUG)
     memset (tc, 0xFA, sizeof (*tc));
   clib_spinlock_unlock_if_init (&sctp_main->half_open_lock);
@@ -617,10 +632,10 @@ always_inline int
 sctp_half_open_connection_cleanup (sctp_connection_t * tc)
 {
   /* Make sure this is the owning thread */
-  if (tc->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_thread_index !=
+  if (tc->sub_conn[SCTP_PRIMARY_PATH_IDX].c_thread_index !=
       vlib_get_thread_index ())
     return 1;
-  sctp_timer_reset (tc, MAIN_SCTP_SUB_CONN_IDX, SCTP_TIMER_T1_INIT);
+  sctp_timer_reset (tc, SCTP_PRIMARY_PATH_IDX, SCTP_TIMER_T1_INIT);
   sctp_half_open_connection_del (tc);
   return 0;
 }
@@ -750,8 +765,8 @@ sctp_connection_get (u32 conn_index, u32 thread_index)
 always_inline u8
 sctp_data_subconn_select (sctp_connection_t * sctp_conn)
 {
-  u32 sub = MAIN_SCTP_SUB_CONN_IDX;
-  u8 i, cwnd = sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].cwnd;
+  u32 sub = SCTP_PRIMARY_PATH_IDX;
+  u8 i, cwnd = sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].cwnd;
   for (i = 1; i < MAX_SCTP_CONNECTIONS; i++)
     {
       if (sctp_conn->sub_conn[i].state == SCTP_SUBCONN_STATE_DOWN)
@@ -784,8 +799,8 @@ sctp_sub_conn_id_via_ip6h (sctp_connection_t * sctp_conn, ip6_header_t * ip6h)
 	return i;
     }
   clib_warning ("Did not find a sub-connection; defaulting to %u",
-		MAIN_SCTP_SUB_CONN_IDX);
-  return MAIN_SCTP_SUB_CONN_IDX;
+		SCTP_PRIMARY_PATH_IDX);
+  return SCTP_PRIMARY_PATH_IDX;
 }
 
 always_inline u8
@@ -802,8 +817,8 @@ sctp_sub_conn_id_via_ip4h (sctp_connection_t * sctp_conn, ip4_header_t * ip4h)
 	return i;
     }
   clib_warning ("Did not find a sub-connection; defaulting to %u",
-		MAIN_SCTP_SUB_CONN_IDX);
-  return MAIN_SCTP_SUB_CONN_IDX;
+		SCTP_PRIMARY_PATH_IDX);
+  return SCTP_PRIMARY_PATH_IDX;
 }
 
 /**
@@ -866,7 +881,7 @@ always_inline void
 update_smallest_pmtu_idx (sctp_connection_t * sctp_conn)
 {
   u8 i;
-  u8 smallest_pmtu_index = MAIN_SCTP_SUB_CONN_IDX;
+  u8 smallest_pmtu_index = SCTP_PRIMARY_PATH_IDX;
 
   for (i = 1; i < MAX_SCTP_CONNECTIONS; i++)
     {
@@ -910,6 +925,8 @@ sctp_in_cong_recovery (sctp_connection_t * sctp_conn, u8 idx)
 always_inline u8
 cwnd_fully_utilized (sctp_connection_t * sctp_conn, u8 idx)
 {
+  if (sctp_conn->sub_conn[idx].cwnd == 0)
+    return 1;
   return 0;
 }
 
@@ -918,6 +935,7 @@ always_inline void
 update_cwnd (sctp_connection_t * sctp_conn)
 {
   u8 i;
+  u32 inflight = sctp_conn->next_tsn - sctp_conn->last_unacked_tsn;
 
   for (i = 0; i < MAX_SCTP_CONNECTIONS; i++)
     {
@@ -950,6 +968,12 @@ update_cwnd (sctp_connection_t * sctp_conn)
 	  sctp_conn->sub_conn[i].cwnd =
 	    clib_min (sctp_conn->sub_conn[i].PMTU, 1);
 	}
+
+      /* Section 6.1; point (D) */
+      if ((inflight + SCTP_RTO_BURST * sctp_conn->sub_conn[i].PMTU) <
+	  sctp_conn->sub_conn[i].cwnd)
+	sctp_conn->sub_conn[i].cwnd =
+	  inflight + SCTP_RTO_BURST * sctp_conn->sub_conn[i].PMTU;
     }
 }