Interface Unicast, Multicast and Broadcast stats on the API

[vpp.git] / src / vnet / interface.h

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index e3fb47a..73f1895 100644 (file)
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -393,22 +393,34 @@ typedef struct vnet_hw_interface_t
 #define VNET_HW_INTERFACE_FLAG_SPEED_10M       (1 << 3)
 #define VNET_HW_INTERFACE_FLAG_SPEED_100M      (1 << 4)
 #define VNET_HW_INTERFACE_FLAG_SPEED_1G                (1 << 5)
-#define VNET_HW_INTERFACE_FLAG_SPEED_10G       (1 << 6)
-#define VNET_HW_INTERFACE_FLAG_SPEED_40G       (1 << 7)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100G      (1 << 8)
+#define VNET_HW_INTERFACE_FLAG_SPEED_2_5G      (1 << 6)
+#define VNET_HW_INTERFACE_FLAG_SPEED_5G                (1 << 7)
+#define VNET_HW_INTERFACE_FLAG_SPEED_10G       (1 << 8)
+#define VNET_HW_INTERFACE_FLAG_SPEED_20G       (1 << 9)
+#define VNET_HW_INTERFACE_FLAG_SPEED_25G       (1 << 10)
+#define VNET_HW_INTERFACE_FLAG_SPEED_40G       (1 << 11)
+#define VNET_HW_INTERFACE_FLAG_SPEED_50G       (1 << 12)
+#define VNET_HW_INTERFACE_FLAG_SPEED_56G       (1 << 13)
+#define VNET_HW_INTERFACE_FLAG_SPEED_100G      (1 << 14)
 #define VNET_HW_INTERFACE_FLAG_SPEED_MASK      \
   (VNET_HW_INTERFACE_FLAG_SPEED_10M |          \
    VNET_HW_INTERFACE_FLAG_SPEED_100M |         \
    VNET_HW_INTERFACE_FLAG_SPEED_1G |           \
+   VNET_HW_INTERFACE_FLAG_SPEED_2_5G |         \
+   VNET_HW_INTERFACE_FLAG_SPEED_5G |           \
    VNET_HW_INTERFACE_FLAG_SPEED_10G |          \
+   VNET_HW_INTERFACE_FLAG_SPEED_20G |          \
+   VNET_HW_INTERFACE_FLAG_SPEED_25G |          \
    VNET_HW_INTERFACE_FLAG_SPEED_40G |          \
+   VNET_HW_INTERFACE_FLAG_SPEED_50G |          \
+   VNET_HW_INTERFACE_FLAG_SPEED_56G |          \
    VNET_HW_INTERFACE_FLAG_SPEED_100G)
 
   /* rx mode flags */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 10)
+#define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 16)
 
   /* tx checksum offload */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 11)
+#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 17)
 
   /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
      address for this class (e.g. PPP). */
@@ -622,9 +634,43 @@ typedef enum
   /* Combined counters. */
   VNET_INTERFACE_COUNTER_RX = 0,
   VNET_INTERFACE_COUNTER_TX = 1,
-  VNET_N_COMBINED_INTERFACE_COUNTER = 2,
+  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_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)
+
+typedef enum
+{
+  COLLECT_SIMPLE_STATS = 0,
+  COLLECT_DETAILED_STATS = 1,
+} vnet_interface_stats_collection_mode_e;
+
+extern int collect_detailed_interface_stats_flag;
+
+static inline int
+collect_detailed_interface_stats ()
+{
+  return collect_detailed_interface_stats_flag;
+}
+
+void collect_detailed_interface_stats_flag_set ();
+void collect_detailed_interface_stats_flag_clear ();
+
+
 typedef struct
 {
   u32 output_node_index;