Merge branch 'main' into RL-lower-speed

Author: DawidWesierski4

lib/src/mt_stat.c

@@ -180,7 +180,7 @@ int mt_stat_uinit(struct mtl_main_impl* impl) {
     mt_free(item);
   }
 
-  ret = rte_eal_alarm_cancel(stat_alarm_handler, impl);
+  ret = rte_eal_alarm_cancel(stat_alarm_handler, (void*)-1);
   if (ret < 0) err("%s, alarm cancel fail %d\n", __func__, ret);
   if (mgr->stat_tid) {
     rte_atomic32_set(&mgr->stat_stop, 1);

lib/src/st2110/st_rx_video_session.c

@@ -2719,14 +2719,14 @@ static int rv_handle_mbuf(void* priv, struct rte_mbuf** mbuf, uint16_t nb) {
       mt_rtcp_rx_parse_rtp_packet(s->rtcp_rx[s_port], rtp);
     }
     int handler_ret = s->pkt_handler(s, mbuf[i], s_port, ctl_thread);
-    ret += handler_ret;
-    if (ret < 0) {
+    if (handler_ret < 0) {
       s->port_user_stats[s_port].err_packets++;
     } else {
       s->stat_bytes_received += mbuf[i]->pkt_len;
       s->port_user_stats[s_port].packets++;
       s->port_user_stats[s_port].bytes += mbuf[i]->pkt_len;
     }
+    ret += handler_ret;
   }
   return ret;
 }
@@ -2736,6 +2736,8 @@ static int rv_pkt_rx_tasklet(struct st_rx_video_session_impl* s) {
   uint16_t rv;
   int num_port = s->ops.num_port;
 
+  int check_err_status;
+
   bool done = true;
 
   if (s->dma_dev) {
@@ -2774,7 +2776,13 @@ static int rv_pkt_rx_tasklet(struct st_rx_video_session_impl* s) {
         s->in_continuous_burst[s_port] = true;
       }
 
-      rv_handle_mbuf(&s->priv[s_port], &mbuf[0], rv);
+      check_err_status = rv_handle_mbuf(&s->priv[s_port], &mbuf[0], rv);
+
+      if (check_err_status < 0) {
+        dbg("%s(%d,%d), handle mbuf fail %d\n", __func__, s->idx, s_port,
+            check_err_status);
+      }
+
       rte_pktmbuf_free_bulk(&mbuf[0], rv);
 
       done = false;