Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ethernet-input: fix assert in l2 mode
[vpp.git]
/
src
/
plugins
/
flowprobe
/
node.c
diff --git
a/src/plugins/flowprobe/node.c
b/src/plugins/flowprobe/node.c
index
c4610a7
..
79d37f8
100644
(file)
--- a/
src/plugins/flowprobe/node.c
+++ b/
src/plugins/flowprobe/node.c
@@
-73,7
+73,7
@@
format_flowprobe_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 *);
flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
- u
word
indent = format_get_indent (s);
+ u
32
indent = format_get_indent (s);
s = format (s,
"FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "
s = format (s,
"FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "
@@
-157,33
+157,33
@@
flowprobe_common_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
/* Ingress interface */
u32 rx_if = clib_host_to_net_u32 (e->key.rx_sw_if_index);
/* Ingress interface */
u32 rx_if = clib_host_to_net_u32 (e->key.rx_sw_if_index);
- clib_memcpy (to_b->data + offset, &rx_if, sizeof (rx_if));
+ clib_memcpy
_fast
(to_b->data + offset, &rx_if, sizeof (rx_if));
offset += sizeof (rx_if);
/* Egress interface */
u32 tx_if = clib_host_to_net_u32 (e->key.tx_sw_if_index);
offset += sizeof (rx_if);
/* Egress interface */
u32 tx_if = clib_host_to_net_u32 (e->key.tx_sw_if_index);
- clib_memcpy (to_b->data + offset, &tx_if, sizeof (tx_if));
+ clib_memcpy
_fast
(to_b->data + offset, &tx_if, sizeof (tx_if));
offset += sizeof (tx_if);
/* packet delta count */
u64 packetdelta = clib_host_to_net_u64 (e->packetcount);
offset += sizeof (tx_if);
/* packet delta count */
u64 packetdelta = clib_host_to_net_u64 (e->packetcount);
- clib_memcpy (to_b->data + offset, &packetdelta, sizeof (u64));
+ clib_memcpy
_fast
(to_b->data + offset, &packetdelta, sizeof (u64));
offset += sizeof (u64);
/* flowStartNanoseconds */
u32 t = clib_host_to_net_u32 (e->flow_start.sec + NTP_TIMESTAMP);
offset += sizeof (u64);
/* flowStartNanoseconds */
u32 t = clib_host_to_net_u32 (e->flow_start.sec + NTP_TIMESTAMP);
- clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+ clib_memcpy
_fast
(to_b->data + offset, &t, sizeof (u32));
offset += sizeof (u32);
t = clib_host_to_net_u32 (e->flow_start.nsec);
offset += sizeof (u32);
t = clib_host_to_net_u32 (e->flow_start.nsec);
- clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+ clib_memcpy
_fast
(to_b->data + offset, &t, sizeof (u32));
offset += sizeof (u32);
/* flowEndNanoseconds */
t = clib_host_to_net_u32 (e->flow_end.sec + NTP_TIMESTAMP);
offset += sizeof (u32);
/* flowEndNanoseconds */
t = clib_host_to_net_u32 (e->flow_end.sec + NTP_TIMESTAMP);
- clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+ clib_memcpy
_fast
(to_b->data + offset, &t, sizeof (u32));
offset += sizeof (u32);
t = clib_host_to_net_u32 (e->flow_end.nsec);
offset += sizeof (u32);
t = clib_host_to_net_u32 (e->flow_end.nsec);
- clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+ clib_memcpy
_fast
(to_b->data + offset, &t, sizeof (u32));
offset += sizeof (u32);
return offset - start;
offset += sizeof (u32);
return offset - start;
@@
-195,15
+195,15
@@
flowprobe_l2_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
u16 start = offset;
/* src mac address */
u16 start = offset;
/* src mac address */
- clib_memcpy (to_b->data + offset, &e->key.src_mac, 6);
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.src_mac, 6);
offset += 6;
/* dst mac address */
offset += 6;
/* dst mac address */
- clib_memcpy (to_b->data + offset, &e->key.dst_mac, 6);
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.dst_mac, 6);
offset += 6;
/* ethertype */
offset += 6;
/* ethertype */
- clib_memcpy (to_b->data + offset, &e->key.ethertype, 2);
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.ethertype, 2);
offset += 2;
return offset - start;
offset += 2;
return offset - start;
@@
-215,13
+215,13
@@
flowprobe_l3_ip6_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
u16 start = offset;
/* ip6 src address */
u16 start = offset;
/* ip6 src address */
- clib_memcpy (to_b->data + offset, &e->key.src_address,
- sizeof (ip6_address_t));
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.src_address,
+
sizeof (ip6_address_t));
offset += sizeof (ip6_address_t);
/* ip6 dst address */
offset += sizeof (ip6_address_t);
/* ip6 dst address */
- clib_memcpy (to_b->data + offset, &e->key.dst_address,
- sizeof (ip6_address_t));
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.dst_address,
+
sizeof (ip6_address_t));
offset += sizeof (ip6_address_t);
/* Protocol */
offset += sizeof (ip6_address_t);
/* Protocol */
@@
-229,7
+229,7
@@
flowprobe_l3_ip6_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
/* octetDeltaCount */
u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
/* octetDeltaCount */
u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
- clib_memcpy (to_b->data + offset, &octetdelta, sizeof (u64));
+ clib_memcpy
_fast
(to_b->data + offset, &octetdelta, sizeof (u64));
offset += sizeof (u64);
return offset - start;
offset += sizeof (u64);
return offset - start;
@@
-241,13
+241,13
@@
flowprobe_l3_ip4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
u16 start = offset;
/* ip4 src address */
u16 start = offset;
/* ip4 src address */
- clib_memcpy (to_b->data + offset, &e->key.src_address.ip4,
- sizeof (ip4_address_t));
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.src_address.ip4,
+
sizeof (ip4_address_t));
offset += sizeof (ip4_address_t);
/* ip4 dst address */
offset += sizeof (ip4_address_t);
/* ip4 dst address */
- clib_memcpy (to_b->data + offset, &e->key.dst_address.ip4,
- sizeof (ip4_address_t));
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.dst_address.ip4,
+
sizeof (ip4_address_t));
offset += sizeof (ip4_address_t);
/* Protocol */
offset += sizeof (ip4_address_t);
/* Protocol */
@@
-255,7
+255,7
@@
flowprobe_l3_ip4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
/* octetDeltaCount */
u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
/* octetDeltaCount */
u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
- clib_memcpy (to_b->data + offset, &octetdelta, sizeof (u64));
+ clib_memcpy
_fast
(to_b->data + offset, &octetdelta, sizeof (u64));
offset += sizeof (u64);
return offset - start;
offset += sizeof (u64);
return offset - start;
@@
-267,16
+267,16
@@
flowprobe_l4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
u16 start = offset;
/* src port */
u16 start = offset;
/* src port */
- clib_memcpy (to_b->data + offset, &e->key.src_port, 2);
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.src_port, 2);
offset += 2;
/* dst port */
offset += 2;
/* dst port */
- clib_memcpy (to_b->data + offset, &e->key.dst_port, 2);
+ clib_memcpy
_fast
(to_b->data + offset, &e->key.dst_port, 2);
offset += 2;
/* tcp control bits */
u16 control_bits = htons (e->prot.tcp.flags);
offset += 2;
/* tcp control bits */
u16 control_bits = htons (e->prot.tcp.flags);
- clib_memcpy (to_b->data + offset, &control_bits, 2);
+ clib_memcpy
_fast
(to_b->data + offset, &control_bits, 2);
offset += 2;
return offset - start;
offset += 2;
return offset - start;
@@
-289,10
+289,13
@@
flowprobe_hash (flowprobe_key_t * k)
u32 h = 0;
#ifdef clib_crc32c_uses_intrinsics
u32 h = 0;
#ifdef clib_crc32c_uses_intrinsics
- h = clib_crc32c ((u8 *) k
->as_u32, FLOWPROBE_KEY_IN_U32
);
+ h = clib_crc32c ((u8 *) k
, sizeof (*k)
);
#else
#else
- u64 tmp =
- k->as_u32[0] ^ k->as_u32[1] ^ k->as_u32[2] ^ k->as_u32[3] ^ k->as_u32[4];
+ int i;
+ u64 tmp = 0;
+ for (i = 0; i < sizeof (*k) / 8; i++)
+ tmp ^= ((u64 *) k)[i];
+
h = clib_xxhash (tmp);
#endif
h = clib_xxhash (tmp);
#endif
@@
-370,7
+373,7
@@
add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
ethernet_header_t *eth = vlib_buffer_get_current (b);
u16 ethertype = clib_net_to_host_u16 (eth->type);
/* *INDENT-OFF* */
ethernet_header_t *eth = vlib_buffer_get_current (b);
u16 ethertype = clib_net_to_host_u16 (eth->type);
/* *INDENT-OFF* */
- flowprobe_key_t k = {
{0}
};
+ flowprobe_key_t k = {};
/* *INDENT-ON* */
ip4_header_t *ip4 = 0;
ip6_header_t *ip6 = 0;
/* *INDENT-ON* */
ip4_header_t *ip4 = 0;
ip6_header_t *ip6 = 0;
@@
-391,8
+394,8
@@
add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
if (flags & FLOW_RECORD_L2)
{
if (flags & FLOW_RECORD_L2)
{
- clib_memcpy (k.src_mac, eth->src_address, 6);
- clib_memcpy (k.dst_mac, eth->dst_address, 6);
+ clib_memcpy
_fast
(k.src_mac, eth->src_address, 6);
+ clib_memcpy
_fast
(k.dst_mac, eth->dst_address, 6);
k.ethertype = ethertype;
}
if (collect_ip6 && ethertype == ETHERNET_TYPE_IP6)
k.ethertype = ethertype;
}
if (collect_ip6 && ethertype == ETHERNET_TYPE_IP6)
@@
-447,8
+450,8
@@
add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
{
t->rx_sw_if_index = k.rx_sw_if_index;
t->tx_sw_if_index = k.tx_sw_if_index;
{
t->rx_sw_if_index = k.rx_sw_if_index;
t->tx_sw_if_index = k.tx_sw_if_index;
- clib_memcpy (t->src_mac, k.src_mac, 6);
- clib_memcpy (t->dst_mac, k.dst_mac, 6);
+ clib_memcpy
_fast
(t->src_mac, k.src_mac, 6);
+ clib_memcpy
_fast
(t->dst_mac, k.dst_mac, 6);
t->ethertype = k.ethertype;
t->src_address.ip4.as_u32 = k.src_address.ip4.as_u32;
t->dst_address.ip4.as_u32 = k.dst_address.ip4.as_u32;
t->ethertype = k.ethertype;
t->src_address.ip4.as_u32 = k.src_address.ip4.as_u32;
t->dst_address.ip4.as_u32 = k.dst_address.ip4.as_u32;
@@
-472,6
+475,7
@@
add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
if (e->packetcount)
flowprobe_export_entry (vm, e);
e->key = k;
if (e->packetcount)
flowprobe_export_entry (vm, e);
e->key = k;
+ e->flow_start = timestamp;
vlib_node_increment_counter (vm, node->node_index,
FLOWPROBE_ERROR_COLLISION, 1);
}
vlib_node_increment_counter (vm, node->node_index,
FLOWPROBE_ERROR_COLLISION, 1);
}
@@
-653,7
+657,8
@@
flowprobe_get_buffer (vlib_main_t * vm, flowprobe_variant_t which)
b0->current_data = 0;
b0->current_length = flowprobe_get_headersize ();
b0->current_data = 0;
b0->current_length = flowprobe_get_headersize ();
- b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+ b0->flags |=
+ (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_F_FLOW_REPORT);
vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
fm->context[which].next_record_offset_per_worker[my_cpu_number] =
vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
fm->context[which].next_record_offset_per_worker[my_cpu_number] =
@@
-769,16
+774,14
@@
flowprobe_node_fn (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
b1 = vlib_get_buffer (vm, bi1);
b0 = vlib_get_buffer (vm, bi0);
b1 = vlib_get_buffer (vm, bi1);
- vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
- &next0, b0);
- vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
- &next1, b1);
+ vnet_feature_next (&next0, b0);
+ vnet_feature_next (&next1, b1);
len0 = vlib_buffer_length_in_chain (vm, b0);
ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
len0 = vlib_buffer_length_in_chain (vm, b0);
ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
- if (PREDICT_TRUE ((b0->flags & V
LIB_BUFFER
_FLOW_REPORT) == 0))
+ if (PREDICT_TRUE ((b0->flags & V
NET_BUFFER_F
_FLOW_REPORT) == 0))
add_to_flow_record_state (vm, node, fm, b0, timestamp, len0,
flowprobe_get_variant
(which, fm->context[which].flags,
add_to_flow_record_state (vm, node, fm, b0, timestamp, len0,
flowprobe_get_variant
(which, fm->context[which].flags,
@@
-788,7
+791,7
@@
flowprobe_node_fn (vlib_main_t * vm,
ethernet_header_t *eh1 = vlib_buffer_get_current (b1);
u16 ethertype1 = clib_net_to_host_u16 (eh1->type);
ethernet_header_t *eh1 = vlib_buffer_get_current (b1);
u16 ethertype1 = clib_net_to_host_u16 (eh1->type);
- if (PREDICT_TRUE ((b1->flags & V
LIB_BUFFER
_FLOW_REPORT) == 0))
+ if (PREDICT_TRUE ((b1->flags & V
NET_BUFFER_F
_FLOW_REPORT) == 0))
add_to_flow_record_state (vm, node, fm, b1, timestamp, len1,
flowprobe_get_variant
(which, fm->context[which].flags,
add_to_flow_record_state (vm, node, fm, b1, timestamp, len1,
flowprobe_get_variant
(which, fm->context[which].flags,
@@
-817,14
+820,13
@@
flowprobe_node_fn (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
b0 = vlib_get_buffer (vm, bi0);
- vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
- &next0, b0);
+ vnet_feature_next (&next0, b0);
len0 = vlib_buffer_length_in_chain (vm, b0);
ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
len0 = vlib_buffer_length_in_chain (vm, b0);
ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
- if (PREDICT_TRUE ((b0->flags & V
LIB_BUFFER
_FLOW_REPORT) == 0))
+ if (PREDICT_TRUE ((b0->flags & V
NET_BUFFER_F
_FLOW_REPORT) == 0))
{
flowprobe_trace_t *t = 0;
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
{
flowprobe_trace_t *t = 0;
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)