infra: add stats for control plane

Add new fields in the existing stats structure to track
the number of packets sent/received by the control plane
interfaces, gr-loop included.

Signed-off-by: Christophe Fontaine <[email protected]>

Author: christophefontaine

modules/infra/api/gr_infra.h

@@ -240,6 +240,10 @@ struct gr_iface_stats {
 	uint64_t tx_packets;
 	uint64_t tx_bytes;
 	uint64_t tx_errors;
+	uint64_t cp_rx_packets;
+	uint64_t cp_rx_bytes;
+	uint64_t cp_tx_packets;
+	uint64_t cp_tx_bytes;
 };
 
 struct gr_infra_iface_stats_get_resp {

modules/infra/api/stats.c

@@ -266,6 +266,10 @@ static struct api_out iface_stats_get(const void * /*request*/, struct api_ctx *
 		s.tx_packets = 0;
 		s.tx_bytes = 0;
 		s.tx_errors = 0;
+		s.cp_rx_packets = 0;
+		s.cp_rx_bytes = 0;
+		s.cp_tx_packets = 0;
+		s.cp_tx_bytes = 0;
 
 		// Aggregate per-core stats
 		for (int i = 0; i < RTE_MAX_LCORE; i++) {
@@ -274,6 +278,10 @@ static struct api_out iface_stats_get(const void * /*request*/, struct api_ctx *
 			s.rx_bytes += sw_stats->rx_bytes;
 			s.tx_packets += sw_stats->tx_packets;
 			s.tx_bytes += sw_stats->tx_bytes;
+			s.cp_rx_packets += sw_stats->cp_rx_packets;
+			s.cp_rx_bytes += sw_stats->cp_rx_bytes;
+			s.cp_tx_packets += sw_stats->cp_tx_packets;
+			s.cp_tx_bytes += sw_stats->cp_tx_bytes;
 		}
 
 		if (iface->type == GR_IFACE_TYPE_PORT) {
@@ -386,17 +394,26 @@ telemetry_ifaces_info_get(const char * /*cmd*/, const char * /*params*/, struct
 
 			// Software stats
 			uint64_t rx_pkts = 0, rx_bytes = 0, tx_pkts = 0, tx_bytes = 0;
+			uint64_t cp_rx_pkts = 0, cp_rx_bytes = 0, cp_tx_pkts = 0, cp_tx_bytes = 0;
 			for (int i = 0; i < RTE_MAX_LCORE; i++) {
 				struct iface_stats *sw_stats = iface_get_stats(i, iface->id);
 				rx_pkts += sw_stats->rx_packets;
 				rx_bytes += sw_stats->rx_bytes;
 				tx_pkts += sw_stats->tx_packets;
 				tx_bytes += sw_stats->tx_bytes;
+				cp_rx_pkts += sw_stats->cp_rx_packets;
+				cp_rx_bytes += sw_stats->cp_rx_bytes;
+				cp_tx_pkts += sw_stats->cp_tx_packets;
+				cp_tx_bytes += sw_stats->cp_tx_bytes;
 			}
 			rte_tel_data_add_dict_uint(stats_container, "rx_packets", rx_pkts);
 			rte_tel_data_add_dict_uint(stats_container, "rx_bytes", rx_bytes);
 			rte_tel_data_add_dict_uint(stats_container, "tx_packets", tx_pkts);
 			rte_tel_data_add_dict_uint(stats_container, "tx_bytes", tx_bytes);
+			rte_tel_data_add_dict_uint(stats_container, "cp_rx_packets", cp_rx_pkts);
+			rte_tel_data_add_dict_uint(stats_container, "cp_rx_bytes", cp_rx_bytes);
+			rte_tel_data_add_dict_uint(stats_container, "cp_tx_packets", cp_tx_pkts);
+			rte_tel_data_add_dict_uint(stats_container, "cp_tx_bytes", cp_tx_bytes);
 
 			// Get hardware stats for physical ports.
 			if (iface->type == GR_IFACE_TYPE_PORT) {

modules/infra/cli/iface.c

@@ -324,6 +324,10 @@ static cmd_status_t iface_stats(struct gr_api_client *c, const struct ec_pnode *
 	scols_table_new_column(table, "TX_PACKETS", 0, SCOLS_FL_RIGHT);
 	scols_table_new_column(table, "TX_BYTES", 0, SCOLS_FL_RIGHT);
 	scols_table_new_column(table, "TX_ERRORS", 0, SCOLS_FL_RIGHT);
+	scols_table_new_column(table, "CP_RX_PACKETS", 0, SCOLS_FL_RIGHT);
+	scols_table_new_column(table, "CP_RX_BYTES", 0, SCOLS_FL_RIGHT);
+	scols_table_new_column(table, "CP_TX_PACKETS", 0, SCOLS_FL_RIGHT);
+	scols_table_new_column(table, "CP_TX_BYTES", 0, SCOLS_FL_RIGHT);
 	scols_table_set_column_separator(table, "  ");
 
 	for (uint16_t i = 0; i < resp->n_stats; i++) {
@@ -346,6 +350,10 @@ static cmd_status_t iface_stats(struct gr_api_client *c, const struct ec_pnode *
 		scols_line_sprintf(line, 4, "%lu", resp->stats[i].tx_packets);
 		scols_line_sprintf(line, 5, "%lu", resp->stats[i].tx_bytes);
 		scols_line_sprintf(line, 6, "%lu", resp->stats[i].tx_errors);
+		scols_line_sprintf(line, 7, "%lu", resp->stats[i].cp_rx_packets);
+		scols_line_sprintf(line, 8, "%lu", resp->stats[i].cp_rx_bytes);
+		scols_line_sprintf(line, 9, "%lu", resp->stats[i].cp_tx_packets);
+		scols_line_sprintf(line, 10, "%lu", resp->stats[i].cp_tx_bytes);
 	}
 
 	scols_print_table(table);

modules/infra/control/gr_iface.h

@@ -92,6 +92,10 @@ struct __rte_cache_aligned iface_stats {
 	uint64_t rx_bytes;
 	uint64_t tx_packets;
 	uint64_t tx_bytes;
+	uint64_t cp_rx_packets;
+	uint64_t cp_rx_bytes;
+	uint64_t cp_tx_packets;
+	uint64_t cp_tx_bytes;
 };
 
 #define MAX_IFACES 1024

modules/infra/control/loopback.c

@@ -53,6 +53,7 @@ static void finalize_fd(struct event *ev, void * /*priv*/) {
 void loopback_tx(struct rte_mbuf *m) {
 	struct mbuf_data *d = mbuf_data(m);
 	struct iface_info_loopback *lo;
+	struct iface_stats *stats;
 	struct iovec iov[2];
 	struct tun_pi pi;
 	char *data;
@@ -97,16 +98,21 @@ void loopback_tx(struct rte_mbuf *m) {
 		LOG(ERR, "write to tun device failed %s", strerror(errno));
 	}
 
+	stats = iface_get_stats(rte_lcore_id(), d->iface->id);
+	stats->cp_tx_packets += 1;
+	stats->cp_tx_bytes += rte_pktmbuf_pkt_len(m);
+
 end:
 	if (!rte_pktmbuf_is_contiguous(m))
 		rte_free(data);
 	rte_pktmbuf_free(m);
 }
 
 static void iface_loopback_poll(evutil_socket_t, short reason, void *ev_iface) {
-	struct eth_input_mbuf_data *e;
-	struct iface_info_loopback *lo;
 	struct iface *iface = ev_iface;
+	struct iface_info_loopback *lo;
+	struct eth_input_mbuf_data *e;
+	struct iface_stats *stats;
 	struct rte_mbuf *mbuf;
 	size_t read_len;
 	size_t len;
@@ -155,6 +161,10 @@ static void iface_loopback_poll(evutil_socket_t, short reason, void *ev_iface) {
 	e->iface = iface;
 	e->domain = ETH_DOMAIN_LOOPBACK;
 
+	stats = iface_get_stats(rte_lcore_id(), iface->id);
+	stats->cp_rx_packets += 1;
+	stats->cp_rx_bytes += rte_pktmbuf_pkt_len(mbuf);
+
 	post_to_stack(loopback_get_control_id(), mbuf);
 	return;