From 034c064e83b300fe3da480b57fe7f16dbf8eff3b Mon Sep 17 00:00:00 2001
From: wangmenglan <wangmenglan@geedgenetworks.com>
Date: Mon, 12 Jun 2023 15:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Clixon=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=85=8D=E7=BD=AEPacket=20IO=20affinity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/traffic-engine/files/helm/conf/tfe.conf     | 4 ++--
 .../roles/traffic-engine/files/helm/templates/_config.tpl | 8 ++++++++
 ansible/roles/traffic-engine/files/helm/values.yaml       | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
index c76e2e10..9ce9cb66 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
@@ -215,8 +215,8 @@ app_name="proxy_rule_hits"
 
 # for enable kni v4
 [packet_io]
-packet_io_threads={{- include "traffic-engine.sapp.workerthread" . }}
-packet_io_cpu_affinity_mask={{- include "traffic-engine.sapp.cpu-affinity" . }}
+packet_io_threads={{- include "traffic-engine.pktio.workerthread" . }}
+packet_io_cpu_affinity_mask={{- include "traffic-engine.pktio.cpu-affinity" . }}
 
 firewall_sids={{ .Values.sid.firewall }}
 proxy_sids={{ .Values.sid.proxy }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
index 5384aa6c..60a9dc66 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
+++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
@@ -50,6 +50,10 @@ enable_breakpad_upload=0
 {{- len .Values.shaping_affinity }}
 {{- end -}}
 
+{{- define "traffic-engine.pktio.workerthread" -}}
+{{- len .Values.pktio_affinity }}
+{{- end -}}
+
 {{- define "traffic-engine.tfe.cpu-affinity" -}}
 {{- if eq (len .Values.tfe_affinity) 1 }}
 {{- print (index .Values.tfe_affinity 0) "," (index .Values.tfe_affinity 0) }}
@@ -66,6 +70,10 @@ enable_breakpad_upload=0
 {{- join "," .Values.shaping_affinity }}
 {{- end -}}
 
+{{- define "traffic-engine.pktio.cpu-affinity" -}}
+{{- join "," .Values.pktio_affinity }}
+{{- end -}}
+
 {{- define "traffic-engine.device-tag-list" -}}
 {{- $tags_list := list -}}
 {{- if .Values.device.tags }}
diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml
index ce7dd941..982f8a73 100644
--- a/ansible/roles/traffic-engine/files/helm/values.yaml
+++ b/ansible/roles/traffic-engine/files/helm/values.yaml
@@ -127,6 +127,7 @@ sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,
 tfe_affinity: [77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
 sce_affinity: [92]
 shaping_affinity: [93]
+pktio_affinity: [94]
 
 tfe_rps_mask: "00000000"