Skip to content

support PR for l3afd PR#556 #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Atul-source wants to merge 2 commits into
base: main
Choose a base branch
from
Open

support PR for l3afd PR#556 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de4116
support PR for l3afd PR#556
Atul-source Mar 24, 2025
a45e8d9
using different branch for testing will revert after it got merged
Atul-source Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dev_environment/cfg/payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions dev_environment/e2e_test/add_payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dev_environment/e2e_test/add_without_chaining_payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
25 changes: 15 additions & 10 deletions dev_environment/e2e_test/exp_output_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down
25 changes: 15 additions & 10 deletions dev_environment/e2e_test/exp_output_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down
25 changes: 15 additions & 10 deletions dev_environment/e2e_test/exp_output_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down
29 changes: 17 additions & 12 deletions dev_environment/e2e_test/exp_output_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 6 additions & 4 deletions dev_environment/e2e_test/exp_output_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
10 changes: 6 additions & 4 deletions dev_environment/e2e_test/exp_output_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
10 changes: 5 additions & 5 deletions dev_environment/e2e_test/upd_payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dev_environment/e2e_test/upd_without_chaining_payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions dev_environment/setup_linux_dev_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ apt-get install -y bc \
curl \
exuberant-ctags \
flex \
gcc-9 \
gnutls-bin \
jq \
libc6-dev \
Expand Down Expand Up @@ -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

@pmoroney pmoroney May 14, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this change be omitted?

fi
cd eBPF-Package-Repository

Expand Down