diff --git a/dev_environment/cfg/payload.json b/dev_environment/cfg/payload.json index f871302..13911e6 100644 --- a/dev_environment/cfg/payload.json +++ b/dev_environment/cfg/payload.json @@ -18,8 +18,8 @@ {"name": "rl_config_map", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "rl_drop_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "rl_recv_count_map", "key": 0, "aggregator": "max-rate"} + { "name": "rl_drop_count_map", "key": "0", "aggregator": "scalar","key_type":"int"}, + { "name": "rl_recv_count_map", "key": "0", "aggregator": "max-rate","key_type":"int"} ], "object_file": "ratelimiting.bpf.o", "entry_function_name": "_xdp_ratelimiting" @@ -39,9 +39,9 @@ {"name": "cl_max_conn", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "cl_recv_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "cl_drop_count_map", "key": 0, "aggregator": "scalar" }, - { "name": "cl_conn_count", "key": 0, "aggregator": "scalar" } + { "name": "cl_recv_count_map", "key": "0", "aggregator": "scalar", "key_type":"int"}, + { "name": "cl_drop_count_map", "key": "0", "aggregator": "scalar", "key_type":"int"}, + { "name": "cl_conn_count", "key": "0", "aggregator": "scalar", "key_type":"int"} ], "object_file": "connection_limit.bpf.o", "entry_function_name": "_xdp_limit_conn" diff --git a/dev_environment/e2e_test/add_payload.json b/dev_environment/e2e_test/add_payload.json index 83e77a7..0d60497 100644 --- a/dev_environment/e2e_test/add_payload.json +++ b/dev_environment/e2e_test/add_payload.json @@ -18,8 +18,8 @@ {"name": "rl_config_map", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "rl_drop_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "rl_recv_count_map", "key": 0, "aggregator": "max-rate"} + { "name": "rl_drop_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "rl_recv_count_map", "key": "0", "aggregator": "max-rate", "key_type": "int"} ], "object_file": "ratelimiting.bpf.o", "entry_function_name": "_xdp_ratelimiting" @@ -39,9 +39,9 @@ {"name": "cl_max_conn", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "cl_recv_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "cl_drop_count_map", "key": 0, "aggregator": "scalar" }, - { "name": "cl_conn_count", "key": 0, "aggregator": "scalar" } + { "name": "cl_recv_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "cl_drop_count_map", "key": "0", "aggregator": "scalar" , "key_type": "int"}, + { "name": "cl_conn_count", "key": "0", "aggregator": "scalar", "key_type": "int" } ], "object_file": "connection_limit.bpf.o", "entry_function_name": "_xdp_limit_conn" diff --git a/dev_environment/e2e_test/add_without_chaining_payload.json b/dev_environment/e2e_test/add_without_chaining_payload.json index c9af9fb..6613a7d 100644 --- a/dev_environment/e2e_test/add_without_chaining_payload.json +++ b/dev_environment/e2e_test/add_without_chaining_payload.json @@ -18,8 +18,8 @@ {"name": "rl_config_map", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "rl_drop_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "rl_recv_count_map", "key": 0, "aggregator": "max-rate"} + { "name": "rl_drop_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "rl_recv_count_map", "key": "0", "aggregator": "max-rate", "key_type": "int"} ], "object_file": "ratelimiting.bpf.o", "entry_function_name": "_xdp_ratelimiting" diff --git a/dev_environment/e2e_test/exp_output_1.json b/dev_environment/e2e_test/exp_output_1.json index 9db9c66..df6ebb0 100644 --- a/dev_environment/e2e_test/exp_output_1.json +++ b/dev_environment/e2e_test/exp_output_1.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", @@ -124,18 +126,21 @@ "monitor_maps": [ { "name": "cl_recv_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_conn_count", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" } ], "ebpf_package_repo_url": "", diff --git a/dev_environment/e2e_test/exp_output_2.json b/dev_environment/e2e_test/exp_output_2.json index 86491fd..59b60b2 100644 --- a/dev_environment/e2e_test/exp_output_2.json +++ b/dev_environment/e2e_test/exp_output_2.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", @@ -124,18 +126,21 @@ "monitor_maps": [ { "name": "cl_recv_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_conn_count", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" } ], "ebpf_package_repo_url": "", diff --git a/dev_environment/e2e_test/exp_output_3.json b/dev_environment/e2e_test/exp_output_3.json index c6a0814..75227da 100644 --- a/dev_environment/e2e_test/exp_output_3.json +++ b/dev_environment/e2e_test/exp_output_3.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", @@ -124,18 +126,21 @@ "monitor_maps": [ { "name": "cl_recv_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_conn_count", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" } ], "ebpf_package_repo_url": "", diff --git a/dev_environment/e2e_test/exp_output_4.json b/dev_environment/e2e_test/exp_output_4.json index a56d27a..cc502c9 100644 --- a/dev_environment/e2e_test/exp_output_4.json +++ b/dev_environment/e2e_test/exp_output_4.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", @@ -124,18 +126,21 @@ "monitor_maps": [ { "name": "cl_recv_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "cl_conn_count", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" } ], "ebpf_package_repo_url": "", @@ -182,7 +187,7 @@ "update_args": null, "map_args": null, "config_args": null, - "monitor_maps": null, + "monitor_maps": [], "ebpf_package_repo_url": "", "object_file": "mirroring_ingress.bpf.o", "entry_function_name": "_ingress_redirect" @@ -227,7 +232,7 @@ "update_args": null, "map_args": null, "config_args": null, - "monitor_maps": null, + "monitor_maps": [], "ebpf_package_repo_url": "", "object_file": "mirroring_egress.bpf.o", "entry_function_name": "_egress_redirect" diff --git a/dev_environment/e2e_test/exp_output_5.json b/dev_environment/e2e_test/exp_output_5.json index 712e405..cb468f1 100644 --- a/dev_environment/e2e_test/exp_output_5.json +++ b/dev_environment/e2e_test/exp_output_5.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", diff --git a/dev_environment/e2e_test/exp_output_6.json b/dev_environment/e2e_test/exp_output_6.json index f99c313..ce18e5f 100644 --- a/dev_environment/e2e_test/exp_output_6.json +++ b/dev_environment/e2e_test/exp_output_6.json @@ -57,13 +57,15 @@ "monitor_maps": [ { "name": "rl_drop_count_map", - "key": 0, - "aggregator": "scalar" + "key": "0", + "aggregator": "scalar", + "key_type": "int" }, { "name": "rl_recv_count_map", - "key": 0, - "aggregator": "max-rate" + "key": "0", + "aggregator": "max-rate", + "key_type": "int" } ], "ebpf_package_repo_url": "", diff --git a/dev_environment/e2e_test/upd_payload.json b/dev_environment/e2e_test/upd_payload.json index 575a3bd..fdd3217 100644 --- a/dev_environment/e2e_test/upd_payload.json +++ b/dev_environment/e2e_test/upd_payload.json @@ -18,8 +18,8 @@ {"name": "rl_config_map", "args": [{"key": 0, "value": 2}]} ], "monitor_maps": [ - { "name": "rl_drop_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "rl_recv_count_map", "key": 0, "aggregator": "max-rate"} + { "name": "rl_drop_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "rl_recv_count_map", "key": "0", "aggregator": "max-rate", "key_type": "int"} ], "object_file": "ratelimiting.bpf.o", "entry_function_name": "_xdp_ratelimiting" @@ -39,9 +39,9 @@ {"name": "cl_max_conn", "args": [{"key": 0, "value": 5}]} ], "monitor_maps": [ - { "name": "cl_recv_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "cl_drop_count_map", "key": 0, "aggregator": "scalar" }, - { "name": "cl_conn_count", "key": 0, "aggregator": "scalar" } + { "name": "cl_recv_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "cl_drop_count_map", "key": "0", "aggregator": "scalar" , "key_type": "int"}, + { "name": "cl_conn_count", "key": "0", "aggregator": "scalar", "key_type": "int" } ], "object_file": "connection_limit.bpf.o", "entry_function_name": "_xdp_limit_conn" diff --git a/dev_environment/e2e_test/upd_without_chaining_payload.json b/dev_environment/e2e_test/upd_without_chaining_payload.json index 731a662..666486c 100644 --- a/dev_environment/e2e_test/upd_without_chaining_payload.json +++ b/dev_environment/e2e_test/upd_without_chaining_payload.json @@ -18,8 +18,8 @@ {"name": "rl_config_map", "args": [{"key": 0, "value": 5}]} ], "monitor_maps": [ - { "name": "rl_drop_count_map", "key": 0, "aggregator": "scalar"}, - { "name": "rl_recv_count_map", "key": 0, "aggregator": "max-rate"} + { "name": "rl_drop_count_map", "key": "0", "aggregator": "scalar", "key_type": "int"}, + { "name": "rl_recv_count_map", "key": "0", "aggregator": "max-rate", "key_type": "int"} ], "object_file": "ratelimiting.bpf.o", "entry_function_name": "_xdp_ratelimiting" diff --git a/dev_environment/setup_linux_dev_env.sh b/dev_environment/setup_linux_dev_env.sh index fb4623b..d5802f5 100755 --- a/dev_environment/setup_linux_dev_env.sh +++ b/dev_environment/setup_linux_dev_env.sh @@ -103,7 +103,6 @@ apt-get install -y bc \ curl \ exuberant-ctags \ flex \ - gcc-9 \ gnutls-bin \ jq \ libc6-dev \ @@ -308,7 +307,7 @@ cd $BUILD_DIR # Get the eBPF-Package-Repository repo containing the eBPF programs if [ ! -d "$BUILD_DIR/eBPF-Package-Repository" ]; then - git clone https://github.com/l3af-project/eBPF-Package-Repository.git + git clone -b usr-prog-fix-orc https://github.com/Atul-source/eBPF-Package-Repository.git fi cd eBPF-Package-Repository