X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fflowprobe%2Fnode.c;h=79d37f8a75e735d2c9a975a3e209fe2efe2caf31;hb=ffba3c3;hp=2f7d002561ae6d54a48027670da6e76a5b9aa6e1;hpb=50b60ebcc306b162a5d7b0916830638a2e99d378;p=vpp.git diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c index 2f7d002561a..79d37f8a75e 100644 --- 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 *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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; @@ -195,15 +195,15 @@ flowprobe_l2_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset) 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 */ - 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 */ - 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; @@ -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 */ - 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 */ - 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 */ @@ -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); - 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; @@ -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 */ - 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 */ - 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 */ @@ -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); - 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; @@ -267,16 +267,16 @@ flowprobe_l4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset) 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 */ - 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); - clib_memcpy (to_b->data + offset, &control_bits, 2); + clib_memcpy_fast (to_b->data + offset, &control_bits, 2); offset += 2; return offset - start; @@ -394,8 +394,8 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node, 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) @@ -450,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; - 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; @@ -657,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->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] = @@ -773,16 +774,14 @@ flowprobe_node_fn (vlib_main_t * vm, 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); - if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0)) + if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0)) add_to_flow_record_state (vm, node, fm, b0, timestamp, len0, flowprobe_get_variant (which, fm->context[which].flags, @@ -792,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); - if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0)) + if (PREDICT_TRUE ((b1->flags & VNET_BUFFER_F_FLOW_REPORT) == 0)) add_to_flow_record_state (vm, node, fm, b1, timestamp, len1, flowprobe_get_variant (which, fm->context[which].flags, @@ -821,14 +820,13 @@ flowprobe_node_fn (vlib_main_t * vm, 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); - if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0)) + if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0)) { flowprobe_trace_t *t = 0; if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)