Skip to content

Commit 50de72f

Browse files
committed
Add NET_SCH_CAKE support
1 parent 1e04b0e commit 50de72f

1 file changed

Lines changed: 30 additions & 2 deletions

File tree

.github/actions/build-kernel/action.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,9 +1445,23 @@ runs:
14451445
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
14461446
CONFIG_TCP_CONG_ADVANCED=y
14471447
CONFIG_TCP_CONG_BBR=y
1448+
EOF
1449+
1450+
- name: Enable Important Net Schedulers (qdisc)
1451+
shell: bash
1452+
run: |
1453+
set -euo pipefail
1454+
echo "Enable Important Net Schedulers (qdisc)"
1455+
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
14481456
CONFIG_NET_SCH_FQ=y
14491457
CONFIG_NET_SCH_FQ_CODEL=y
1458+
CONFIG_NET_ACT_CONNMARK=y
1459+
CONFIG_NET_SCH_CAKE=y
1460+
CONFIG_NET_SCH_PIE=y
14501461
EOF
1462+
1463+
sed -i '/tristate "Common Applications Kept Enhanced (CAKE)"/a \\tdefault y' "$COMMON_KERNEL_FOLDER/net/sched/Kconfig"
1464+
sed -i '/tristate "Proportional Integral controller Enhanced (PIE) scheduler"/a \\tdefault y' "$COMMON_KERNEL_FOLDER/net/sched/Kconfig"
14511465
14521466
- name: Apply BBRv3
14531467
shell: bash
@@ -1456,6 +1470,7 @@ runs:
14561470
echo "::group::Apply BBRv3 patches"
14571471
cd "$COMMON_KERNEL_FOLDER"
14581472
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
1473+
CONFIG_TCP_CONG_ADVANCED=y
14591474
CONFIG_TCP_CONG_BBR3=y
14601475
EOF
14611476
PATCH_URL="https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/bbr3/0001-net-tcp-backport-BBRv3-to-$ANDROID_VER-$KERNEL_VER.patch"
@@ -1519,7 +1534,7 @@ runs:
15191534
CONFIG_IP6_NF_TARGET_MASQUERADE=y
15201535
EOF
15211536
1522-
patch -p1 -F 3 < "$KERNEL_PATCHES_FOLDER/common/IPv6_NAT_FIX.patch"
1537+
# patch -p1 -F 3 < "$KERNEL_PATCHES_FOLDER/common/IPv6_NAT_FIX.patch"
15231538
15241539
- name: Add Droidspaces support
15251540
shell: bash
@@ -1726,9 +1741,15 @@ runs:
17261741
ccache -s | head -n 20
17271742
echo "============================================"
17281743
1744+
echo "--- CAKE before gki_defconfig ---"
1745+
grep "CAKE" "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" || echo "CAKE not set"
1746+
17291747
make LD="$COMMON_KERNEL_FOLDER/ld-wrapper" HOSTLD="$COMMON_KERNEL_FOLDER/ld-wrapper" O="$OUT" gki_defconfig
17301748
1731-
LOCAL_LOCALVERSION="${CUSTOM_LOCALVERSION:--OP-WILD-BBRv3}"
1749+
echo "--- CAKE after gki_defconfig ---"
1750+
grep "CAKE" "$OUT/.config" || echo "CAKE not set"
1751+
1752+
LOCAL_LOCALVERSION="${CUSTOM_LOCALVERSION:--OP-WILD}"
17321753
if [ -n "${LOCAL_LOCALVERSION:-}" ]; then
17331754
scripts/config --file "$OUT/.config" --set-str LOCALVERSION "${LOCAL_LOCALVERSION}"
17341755
scripts/config --file "$OUT/.config" -d LOCALVERSION_AUTO || true
@@ -1764,6 +1785,9 @@ runs:
17641785
17651786
make LD="$COMMON_KERNEL_FOLDER/ld-wrapper" HOSTLD="$COMMON_KERNEL_FOLDER/ld-wrapper" O="$OUT" olddefconfig
17661787
1788+
echo "--- CAKE after olddefconfig ---"
1789+
grep "CAKE" "$OUT/.config" || echo "CAKE not set"
1790+
17671791
KCFLAGS="$KCFLAGS -Wno-error -pipe ${KCFLAGS_EXTRA}"
17681792
KCPPFLAGS="$KCPPFLAGS -DCONFIG_OPTIMIZE_INLINING"
17691793
@@ -1793,6 +1817,9 @@ runs:
17931817
echo ""
17941818
fi
17951819
1820+
echo "--- CAKE after headers_install and prepare ---"
1821+
grep "CAKE" "$OUT/.config" || echo "CAKE not set"
1822+
17961823
BUILD_START=$(date +%s)
17971824
set -o pipefail
17981825
@@ -1995,6 +2022,7 @@ runs:
19952022
cp "$IMAGE_PATH" "$AK3_FOLDER/Image"
19962023
19972024
mv "${ARTIFACTS_FOLDER}/${OP_MODEL}_${OP_OS_VERSION}.txt" "$AK3_FOLDER/"
2025+
cp "$KERNEL_PLATFORM_FOLDER/out/$OP_ANDROID_VERSION-$OP_KERNEL_VERSION/dist/.config" "$AK3_FOLDER/" || true
19982026
cd "$AK3_FOLDER"
19992027
20002028
sed -i 's/do.check_boot_version=.*/do.check_boot_version=1/' anykernel.sh

0 commit comments

Comments
 (0)