1、修改mrzcpd 的mrglobal.conf 和 sapp的sapp.toml 以适配流量处理

2、新增gdev.conf bfd 保活
3、提交mrzcpd 修改

config/mrzcpd/etc/mrglobal.conf

@@ -1,6 +1,16 @@
 [device]
-device=virtio_user0
+device=virtio_user0,virtio_user1
-virtio_user=virtio_user0
+virtio_user=virtio_user0,virtio_user1
+sz_tunnel=8192
+sz_buffer=0
+
+[device:virtio_user0]
+in_addr=192.168.1.30
+in_mask=255.255.255.0
+promisc=1
+
+[device:virtio_user1]
+promisc=1
 
 [service]
 # lcore id for i/o service, use comma to split
@@ -10,8 +20,13 @@ hashmode=0
 
 [eal]
 virtaddr=0x7f40c4a00000
-loglevel=7
+loglevel=8
 no-pci=1
+mem=4096
+single-file-segments=0
+
+[ctrlzone]
+ctrlzone0=tunnat,64
 
 [keepalive]
 check_spinlock=1

config/sapp_run/etc/gdev.conf

@@ -0,0 +1,5 @@
+[Module]
+pcapdevice=virtio_user0
+sendto_gdev_card=virtio_user0
+sendto_gdev_ip=192.168.1.30
+gdev_status_switch=1

config/sapp_run/etc/sapp.toml

@@ -18,6 +18,13 @@ dictator_enable=1
 [PACKET_IO]
     [overlay_tunnel_definition]
     l2_l3_tunnel_support=1
+    overlay_mode=vxlan
+    stream_compare_layer_cfg_file="etc/stream_compare_layer.conf"
+    vlan_flipping_cfg_file="etc/vlan_flipping_map.conf"
+    asymmetric_presence_layer_cfg_file="etc/asymmetric_presence_layer.conf"
+    asymmetric_addr_layer_cfg_file="etc/asymmetric_addr_layer.conf"
+    prune_inject_layer_cfg_file="etc/prune_inject_layer.conf"
+
     [packet_io.feature]
     inbound_route_dir=1
 #inject_mode_inline_device_sport=54789

docker-compose.yml

@@ -9,11 +9,12 @@ services:
     security_opt:
      - seccomp:unconfined
     volumes:
-     - /dev/hugepages:/dev/hugepages
+     - /mnt/huge_1G:/mnt/huge_1G
      - /tmp/vhost_tsg_container_firewall:/run/usvhost/
      - ./config/mrzcpd/etc/mrglobal.conf:/opt/mrzcpd/etc/mrglobal.conf
      - ./config/sapp_run/etc/sapp.toml:/home/mesasoft/sapp_run/etc/sapp.toml
      - ./config/sapp_run/etc/sapp_log.conf:/home/mesasoft/sapp_run/etc/sapp_log.conf
+     - ./config/sapp_run/etc/gdev.conf:/home/mesasoft/sapp_run/etc/gdev.conf
      - ./config/sapp_run/tsgconf/main.conf:/home/mesasoft/sapp_run/tsgconf/main.conf
      - ./config/sapp_run/tsgconf/maat.conf:/home/mesasoft/sapp_run/tsgconf/maat.conf
      - ./config/sapp_run/conf/capture_packet_plug.conf:/home/mesasoft/sapp_run/conf/capture_packet_plug.conf