diff --git a/conf/kni.conf b/conf/kni.conf index 219961d..9565b7a 100644 --- a/conf/kni.conf +++ b/conf/kni.conf @@ -1,6 +1,6 @@ [global] log_path = ./log/kni/kni.log -log_level = 10 +log_level = 30 tfe_node_count = 1 manage_eth = eth0 #normal or tun @@ -65,27 +65,28 @@ security.protocol = MG #128:bypass, 2: intercept [dup_traffic] -switch = 0 +switch = 1 action = 2 -capacity = 1000000 -error_rate = 0.05 -expiry_time = 30 +capacity = 10000000 +error_rate = 0.00001 +expiry_time = 60 [traceid2pme_htable] mho_screen_print_ctrl = 0 mho_thread_safe = 1 mho_mutex_num = 160 -mho_hash_slot_size = 160000 -mho_hash_max_element_num = 640000 +mho_hash_slot_size = 640000 +mho_hash_max_element_num = 2560000 mho_expire_time = 30 mho_eliminate_type = LRU +//per thread [tuple2stream_htable] mho_screen_print_ctrl = 0 mho_thread_safe = 0 mho_mutex_num = 160 -mho_hash_slot_size = 160000 -mho_hash_max_element_num = 640000 +mho_hash_slot_size = 80000 +mho_hash_max_element_num = 320000 mho_expire_time = 0 mho_eliminate_type = LRU @@ -93,4 +94,4 @@ mho_eliminate_type = LRU remote_switch = 1 remote_ip = 192.168.10.152 remote_port = 8125 -local_path = ./fs2_kni.status \ No newline at end of file +local_path = ./fs2_kni.status diff --git a/conf/sapp/sapp.toml b/conf/sapp/sapp.toml new file mode 100644 index 0000000..14c2a35 --- /dev/null +++ b/conf/sapp/sapp.toml @@ -0,0 +1,121 @@ +################################################################################################### +# NOTE: +# The format of this file is toml (https://github.com/cktan/tomlc99) +# to make vim editor display colorful and human readable, +# you can create a symbolic links named sapp.ini to sapp.toml, ln -sf sapp.toml sapp.ini +################################################################################################### + +[SYSTEM] +instance_name = "sapp4" + +[CPU] +worker_threads=16 +### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as [] +bind_mask=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16] +#bind_mask=[] + +[PACKET_IO] +### note, BSD_packet_filter, if you do not want to set any filter rule, keep it empty as "" +BSD_packet_filter="" + +### note, depolyment.mode options: [mirror, inline, transparent] + [packet_io.depolyment] + mode=inline + +### note, interface.type options: [pag,pcap,marsio] + [packet_io.internal.interface] + type=marsio + name=vxlan_user + + [packet_io.external.interface] + type=pcap + name=lo + + [packet_io.polling] +### note, polling_priority = call sapp_recv_pkt every call polling_entry times, + polling_priority=1 + +[STREAM] + [stream.tcp] + max=200000 + timeout=30 + syn_mandatory=1 + reorder_pkt_max=5 + analyse_option_enabled=1 + [stream.tcp.inject] + link_mss=1460 + + [stream.tcp.inject.rst] + number=3 + signature_enabled=1 + signature_seed1=65535 + signature_seed2=13 + + [stream.udp] + max=10000 + timeout=60 + +[PROFILING] + [profiling.pkt_latency] + enabled=0 +### note, threshold unit is microseconds (us) + threshold=1000000 + + [profiling.sanity_check] + raw_pkt_broken_enabled=0 + symbol_conflict_enabled=0 + + [profiling.log] + level=20 + interval=5 + + [profiling.log.local] + enabled=1 +### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending. + file_truncate_enabled = 1 + log_file_name = "fs2_sysinfo.log" + + [profiling.log.remote] + enabled=1 + server_ip="192.168.11.90" + server_port=8126 + + [profiling.log.remote.field_stat2] +### note, is valid when "remote_send_out_type=field_stat2" +### note, metric_type option value: [default, json] + metric_type = default + app_name=sapp + +[TOOLS] + [tools.pkt_dump] + enabled=0 +### note, mode options value:[storage, udp_socket] + mode=udp_socket + BSD_packet_filter="" + + [tools.pkt_dump.threads] +### note, if you want enable pkt dump in all thread, set dump_thread_all_enabled=1, then 'dump_thread_id' is obsoleted. +### if dump_thread_all_enabled=0, then use dump_thread_id to specify separate specified thread index. + all_threads_enabled=1 + +### note, dump_thread_id start from 0, max is CPU.worker_threads-1 + dump_thread_id=[0,1,2,3,4] + + [tools.pkt_dump.udp] + command_port=12345 + + [tools.pkt_dump.storage] +### note, file path must be double quotation mark extension, for example, path="/dev/shm/pkt_dump" + path="/dev/shm/pkt_dump" +### note, file size unit: MB + file_size_max_per_thread=10000 + +### note: +### These configurations format is complex and difficult to describe with toml grammar, +### so, create a Independent config file to description specific information. +[SPECIAL_CONFIG_LINK] + project_list_path="./etc/project_list.conf" + plugin_path="./etc/plugin.conf" + entrylist_path="./etc/entrylist.conf" + send_raw_pkt_path="./etc/send_raw_pkt.conf" + vxlan_sport_service_map_path="./etc/vxlan_sport_service_map.conf" diff --git a/docs/fs统计说明.md b/docs/fs统计说明.md index 293d2b6..091f930 100644 --- a/docs/fs统计说明.md +++ b/docs/fs统计说明.md @@ -57,10 +57,14 @@ * 当前内存中有多少个pme * id2pme_cnt * traceid2pme_htable中当前有多少个元素 +* tuple2stm_cnt + * tuple2stream_htable中有多少个元素,per thread +* bloom_cnt + * dablooms中有多少元素,per * bloom_hit * 被识别成重复包的个数 * 系统总占用内存大小 - * sapp_stm_cnt + pme_cnt + id2pme_cnt + tuple2stm_cnt + bloom_cnt + * pme_cnt + id2pme_cnt + tuple2stm_cnt + bloom_cnt * 各种统计之间关系 ```cpp