From 8e71529ea86018ab05c8cb77081512cbd2e413a7 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 3 Sep 2018 15:41:45 +0200 Subject: Deprecate old buffer replication scheme Change-Id: I1f54b994425c58776e1445c8d9fe142e7a644d3d Signed-off-by: Damjan Marion --- src/vnet/CMakeLists.txt | 2 - src/vnet/l2/l2_flood.c | 1 - src/vnet/replication.c | 283 ------------------------------------------------ src/vnet/replication.h | 137 ----------------------- 4 files changed, 423 deletions(-) delete mode 100644 src/vnet/replication.c delete mode 100644 src/vnet/replication.h (limited to 'src/vnet') diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 61945a41867..3dcb7efa799 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -37,7 +37,6 @@ list(APPEND VNET_SOURCES interface_output.c interface_stats.c misc.c - replication.c ) list(APPEND VNET_HEADERS @@ -56,7 +55,6 @@ list(APPEND VNET_HEADERS l3_types.h plugin/plugin.h pipeline.h - replication.h vnet.h vnet_all_api_h.h vnet_msg_enum.h diff --git a/src/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c index 8a635cec208..668301731a9 100644 --- a/src/vnet/l2/l2_flood.c +++ b/src/vnet/l2/l2_flood.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/src/vnet/replication.c b/src/vnet/replication.c deleted file mode 100644 index 21f5485e6c7..00000000000 --- a/src/vnet/replication.c +++ /dev/null @@ -1,283 +0,0 @@ -/* - * replication.c : packet replication - * - * Copyright (c) 2013 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include - - -replication_main_t replication_main; - - -replication_context_t * -replication_prep (vlib_main_t * vm, - vlib_buffer_t * b0, u32 recycle_node_index, u32 l2_packet) -{ - replication_main_t *rm = &replication_main; - replication_context_t *ctx; - uword thread_index = vm->thread_index; - ip4_header_t *ip; - u32 ctx_id; - - /* Allocate a context, reserve context 0 */ - if (PREDICT_FALSE (rm->contexts[thread_index] == 0)) - pool_get_aligned (rm->contexts[thread_index], ctx, CLIB_CACHE_LINE_BYTES); - - pool_get_aligned (rm->contexts[thread_index], ctx, CLIB_CACHE_LINE_BYTES); - ctx_id = ctx - rm->contexts[thread_index]; - - /* Save state from vlib buffer */ - ctx->saved_free_list_index = vlib_buffer_get_free_list_index (b0); - ctx->current_data = b0->current_data; - ctx->flags = b0->flags & VNET_BUFFER_FLAGS_VLAN_BITS; - - /* Set up vlib buffer hooks */ - b0->recycle_count = ctx_id; - vlib_buffer_set_free_list_index (b0, rm->recycle_list_index); - b0->flags |= VLIB_BUFFER_RECYCLE; - - /* Save feature state */ - ctx->recycle_node_index = recycle_node_index; - - /* Save vnet state */ - clib_memcpy (ctx->vnet_buffer, vnet_buffer (b0), - sizeof (vnet_buffer_opaque_t)); - - /* Save packet contents */ - ctx->l2_packet = l2_packet; - ip = (ip4_header_t *) vlib_buffer_get_current (b0); - if (l2_packet) - { - /* Save ethernet header */ - ctx->l2_header[0] = ((u64 *) ip)[0]; - ctx->l2_header[1] = ((u64 *) ip)[1]; - ctx->l2_header[2] = ((u64 *) ip)[2]; - /* set ip to the true ip header */ - ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len); - } - - /* - * Copy L3 fields. - * We need to save TOS for ip4 and ip6 packets. - * Fortunately the TOS field is - * in the first two bytes of both the ip4 and ip6 headers. - */ - ctx->ip_tos = *((u16 *) (ip)); - - /* - * Save the ip4 checksum as well. We just blindly save the corresponding two - * bytes even for ip6 packets. - */ - ctx->ip4_checksum = ip->checksum; - - return ctx; -} - - -replication_context_t * -replication_recycle (vlib_main_t * vm, vlib_buffer_t * b0, u32 is_last) -{ - replication_main_t *rm = &replication_main; - replication_context_t *ctx; - uword thread_index = vm->thread_index; - ip4_header_t *ip; - - /* Get access to the replication context */ - ctx = pool_elt_at_index (rm->contexts[thread_index], b0->recycle_count); - - /* Restore vnet buffer state */ - clib_memcpy (vnet_buffer (b0), ctx->vnet_buffer, - sizeof (vnet_buffer_opaque_t)); - - /* Restore the vlan flags */ - b0->flags &= ~VNET_BUFFER_FLAGS_VLAN_BITS; - b0->flags |= ctx->flags; - - /* Restore the packet start (current_data) and length */ - vlib_buffer_advance (b0, ctx->current_data - b0->current_data); - - /* Restore packet contents */ - ip = (ip4_header_t *) vlib_buffer_get_current (b0); - if (ctx->l2_packet) - { - /* Restore ethernet header */ - ((u64 *) ip)[0] = ctx->l2_header[0]; - ((u64 *) ip)[1] = ctx->l2_header[1]; - ((u64 *) ip)[2] = ctx->l2_header[2]; - /* set ip to the true ip header */ - ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len); - } - - // Restore L3 fields - *((u16 *) (ip)) = ctx->ip_tos; - ip->checksum = ctx->ip4_checksum; - - if (is_last) - { - /* - * This is the last replication in the list. - * Restore original buffer free functionality. - */ - vlib_buffer_set_free_list_index (b0, ctx->saved_free_list_index); - b0->flags &= ~VLIB_BUFFER_RECYCLE; - - /* Free context back to its pool */ - pool_put (rm->contexts[thread_index], ctx); - } - - return ctx; -} - - - -/* - * fish pkts back from the recycle queue/freelist - * un-flatten the context chains - */ -static void -replication_recycle_callback (vlib_main_t * vm, vlib_buffer_free_list_t * fl) -{ - vlib_frame_t *f = 0; - u32 n_left_from; - u32 n_left_to_next = 0; - u32 n_this_frame = 0; - u32 *from; - u32 *to_next = 0; - u32 bi0, pi0; - vlib_buffer_t *b0; - int i; - replication_main_t *rm = &replication_main; - replication_context_t *ctx; - u32 feature_node_index = 0; - uword thread_index = vm->thread_index; - - /* - * All buffers in the list are destined to the same recycle node. - * Pull the recycle node index from the first buffer. - * Note: this could be sped up if the node index were stuffed into - * the freelist itself. - */ - if (vec_len (fl->buffers) > 0) - { - bi0 = fl->buffers[0]; - b0 = vlib_get_buffer (vm, bi0); - ctx = pool_elt_at_index (rm->contexts[thread_index], b0->recycle_count); - feature_node_index = ctx->recycle_node_index; - } - - /* buffers */ - for (i = 0; i < 2; i++) - { - if (i == 0) - { - from = fl->buffers; - n_left_from = vec_len (from); - } - - while (n_left_from > 0) - { - if (PREDICT_FALSE (n_left_to_next == 0)) - { - if (f) - { - f->n_vectors = n_this_frame; - vlib_put_frame_to_node (vm, feature_node_index, f); - } - - f = vlib_get_frame_to_node (vm, feature_node_index); - to_next = vlib_frame_vector_args (f); - n_left_to_next = VLIB_FRAME_SIZE; - n_this_frame = 0; - } - - bi0 = from[0]; - if (PREDICT_TRUE (n_left_from > 1)) - { - pi0 = from[1]; - vlib_prefetch_buffer_with_index (vm, pi0, LOAD); - } - - b0 = vlib_get_buffer (vm, bi0); - - /* Mark that this buffer was just recycled */ - b0->flags |= VLIB_BUFFER_IS_RECYCLED; - -#if (CLIB_DEBUG > 0) - if (buffer_main.callbacks_registered == 0) - vlib_buffer_set_known_state (bi0, VLIB_BUFFER_KNOWN_ALLOCATED); -#endif - - /* If buffer is traced, mark frame as traced */ - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - f->flags |= VLIB_FRAME_TRACE; - - to_next[0] = bi0; - - from++; - to_next++; - n_this_frame++; - n_left_to_next--; - n_left_from--; - } - } - - vec_reset_length (fl->buffers); - - if (f) - { - ASSERT (n_this_frame); - f->n_vectors = n_this_frame; - vlib_put_frame_to_node (vm, feature_node_index, f); - } -} - -clib_error_t * -replication_init (vlib_main_t * vm) -{ - replication_main_t *rm = &replication_main; - vlib_buffer_free_list_t *fl; - __attribute__ ((unused)) replication_context_t *ctx; - vlib_thread_main_t *tm = vlib_get_thread_main (); - - rm->vlib_main = vm; - rm->vnet_main = vnet_get_main (); - rm->recycle_list_index = - vlib_buffer_create_free_list (vm, 1024 /* fictional */ , - "replication-recycle"); - - fl = pool_elt_at_index (vm->buffer_free_list_pool, rm->recycle_list_index); - - fl->buffers_added_to_freelist_function = replication_recycle_callback; - - /* Verify the replication context is the expected size */ - ASSERT (sizeof (replication_context_t) == 128); /* 2 cache lines */ - - vec_validate (rm->contexts, tm->n_vlib_mains - 1); - return 0; -} - -VLIB_INIT_FUNCTION (replication_init); - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vnet/replication.h b/src/vnet/replication.h deleted file mode 100644 index 6350aedfe7f..00000000000 --- a/src/vnet/replication.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - * replication.h : packet replication - * - * Copyright (c) 2013 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef included_replication_h -#define included_replication_h - - -#include -#include -#include - - -typedef struct -{ - /* The entire vnet buffer header restored for each replica */ - u8 vnet_buffer[40]; /* 16B aligned to allow vector unit copy */ - u8 reserved[24]; /* space for future expansion of vnet buffer header */ - - /* feature state used during this replication */ - u64 feature_replicas; /* feature's id for its set of replicas */ - u32 feature_counter; /* feature's current index into set of replicas */ - u32 recycle_node_index; /* feature's recycle node index */ - - /* - * data saved from the start of replication and restored - * at the end of replication - */ - vlib_buffer_free_list_index_t saved_free_list_index; /* from vlib buffer */ - - /* data saved from the original packet and restored for each replica */ - u64 l2_header[3]; /* 24B (must be at least 22B for l2 packets) */ - u32 flags; /* vnet buffer flags */ - u16 ip_tos; /* v4 and v6 */ - u16 ip4_checksum; /* needed for v4 only */ - - /* data saved from the vlib buffer header and restored for each replica */ - i16 current_data; /* offset of first byte of packet in packet data */ - u8 pad[2]; /* to 64B */ - u8 l2_packet; /* flag for l2 vs l3 packet data */ - -} replication_context_t; /* 128B */ - - -typedef struct -{ - - u32 recycle_list_index; - - /* per-thread pools of replication contexts */ - replication_context_t **contexts; - - vlib_main_t *vlib_main; - vnet_main_t *vnet_main; - -} replication_main_t; - - -extern replication_main_t replication_main; - - -/* Return 1 if this buffer just came from the replication recycle handler. */ -always_inline u32 -replication_is_recycled (vlib_buffer_t * b0) -{ - return b0->flags & VLIB_BUFFER_IS_RECYCLED; -} - -/* - * Clear the recycle flag. If buffer came from the replication recycle - * handler, this flag must be cleared before the packet is transmitted again. - */ -always_inline void -replication_clear_recycled (vlib_buffer_t * b0) -{ - b0->flags &= ~VLIB_BUFFER_IS_RECYCLED; -} - -/* - * Return the active replication context if this buffer has - * been recycled, otherwise return 0. (Note that this essentially - * restricts access to the replication context to the replication - * feature's prep and recycle nodes.) - */ -always_inline replication_context_t * -replication_get_ctx (vlib_buffer_t * b0) -{ - replication_main_t *rm = &replication_main; - - return replication_is_recycled (b0) ? - pool_elt_at_index (rm->contexts[vlib_get_thread_index ()], - b0->recycle_count) : 0; -} - -/* Prefetch the replication context for this buffer, if it exists */ -always_inline void -replication_prefetch_ctx (vlib_buffer_t * b0) -{ - replication_context_t *ctx = replication_get_ctx (b0); - - if (ctx) - { - CLIB_PREFETCH (ctx, (2 * CLIB_CACHE_LINE_BYTES), STORE); - } -} - -replication_context_t *replication_prep (vlib_main_t * vm, - vlib_buffer_t * b0, - u32 recycle_node_index, - u32 l2_packet); - -replication_context_t *replication_recycle (vlib_main_t * vm, - vlib_buffer_t * b0, u32 is_last); - - -#endif - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ -- cgit 1.2.3-korg