summaryrefslogtreecommitdiffstats
path: root/src/plugins/gbp/gbp_fwd.c
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-02-28 02:51:47 -0800
committerNeale Ranns <nranns@cisco.com>2019-03-04 07:49:25 +0000
commit6fa5dac5fe9699c5eeed383c5bcb3f08507e1548 (patch)
treee09cec5c32013f5d790a8d1cc036ed526a329498 /src/plugins/gbp/gbp_fwd.c
parent6442401c21f880dbfd25d36859f79ddf54b49178 (diff)
gbp: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I3b10caa447b796172f787df8fcbb92f2b4dd2803 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/plugins/gbp/gbp_fwd.c')
-rw-r--r--src/plugins/gbp/gbp_fwd.c164
1 files changed, 29 insertions, 135 deletions
diff --git a/src/plugins/gbp/gbp_fwd.c b/src/plugins/gbp/gbp_fwd.c
index e4814337558..8d98f1cd365 100644
--- a/src/plugins/gbp/gbp_fwd.c
+++ b/src/plugins/gbp/gbp_fwd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Copyright (c) 2019 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:
@@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
#include <plugins/gbp/gbp.h>
#include <vnet/l2/l2_input.h>
+#include <plugins/gbp/gbp_learn.h>
/**
* Grouping of global data for the GBP source EPG classification feature
@@ -29,155 +29,49 @@ typedef struct gbp_fwd_main_t_
static gbp_fwd_main_t gbp_fwd_main;
-#define foreach_gbp_fwd \
- _(DROP, "drop") \
- _(OUTPUT, "output")
-
-typedef enum
-{
-#define _(sym,str) GBP_FWD_ERROR_##sym,
- foreach_gbp_fwd
-#undef _
- GBP_FWD_N_ERROR,
-} gbp_fwd_error_t;
-
-static char *gbp_fwd_error_strings[] = {
-#define _(sym,string) string,
- foreach_gbp_fwd
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) GBP_FWD_NEXT_##sym,
- foreach_gbp_fwd
-#undef _
- GBP_FWD_N_NEXT,
-} gbp_fwd_next_t;
-
-/**
- * per-packet trace data
- */
-typedef struct gbp_fwd_trace_t_
-{
- /* per-pkt trace data */
- epg_id_t src_epg;
- u32 sw_if_index;
-} gbp_fwd_trace_t;
+gbp_policy_main_t gbp_policy_main;
-static uword
-gbp_fwd (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+void
+gbp_learn_enable (u32 sw_if_index, gbb_learn_mode_t mode)
{
- u32 n_left_from, *from, *to_next;
- u32 next_index;
-
- next_index = 0;
- n_left_from = frame->n_vectors;
- from = vlib_frame_vector_args (frame);
-
- while (n_left_from > 0)
+ if (GBP_LEARN_MODE_L2 == mode)
{
- u32 n_left_to_next;
-
- vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
- while (n_left_from > 0 && n_left_to_next > 0)
- {
- u32 bi0, sw_if_index0, src_epg;
- gbp_fwd_next_t next0;
- vlib_buffer_t *b0;
-
- next0 = GBP_FWD_NEXT_DROP;
- bi0 = from[0];
- to_next[0] = bi0;
- from += 1;
- to_next += 1;
- n_left_from -= 1;
- n_left_to_next -= 1;
-
- b0 = vlib_get_buffer (vm, bi0);
-
- /*
- * lookup the uplink based on src EPG
- */
- src_epg = vnet_buffer2 (b0)->gbp.src_epg;
-
- sw_if_index0 = gbp_epg_itf_lookup (src_epg);
-
- if (~0 != sw_if_index0)
- {
- vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index0;
-
- next0 = GBP_FWD_NEXT_OUTPUT;
- }
- /*
- * else
- * don't know the uplink interface for this EPG => drop
- */
-
- if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED)))
- {
- gbp_fwd_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
- t->src_epg = src_epg;
- t->sw_if_index = sw_if_index0;
- }
-
- /* verify speculative enqueue, maybe switch current next frame */
- vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
- to_next, n_left_to_next,
- bi0, next0);
- }
-
- vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_GBP_LEARN, 1);
+ }
+ else
+ {
+ vnet_feature_enable_disable ("ip4-unicast",
+ "gbp-learn-ip4", sw_if_index, 1, 0, 0);
+ vnet_feature_enable_disable ("ip6-unicast",
+ "gbp-learn-ip6", sw_if_index, 1, 0, 0);
}
-
- return frame->n_vectors;
}
-/* packet trace format function */
-static u8 *
-format_gbp_fwd_trace (u8 * s, va_list * args)
+void
+gbp_learn_disable (u32 sw_if_index, gbb_learn_mode_t mode)
{
- CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
- CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
- gbp_fwd_trace_t *t = va_arg (*args, gbp_fwd_trace_t *);
-
- s = format (s, "src-epg:%d", t->src_epg);
-
- return s;
+ if (GBP_LEARN_MODE_L2 == mode)
+ {
+ l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_GBP_LEARN, 0);
+ }
+ else
+ {
+ vnet_feature_enable_disable ("ip4-unicast",
+ "gbp-learn-ip4", sw_if_index, 0, 0, 0);
+ vnet_feature_enable_disable ("ip6-unicast",
+ "gbp-learn-ip6", sw_if_index, 0, 0, 0);
+ }
}
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (gbp_fwd_node) = {
- .function = gbp_fwd,
- .name = "gbp-fwd",
- .vector_size = sizeof (u32),
- .format_trace = format_gbp_fwd_trace,
- .type = VLIB_NODE_TYPE_INTERNAL,
-
- .n_errors = ARRAY_LEN(gbp_fwd_error_strings),
- .error_strings = gbp_fwd_error_strings,
-
- .n_next_nodes = GBP_FWD_N_NEXT,
-
- .next_nodes = {
- [GBP_FWD_NEXT_DROP] = "error-drop",
- [GBP_FWD_NEXT_OUTPUT] = "l2-output",
- },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (gbp_fwd_node, gbp_fwd);
-
-/* *INDENT-ON* */
-
static clib_error_t *
gbp_fwd_init (vlib_main_t * vm)
{
gbp_fwd_main_t *gpm = &gbp_fwd_main;
+ vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "gbp-fwd");
/* Initialize the feature next-node indices */
feat_bitmap_init_next_nodes (vm,
- gbp_fwd_node.index,
+ node->index,
L2INPUT_N_FEAT,
l2input_get_feat_names (),
gpm->l2_input_feat_next);