ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

l2e: Migrate old MULTIARCH macros to VLIB_NODE_FN

Browse Source 
Change-Id: I55f45d84212e2293e3798dff6850d86d75414d02
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
This commit is contained in:
Filip Tehlar
2019-02-26 07:28:33 -08:00
committed by Damjan Marion
parent 901cbb9e4d
commit b9625cbdb1
5 changed files with 352 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/l2e/CMakeLists.txt
View File

@@ -13,9 +13,13 @@
add_vpp_plugin(l2e
SOURCES
l2e_node.c
l2e_api.c
l2e.c
MULTIARCH_SOURCES
l2e_node.c
API_FILES
l2e.api

325
src/plugins/l2e/l2e.c
View File

File diff suppressed because it is too large Load Diff

43
src/plugins/l2e/l2e.h
View File

@@ -19,6 +19,47 @@
#include <vlib/vlib.h>
#include <vnet/vnet.h>
/**
* Per-interface L2 configuration
*/
typedef struct l2_emulation_t_
{
/**
* Enabled or Disabled.
* this is required since one L3 protocl can be enabled, but others not
*/
u8 enabled;
} l2_emulation_t;
/**
* per-packet trace data
*/
typedef struct l2_emulation_trace_t_
{
/* per-pkt trace data */
u8 extracted;
} l2_emulation_trace_t;
/**
* Grouping of global data for the L2 emulation feature
*/
typedef struct l2_emulation_main_t_
{
u16 msg_id_base;
u32 l2_emulation_node_index;
/**
* Per-interface vector of emulation configs
*/
l2_emulation_t *l2_emulations;
/**
* Next nodes for L2 output features
*/
u32 l2_input_feat_next[32];
} l2_emulation_main_t;
/**
* L2 Emulation is a feautre that is applied to L2 ports to 'extract'
* IP packets from the L2 path and inject them into the L3 path (i.e.
@@ -30,6 +71,8 @@
extern void l2_emulation_enable (u32 sw_if_index);
extern void l2_emulation_disable (u32 sw_if_index);
extern l2_emulation_main_t l2_emulation_main;
#endif
/*

15
src/plugins/l2e/l2e_api.c
View File

@@ -56,21 +56,12 @@
#define foreach_l2e_api_msg \
_(L2_EMULATION, l2_emulation)
/**
* L2 Emulation Main
*/
typedef struct l2_emulation_main_t_
{
u16 msg_id_base;
} l2_emulation_main_t;
static l2_emulation_main_t l2_emulation_main;
#define L2E_MSG_BASE l2_emulation_main.msg_id_base
#define L2E_MSG_BASE l2em->msg_id_base
static void
vl_api_l2_emulation_t_handler (vl_api_l2_emulation_t * mp)
{
l2_emulation_main_t *l2em = &l2_emulation_main;
vl_api_l2_emulation_reply_t *rmp;
int rv = 0;
@@ -102,6 +93,7 @@ vl_api_l2_emulation_t_handler (vl_api_l2_emulation_t * mp)
static void
setup_message_id_table (api_main_t * am)
{
l2_emulation_main_t *l2em = &l2_emulation_main;
#define _(id,n,crc) \
vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + L2E_MSG_BASE);
foreach_vl_msg_name_crc_l2e;
@@ -111,6 +103,7 @@ setup_message_id_table (api_main_t * am)
static void
l2e_api_hookup (vlib_main_t * vm)
{
l2_emulation_main_t *l2em = &l2_emulation_main;
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N + L2E_MSG_BASE, \
#n, \

283
src/plugins/l2e/l2e_node.c Normal file
View File

@@ -0,0 +1,283 @@
/*
* l2e_node.c : l2 emulation node
*
* 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:
*
* 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 <plugins/l2e/l2e.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2/feat_bitmap.h>
#define foreach_l2_emulation \
_(IP4, "Extract IPv4") \
_(IP6, "Extract IPv6")
typedef enum
{
#define _(sym,str) L2_EMULATION_ERROR_##sym,
foreach_l2_emulation
#undef _
L2_EMULATION_N_ERROR,
} l2_emulation_error_t;
static char *l2_emulation_error_strings[] = {
#define _(sym,string) string,
foreach_l2_emulation
#undef _
};
typedef enum
{
#define _(sym,str) L2_EMULATION_NEXT_##sym,
foreach_l2_emulation
#undef _
L2_EMULATION_N_NEXT,
} l2_emulation_next_t;
/* packet trace format function */
static u8 *
format_l2_emulation_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
l2_emulation_trace_t *t = va_arg (*args, l2_emulation_trace_t *);
s = format (s, "l2-emulation: %s", (t->extracted ? "yes" : "no"));
return s;
}
VLIB_NODE_FN (l2_emulation_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
l2_emulation_main_t *em = &l2_emulation_main;
u32 n_left_from, *from, *to_next;
l2_emulation_next_t next_index;
u32 ip4_hits = 0;
u32 ip6_hits = 0;
next_index = 0;
n_left_from = frame->n_vectors;
from = vlib_frame_vector_args (frame);
while (n_left_from > 0)
{
u32 n_left_to_next;
vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
while (n_left_from >= 4 && n_left_to_next >= 2)
{
vlib_buffer_t *b0, *b1;
u32 sw_if_index0, sw_if_index1;
u16 ether_type0, ether_type1;
u32 next0 = ~0, next1 = ~0;
u8 l2_len0, l2_len1;
u32 bi0, bi1;
u8 *h0, *h1;
bi0 = to_next[0] = from[0];
bi1 = to_next[1] = from[1];
from += 2;
n_left_from -= 2;
to_next += 2;
n_left_to_next -= 2;
b0 = vlib_get_buffer (vm, bi0);
b1 = vlib_get_buffer (vm, bi1);
l2_len0 = vnet_buffer (b0)->l2.l2_len;
l2_len1 = vnet_buffer (b1)->l2.l2_len;
h0 = vlib_buffer_get_current (b0);
h1 = vlib_buffer_get_current (b1);
ether_type0 = clib_net_to_host_u16 (*(u16 *) (h0 + l2_len0 - 2));
ether_type1 = clib_net_to_host_u16 (*(u16 *) (h1 + l2_len1 - 2));
sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
/*
* only extract unicast
*/
if (PREDICT_TRUE (!(h0[0] & 0x1)))
{
switch (ether_type0)
{
case ETHERNET_TYPE_IP4:
ASSERT (em->l2_emulations[sw_if_index0].enabled);
++ip4_hits;
next0 = L2_EMULATION_NEXT_IP4;
vlib_buffer_advance (b0, l2_len0);
break;
case ETHERNET_TYPE_IP6:
ASSERT (em->l2_emulations[sw_if_index0].enabled);
++ip6_hits;
next0 = L2_EMULATION_NEXT_IP6;
vlib_buffer_advance (b0, l2_len0);
default:
break;
}
}
if (PREDICT_TRUE (!(h1[0] & 0x1)))
{
switch (ether_type1)
{
case ETHERNET_TYPE_IP4:
ASSERT (em->l2_emulations[sw_if_index1].enabled);
++ip4_hits;
next1 = L2_EMULATION_NEXT_IP4;
vlib_buffer_advance (b1, l2_len1);
break;
case ETHERNET_TYPE_IP6:
ASSERT (em->l2_emulations[sw_if_index1].enabled);
++ip6_hits;
next1 = L2_EMULATION_NEXT_IP6;
vlib_buffer_advance (b1, l2_len1);
default:
break;
}
}
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
&& (b0->flags & VLIB_BUFFER_IS_TRACED)))
{
l2_emulation_trace_t *t =
vlib_add_trace (vm, node, b0, sizeof (*t));
t->extracted = (next0 != ~0);
}
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
&& (b1->flags & VLIB_BUFFER_IS_TRACED)))
{
l2_emulation_trace_t *t =
vlib_add_trace (vm, node, b1, sizeof (*t));
t->extracted = (next1 != ~0);
}
/* Determine the next node and remove ourself from bitmap */
if (PREDICT_TRUE (next0 == ~0))
next0 = vnet_l2_feature_next (b0, em->l2_input_feat_next,
L2INPUT_FEAT_L2_EMULATION);
/* Determine the next node and remove ourself from bitmap */
if (PREDICT_TRUE (next1 == ~0))
next1 = vnet_l2_feature_next (b1, em->l2_input_feat_next,
L2INPUT_FEAT_L2_EMULATION);
vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
to_next, n_left_to_next,
bi0, bi1, next0, next1);
}
while (n_left_from > 0 && n_left_to_next > 0)
{
vlib_buffer_t *b0;
u32 sw_if_index0;
u16 ether_type0;
u32 next0 = ~0;
u8 l2_len0;
u32 bi0;
u8 *h0;
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);
l2_len0 = vnet_buffer (b0)->l2.l2_len;
h0 = vlib_buffer_get_current (b0);
ether_type0 = clib_net_to_host_u16 (*(u16 *) (h0 + l2_len0 - 2));
sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
/*
* only extract unicast
*/
if (PREDICT_TRUE (!(h0[0] & 0x1)))
{
switch (ether_type0)
{
case ETHERNET_TYPE_IP4:
ASSERT (em->l2_emulations[sw_if_index0].enabled);
++ip4_hits;
next0 = L2_EMULATION_NEXT_IP4;
vlib_buffer_advance (b0, l2_len0);
break;
case ETHERNET_TYPE_IP6:
ASSERT (em->l2_emulations[sw_if_index0].enabled);
++ip6_hits;
next0 = L2_EMULATION_NEXT_IP6;
vlib_buffer_advance (b0, l2_len0);
default:
break;
}
}
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
&& (b0->flags & VLIB_BUFFER_IS_TRACED)))
{
l2_emulation_trace_t *t =
vlib_add_trace (vm, node, b0, sizeof (*t));
t->extracted = (next0 != ~0);
}
/* Determine the next node and remove ourself from bitmap */
if (PREDICT_TRUE (next0 == ~0))
next0 = vnet_l2_feature_next (b0, em->l2_input_feat_next,
L2INPUT_FEAT_L2_EMULATION);
/* 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);
}
vlib_node_increment_counter (vm, node->node_index,
L2_EMULATION_ERROR_IP4, ip4_hits);
vlib_node_increment_counter (vm, node->node_index,
L2_EMULATION_ERROR_IP6, ip6_hits);
return frame->n_vectors;
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (l2_emulation_node) = {
.name = "l2-emulation",
.vector_size = sizeof (u32),
.format_trace = format_l2_emulation_trace,
.type = VLIB_NODE_TYPE_INTERNAL,
.n_errors = ARRAY_LEN(l2_emulation_error_strings),
.error_strings = l2_emulation_error_strings,
.n_next_nodes = L2_EMULATION_N_NEXT,
/* edit / add dispositions here */
.next_nodes = {
[L2_EMULATION_NEXT_IP4] = "ip4-input",
[L2_EMULATION_NEXT_IP6] = "ip6-input",
},
};
/* *INDENT-ON* */
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/