tcp: minimal set of worker stats

[vpp.git] / src / vnet / tcp / tcp.h

diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h
index 73d5970..1549efb 100644 (file)
--- a/src/vnet/tcp/tcp.h
+++ b/src/vnet/tcp/tcp.h
@@ -436,6 +436,8 @@ typedef struct _tcp_connection
   u16 mss;             /**< Our max seg size that includes options */
   u32 timestamp_delta; /**< Offset for timestamp */
   u32 ipv6_flow_label; /**< flow label for ipv6 header */
+
+#define rst_state snd_wl1
 } tcp_connection_t;
 
 /* *INDENT-OFF* */
@@ -500,20 +502,30 @@ typedef struct _tcp_lookup_dispatch
   u8 next, error;
 } tcp_lookup_dispatch_t;
 
+#define foreach_tcp_wrk_stat                                   \
+  _(timer_expirations, u64, "timer expirations")               \
+  _(rxt_segs, u64, "segments retransmitted")                   \
+  _(tr_events, u32, "timer retransmit events")                 \
+  _(to_closewait, u32, "timeout close-wait")                   \
+  _(to_finwait1, u32, "timeout fin-wait-1")                    \
+  _(to_lastack, u32, "timeout last-ack")                       \
+  _(to_closing, u32, "timeout closing")                                \
+  _(tr_abort, u32, "timer retransmit abort")                   \
+  _(rst_unread, u32, "reset on close due to unread data")      \
+
+typedef struct tcp_wrk_stats_
+{
+#define _(name, type, str) type name;
+  foreach_tcp_wrk_stat
+#undef _
+} tcp_wrk_stats_t;
+
 typedef struct tcp_worker_ctx_
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  /** worker time */
-  u32 time_now;
-
-  /** worker timer wheel */
-  tw_timer_wheel_16t_2w_512sl_t timer_wheel;
 
-  /** tx buffer free list */
-  u32 *tx_buffers;
-
-  /** tx frames for ip 4/6 lookup nodes */
-  vlib_frame_t *ip_lookup_tx_frames[2];
+  /** worker's pool of connections */
+  tcp_connection_t *connections;
 
   /** vector of pending ack dequeues */
   u32 *pending_deq_acked;
@@ -521,16 +533,40 @@ typedef struct tcp_worker_ctx_
   /** vector of pending disconnect notifications */
   u32 *pending_disconnects;
 
+  /** vector of pending reset notifications */
+  u32 *pending_resets;
+
   /** convenience pointer to this thread's vlib main */
   vlib_main_t *vm;
 
+  /** worker time */
+  u32 time_now;
+
+  /** tx frames for ip 4/6 lookup nodes */
+  vlib_frame_t *ip_lookup_tx_frames[2];
+
     CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
 
   /** cached 'on the wire' options for bursts */
   u8 cached_opts[40];
 
+  /** tx buffer free list */
+  u32 *tx_buffers;
+
+  /** worker timer wheel */
+  tw_timer_wheel_16t_2w_512sl_t timer_wheel;
+
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
+
+  tcp_wrk_stats_t stats;
 } tcp_worker_ctx_t;
 
+#define tcp_worker_stats_inc(_ti,_stat,_val)           \
+  tcp_main.wrk_ctx[_ti].stats._stat += _val
+
+#define tcp_workerp_stats_inc(_wrk,_stat,_val)                 \
+  _wrk->stats._stat += _val
+
 typedef struct tcp_iss_seed_
 {
   u64 first;
@@ -609,27 +645,24 @@ typedef struct tcp_configuration_
 
 typedef struct _tcp_main
 {
-  /* Per-worker thread tcp connection pools */
-  tcp_connection_t **connections;
+  /** per-worker context */
+  tcp_worker_ctx_t *wrk_ctx;
 
   /* Pool of listeners. */
   tcp_connection_t *listener_pool;
 
+  f64 tstamp_ticks_per_clock;
+
+  /** vlib buffer size */
+  u32 bytes_per_buffer;
+
   /** Dispatch table by state and flags */
   tcp_lookup_dispatch_t dispatch_table[TCP_N_STATES][64];
 
-  u8 log2_tstamp_clocks_per_tick;
-  f64 tstamp_ticks_per_clock;
-
-  /** per-worker context */
-  tcp_worker_ctx_t *wrk_ctx;
+  clib_spinlock_t half_open_lock;
 
   /** Pool of half-open connections on which we've sent a SYN */
   tcp_connection_t *half_open_connections;
-  clib_spinlock_t half_open_lock;
-
-  /** vlib buffer size */
-  u32 bytes_per_buffer;
 
   /** Seed used to generate random iss */
   tcp_iss_seed_t iss_seed;
@@ -689,6 +722,7 @@ vnet_get_tcp_main ()
 always_inline tcp_worker_ctx_t *
 tcp_get_worker (u32 thread_index)
 {
+  ASSERT (thread_index < vec_len (tcp_main.wrk_ctx));
   return &tcp_main.wrk_ctx[thread_index];
 }
 
@@ -716,20 +750,22 @@ void tcp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
 always_inline tcp_connection_t *
 tcp_connection_get (u32 conn_index, u32 thread_index)
 {
-  if (PREDICT_FALSE
-      (pool_is_free_index (tcp_main.connections[thread_index], conn_index)))
+  tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index);
+  if (PREDICT_FALSE (pool_is_free_index (wrk->connections, conn_index)))
     return 0;
-  return pool_elt_at_index (tcp_main.connections[thread_index], conn_index);
+  return pool_elt_at_index (wrk->connections, conn_index);
 }
 
 always_inline tcp_connection_t *
 tcp_connection_get_if_valid (u32 conn_index, u32 thread_index)
 {
-  if (tcp_main.connections[thread_index] == 0)
+  tcp_worker_ctx_t *wrk;
+  if (thread_index >= vec_len (tcp_main.wrk_ctx))
     return 0;
-  if (pool_is_free_index (tcp_main.connections[thread_index], conn_index))
+  wrk = tcp_get_worker (thread_index);
+  if (pool_is_free_index (wrk->connections, conn_index))
     return 0;
-  return pool_elt_at_index (tcp_main.connections[thread_index], conn_index);
+  return pool_elt_at_index (wrk->connections, conn_index);
 }
 
 always_inline tcp_connection_t *
@@ -753,7 +789,6 @@ tcp_connection_t *tcp_connection_alloc (u8 thread_index);
 tcp_connection_t *tcp_connection_alloc_w_base (u8 thread_index,
                                               tcp_connection_t * base);
 void tcp_connection_free (tcp_connection_t * tc);
-void tcp_connection_reset (tcp_connection_t * tc);
 int tcp_configure_v4_source_address_range (vlib_main_t * vm,
                                           ip4_address_t * start,
                                           ip4_address_t * end, u32 table_id);