X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_reassembly.c;h=bd33026db8540a5aa97317342699316d768054a3;hb=178cf493d009995b28fdf220f04c98860ff79a9b;hp=114d8e052f8a0a92313058ddb903b6507e151531;hpb=4c53313cd7e9b866412ad3e04b2d91ac098c1398;p=vpp.git diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c index 114d8e052f8..bd33026db85 100644 --- a/src/vnet/ip/ip4_reassembly.c +++ b/src/vnet/ip/ip4_reassembly.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #define MSEC_PER_SEC 1000 @@ -62,17 +62,14 @@ typedef struct { struct { - // align by making this 4 octets even though its a 2 octets field u32 xx_id; ip4_address_t src; ip4_address_t dst; - // align by making this 4 octets even though its a 2 octets field - u32 frag_id; - // align by making this 4 octets even though its a 1 octet field - u32 proto; - u32 unused; + u16 frag_id; + u8 proto; + u8 unused; }; - u64 as_u64[3]; + u64 as_u64[2]; }; } ip4_reass_key_t; @@ -147,7 +144,7 @@ typedef struct u32 max_reass_n; // IPv4 runtime - clib_bihash_24_8_t hash; + clib_bihash_16_8_t hash; // per-thread data ip4_reass_per_thread_t *per_thread_data; @@ -297,11 +294,10 @@ always_inline void ip4_reass_free (ip4_reass_main_t * rm, ip4_reass_per_thread_t * rt, ip4_reass_t * reass) { - clib_bihash_kv_24_8_t kv; + clib_bihash_kv_16_8_t kv; kv.key[0] = reass->key.as_u64[0]; kv.key[1] = reass->key.as_u64[1]; - kv.key[2] = reass->key.as_u64[2]; - clib_bihash_add_del_24_8 (&rm->hash, &kv, 0); + clib_bihash_add_del_16_8 (&rm->hash, &kv, 0); pool_put (rt->pool, reass); --rt->reass_n; } @@ -343,12 +339,11 @@ ip4_reass_find_or_create (vlib_main_t * vm, ip4_reass_main_t * rm, { ip4_reass_t *reass = NULL; f64 now = vlib_time_now (rm->vlib_main); - clib_bihash_kv_24_8_t kv, value; + clib_bihash_kv_16_8_t kv, value; kv.key[0] = k->as_u64[0]; kv.key[1] = k->as_u64[1]; - kv.key[2] = k->as_u64[2]; - if (!clib_bihash_search_24_8 (&rm->hash, &kv, &value)) + if (!clib_bihash_search_16_8 (&rm->hash, &kv, &value)) { reass = pool_elt_at_index (rt->pool, value.value); if (now > reass->last_heard + rm->timeout) @@ -373,7 +368,7 @@ ip4_reass_find_or_create (vlib_main_t * vm, ip4_reass_main_t * rm, else { pool_get (rt->pool, reass); - memset (reass, 0, sizeof (*reass)); + clib_memset (reass, 0, sizeof (*reass)); reass->id = ((u64) os_get_thread_index () * 1000000000) + rt->id_counter; ++rt->id_counter; @@ -385,11 +380,10 @@ ip4_reass_find_or_create (vlib_main_t * vm, ip4_reass_main_t * rm, reass->key.as_u64[0] = kv.key[0] = k->as_u64[0]; reass->key.as_u64[1] = kv.key[1] = k->as_u64[1]; - reass->key.as_u64[2] = kv.key[2] = k->as_u64[2]; kv.value = reass - rt->pool; reass->last_heard = now; - if (clib_bihash_add_del_24_8 (&rm->hash, &kv, 1)) + if (clib_bihash_add_del_16_8 (&rm->hash, &kv, 1)) { ip4_reass_free (rm, rt, reass); reass = NULL; @@ -402,7 +396,7 @@ always_inline void ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_reass_main_t * rm, ip4_reass_per_thread_t * rt, ip4_reass_t * reass, u32 * bi0, u32 * next0, - vlib_error_t * error0, u32 ** vec_drop_compress, + u32 * error0, u32 ** vec_drop_compress, u32 ** vec_drop_overlap, bool is_feature) { ASSERT (~0 != reass->first_bi); @@ -497,6 +491,8 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, reass.next_range_bi; } while (~0 != sub_chain_bi); + + ASSERT (last_b != NULL); last_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; ASSERT (rt->buffers_n >= (buf_cnt - dropped_cnt)); rt->buffers_n -= buf_cnt - dropped_cnt; @@ -649,7 +645,7 @@ always_inline void ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_reass_main_t * rm, ip4_reass_per_thread_t * rt, ip4_reass_t * reass, u32 * bi0, u32 * next0, - vlib_error_t * error0, u32 ** vec_drop_overlap, + u32 * error0, u32 ** vec_drop_overlap, u32 ** vec_drop_compress, bool is_feature) { int consumed = 0; @@ -657,6 +653,7 @@ ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_header_t *fip = vlib_buffer_get_current (fb); ASSERT (fb->current_length >= sizeof (*fip)); vnet_buffer_opaque_t *fvnb = vnet_buffer (fb); + reass->next_index = fvnb->ip.reass.next_index; // store next_index before it's overwritten u32 fragment_first = fvnb->ip.reass.fragment_first = ip4_get_fragment_offset_bytes (fip); u32 fragment_length = @@ -666,7 +663,6 @@ ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node, int more_fragments = ip4_get_fragment_more (fip); u32 candidate_range_bi = reass->first_bi; u32 prev_range_bi = ~0; - reass->next_index = fvnb->ip.reass.next_index; // store next_index before it's overwritten fvnb->ip.reass.range_first = fragment_first; fvnb->ip.reass.range_last = fragment_last; fvnb->ip.reass.next_range_bi = ~0; @@ -932,12 +928,14 @@ ip4_reassembly_inline (vlib_main_t * vm, else { ip4_reass_key_t k; - k.src.as_u32 = ip0->src_address.as_u32; - k.dst.as_u32 = ip0->dst_address.as_u32; - k.xx_id = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - k.frag_id = ip0->fragment_id; - k.proto = ip0->protocol; - k.unused = 0; + k.as_u64[0] = + (u64) vnet_buffer (b0)->sw_if_index[VLIB_RX] << 32 | (u64) + ip0->src_address.as_u32; + k.as_u64[1] = + (u64) ip0->dst_address. + as_u32 << 32 | (u64) ip0->fragment_id << 16 | (u64) ip0-> + protocol << 8; + ip4_reass_t *reass = ip4_reass_find_or_create (vm, rm, rt, &k, &vec_drop_timeout); @@ -963,8 +961,8 @@ ip4_reassembly_inline (vlib_main_t * vm, n_left_to_next -= 1; if (is_feature && IP4_ERROR_NONE == error0) { - vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_RX], - &next0, b0); + b0 = vlib_get_buffer (vm, bi0); + vnet_feature_next (&next0, b0); } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, bi0, next0); @@ -988,7 +986,7 @@ static char *ip4_reassembly_error_strings[] = { #undef _ }; -always_inline uword +static uword ip4_reassembly (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -1014,7 +1012,7 @@ VLIB_REGISTER_NODE (ip4_reass_node, static) = { VLIB_NODE_FUNCTION_MULTIARCH (ip4_reass_node, ip4_reassembly); -always_inline uword +static uword ip4_reassembly_feature (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -1074,14 +1072,14 @@ typedef enum typedef struct { int failure; - clib_bihash_24_8_t *new_hash; + clib_bihash_16_8_t *new_hash; } ip4_rehash_cb_ctx; static void -ip4_rehash_cb (clib_bihash_kv_24_8_t * kv, void *_ctx) +ip4_rehash_cb (clib_bihash_kv_16_8_t * kv, void *_ctx) { ip4_rehash_cb_ctx *ctx = _ctx; - if (clib_bihash_add_del_24_8 (ctx->new_hash, kv, 1)) + if (clib_bihash_add_del_16_8 (ctx->new_hash, kv, 1)) { ctx->failure = 1; } @@ -1108,28 +1106,27 @@ ip4_reass_set (u32 timeout_ms, u32 max_reassemblies, ip4_reass_main.ip4_reass_expire_node_idx, IP4_EVENT_CONFIG_CHANGED, 0); u32 new_nbuckets = ip4_reass_get_nbuckets (); - if (ip4_reass_main.max_reass_n > 0 && new_nbuckets > 1 && - new_nbuckets != old_nbuckets) + if (ip4_reass_main.max_reass_n > 0 && new_nbuckets > old_nbuckets) { - clib_bihash_24_8_t new_hash; - memset (&new_hash, 0, sizeof (new_hash)); + clib_bihash_16_8_t new_hash; + clib_memset (&new_hash, 0, sizeof (new_hash)); ip4_rehash_cb_ctx ctx; ctx.failure = 0; ctx.new_hash = &new_hash; - clib_bihash_init_24_8 (&new_hash, "ip4-reass", new_nbuckets, + clib_bihash_init_16_8 (&new_hash, "ip4-reass", new_nbuckets, new_nbuckets * 1024); - clib_bihash_foreach_key_value_pair_24_8 (&ip4_reass_main.hash, + clib_bihash_foreach_key_value_pair_16_8 (&ip4_reass_main.hash, ip4_rehash_cb, &ctx); if (ctx.failure) { - clib_bihash_free_24_8 (&new_hash); + clib_bihash_free_16_8 (&new_hash); return -1; } else { - clib_bihash_free_24_8 (&ip4_reass_main.hash); - clib_memcpy (&ip4_reass_main.hash, &new_hash, - sizeof (ip4_reass_main.hash)); + clib_bihash_free_16_8 (&ip4_reass_main.hash); + clib_memcpy_fast (&ip4_reass_main.hash, &new_hash, + sizeof (ip4_reass_main.hash)); } } return 0; @@ -1156,7 +1153,7 @@ ip4_reass_init_function (vlib_main_t * vm) rm->vlib_main = vm; rm->vnet_main = vnet_get_main (); - vec_validate (rm->per_thread_data, vlib_num_workers () + 1); + vec_validate (rm->per_thread_data, vlib_num_workers ()); ip4_reass_per_thread_t *rt; vec_foreach (rt, rm->per_thread_data) { @@ -1168,17 +1165,17 @@ ip4_reass_init_function (vlib_main_t * vm) ASSERT (node); rm->ip4_reass_expire_node_idx = node->index; + ip4_reass_set_params (IP4_REASS_TIMEOUT_DEFAULT_MS, + IP4_REASS_MAX_REASSEMBLIES_DEFAULT, + IP4_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS); + nbuckets = ip4_reass_get_nbuckets (); - clib_bihash_init_24_8 (&rm->hash, "ip4-reass", nbuckets, nbuckets * 1024); + clib_bihash_init_16_8 (&rm->hash, "ip4-reass", nbuckets, nbuckets * 1024); node = vlib_get_node_by_name (vm, (u8 *) "ip4-drop"); ASSERT (node); rm->ip4_drop_idx = node->index; - ip4_reass_set_params (IP4_REASS_TIMEOUT_DEFAULT_MS, - IP4_REASS_MAX_REASSEMBLIES_DEFAULT, - IP4_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS); - return error; } @@ -1217,7 +1214,7 @@ ip4_reass_walk_expired (vlib_main_t * vm, uword thread_index = 0; int index; - const uword nthreads = os_get_nthreads (); + const uword nthreads = vlib_num_workers () + 1; for (thread_index = 0; thread_index < nthreads; ++thread_index) { ip4_reass_per_thread_t *rt = &rm->per_thread_data[thread_index]; @@ -1290,7 +1287,7 @@ ip4_reass_walk_expired (vlib_main_t * vm, n_left_to_next -= 1; IP4_REASS_DEBUG_BUFFER (bi, enqueue_drop_timeout_walk); } - f->flags |= (trace_frame * VLIB_FRAME_TRACE); + f->frame_flags |= (trace_frame * VLIB_FRAME_TRACE); vlib_put_frame_to_node (vm, rm->ip4_drop_idx, f); } @@ -1384,7 +1381,7 @@ show_ip4_reass (vlib_main_t * vm, unformat_input_t * input, u64 sum_buffers_n = 0; ip4_reass_t *reass; uword thread_index; - const uword nthreads = os_get_nthreads (); + const uword nthreads = vlib_num_workers () + 1; for (thread_index = 0; thread_index < nthreads; ++thread_index) { ip4_reass_per_thread_t *rt = &rm->per_thread_data[thread_index];