X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_reassembly.c;h=a8b6d2c8a0effb4a38e6aa243bab716e4dc9d077;hb=a638c18375f17891a9455e717d8436158af12387;hp=45cd2b2eaeb7074d4d4bb22df8154baee54bf94b;hpb=3a343d42d7bd90753ea6ed48fe750a7a209b1ddf;p=vpp.git diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c index 45cd2b2eaeb..a8b6d2c8a0e 100644 --- a/src/vnet/ip/ip6_reassembly.c +++ b/src/vnet/ip/ip6_reassembly.c @@ -110,8 +110,10 @@ typedef struct u32 data_len; // trace operation counter u32 trace_op_counter; - // next index - used by non-feature node - u8 next_index; + // next index - used by custom apps (~0 if not set) + u32 next_index; + // error next index - used by custom apps (~0 if not set) + u32 error_next_index; // minimum fragment length for this reassembly - used to estimate MTU u16 min_fragment_length; // number of fragments for this reassembly @@ -278,12 +280,6 @@ ip6_reass_add_trace (vlib_main_t * vm, vlib_node_runtime_t * node, { vlib_buffer_t *b = vlib_get_buffer (vm, bi); vnet_buffer_opaque_t *vnb = vnet_buffer (b); - if (pool_is_free_index (vm->trace_main.trace_buffer_pool, b->trace_index)) - { - // this buffer's trace is gone - b->flags &= ~VLIB_BUFFER_IS_TRACED; - return; - } ip6_reass_trace_t *t = vlib_add_trace (vm, node, b, sizeof (t[0])); t->reass_id = reass->id; t->action = action; @@ -321,8 +317,8 @@ ip6_reass_free (ip6_reass_main_t * rm, ip6_reass_per_thread_t * rt, } always_inline void -ip6_reass_drop_all (vlib_main_t * vm, ip6_reass_main_t * rm, - ip6_reass_t * reass) +ip6_reass_drop_all (vlib_main_t * vm, vlib_node_runtime_t * node, + ip6_reass_main_t * rm, ip6_reass_t * reass) { u32 range_bi = reass->first_bi; vlib_buffer_t *range_b; @@ -349,7 +345,39 @@ ip6_reass_drop_all (vlib_main_t * vm, ip6_reass_main_t * rm, } range_bi = range_vnb->ip.reass.next_range_bi; } - vlib_buffer_free (vm, to_free, vec_len (to_free)); + /* send to next_error_index */ + if (~0 != reass->error_next_index) + { + u32 n_left_to_next, *to_next, next_index; + + next_index = reass->error_next_index; + u32 bi = ~0; + + while (vec_len (to_free) > 0) + { + vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + + while (vec_len (to_free) > 0 && n_left_to_next > 0) + { + bi = vec_pop (to_free); + + if (~0 != bi) + { + to_next[0] = bi; + to_next += 1; + n_left_to_next -= 1; + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, + to_next, n_left_to_next, + bi, next_index); + } + } + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } + } + else + { + vlib_buffer_free (vm, to_free, vec_len (to_free)); + } vec_free (to_free); } @@ -362,31 +390,34 @@ ip6_reass_on_timeout (vlib_main_t * vm, vlib_node_runtime_t * node, { return; } - vlib_buffer_t *b = vlib_get_buffer (vm, reass->first_bi); - if (0 == vnet_buffer (b)->ip.reass.fragment_first) + if (~0 == reass->next_index) // custom apps don't want icmp { - *icmp_bi = reass->first_bi; - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - ip6_reass_add_trace (vm, node, rm, reass, reass->first_bi, - ICMP_ERROR_RT_EXCEEDED, 0); - } - // fragment with offset zero received - send icmp message back - if (b->flags & VLIB_BUFFER_NEXT_PRESENT) - { - // separate first buffer from chain and steer it towards icmp node - b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; - reass->first_bi = b->next_buffer; - } - else + vlib_buffer_t *b = vlib_get_buffer (vm, reass->first_bi); + if (0 == vnet_buffer (b)->ip.reass.fragment_first) { - reass->first_bi = vnet_buffer (b)->ip.reass.next_range_bi; + *icmp_bi = reass->first_bi; + if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) + { + ip6_reass_add_trace (vm, node, rm, reass, reass->first_bi, + ICMP_ERROR_RT_EXCEEDED, 0); + } + // fragment with offset zero received - send icmp message back + if (b->flags & VLIB_BUFFER_NEXT_PRESENT) + { + // separate first buffer from chain and steer it towards icmp node + b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; + reass->first_bi = b->next_buffer; + } + else + { + reass->first_bi = vnet_buffer (b)->ip.reass.next_range_bi; + } + icmp6_error_set_vnet_buffer (b, ICMP6_time_exceeded, + ICMP6_time_exceeded_fragment_reassembly_time_exceeded, + 0); } - icmp6_error_set_vnet_buffer (b, ICMP6_time_exceeded, - ICMP6_time_exceeded_fragment_reassembly_time_exceeded, - 0); } - ip6_reass_drop_all (vm, rm, reass); + ip6_reass_drop_all (vm, node, rm, reass); } always_inline ip6_reass_t * @@ -435,6 +466,8 @@ ip6_reass_find_or_create (vlib_main_t * vm, vlib_node_runtime_t * node, reass->first_bi = ~0; reass->last_packet_octet = ~0; reass->data_len = 0; + reass->next_index = ~0; + reass->error_next_index = ~0; ++rt->reass_n; } @@ -461,7 +494,7 @@ always_inline ip6_reass_rc_t ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, ip6_reass_main_t * rm, ip6_reass_per_thread_t * rt, ip6_reass_t * reass, u32 * bi0, u32 * next0, u32 * error0, - bool is_feature) + bool is_custom_app) { *bi0 = reass->first_bi; *error0 = IP6_ERROR_NONE; @@ -633,6 +666,7 @@ ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, rv = IP6_REASS_RC_NO_BUF; goto free_buffers_and_return; } + first_b->flags &= ~VLIB_BUFFER_EXT_HDR_VALID; if (PREDICT_FALSE (first_b->flags & VLIB_BUFFER_IS_TRACED)) { ip6_reass_add_trace (vm, node, rm, reass, reass->first_bi, FINALIZE, 0); @@ -663,7 +697,7 @@ ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, while (0); #endif } - if (is_feature) + if (!is_custom_app) { *next0 = IP6_REASSEMBLY_NEXT_INPUT; } @@ -711,12 +745,17 @@ always_inline ip6_reass_rc_t ip6_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node, ip6_reass_main_t * rm, ip6_reass_per_thread_t * rt, ip6_reass_t * reass, u32 * bi0, u32 * next0, u32 * error0, - ip6_frag_hdr_t * frag_hdr, bool is_feature) + ip6_frag_hdr_t * frag_hdr, bool is_custom_app) { int consumed = 0; vlib_buffer_t *fb = vlib_get_buffer (vm, *bi0); vnet_buffer_opaque_t *fvnb = vnet_buffer (fb); - reass->next_index = fvnb->ip.reass.next_index; // store next_index before it's overwritten + if (is_custom_app) + { + reass->next_index = fvnb->ip.reass.next_index; // store next_index before it's overwritten + reass->error_next_index = fvnb->ip.reass.error_next_index; // store error_next_index before it is overwritten + } + fvnb->ip.reass.ip6_frag_hdr_offset = (u8 *) frag_hdr - (u8 *) vlib_buffer_get_current (fb); ip6_header_t *fip = vlib_buffer_get_current (fb); @@ -792,7 +831,7 @@ ip6_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node, else { // overlapping fragment - not allowed by RFC 8200 - ip6_reass_drop_all (vm, rm, reass); + ip6_reass_drop_all (vm, node, rm, reass); ip6_reass_free (rm, rt, reass); if (PREDICT_FALSE (fb->flags & VLIB_BUFFER_IS_TRACED)) { @@ -818,7 +857,7 @@ check_if_done_maybe: reass->data_len == reass->last_packet_octet + 1) { return ip6_reass_finalize (vm, node, rm, rt, reass, bi0, next0, error0, - is_feature); + is_custom_app); } else { @@ -907,9 +946,9 @@ ip6_reass_verify_packet_size_lt_64k (vlib_main_t * vm, } always_inline uword -ip6_reassembly_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, bool is_feature) +ip6_reassembly_inline (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame, bool is_feature, + bool is_custom_app) { u32 *from = vlib_frame_vector_args (frame); u32 n_left_from, n_left_to_next, *to_next, next_index; @@ -997,7 +1036,7 @@ ip6_reassembly_inline (vlib_main_t * vm, else if (reass) { switch (ip6_reass_update (vm, node, rm, rt, reass, &bi0, &next0, - &error0, frag_hdr, is_feature)) + &error0, frag_hdr, is_custom_app)) { case IP6_REASS_RC_OK: /* nothing to do here */ @@ -1006,22 +1045,23 @@ ip6_reassembly_inline (vlib_main_t * vm, vlib_node_increment_counter (vm, node->node_index, IP6_ERROR_REASS_FRAGMENT_CHAIN_TOO_LONG, 1); - ip6_reass_drop_all (vm, rm, reass); + ip6_reass_drop_all (vm, node, rm, reass); ip6_reass_free (rm, rt, reass); goto next_packet; break; case IP6_REASS_RC_NO_BUF: vlib_node_increment_counter (vm, node->node_index, IP6_ERROR_REASS_NO_BUF, 1); - ip6_reass_drop_all (vm, rm, reass); + ip6_reass_drop_all (vm, node, rm, reass); ip6_reass_free (rm, rt, reass); goto next_packet; break; case IP6_REASS_RC_INTERNAL_ERROR: + /* drop everything and start with a clean slate */ vlib_node_increment_counter (vm, node->node_index, IP6_ERROR_REASS_INTERNAL_ERROR, 1); - ip6_reass_drop_all (vm, rm, reass); + ip6_reass_drop_all (vm, node, rm, reass); ip6_reass_free (rm, rt, reass); goto next_packet; break; @@ -1029,7 +1069,15 @@ ip6_reassembly_inline (vlib_main_t * vm, } else { - next0 = IP6_REASSEMBLY_NEXT_DROP; + if (is_feature) + { + next0 = IP6_REASSEMBLY_NEXT_DROP; + } + else + { + vnet_buffer_opaque_t *fvnb = vnet_buffer (b0); + next0 = fvnb->ip.reass.error_next_index; + } error0 = IP6_ERROR_REASS_LIMIT_REACHED; } @@ -1081,7 +1129,8 @@ static char *ip6_reassembly_error_strings[] = { VLIB_NODE_FN (ip6_reass_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { - return ip6_reassembly_inline (vm, node, frame, false /* is_feature */ ); + return ip6_reassembly_inline (vm, node, frame, false /* is_feature */ , + false /* is_custom_app */ ); } /* *INDENT-OFF* */ @@ -1106,7 +1155,8 @@ VLIB_NODE_FN (ip6_reass_node_feature) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { - return ip6_reassembly_inline (vm, node, frame, true /* is_feature */ ); + return ip6_reassembly_inline (vm, node, frame, true /* is_feature */ , + false /* is_custom_app */ ); } /* *INDENT-OFF* */ @@ -1343,21 +1393,10 @@ ip6_reass_walk_expired (vlib_main_t * vm, { ip6_reass_t *reass = pool_elt_at_index (rt->pool, i[0]); u32 icmp_bi = ~0; - vlib_buffer_t *b = vlib_get_buffer (vm, reass->first_bi); - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - if (pool_is_free_index (vm->trace_main.trace_buffer_pool, - b->trace_index)) - { - /* the trace is gone, don't trace this buffer anymore */ - b->flags &= ~VLIB_BUFFER_IS_TRACED; - } - } ip6_reass_on_timeout (vm, node, rm, reass, &icmp_bi); if (~0 != icmp_bi) - { - vec_add1 (vec_icmp_bi, icmp_bi); - } + vec_add1 (vec_icmp_bi, icmp_bi); + ip6_reass_free (rm, rt, reass); } /* *INDENT-ON* */ @@ -1377,18 +1416,7 @@ ip6_reass_walk_expired (vlib_main_t * vm, u32 bi = vec_pop (vec_icmp_bi); vlib_buffer_t *b = vlib_get_buffer (vm, bi); if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - if (pool_is_free_index (vm->trace_main.trace_buffer_pool, - b->trace_index)) - { - /* the trace is gone, don't trace this buffer anymore */ - b->flags &= ~VLIB_BUFFER_IS_TRACED; - } - else - { - trace_frame = 1; - } - } + trace_frame = 1; b->error = node->errors[IP6_ERROR_REASS_TIMEOUT]; to_next[0] = bi; ++f->n_vectors;