From 7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 19 Dec 2016 23:05:39 +0100 Subject: Reorganize source tree to use single autotools instance Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23 Signed-off-by: Damjan Marion --- src/vnet/llc/llc.c | 241 ++++++++++++++++++++++++++++++++++++++ src/vnet/llc/llc.h | 194 ++++++++++++++++++++++++++++++ src/vnet/llc/node.c | 331 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vnet/llc/pg.c | 113 ++++++++++++++++++ 4 files changed, 879 insertions(+) create mode 100644 src/vnet/llc/llc.c create mode 100644 src/vnet/llc/llc.h create mode 100644 src/vnet/llc/node.c create mode 100644 src/vnet/llc/pg.c (limited to 'src/vnet/llc') diff --git a/src/vnet/llc/llc.c b/src/vnet/llc/llc.c new file mode 100644 index 00000000..975207b6 --- /dev/null +++ b/src/vnet/llc/llc.c @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2015 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. + */ +/* + * llc.c: llc support + * + * Copyright (c) 2010 Eliot Dresselhaus + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +/* Global main structure. */ +llc_main_t llc_main; + +u8 * +format_llc_protocol (u8 * s, va_list * args) +{ + llc_protocol_t p = va_arg (*args, u32); + llc_main_t *pm = &llc_main; + llc_protocol_info_t *pi = llc_get_protocol_info (pm, p); + + if (pi) + s = format (s, "%s", pi->name); + else + s = format (s, "0x%02x", p); + + return s; +} + +u8 * +format_llc_header_with_length (u8 * s, va_list * args) +{ + llc_main_t *pm = &llc_main; + llc_header_t *h = va_arg (*args, llc_header_t *); + u32 max_header_bytes = va_arg (*args, u32); + llc_protocol_t p = h->dst_sap; + uword indent, header_bytes; + + header_bytes = llc_header_length (h); + if (max_header_bytes != 0 && header_bytes > max_header_bytes) + return format (s, "llc header truncated"); + + indent = format_get_indent (s); + + s = format (s, "LLC %U -> %U", + format_llc_protocol, h->src_sap, + format_llc_protocol, h->dst_sap); + + if (h->control != 0x03) + s = format (s, ", control 0x%x", llc_header_get_control (h)); + + if (max_header_bytes != 0 && header_bytes > max_header_bytes) + { + llc_protocol_info_t *pi = llc_get_protocol_info (pm, p); + vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index); + if (node->format_buffer) + s = format (s, "\n%U%U", + format_white_space, indent, + node->format_buffer, (void *) (h + 1), + max_header_bytes - header_bytes); + } + + return s; +} + +u8 * +format_llc_header (u8 * s, va_list * args) +{ + llc_header_t *h = va_arg (*args, llc_header_t *); + return format (s, "%U", format_llc_header_with_length, h, 0); +} + +/* Returns llc protocol as an int in host byte order. */ +uword +unformat_llc_protocol (unformat_input_t * input, va_list * args) +{ + u8 *result = va_arg (*args, u8 *); + llc_main_t *pm = &llc_main; + int p, i; + + /* Numeric type. */ + if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p)) + { + if (p >= (1 << 8)) + return 0; + *result = p; + return 1; + } + + /* Named type. */ + if (unformat_user (input, unformat_vlib_number_by_name, + pm->protocol_info_by_name, &i)) + { + llc_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i); + *result = pi->protocol; + return 1; + } + + return 0; +} + +uword +unformat_llc_header (unformat_input_t * input, va_list * args) +{ + u8 **result = va_arg (*args, u8 **); + llc_header_t _h, *h = &_h; + u8 p; + + if (!unformat (input, "%U", unformat_llc_protocol, &p)) + return 0; + + h->src_sap = h->dst_sap = p; + h->control = 0x3; + + /* Add header to result. */ + { + void *p; + u32 n_bytes = sizeof (h[0]); + + vec_add2 (*result, p, n_bytes); + clib_memcpy (p, h, n_bytes); + } + + return 1; +} + +static u8 * +llc_build_rewrite (vnet_main_t * vnm, + u32 sw_if_index, + vnet_link_t link_type, const void *dst_address) +{ + llc_header_t *h; + u8 *rewrite = NULL; + llc_protocol_t protocol; + + switch (link_type) + { +#define _(a,b) case VNET_LINK_##a: protocol = LLC_PROTOCOL_##b; break + _(IP4, ip4); +#undef _ + default: + return (NULL); + } + + vec_validate (rewrite, sizeof (*h) - 1); + h = (llc_header_t *) rewrite; + h->src_sap = h->dst_sap = protocol; + h->control = 0x3; + + return (rewrite); +} + +/* *INDENT-OFF* */ +VNET_HW_INTERFACE_CLASS (llc_hw_interface_class) = { + .name = "LLC", + .format_header = format_llc_header_with_length, + .unformat_header = unformat_llc_header, + .build_rewrite = llc_build_rewrite, +}; +/* *INDENT-ON* */ + +static void +add_protocol (llc_main_t * pm, llc_protocol_t protocol, char *protocol_name) +{ + llc_protocol_info_t *pi; + u32 i; + + vec_add2 (pm->protocol_infos, pi, 1); + i = pi - pm->protocol_infos; + + pi->name = protocol_name; + pi->protocol = protocol; + pi->next_index = pi->node_index = ~0; + + hash_set (pm->protocol_info_by_protocol, protocol, i); + hash_set_mem (pm->protocol_info_by_name, pi->name, i); +} + +static clib_error_t * +llc_init (vlib_main_t * vm) +{ + clib_error_t *error; + llc_main_t *pm = &llc_main; + + memset (pm, 0, sizeof (pm[0])); + pm->vlib_main = vm; + + pm->protocol_info_by_name = hash_create_string (0, sizeof (uword)); + pm->protocol_info_by_protocol = hash_create (0, sizeof (uword)); + +#define _(f,n) add_protocol (pm, LLC_PROTOCOL_##f, #f); + foreach_llc_protocol; +#undef _ + + if ((error = vlib_call_init_function (vm, snap_init))) + return error; + + return vlib_call_init_function (vm, llc_input_init); +} + +VLIB_INIT_FUNCTION (llc_init); + + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/llc/llc.h b/src/vnet/llc/llc.h new file mode 100644 index 00000000..0b85f5d8 --- /dev/null +++ b/src/vnet/llc/llc.h @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2015 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. + */ +/* + * llc.h: LLC definitions + * + * Copyright (c) 2008 Eliot Dresselhaus + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef included_llc_h +#define included_llc_h + +#include +#include + +/* Protocol (SSAP/DSAP) types. */ +#define foreach_llc_protocol \ + _ (null, 0x0) \ + _ (sublayer, 0x2) \ + _ (sna_path_control, 0x4) \ + _ (ip4, 0x6) \ + _ (sna1, 0x8) \ + _ (sna2, 0xc) \ + _ (sna3, 0x40) \ + _ (proway_lan, 0x0e) \ + _ (netware1, 0x10) \ + _ (netware2, 0xe0) \ + _ (osi_layer1, 0x14) \ + _ (osi_layer2, 0x20) \ + _ (osi_layer3, 0x34) \ + _ (osi_layer4, 0x54) \ + _ (osi_layer5, 0xfe) \ + _ (bpdu, 0x42) \ + _ (arp, 0x98) \ + _ (snap, 0xaa) \ + _ (vines1, 0xba) \ + _ (vines2, 0xbc) \ + _ (netbios, 0xf0) \ + _ (global_dsap, 0xff) + +typedef enum +{ +#define _(f,n) LLC_PROTOCOL_##f = n, + foreach_llc_protocol +#undef _ +} llc_protocol_t; + +typedef struct +{ +#define LLC_DST_SAP_IS_GROUP (1 << 0) +#define LLC_SRC_SAP_IS_RESPONSE (1 << 0) + u8 dst_sap, src_sap; + + /* Control byte. + [0] 1 => supervisory 0 => information + [1] unnumbered frame. */ + u8 control; + + /* Only present if (control & 3) != 3. */ + u8 extended_control[0]; +} llc_header_t; + +always_inline u16 +llc_header_get_control (llc_header_t * h) +{ + u16 r = h->control; + return r | ((((r & 3) != 3) ? h->extended_control[0] : 0) << 8); +} + +always_inline u8 +llc_header_length (llc_header_t * h) +{ + return ((h->control & 3) != 3 ? 4 : 3); +} + +typedef struct +{ + /* Name (a c string). */ + char *name; + + /* LLC protocol (SAP type). */ + llc_protocol_t protocol; + + /* Node which handles this type. */ + u32 node_index; + + /* Next index for this type. */ + u32 next_index; +} llc_protocol_info_t; + +#define foreach_llc_error \ + _ (NONE, "no error") \ + _ (UNKNOWN_PROTOCOL, "unknown llc ssap/dsap") \ + _ (UNKNOWN_CONTROL, "control != 0x3") + +typedef enum +{ +#define _(f,s) LLC_ERROR_##f, + foreach_llc_error +#undef _ + LLC_N_ERROR, +} llc_error_t; + +typedef struct +{ + vlib_main_t *vlib_main; + + llc_protocol_info_t *protocol_infos; + + /* Hash tables mapping name/protocol to protocol info index. */ + uword *protocol_info_by_name, *protocol_info_by_protocol; + + /* llc-input next index indexed by protocol. */ + u8 input_next_by_protocol[256]; +} llc_main_t; + +always_inline llc_protocol_info_t * +llc_get_protocol_info (llc_main_t * m, llc_protocol_t protocol) +{ + uword *p = hash_get (m->protocol_info_by_protocol, protocol); + return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0; +} + +extern llc_main_t llc_main; + +/* Register given node index to take input for given llc type. */ +void +llc_register_input_protocol (vlib_main_t * vm, + llc_protocol_t protocol, u32 node_index); + +void llc_set_adjacency (vnet_rewrite_header_t * rw, + uword max_data_bytes, llc_protocol_t protocol); + +format_function_t format_llc_protocol; +format_function_t format_llc_header; +format_function_t format_llc_header_with_length; + +/* Parse llc protocol as 0xXXXX or protocol name. */ +unformat_function_t unformat_llc_protocol; + +/* Parse llc header. */ +unformat_function_t unformat_llc_header; +unformat_function_t unformat_pg_llc_header; + +always_inline void +llc_setup_node (vlib_main_t * vm, u32 node_index) +{ + vlib_node_t *n = vlib_get_node (vm, node_index); + pg_node_t *pn = pg_get_node (node_index); + + n->format_buffer = format_llc_header_with_length; + n->unformat_buffer = unformat_llc_header; + pn->unformat_edit = unformat_pg_llc_header; +} + +#endif /* included_llc_h */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/llc/node.c b/src/vnet/llc/node.c new file mode 100644 index 00000000..60b5c134 --- /dev/null +++ b/src/vnet/llc/node.c @@ -0,0 +1,331 @@ +/* + * Copyright (c) 2015 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. + */ +/* + * llc_node.c: llc packet processing + * + * Copyright (c) 2010 Eliot Dresselhaus + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +#define foreach_llc_input_next \ + _ (PUNT, "error-punt") \ + _ (DROP, "error-drop") + +typedef enum +{ +#define _(s,n) LLC_INPUT_NEXT_##s, + foreach_llc_input_next +#undef _ + LLC_INPUT_N_NEXT, +} llc_input_next_t; + +typedef struct +{ + u8 packet_data[32]; +} llc_input_trace_t; + +static u8 * +format_llc_input_trace (u8 * s, va_list * va) +{ + CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *); + CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); + llc_input_trace_t *t = va_arg (*va, llc_input_trace_t *); + + s = format (s, "%U", format_llc_header, t->packet_data); + + return s; +} + +static uword +llc_input (vlib_main_t * vm, + vlib_node_runtime_t * node, vlib_frame_t * from_frame) +{ + llc_main_t *lm = &llc_main; + u32 n_left_from, next_index, *from, *to_next; + + from = vlib_frame_vector_args (from_frame); + n_left_from = from_frame->n_vectors; + + if (node->flags & VLIB_NODE_FLAG_TRACE) + vlib_trace_frame_buffers_only (vm, node, + from, + n_left_from, + sizeof (from[0]), + sizeof (llc_input_trace_t)); + + next_index = node->cached_next_index; + + 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) + { + u32 bi0, bi1; + vlib_buffer_t *b0, *b1; + llc_header_t *h0, *h1; + u8 next0, next1, len0, len1, enqueue_code; + + /* Prefetch next iteration. */ + { + vlib_buffer_t *b2, *b3; + + b2 = vlib_get_buffer (vm, from[2]); + b3 = vlib_get_buffer (vm, from[3]); + + vlib_prefetch_buffer_header (b2, LOAD); + vlib_prefetch_buffer_header (b3, LOAD); + + CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD); + CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD); + } + + bi0 = from[0]; + bi1 = from[1]; + to_next[0] = bi0; + to_next[1] = bi1; + from += 2; + to_next += 2; + n_left_to_next -= 2; + n_left_from -= 2; + + b0 = vlib_get_buffer (vm, bi0); + b1 = vlib_get_buffer (vm, bi1); + + h0 = (void *) (b0->data + b0->current_data); + h1 = (void *) (b1->data + b1->current_data); + + len0 = llc_header_length (h0); + len1 = llc_header_length (h1); + + b0->current_data += len0; + b1->current_data += len1; + + b0->current_length -= len0; + b1->current_length -= len1; + + next0 = lm->input_next_by_protocol[h0->dst_sap]; + next1 = lm->input_next_by_protocol[h1->dst_sap]; + + b0->error = + node->errors[next0 == + LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL : + LLC_ERROR_NONE]; + b1->error = + node->errors[next1 == + LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL : + LLC_ERROR_NONE]; + + enqueue_code = (next0 != next_index) + 2 * (next1 != next_index); + + if (PREDICT_FALSE (enqueue_code != 0)) + { + switch (enqueue_code) + { + case 1: + /* A B A */ + to_next[-2] = bi1; + to_next -= 1; + n_left_to_next += 1; + vlib_set_next_frame_buffer (vm, node, next0, bi0); + break; + + case 2: + /* A A B */ + to_next -= 1; + n_left_to_next += 1; + vlib_set_next_frame_buffer (vm, node, next1, bi1); + break; + + case 3: + /* A B B or A B C */ + to_next -= 2; + n_left_to_next += 2; + vlib_set_next_frame_buffer (vm, node, next0, bi0); + vlib_set_next_frame_buffer (vm, node, next1, bi1); + if (next0 == next1) + { + vlib_put_next_frame (vm, node, next_index, + n_left_to_next); + next_index = next1; + 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; + vlib_buffer_t *b0; + llc_header_t *h0; + u8 next0, len0; + + 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); + + h0 = (void *) (b0->data + b0->current_data); + + len0 = llc_header_length (h0); + + b0->current_data += len0; + + b0->current_length -= len0; + + next0 = lm->input_next_by_protocol[h0->dst_sap]; + + b0->error = + node->errors[next0 == + LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL : + LLC_ERROR_NONE]; + + /* Sent packet to wrong next? */ + if (PREDICT_FALSE (next0 != next_index)) + { + /* Return old frame; remove incorrectly enqueued packet. */ + vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1); + + /* Send to correct next. */ + next_index = next0; + vlib_get_next_frame (vm, node, next_index, + to_next, n_left_to_next); + + to_next[0] = bi0; + to_next += 1; + n_left_to_next -= 1; + } + } + + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } + + return from_frame->n_vectors; +} + +static char *llc_error_strings[] = { +#define _(f,s) s, + foreach_llc_error +#undef _ +}; + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (llc_input_node) = { + .function = llc_input, + .name = "llc-input", + /* Takes a vector of packets. */ + .vector_size = sizeof (u32), + + .n_errors = LLC_N_ERROR, + .error_strings = llc_error_strings, + + .n_next_nodes = LLC_INPUT_N_NEXT, + .next_nodes = { +#define _(s,n) [LLC_INPUT_NEXT_##s] = n, + foreach_llc_input_next +#undef _ + }, + + .format_buffer = format_llc_header_with_length, + .format_trace = format_llc_input_trace, + .unformat_buffer = unformat_llc_header, +}; +/* *INDENT-ON* */ + +static clib_error_t * +llc_input_init (vlib_main_t * vm) +{ + llc_main_t *lm = &llc_main; + + { + clib_error_t *error = vlib_call_init_function (vm, llc_init); + if (error) + clib_error_report (error); + } + + llc_setup_node (vm, llc_input_node.index); + + { + int i; + for (i = 0; i < ARRAY_LEN (lm->input_next_by_protocol); i++) + lm->input_next_by_protocol[i] = LLC_INPUT_NEXT_DROP; + } + + return 0; +} + +VLIB_INIT_FUNCTION (llc_input_init); + +void +llc_register_input_protocol (vlib_main_t * vm, + llc_protocol_t protocol, u32 node_index) +{ + llc_main_t *lm = &llc_main; + llc_protocol_info_t *pi; + + { + clib_error_t *error = vlib_call_init_function (vm, llc_input_init); + if (error) + clib_error_report (error); + /* Otherwise, osi_input_init will wipe out e.g. the snap init */ + error = vlib_call_init_function (vm, osi_input_init); + if (error) + clib_error_report (error); + } + + pi = llc_get_protocol_info (lm, protocol); + pi->node_index = node_index; + pi->next_index = vlib_node_add_next (vm, llc_input_node.index, node_index); + + lm->input_next_by_protocol[protocol] = pi->next_index; +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/llc/pg.c b/src/vnet/llc/pg.c new file mode 100644 index 00000000..ad18a4b0 --- /dev/null +++ b/src/vnet/llc/pg.c @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2015 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. + */ +/* + * llc_pg.c: packet generator llc interface + * + * Copyright (c) 2008 Eliot Dresselhaus + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +typedef struct +{ + pg_edit_t dst_sap; + pg_edit_t src_sap; + pg_edit_t control; +} pg_llc_header_t; + +static inline void +pg_llc_header_init (pg_llc_header_t * e) +{ + pg_edit_init (&e->dst_sap, llc_header_t, dst_sap); + pg_edit_init (&e->src_sap, llc_header_t, src_sap); + pg_edit_init (&e->control, llc_header_t, control); +} + +uword +unformat_pg_llc_header (unformat_input_t * input, va_list * args) +{ + pg_stream_t *s = va_arg (*args, pg_stream_t *); + pg_llc_header_t *h; + u32 group_index, error; + + h = pg_create_edit_group (s, sizeof (h[0]), sizeof (llc_header_t), + &group_index); + pg_llc_header_init (h); + + pg_edit_set_fixed (&h->control, 0x03); + + error = 1; + if (!unformat (input, "%U -> %U", + unformat_pg_edit, + unformat_llc_protocol, &h->src_sap, &h->dst_sap)) + goto done; + + { + llc_main_t *pm = &llc_main; + llc_protocol_info_t *pi = 0; + pg_node_t *pg_node = 0; + + if (h->dst_sap.type == PG_EDIT_FIXED) + { + u8 t = *h->dst_sap.values[PG_EDIT_LO]; + pi = llc_get_protocol_info (pm, t); + if (pi && pi->node_index != ~0) + pg_node = pg_get_node (pi->node_index); + } + + if (pg_node && pg_node->unformat_edit + && unformat_user (input, pg_node->unformat_edit, s)) + ; + + else if (!unformat_user (input, unformat_pg_payload, s)) + goto done; + } + + error = 0; +done: + if (error) + pg_free_edit_group (s); + return error == 0; +} + + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg From 2e7fbcc08152da5c6a17ed80ba08cd37edec6c8c Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 15 Mar 2017 04:22:25 -0700 Subject: Mcast rewrite no memcpy use a 32bit mask in the adjacency to AND with the IP address and OR into the rewrite. Change-Id: I80b0f246c18fd74f3e43c5d49e25833412f34665 Signed-off-by: Neale Ranns --- src/vnet.am | 3 +-- src/vnet/adj/adj.c | 2 +- src/vnet/adj/adj_mcast.c | 11 ++++++++++- src/vnet/adj/adj_mcast.h | 11 ++++++++++- src/vnet/ethernet/arp.c | 44 +++++++++++++++++++++++--------------------- src/vnet/hdlc/hdlc.h | 4 ---- src/vnet/ip/ip4_forward.c | 6 +++--- src/vnet/ip/ip6_forward.c | 6 +++--- src/vnet/ip/ip6_neighbor.c | 43 ++++++++++++++++++++++--------------------- src/vnet/ip/lookup.h | 1 + src/vnet/llc/llc.h | 3 --- src/vnet/osi/osi.h | 3 --- src/vnet/ppp/ppp.h | 3 --- src/vnet/rewrite.h | 42 ++++++++++++++++++++---------------------- src/vnet/snap/snap.h | 3 --- src/vnet/vnet.h | 1 - test/test_ip_mcast.py | 2 -- 17 files changed, 94 insertions(+), 94 deletions(-) (limited to 'src/vnet/llc') diff --git a/src/vnet.am b/src/vnet.am index 9e099f33..3e73de8f 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -42,7 +42,7 @@ libvnet_la_SOURCES += \ vnet/interface_format.c \ vnet/interface_output.c \ vnet/misc.c \ - vnet/replication.c \ + vnet/replication.c \ vnet/rewrite.c nobase_include_HEADERS += \ @@ -58,7 +58,6 @@ nobase_include_HEADERS += \ vnet/l3_types.h \ vnet/pipeline.h \ vnet/replication.h \ - vnet/rewrite.h \ vnet/vnet.h \ vnet/vnet_all_api_h.h \ vnet/vnet_msg_enum.h \ diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c index f3d483ac..9a01e89d 100644 --- a/src/vnet/adj/adj.c +++ b/src/vnet/adj/adj.c @@ -360,7 +360,7 @@ adj_get_sw_if_index (adj_index_t ai) } /** - * @brief Return the link type of the adjacency + * @brief Return the rewrite string of the adjacency */ const u8* adj_get_rewrite (adj_index_t ai) diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c index a3ba4d6a..4f678e43 100644 --- a/src/vnet/adj/adj_mcast.c +++ b/src/vnet/adj/adj_mcast.c @@ -100,7 +100,9 @@ adj_mcast_add_or_lock (fib_protocol_t proto, */ void adj_mcast_update_rewrite (adj_index_t adj_index, - u8 *rewrite) + u8 *rewrite, + u8 offset, + u32 mask) { ip_adjacency_t *adj; @@ -118,6 +120,13 @@ adj_mcast_update_rewrite (adj_index_t adj_index, vnet_get_main(), adj->rewrite_header.sw_if_index), rewrite); + /* + * set the fields corresponding to the mcast IP address rewrite + * The mask must be stored in network byte order, since the packet's + * IP address will also be in network order. + */ + adj->rewrite_header.dst_mcast_offset = offset; + adj->rewrite_header.dst_mcast_mask = clib_host_to_net_u32(mask); } void diff --git a/src/vnet/adj/adj_mcast.h b/src/vnet/adj/adj_mcast.h index 21c5a141..40d44313 100644 --- a/src/vnet/adj/adj_mcast.h +++ b/src/vnet/adj/adj_mcast.h @@ -55,9 +55,18 @@ extern adj_index_t adj_mcast_add_or_lock(fib_protocol_t proto, * * @param * The new rewrite + * + * @param + * The offset in the rewrite a which to write in packet's + * IP Address + * + * @param + * The mask to apply to the packet berfore the rewrite. */ extern void adj_mcast_update_rewrite(adj_index_t adj_index, - u8 *rewrite); + u8 *rewrite, + u8 offset, + u32 mask); /** * @brief Format/display a mcast adjacency. diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c index 75c7e203..2f81da32 100644 --- a/src/vnet/ethernet/arp.c +++ b/src/vnet/ethernet/arp.c @@ -479,28 +479,30 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) } break; case IP_LOOKUP_NEXT_MCAST: - /* - * Construct a partial rewrite from the known ethernet mcast dest MAC - */ - adj_mcast_update_rewrite - (ai, - ethernet_build_rewrite (vnm, - sw_if_index, - adj->ia_link, - ethernet_ip4_mcast_dst_addr ())); - - /* - * Complete the remaining fields of the adj's rewrite to direct the - * complete of the rewrite at switch time by copying in the IP - * dst address's bytes. - * Ofset is 11 bytes from the end of the MAC header - which is three - * bytes into the desintation address. And we write 3 bytes. - */ - adj->rewrite_header.dst_mcast_offset = 11; - adj->rewrite_header.dst_mcast_n_bytes = 3; - - break; + { + /* + * Construct a partial rewrite from the known ethernet mcast dest MAC + */ + u8 *rewrite; + u8 offset; + + rewrite = ethernet_build_rewrite (vnm, + sw_if_index, + adj->ia_link, + ethernet_ip4_mcast_dst_addr ()); + offset = vec_len (rewrite) - 2; + + /* + * Complete the remaining fields of the adj's rewrite to direct the + * complete of the rewrite at switch time by copying in the IP + * dst address's bytes. + * Ofset is 2 bytes into the MAC desintation address. And we copy 23 bits + * from the address. + */ + adj_mcast_update_rewrite (ai, rewrite, offset, 0x007fffff); + break; + } case IP_LOOKUP_NEXT_DROP: case IP_LOOKUP_NEXT_PUNT: case IP_LOOKUP_NEXT_LOCAL: diff --git a/src/vnet/hdlc/hdlc.h b/src/vnet/hdlc/hdlc.h index 73b15c2f..8407d39d 100644 --- a/src/vnet/hdlc/hdlc.h +++ b/src/vnet/hdlc/hdlc.h @@ -91,10 +91,6 @@ hdlc_register_input_type (vlib_main_t * vm, hdlc_protocol_t protocol, u32 node_index); -void hdlc_set_adjacency (vnet_rewrite_header_t * rw, - uword max_data_bytes, - hdlc_protocol_t protocol); - format_function_t format_hdlc_protocol; format_function_t format_hdlc_header; format_function_t format_hdlc_header_with_length; diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 7352c2e7..f2bc2a71 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -2553,8 +2553,8 @@ ip4_rewrite_inline (vlib_main_t * vm, /* * copy bytes from the IP address into the MAC rewrite */ - vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0, 1); - vnet_fixup_one_header (adj1[0], &ip1->dst_address, ip1, 1); + vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0); + vnet_fixup_one_header (adj1[0], &ip1->dst_address, ip1); } vlib_validate_buffer_enqueue_x2 (vm, node, next_index, @@ -2635,7 +2635,7 @@ ip4_rewrite_inline (vlib_main_t * vm, /* * copy bytes from the IP address into the MAC rewrite */ - vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0, 1); + vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0); } /* Update packet buffer attributes/set output interface. */ diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index 0b8691bf..ecc3bd2c 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -2087,8 +2087,8 @@ ip6_rewrite_inline (vlib_main_t * vm, /* * copy bytes from the IP address into the MAC rewrite */ - vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0, 0); - vnet_fixup_one_header (adj1[0], &ip1->dst_address, ip1, 0); + vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0); + vnet_fixup_one_header (adj1[0], &ip1->dst_address, ip1); } vlib_validate_buffer_enqueue_x2 (vm, node, next_index, @@ -2197,7 +2197,7 @@ ip6_rewrite_inline (vlib_main_t * vm, } if (is_mcast) { - vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0, 0); + vnet_fixup_one_header (adj0[0], &ip0->dst_address, ip0); } p0->error = error_node->errors[error0]; diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c index 8d355ab2..9b616630 100644 --- a/src/vnet/ip/ip6_neighbor.c +++ b/src/vnet/ip/ip6_neighbor.c @@ -530,28 +530,29 @@ ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) } break; case IP_LOOKUP_NEXT_MCAST: - /* - * Construct a partial rewrite from the known ethernet mcast dest MAC - */ - adj_mcast_update_rewrite - (ai, - ethernet_build_rewrite (vnm, - sw_if_index, - adj->ia_link, - ethernet_ip6_mcast_dst_addr ())); - - /* - * Complete the remaining fields of the adj's rewrite to direct the - * complete of the rewrite at switch time by copying in the IP - * dst address's bytes. - * Ofset is 12 bytes from the end of the MAC header - which is 2 - * bytes into the desintation address. And we write 4 bytes. - */ - adj->rewrite_header.dst_mcast_offset = 12; - adj->rewrite_header.dst_mcast_n_bytes = 4; - - break; + { + /* + * Construct a partial rewrite from the known ethernet mcast dest MAC + */ + u8 *rewrite; + u8 offset; + + rewrite = ethernet_build_rewrite (vnm, + sw_if_index, + adj->ia_link, + ethernet_ip6_mcast_dst_addr ()); + + /* + * Complete the remaining fields of the adj's rewrite to direct the + * complete of the rewrite at switch time by copying in the IP + * dst address's bytes. + * Ofset is 2 bytes into the desintation address. And we write 4 bytes. + */ + offset = vec_len (rewrite) - 2; + adj_mcast_update_rewrite (ai, rewrite, offset, 0xffffffff); + break; + } case IP_LOOKUP_NEXT_DROP: case IP_LOOKUP_NEXT_PUNT: case IP_LOOKUP_NEXT_LOCAL: diff --git a/src/vnet/ip/lookup.h b/src/vnet/ip/lookup.h index 48360b5b..f76ddb37 100644 --- a/src/vnet/ip/lookup.h +++ b/src/vnet/ip/lookup.h @@ -55,6 +55,7 @@ #include #include #include +#include /** @brief Common (IP4/IP6) next index stored in adjacency. */ typedef enum diff --git a/src/vnet/llc/llc.h b/src/vnet/llc/llc.h index 0b85f5d8..990a581d 100644 --- a/src/vnet/llc/llc.h +++ b/src/vnet/llc/llc.h @@ -158,9 +158,6 @@ void llc_register_input_protocol (vlib_main_t * vm, llc_protocol_t protocol, u32 node_index); -void llc_set_adjacency (vnet_rewrite_header_t * rw, - uword max_data_bytes, llc_protocol_t protocol); - format_function_t format_llc_protocol; format_function_t format_llc_header; format_function_t format_llc_header_with_length; diff --git a/src/vnet/osi/osi.h b/src/vnet/osi/osi.h index ee21f0c3..0ff267a3 100644 --- a/src/vnet/osi/osi.h +++ b/src/vnet/osi/osi.h @@ -131,9 +131,6 @@ extern osi_main_t osi_main; /* Register given node index to take input for given osi type. */ void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index); -void osi_set_adjacency (vnet_rewrite_header_t * rw, - uword max_data_bytes, osi_protocol_t protocol); - format_function_t format_osi_protocol; format_function_t format_osi_header; format_function_t format_osi_header_with_length; diff --git a/src/vnet/ppp/ppp.h b/src/vnet/ppp/ppp.h index fdc205b6..726eca66 100644 --- a/src/vnet/ppp/ppp.h +++ b/src/vnet/ppp/ppp.h @@ -93,9 +93,6 @@ void ppp_register_input_type (vlib_main_t * vm, ppp_protocol_t protocol, u32 node_index); -void ppp_set_adjacency (vnet_rewrite_header_t * rw, - uword max_data_bytes, ppp_protocol_t protocol); - format_function_t format_ppp_protocol; format_function_t format_ppp_header; format_function_t format_ppp_header_with_length; diff --git a/src/vnet/rewrite.h b/src/vnet/rewrite.h index 8435a726..1dea72f5 100644 --- a/src/vnet/rewrite.h +++ b/src/vnet/rewrite.h @@ -72,20 +72,18 @@ typedef CLIB_PACKED (struct { Used for MTU check after packet rewrite. */ u16 max_l3_packet_bytes; - u16 unused1; - u8 unused2; - + /* Data-plane flags on the adjacency/rewrite */ vnet_rewrite_flags_t flags; /* When dynamically writing a multicast destination L2 addresss - * this is the offset within the address to start writing n - * bytes of the IP mcast address */ + * this is the offset from the IP address at which to write in the + * IP->MAC address translation. + */ u8 dst_mcast_offset; - /* When dynamically writing a multicast destination L2 addresss - * this is the number of bytes of the dest IP address to write into - * the MAC rewrite */ - u8 dst_mcast_n_bytes; + /* The mask to apply to the lower 4 bytes of the IP address before ORing + * into the destinaiton MAC address */ + u32 dst_mcast_mask; /* Rewrite string starting at end and going backwards. */ u8 data[0]; @@ -293,24 +291,24 @@ _vnet_rewrite_two_headers (vnet_rewrite_header_t * h0, always_inline void _vnet_fixup_one_header (vnet_rewrite_header_t * h0, - u8 * addr, u32 addr_len, - u8 * packet0, int clear_first_bit) + u8 * addr, u32 addr_len, u8 * packet0) { - /* location to write to in the packet */ - u8 *p0 = packet0 - h0->dst_mcast_offset; - u8 *p1 = p0; - /* location to write from in the L3 dest address */ - u8 *a0 = addr + addr_len - h0->dst_mcast_n_bytes; - - clib_memcpy (p0, a0, h0->dst_mcast_n_bytes); - if (clear_first_bit) - *p1 &= 0x7f; + if (PREDICT_TRUE (h0->dst_mcast_mask)) + { + /* location to write to in the packet */ + u8 *p0 = packet0 - h0->dst_mcast_offset; + u32 *p1 = (u32 *) p0; + /* location to copy from in the L3 dest address */ + u32 *a0 = (u32 *) (addr + addr_len - sizeof (h0->dst_mcast_mask)); + + *p1 |= (*a0 & h0->dst_mcast_mask); + } } -#define vnet_fixup_one_header(rw0,addr,p0,clear_first_bit) \ +#define vnet_fixup_one_header(rw0,addr,p0) \ _vnet_fixup_one_header (&((rw0).rewrite_header), \ (u8*)(addr), sizeof((*addr)), \ - (u8*)(p0), (clear_first_bit)) + (u8*)(p0)) #define VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST ((void *) 0) /** Deprecated */ diff --git a/src/vnet/snap/snap.h b/src/vnet/snap/snap.h index dbba15bf..7cd453e7 100644 --- a/src/vnet/snap/snap.h +++ b/src/vnet/snap/snap.h @@ -173,9 +173,6 @@ snap_register_input_protocol (vlib_main_t * vm, char *name, u32 ieee_oui, u16 protocol, u32 node_index); -void snap_set_adjacency (vnet_rewrite_header_t * rw, - uword max_data_bytes, u32 ieee_oui, u16 protocol); - format_function_t format_snap_protocol; format_function_t format_snap_header; format_function_t format_snap_header_with_length; diff --git a/src/vnet/vnet.h b/src/vnet/vnet.h index 5a8ae858..8405f61b 100644 --- a/src/vnet/vnet.h +++ b/src/vnet/vnet.h @@ -46,7 +46,6 @@ #include #include #include -#include #include typedef struct vnet_main_t diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py index 094942b3..36d597a7 100644 --- a/test/test_ip_mcast.py +++ b/test/test_ip_mcast.py @@ -101,7 +101,6 @@ class TestIPMcast(VppTestCase): tx = sent[i] rx = capture[i] - # the rx'd packet has the MPLS label popped eth = rx[Ether] self.assertEqual(eth.type, 0x800) @@ -128,7 +127,6 @@ class TestIPMcast(VppTestCase): tx = sent[i] rx = capture[i] - # the rx'd packet has the MPLS label popped eth = rx[Ether] self.assertEqual(eth.type, 0x86DD) -- cgit 1.2.3-korg