issue: 4397660 Rename fields in cq_stats_t

Rename n_rx_drop_counter and n_rx_pkt_drop.

Signed-off-by: Bashar Abdelgafer <[email protected]>

Author: BasharRadya

src/core/dev/cq_mgr_rx.cpp

@@ -151,7 +151,7 @@ cq_mgr_rx::~cq_mgr_rx()
     VALGRIND_MAKE_MEM_UNDEFINED(m_p_ibv_cq, sizeof(ibv_cq));
 
     g_p_net_device_table_mgr->increase_closed_rings_rx_cq_drop_counter(
-        m_p_cq_stat->n_rx_drop_counter);
+        m_p_cq_stat->n_rx_hw_pkt_drops);
     statistics_print();
     xlio_stats_instance_remove_cq_block(m_p_cq_stat);
 
@@ -160,13 +160,13 @@ cq_mgr_rx::~cq_mgr_rx()
 
 void cq_mgr_rx::statistics_print()
 {
-    if (m_p_cq_stat->n_rx_pkt_drop || m_p_cq_stat->n_rx_drop_counter ||
+    if (m_p_cq_stat->n_rx_sw_pkt_drops || m_p_cq_stat->n_rx_hw_pkt_drops ||
         m_p_cq_stat->n_rx_sw_queue_len || m_p_cq_stat->n_rx_drained_at_once_max ||
         m_p_cq_stat->n_buffer_pool_len) {
-        cq_logdbg_no_funcname("SW RX Packets dropped: %12llu",
-                              (unsigned long long int)m_p_cq_stat->n_rx_pkt_drop);
+        cq_logdbg_no_funcname("Packets dropped: %12llu",
+                              (unsigned long long int)m_p_cq_stat->n_rx_sw_pkt_drops);
         cq_logdbg_no_funcname("HW RX Packets dropped: %12llu",
-                              (unsigned long long int)m_p_cq_stat->n_rx_drop_counter);
+                              (unsigned long long int)m_p_cq_stat->n_rx_hw_pkt_drops);
         cq_logdbg_no_funcname("Drained max: %17u", m_p_cq_stat->n_rx_drained_at_once_max);
         cq_logdbg_no_funcname("CQE errors: %18llu",
                               (unsigned long long int)m_p_cq_stat->n_rx_cqe_error);
@@ -367,7 +367,7 @@ bool cq_mgr_rx::compensate_qp_poll_success(mem_buf_desc_t *buff_cur)
         m_debt -= buffers;
         m_p_cq_stat->n_buffer_pool_len = m_rx_pool.size();
     } else if (m_b_sysvar_cq_keep_qp_full || m_debt >= (int)m_hqrx_ptr->m_rx_num_wr) {
-        m_p_cq_stat->n_rx_pkt_drop++;
+        m_p_cq_stat->n_rx_sw_pkt_drops++;
         m_hqrx_ptr->post_recv_buffer(buff_cur);
         --m_debt;
         return true;

src/core/dev/cq_mgr_rx.h

@@ -115,7 +115,7 @@ class cq_mgr_rx {
     int reclaim_recv_single_buffer(mem_buf_desc_t *rx_reuse);
 
     void get_cq_event(int count = 1) { xlio_ib_mlx5_get_cq_event(&m_mlx5_cq, count); };
-    uint64_t get_n_rx_drop_counter() { return m_p_cq_stat->n_rx_drop_counter; }
+    uint64_t get_n_rx_hw_pkt_drops() { return m_p_cq_stat->n_rx_hw_pkt_drops; }
 
 protected:
     /**

src/core/dev/cq_mgr_rx_regrq.cpp

@@ -119,7 +119,7 @@ void cq_mgr_rx_regrq::cqe_to_mem_buff_desc(struct xlio_mlx5_cqe *cqe,
         p_rx_wc_buf_desc->rx.timestamps.hw_raw = ntohll(cqe->timestamp);
         uint32_t sop_rxdrop_qpn_flowtag_h_byte = ntohl(cqe->sop_rxdrop_qpn_flowtag);
         p_rx_wc_buf_desc->rx.flow_tag_id = sop_rxdrop_qpn_flowtag_h_byte & 0x00FFFFFF;
-        m_p_cq_stat->n_rx_drop_counter += sop_rxdrop_qpn_flowtag_h_byte >> 24;
+        m_p_cq_stat->n_rx_hw_pkt_drops += sop_rxdrop_qpn_flowtag_h_byte >> 24;
         p_rx_wc_buf_desc->rx.is_sw_csum_need =
             !(m_b_is_rx_hw_csum_on && (cqe->hds_ip_ext & MLX5_CQE_L4_OK) &&
               (cqe->hds_ip_ext & MLX5_CQE_L3_OK));
@@ -206,7 +206,7 @@ int cq_mgr_rx_regrq::drain_and_proccess(uintptr_t *p_recycle_buffers_last_wr_id
 
         if (cqe_process_rx(buff, status)) {
             if (p_recycle_buffers_last_wr_id) {
-                m_p_cq_stat->n_rx_pkt_drop++;
+                m_p_cq_stat->n_rx_sw_pkt_drops++;
                 reclaim_recv_buffer_helper(buff);
             } else {
                 bool procces_now = is_eth_tcp_frame(buff);
@@ -296,7 +296,7 @@ bool cq_mgr_rx_regrq::poll_and_process_element_rx(uint64_t *p_cq_poll_sn, void *
                     process_recv_buffer(buff, pv_fd_ready_array);
                 }
             } else {
-                m_p_cq_stat->n_rx_pkt_drop++;
+                m_p_cq_stat->n_rx_sw_pkt_drops++;
                 if (++m_debt >= (int)m_n_sysvar_rx_num_wr_to_post_recv) {
                     compensate_qp_poll_failed();
                 }

src/core/dev/cq_mgr_rx_strq.cpp

@@ -226,7 +226,7 @@ inline bool cq_mgr_rx_strq::strq_cqe_to_mem_buff_desc(struct xlio_mlx5_cqe *cqe,
         _hot_buffer_stride->rx.timestamps.hw_raw = ntohll(cqe->timestamp);
         uint32_t sop_rxdrop_qpn_flowtag_h_byte = ntohl(cqe->sop_rxdrop_qpn_flowtag);
         _hot_buffer_stride->rx.flow_tag_id = sop_rxdrop_qpn_flowtag_h_byte & 0x00FFFFFF;
-        m_p_cq_stat->n_rx_drop_counter += sop_rxdrop_qpn_flowtag_h_byte >> 24;
+        m_p_cq_stat->n_rx_hw_pkt_drops += sop_rxdrop_qpn_flowtag_h_byte >> 24;
         _hot_buffer_stride->rx.is_sw_csum_need =
             !(m_b_is_rx_hw_csum_on && (cqe->hds_ip_ext & MLX5_CQE_L4_OK) &&
               (cqe->hds_ip_ext & MLX5_CQE_L3_OK));
@@ -322,7 +322,7 @@ int cq_mgr_rx_strq::drain_and_proccess_helper(mem_buf_desc_t *buff, mem_buf_desc
         ++ret_total;
         if (process_strq_cq_element_rx(buff, status)) {
             if (p_recycle_buffers_last_wr_id) {
-                m_p_cq_stat->n_rx_pkt_drop++;
+                m_p_cq_stat->n_rx_sw_pkt_drops++;
                 reclaim_recv_buffer_helper(buff);
             } else {
                 bool procces_now = is_eth_tcp_frame(buff);

src/core/dev/ring_simple.cpp

@@ -1011,7 +1011,7 @@ void ring_simple::modify_cq_moderation(uint32_t period, uint32_t count)
 
 uint64_t ring_simple::get_rx_cq_out_of_buffer_drop()
 {
-    return m_p_cq_mgr_rx->get_n_rx_drop_counter();
+    return m_p_cq_mgr_rx->get_n_rx_hw_pkt_drops();
 }
 
 void ring_simple::adapt_cq_moderation()

src/core/util/xlio_stats.h

@@ -308,10 +308,10 @@ typedef struct {
 // CQ stat info
 typedef struct {
     uint64_t n_rx_stride_count;
-    uint64_t n_rx_drop_counter;
+    uint64_t n_rx_hw_pkt_drops;
     uint64_t n_rx_packet_count;
     uint64_t n_rx_consumed_rwqe_count;
-    uint64_t n_rx_pkt_drop;
+    uint64_t n_rx_sw_pkt_drops;
     uint64_t n_rx_lro_packets;
     uint64_t n_rx_lro_bytes;
     uint64_t n_rx_gro_packets;

src/stats/stats_reader.cpp

@@ -396,10 +396,10 @@ void update_delta_cq_stat(cq_stats_t *p_curr_cq_stats, cq_stats_t *p_prev_cq_sta
     int delay = user_params.interval;
     if (p_curr_cq_stats && p_prev_cq_stats) {
         p_prev_cq_stats->n_rx_drained_at_once_max = p_curr_cq_stats->n_rx_drained_at_once_max;
-        p_prev_cq_stats->n_rx_pkt_drop =
-            (p_curr_cq_stats->n_rx_pkt_drop - p_prev_cq_stats->n_rx_pkt_drop) / delay;
-        p_prev_cq_stats->n_rx_drop_counter =
-            (p_curr_cq_stats->n_rx_drop_counter - p_prev_cq_stats->n_rx_drop_counter) / delay;
+        p_prev_cq_stats->n_rx_sw_pkt_drops =
+            (p_curr_cq_stats->n_rx_sw_pkt_drops - p_prev_cq_stats->n_rx_sw_pkt_drops) / delay;
+        p_prev_cq_stats->n_rx_hw_pkt_drops =
+            (p_curr_cq_stats->n_rx_hw_pkt_drops - p_prev_cq_stats->n_rx_hw_pkt_drops) / delay;
 
         p_prev_cq_stats->n_rx_sw_queue_len = p_curr_cq_stats->n_rx_sw_queue_len;
         p_prev_cq_stats->n_buffer_pool_len = p_curr_cq_stats->n_buffer_pool_len;
@@ -572,9 +572,9 @@ void print_cq_stats(cq_instance_block_t *p_cq_inst_arr)
             p_cq_stats = &p_cq_inst_arr[i].cq_stats;
             printf("======================================================\n");
             printf("\tCQ=[%u]\n", i);
-            printf(FORMAT_STATS_64bit, "SW RX Packets dropped:", p_cq_stats->n_rx_pkt_drop,
+            printf(FORMAT_STATS_64bit, "SW RX Packets dropped:", p_cq_stats->n_rx_sw_pkt_drops,
                    post_fix);
-            printf(FORMAT_STATS_64bit, "HW RX Packets dropped:", p_cq_stats->n_rx_drop_counter,
+            printf(FORMAT_STATS_64bit, "HW RX Packets dropped:", p_cq_stats->n_rx_hw_pkt_drops,
                    post_fix);
             printf(FORMAT_STATS_32bit, "Packets queue len:", p_cq_stats->n_rx_sw_queue_len);
             printf(FORMAT_STATS_32bit, "Drained max:", p_cq_stats->n_rx_drained_at_once_max);