From 92b2489d26bd8b73caaec228caee723e00bf2c01 Mon Sep 17 00:00:00 2001
From: wangmenglan <wangmenglan@geedgenetworks.com>
Date: Tue, 26 Mar 2024 17:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(DPISDN-38):=E8=B0=83=E6=95=B4M?=
 =?UTF-8?q?RZCPD=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../install_config/group_vars/rpm_version.yml |  2 +-
 .../tsg-os-HAL/files/script/tsg-os-HAL.sh     | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index fe9f5190..aa10005c 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -88,7 +88,7 @@ hasp_tools_rpm_version:
 tsg_os_clixon_rpm_version:
   cligen: cligen-5.8.0-release
   clixon: clixon-5.8.0-release
-  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.21.6ff72bd
+  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.22.73b5f31
 
 sce_rpm_version:
   sce: sce-1.2.12.4490735
diff --git a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
index 7f1ca3ea..5a2b9d51 100644
--- a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
+++ b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
@@ -22,8 +22,8 @@ WORKLOAD_CORE=
 MRZCPD_DIRECT_PKTMBUF=
 MRZCPD_INDIRECT_PKTMBUF=
 MRZCPD_POLL_WAIT_THROTTLE=512
-MRZCPD_SZ_DATA=8192
-MRZCPD_SZ_TUNNEL=1024
+MRZCPD_SZ_DATA=4096
+MRZCPD_SZ_TUNNEL=
 MRZCPD_CHECK_BUFFER_LEAK=1
 TRAFFIC_ENGINE_LOGS_VDISK_PATH="/data/vdisks"
 TRAFFIC_ENGINE_LOGS_VDISK_SIZE_BYTES=
@@ -136,7 +136,7 @@ set_hugepages()
         elif [ $mem_num -le "131072" ]; then
             HUGEPAGES=16
         else
-            HUGEPAGES=48
+            HUGEPAGES=32
         fi
     fi
 }
@@ -148,15 +148,30 @@ set_mrzcpd_indirect_pktmbuf()
     fi
 }
 
+set_mrzcpd_sz_tunnel()
+{
+    if [ ! -n "$MRZCPD_SZ_TUNNEL" ]; then
+        if [ $mem_num -le "32768" ]; then
+            MRZCPD_SZ_TUNNEL=512
+        elif [ $mem_num -le "65536" ]; then
+            MRZCPD_SZ_TUNNEL=512
+        elif [ $mem_num -le "131072" ]; then
+            MRZCPD_SZ_TUNNEL=256
+        else
+            MRZCPD_SZ_TUNNEL=512
+        fi
+    fi
+}
+
 set_mrzcpd_direct_pktmbuf()
 {
     if [ ! -n "$MRZCPD_DIRECT_PKTMBUF" ]; then
         if [ $mem_num -le "32768" ]; then
-            MRZCPD_DIRECT_PKTMBUF=`expr 262144 / $NUMA_NODE_CNT - 1`
-        elif [ $mem_num -le "65536" ]; then
             MRZCPD_DIRECT_PKTMBUF=`expr 524288 / $NUMA_NODE_CNT - 1`
-        elif [ $mem_num -le "131072" ]; then
+        elif [ $mem_num -le "65536" ]; then
             MRZCPD_DIRECT_PKTMBUF=`expr 1048576 / $NUMA_NODE_CNT - 1`
+        elif [ $mem_num -le "131072" ]; then
+            MRZCPD_DIRECT_PKTMBUF=`expr 2097152 / $NUMA_NODE_CNT - 1`
         else
             MRZCPD_DIRECT_PKTMBUF=`expr 4194304 / $NUMA_NODE_CNT - 1`
         fi
@@ -347,6 +362,7 @@ echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode
 modprobe vfio_pci
 
 set_mrzcpd_indirect_pktmbuf
+set_mrzcpd_sz_tunnel
 set_mrzcpd_direct_pktmbuf
 
 set_k3s_config ${mem_num}