From fff3162d5d7cf2d099245d9a1d0346314efcec31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 3 May 2021 23:27:27 -0700 Subject: [PATCH] ANDROID: gki - CONFIG_NET_SCH_{CODEL,FQ_CODEL,SFQ}=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enables the codel, fq_codel and sfq qdiscs. The netem qdisc is already recommended in Android R, and appears to have been left out of the gki configs by mistake, and was just recently enabled - this enables a few more qdiscs in a similar vein. These qdiscs are very useful for testing (netem) and/or significantly better then the defaults (pfifo_fast) for multi-flow configurations/benchmarks. Test: built and booted on a gki using phone Bug: 124467469 Signed-off-by: Maciej Żenczykowski Change-Id: I34acd453cfa164efb220c658868823f77d6ae8aa (cherry picked from commit 569693970c073cab4d322bf6e02050977bf3871a) --- arch/arm64/configs/gki_defconfig | 3 +++ arch/x86/configs/gki_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9b563d378686..aa0c2fd89a17 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -219,8 +219,11 @@ CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_PRIO=y CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_SFQ=y CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y +CONFIG_NET_SCH_CODEL=y +CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_TCINDEX=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 03c0336b78fb..0e1e834af50b 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -200,8 +200,11 @@ CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_PRIO=y CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_SFQ=y CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y +CONFIG_NET_SCH_CODEL=y +CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_TCINDEX=y