From c59ab2f9daae4af295d1615e4ed80003d4136ccb Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Fri, 12 May 2023 08:56:10 -0700 Subject: [PATCH 1/3] Add kernel configs necessary for enabling traffic control's (tc) NETEM Signed-off-by: Dom Del Nano --- tools/docker/kernel_builder/kernel.config | 54 ++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/tools/docker/kernel_builder/kernel.config b/tools/docker/kernel_builder/kernel.config index cb6ce1cbe04..b666637e6a3 100644 --- a/tools/docker/kernel_builder/kernel.config +++ b/tools/docker/kernel_builder/kernel.config @@ -1221,7 +1221,59 @@ CONFIG_LLC=y # CONFIG_PHONET is not set # CONFIG_6LOWPAN is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_CBS is not set +# CONFIG_NET_SCH_ETF is not set +# CONFIG_NET_SCH_TAPRIO is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_SKBPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +# CONFIG_NET_SCH_FQ_CODEL is not set +# CONFIG_NET_SCH_CAKE is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +# CONFIG_NET_SCH_PLUG is not set +# CONFIG_NET_SCH_ETS is not set +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_CLS_BPF is not set +# CONFIG_NET_CLS_FLOWER is not set +# CONFIG_NET_CLS_MATCHALL is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set # CONFIG_DNS_RESOLVER is not set # CONFIG_BATMAN_ADV is not set From 8518482ad5ce0dcbc656aadc632fca41dcf4f0bb Mon Sep 17 00:00:00 2001 From: Vihang Mehta Date: Tue, 16 May 2023 23:16:01 +0000 Subject: [PATCH 2/3] Build and push new kernels #ci:bpf-build-all-kernels Signed-off-by: Vihang Mehta --- bazel/pl_qemu_kernels.bzl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bazel/pl_qemu_kernels.bzl b/bazel/pl_qemu_kernels.bzl index 1ff592397bf..6276611304d 100644 --- a/bazel/pl_qemu_kernels.bzl +++ b/bazel/pl_qemu_kernels.bzl @@ -16,14 +16,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") -kernel_build_date = 20230406145001 +kernel_build_date = 20230516231333 kernel_catalog = { - "4.14.254": "47e9159d229694f8a78a0fceb8acf4438d345c6a62fb6c99337893d6b76f18a4", - "4.19.254": "78d7d59d30d3eed06abb10754985e1b4abb54b652b62f79e6f81b6648efd134a", - "5.10.173": "7043331f05cbd1023a84ad366eb662556963557b3da93ea651ab3a38410dfb5e", - "5.15.101": "4e68bef1ac3ee5f696683b6ffceb5f8042427942851f54dda4eeaa26696267cf", - "5.4.235": "65a568ed5d4d1c5ad9502794402a8ca0a821315bd643cd0e8aa064c94df6ebe9", - "6.1.18": "b2f4a134d7c4a84a129b7b977f54740dceeb48233b8beeefcd86be04a531dcde", + "4.14.254": "17e9ec8e081f98f38d23e5deb4ed0d29cc9785e19e842289d2f8ecd4f0263605", + "4.19.254": "2246f6f7a7949b721e228b94affd93fdb3a6e4262a589f870df232624daf6123", + "5.4.235": "29ec911b99a55deebdc1538903b350c93dc33fe2e4d3a92dbd4020f6992d8aba", + "5.10.173": "d9033d193d44a3abcd1e14ab7757052e1ba104753e9a45f371356aac222f7381", + "5.15.101": "50d6150186856211ec0a3fc752568daf89f569c0c7b911c53cba402dd330041a", + "6.1.18": "29f85b949a57b4b7f3c88c4c5459420b61247a71c05a7c1aa9a8d038fdc7a80b", } def kernel_version_to_name(version): From 6e38aa8041ad8582553f6e781998abe8eff3bfa9 Mon Sep 17 00:00:00 2001 From: Vihang Mehta Date: Tue, 16 May 2023 23:17:24 +0000 Subject: [PATCH 3/3] Fix lint Signed-off-by: Vihang Mehta --- bazel/pl_qemu_kernels.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/pl_qemu_kernels.bzl b/bazel/pl_qemu_kernels.bzl index 6276611304d..01e88e45c0b 100644 --- a/bazel/pl_qemu_kernels.bzl +++ b/bazel/pl_qemu_kernels.bzl @@ -20,9 +20,9 @@ kernel_build_date = 20230516231333 kernel_catalog = { "4.14.254": "17e9ec8e081f98f38d23e5deb4ed0d29cc9785e19e842289d2f8ecd4f0263605", "4.19.254": "2246f6f7a7949b721e228b94affd93fdb3a6e4262a589f870df232624daf6123", - "5.4.235": "29ec911b99a55deebdc1538903b350c93dc33fe2e4d3a92dbd4020f6992d8aba", "5.10.173": "d9033d193d44a3abcd1e14ab7757052e1ba104753e9a45f371356aac222f7381", "5.15.101": "50d6150186856211ec0a3fc752568daf89f569c0c7b911c53cba402dd330041a", + "5.4.235": "29ec911b99a55deebdc1538903b350c93dc33fe2e4d3a92dbd4020f6992d8aba", "6.1.18": "29f85b949a57b4b7f3c88c4c5459420b61247a71c05a7c1aa9a8d038fdc7a80b", }