From a63dd0414ae2d237a7ee15d9b5f0323eba31e375 Mon Sep 17 00:00:00 2001 From: wangmenglan Date: Mon, 24 Jul 2023 17:58:29 +0800 Subject: [PATCH] =?UTF-8?q?Clixon=E6=9B=B4=E6=96=B0=E8=87=B31.0.60;=20HAL?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9mrglobal.conf=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=ADsz=5Fdata,sz=5Ftunnel,check=5Fbuffer=5Fleak?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20TSG-16295:=20Clixon=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=9F=E6=88=90JA3=E6=8C=87=E7=BA=B9=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 2 +- ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf | 3 +++ ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index a0101762..c585fe91 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -102,7 +102,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.0.59.5e8ede0 + tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.60.e37d671 sce_rpm_version: sce: sce-1.0.14.769ac0e diff --git a/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf b/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf index 34b80698..68acdbc6 100644 --- a/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf +++ b/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf @@ -10,3 +10,6 @@ # MRZCPD_DIRECT_PKTMBUF= # MRZCPD_INDIRECT_PKTMBUF= # MRZCPD_POLL_WAIT_THROTTLE= +# MRZCPD_SZ_DATA= +# MRZCPD_SZ_TUNNEL= +# MRZCPD_CHECK_BUFFER_LEAK= 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 9f305386..ae821f33 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,6 +22,9 @@ CLIXON_IOCORE= MRZCPD_DIRECT_PKTMBUF= MRZCPD_INDIRECT_PKTMBUF= MRZCPD_POLL_WAIT_THROTTLE=512 +MRZCPD_SZ_DATA=4096 +MRZCPD_SZ_TUNNEL=8192 +MRZCPD_CHECK_BUFFER_LEAK=1 load_tsg_os_HAL_config() { @@ -67,6 +70,9 @@ set_tsg_clixon_conf() [ -f ${mrglobal_cfg_template} ] && sed -i "s/^iocore=.*$/iocore=${MRZCPD_IOCORE}/g" ${mrglobal_cfg_template} [ -f ${mrglobal_cfg_template} ] && sed -i "s/^poll_wait_throttle=.*$/poll_wait_throttle=${MRZCPD_POLL_WAIT_THROTTLE}/g" ${mrglobal_cfg_template} + [ -f ${mrglobal_cfg_template} ] && sed -i "s/^sz_data=.*$/sz_data=${MRZCPD_SZ_DATA}/g" ${mrglobal_cfg_template} + [ -f ${mrglobal_cfg_template} ] && sed -i "s/^sz_tunnel=.*$/sz_tunnel=${MRZCPD_SZ_TUNNEL}/g" ${mrglobal_cfg_template} + [ -f ${mrglobal_cfg_template} ] && sed -i "s/^check_buffer_leak=.*$/check_buffer_leak=${MRZCPD_CHECK_BUFFER_LEAK}/g" ${mrglobal_cfg_template} [ -f ${tsg_clixon_cfg_file} ] && sed -i "s/^cpu_range=.*$/cpu_range=${CLIXON_IOCORE}/g" ${tsg_clixon_cfg_file} }