summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ethernet/packet.h45
-rw-r--r--src/vnet/interface.h30
-rw-r--r--src/vnet/interface_api.c11
-rw-r--r--src/vnet/interface_funcs.h3
-rw-r--r--src/vnet/interface_stats.c224
5 files changed, 290 insertions, 23 deletions
diff --git a/src/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h
index 09f5e7f3d0b..1a0506dc4d6 100644
--- a/src/vnet/ethernet/packet.h
+++ b/src/vnet/ethernet/packet.h
@@ -40,6 +40,8 @@
#ifndef included_ethernet_packet_h
#define included_ethernet_packet_h
+#include <vnet/interface.h>
+
typedef enum
{
#define ethernet_type(n,s) ETHERNET_TYPE_##s = n,
@@ -67,6 +69,13 @@ ethernet_address_cast (u8 * a)
return (a[0] >> 0) & 1;
}
+always_inline int
+ethernet_address_is_broadcast (u8 * a)
+{
+ return clib_mem_unaligned (a, u32) == 0xffffffff &&
+ clib_mem_unaligned (a + 4, u16) == 0xffff;
+}
+
always_inline uword
ethernet_address_is_locally_administered (u8 * a)
{
@@ -79,6 +88,42 @@ ethernet_address_set_locally_administered (u8 * a)
a[0] |= 1 << 1;
}
+always_inline int
+eh_dst_addr_to_rx_ctype (ethernet_header_t * eh)
+{
+ if (PREDICT_TRUE (ethernet_address_cast (eh->dst_address) ==
+ ETHERNET_ADDRESS_UNICAST))
+ {
+ return VNET_INTERFACE_COUNTER_RX_UNICAST;
+ }
+ else if (ethernet_address_is_broadcast (eh->dst_address))
+ {
+ return VNET_INTERFACE_COUNTER_RX_BROADCAST;
+ }
+ else
+ {
+ return VNET_INTERFACE_COUNTER_RX_MULTICAST;
+ }
+}
+
+always_inline int
+eh_dst_addr_to_tx_ctype (ethernet_header_t * eh)
+{
+ if (PREDICT_TRUE (ethernet_address_cast (eh->dst_address) ==
+ ETHERNET_ADDRESS_UNICAST))
+ {
+ return VNET_INTERFACE_COUNTER_TX_UNICAST;
+ }
+ else if (ethernet_address_is_broadcast (eh->dst_address))
+ {
+ return VNET_INTERFACE_COUNTER_TX_BROADCAST;
+ }
+ else
+ {
+ return VNET_INTERFACE_COUNTER_TX_MULTICAST;
+ }
+}
+
/* For VLAN ethernet type. */
typedef struct
{
diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 62fdc601e99..00a7353d701 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -633,25 +633,25 @@ typedef enum
VNET_N_SIMPLE_INTERFACE_COUNTER = 9,
/* Combined counters. */
VNET_INTERFACE_COUNTER_RX = 0,
- VNET_INTERFACE_COUNTER_TX = 1,
- VNET_INTERFACE_COUNTER_RX_UNICAST = 2,
- VNET_INTERFACE_COUNTER_TX_UNICAST = 3,
- VNET_INTERFACE_COUNTER_RX_MULTICAST = 4,
- VNET_INTERFACE_COUNTER_TX_MULTICAST = 5,
- VNET_INTERFACE_COUNTER_RX_BROADCAST = 6,
+ VNET_INTERFACE_COUNTER_RX_UNICAST = 1,
+ VNET_INTERFACE_COUNTER_RX_MULTICAST = 2,
+ VNET_INTERFACE_COUNTER_RX_BROADCAST = 3,
+ VNET_INTERFACE_COUNTER_TX = 4,
+ VNET_INTERFACE_COUNTER_TX_UNICAST = 5,
+ VNET_INTERFACE_COUNTER_TX_MULTICAST = 6,
VNET_INTERFACE_COUNTER_TX_BROADCAST = 7,
VNET_N_COMBINED_INTERFACE_COUNTER = 8,
} vnet_interface_counter_type_t;
-#define foreach_combined_interface_counter(X) \
- X(VNET_INTERFACE_COUNTER_RX, rx) \
- X(VNET_INTERFACE_COUNTER_TX, tx) \
- X(VNET_INTERFACE_COUNTER_RX_UNICAST, rx_unicast) \
- X(VNET_INTERFACE_COUNTER_TX_UNICAST, tx_unicast) \
- X(VNET_INTERFACE_COUNTER_RX_MULTICAST, rx_multicast) \
- X(VNET_INTERFACE_COUNTER_TX_MULTICAST, tx_multicast) \
- X(VNET_INTERFACE_COUNTER_RX_BROADCAST, rx_broadcast) \
- X(VNET_INTERFACE_COUNTER_TX_BROADCAST, tx_broadcast)
+#define foreach_rx_combined_interface_counter(_x) \
+ for (_x = VNET_INTERFACE_COUNTER_RX; \
+ _x <= VNET_INTERFACE_COUNTER_RX_BROADCAST; \
+ _x++)
+
+#define foreach_tx_combined_interface_counter(_x) \
+ for (_x = VNET_INTERFACE_COUNTER_TX; \
+ _x <= VNET_INTERFACE_COUNTER_TX_BROADCAST; \
+ _x++)
typedef enum
{
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 3d9bb30f142..8d982e36b73 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -1177,14 +1177,9 @@ static void
vl_api_collect_detailed_interface_stats_reply_t *rmp;
int rv = 0;
- if (mp->enable_disable)
- {
- collect_detailed_interface_stats_flag_set ();
- }
- else
- {
- collect_detailed_interface_stats_flag_clear ();
- }
+ rv =
+ vnet_sw_interface_stats_collect_enable_disable (ntohl (mp->sw_if_index),
+ mp->enable_disable);
REPLY_MACRO (VL_API_COLLECT_DETAILED_INTERFACE_STATS_REPLY);
}
diff --git a/src/vnet/interface_funcs.h b/src/vnet/interface_funcs.h
index 3d045f84d2b..6e188f7f543 100644
--- a/src/vnet/interface_funcs.h
+++ b/src/vnet/interface_funcs.h
@@ -299,6 +299,9 @@ void vnet_hw_interface_set_mtu (vnet_main_t * vnm, u32 hw_if_index, u32 mtu);
void vnet_sw_interface_update_unnumbered (u32 sw_if_index,
u32 ip_sw_if_index, u8 enable);
+int vnet_sw_interface_stats_collect_enable_disable (u32 sw_if_index,
+ u8 enable);
+
/* Formats sw/hw interface. */
format_function_t format_vnet_hw_interface;
format_function_t format_vnet_hw_interface_rx_mode;
diff --git a/src/vnet/interface_stats.c b/src/vnet/interface_stats.c
new file mode 100644
index 00000000000..1b07552727c
--- /dev/null
+++ b/src/vnet/interface_stats.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2018 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 <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+
+#include <vnet/feature/feature.h>
+#include <vnet/ethernet/ethernet.h>
+
+int
+vnet_sw_interface_stats_collect_enable_disable (u32 sw_if_index, u8 enable)
+{
+ ethernet_interface_t *eif;
+ vnet_sw_interface_t *si;
+ ethernet_main_t *em;
+ vnet_main_t *vnm;
+
+ vnm = vnet_get_main ();
+ em = &ethernet_main;
+ si = vnet_get_sw_interface (vnm, sw_if_index);
+
+ /*
+ * only ethernet HW interfaces are supported at this time
+ */
+ if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
+ {
+ return (VNET_API_ERROR_INVALID_VALUE);
+ }
+
+ eif = ethernet_get_interface (em, si->hw_if_index);
+
+ if (!eif)
+ {
+ return (VNET_API_ERROR_FEATURE_DISABLED);
+ }
+
+ vnet_feature_enable_disable ("device-input", "stats-collect-rx",
+ sw_if_index, enable, 0, 0);
+ vnet_feature_enable_disable ("interface-output", "stats-collect-tx",
+ sw_if_index, enable, 0, 0);
+
+ return (0);
+}
+
+static u8 *
+format_stats_collect_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 *);
+
+ return s;
+}
+
+#define inc_counter(ctype, rx_tx) \
+{ \
+}
+
+static_always_inline uword
+stats_collect_inline (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame, vlib_rx_or_tx_t rxtx)
+{
+ vnet_interface_counter_type_t ct;
+ u32 n_left_from, *from, *to_next;
+ u32 next_index;
+ u32 sw_if_index = 0;
+ u32 stats_n_packets[VNET_N_COMBINED_INTERFACE_COUNTER] = { 0 };
+ u64 stats_n_bytes[VNET_N_COMBINED_INTERFACE_COUNTER] = { 0 };
+
+ from = vlib_frame_vector_args (frame);
+ n_left_from = frame->n_vectors;
+ 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 > 0 && n_left_to_next > 0)
+ {
+ u32 bi0;
+ vlib_buffer_t *b0;
+ u32 next0 = 0;
+ int b0_ctype;
+
+ /* speculatively enqueue b0 to the current next frame */
+ to_next[0] = bi0 = from[0];
+ to_next += 1;
+ n_left_to_next -= 1;
+ from += 1;
+ n_left_from -= 1;
+
+ b0 = vlib_get_buffer (vm, bi0);
+ sw_if_index = vnet_buffer (b0)->sw_if_index[rxtx];
+
+ if (VLIB_RX == rxtx)
+ {
+ b0_ctype =
+ eh_dst_addr_to_rx_ctype (vlib_buffer_get_current (b0));
+ }
+ else
+ {
+ b0_ctype =
+ eh_dst_addr_to_tx_ctype (vlib_buffer_get_current (b0));
+ }
+
+ stats_n_bytes[b0_ctype] += vlib_buffer_length_in_chain (vm, b0);
+ stats_n_packets[b0_ctype] += 1;
+
+ vnet_feature_next (sw_if_index, &next0, b0);
+
+ vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+ n_left_to_next, bi0, next0);
+ }
+
+ if (VLIB_RX == rxtx)
+ {
+ foreach_rx_combined_interface_counter (ct)
+ {
+ vlib_increment_combined_counter
+ (vnet_main.interface_main.combined_sw_if_counters + ct,
+ vlib_get_thread_index (),
+ sw_if_index, stats_n_packets[ct], stats_n_bytes[ct]);
+ }
+ }
+ else
+ {
+ foreach_tx_combined_interface_counter (ct)
+ {
+ vlib_increment_combined_counter
+ (vnet_main.interface_main.combined_sw_if_counters + ct,
+ vlib_get_thread_index (),
+ sw_if_index, stats_n_packets[ct], stats_n_bytes[ct]);
+ }
+ }
+
+ vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ }
+
+ return frame->n_vectors;
+}
+
+static uword
+stats_collect_rx (vlib_main_t * vm,
+ vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+ return stats_collect_inline (vm, node, frame, VLIB_RX);
+}
+
+static uword
+stats_collect_tx (vlib_main_t * vm,
+ vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+ return stats_collect_inline (vm, node, frame, VLIB_TX);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (stats_collect_rx_node) = {
+ .vector_size = sizeof (u32),
+ .format_trace = format_stats_collect_trace,
+ .type = VLIB_NODE_TYPE_INTERNAL,
+ .n_errors = 0,
+ .n_next_nodes = 0,
+ .function = stats_collect_rx,
+ .name = "stats-collect-rx",
+};
+
+VLIB_REGISTER_NODE (stats_collect_tx_node) = {
+ .vector_size = sizeof (u32),
+ .format_trace = format_stats_collect_trace,
+ .type = VLIB_NODE_TYPE_INTERNAL,
+ .n_errors = 0,
+ .n_next_nodes = 0,
+ .function = stats_collect_tx,
+ .name = "stats-collect-tx",
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (stats_collect_rx_node, stats_collect_rx);
+VLIB_NODE_FUNCTION_MULTIARCH (stats_collect_tx_node, stats_collect_tx);
+
+VNET_FEATURE_INIT (stats_collect_rx_node, static) = {
+ .arc_name = "device-input",
+ .node_name = "stats-collect-rx",
+ .runs_before = VNET_FEATURES ("ethernet-input"),
+};
+
+VNET_FEATURE_INIT (stats_collect_tx_node, static) = {
+ .arc_name = "interface-output",
+ .node_name = "stats-collect-tx",
+ .runs_before = VNET_FEATURES ("interface-tx"),
+};
+
+/* *INDENT-ON* */
+
+static clib_error_t *
+stats_collect_init (vlib_main_t * vm)
+{
+ return 0;
+}
+
+VLIB_INIT_FUNCTION (stats_collect_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */