From 5d94493cab98bae67e99bbb899e90f16d09aef65 Mon Sep 17 00:00:00 2001
From: luwenpeng <luwenpeng@zdjizhi.com>
Date: Fri, 1 Jul 2022 11:51:54 +0800
Subject: [PATCH] =?UTF-8?q?TSG-11090=20K83=E4=B8=AD=E6=94=AF=E6=8C=81KNI?=
 =?UTF-8?q?=E7=9A=84TAP=E6=A8=A1=E5=BC=8F=20TSG-11042=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93KNI=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6(?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E6=97=A7=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../install_config/group_vars/rpm_version.yml |  2 +-
 ansible/roles/kni/templates/kni.conf.j2       | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 9212bf81..b3bbf7bc 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -53,7 +53,7 @@ framework_rpm_version:
   libmaatframe: libmaatframe-3.6.10.d482a8d
 
 kni_rpm_version:
-  kni: kni-4.0.1.6d75cbe
+  kni: kni-5.0.1.3cc6d58
 
 mrzcpd_rpm_version:
   mrzcpd: mrzcpd-4.5.2.6ffddf8
diff --git a/ansible/roles/kni/templates/kni.conf.j2 b/ansible/roles/kni/templates/kni.conf.j2
index 989a877e..be1baaad 100644
--- a/ansible/roles/kni/templates/kni.conf.j2
+++ b/ansible/roles/kni/templates/kni.conf.j2
@@ -8,15 +8,40 @@ tfe_node_count = 1
 tfe_node_count = {{ dp_steering_proxy.node_count }}
 {% endif %}
 manage_eth = {{ control_and_policy.nic_name }}
+# deploy_mode: normal/tap
 {% if dp_steering_proxy.tun_mode is defined %}
-deploy_mode = tun
+deploy_mode = tap
 {% else %}
 deploy_mode = normal
 {% endif %}
-tun_name = tap0
 src_mac_addr = 00:0e:c6:d6:72:c1
 dst_mac_addr = fe:65:b7:03:50:bd
 
+[tap]
+tap_name=tap0
+
+# tap_allow_mutilthread=1     load bpf
+# tap_allow_mutilthread=0 not load bpf
+tap_allow_mutilthread=1
+bpf_obj=/opt/tsg/sapp/plug/business/kni/bpf_tun_rss_steering.o
+bpf_default_queue=-1
+# tap_bpf_debug_log: cat /sys/kernel/debug/tracing/trace_pipe
+bpf_debug_log=0
+# 2: BPF 使用二元组分流; 4: BPF 使用四元组分流
+bpf_hash_mode=2
+
+tap_rps_enable=0
+# cat /sys/class/net/tap0/queues/rx-%{d}/rps_cpus
+tap_rps_mask=0,1fffffff,c0000000,00000000
+
+[io_uring]
+enable_iouring=1
+enable_debuglog=0
+ring_size=1024
+buff_size=2048
+flags=0
+sq_thread_idle=0
+
 {% for tfe_node_info in dp_steering_proxy.node_list %}
 {% if dp_steering_proxy.location == 'local' %}
 [tfe0]