From 12cd6578084ea75243ef39a10a850206f2b139bc Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 8 Dec 2015 00:14:41 +0000 Subject: [PATCH] kernel: revert fq_codel quantum override to prevent it from causing too much cpu load with higher speed (#21326) Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47811 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.18/660-fq_codel_defaults.patch | 7 ++----- target/linux/generic/patches-4.1/660-fq_codel_defaults.patch | 7 ++----- target/linux/generic/patches-4.3/660-fq_codel_defaults.patch | 7 ++----- target/linux/generic/patches-4.4/660-fq_codel_defaults.patch | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch b/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch index f7f4659efc..8c99e62cec 100644 --- a/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch +++ b/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch @@ -1,14 +1,11 @@ --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -387,9 +387,9 @@ static int fq_codel_init(struct Qdisc *s +@@ -387,7 +387,7 @@ static int fq_codel_init(struct Qdisc *s struct fq_codel_sched_data *q = qdisc_priv(sch); int i; - sch->limit = 10*1024; + sch->limit = 1024; q->flows_cnt = 1024; -- q->quantum = psched_mtu(qdisc_dev(sch)); -+ q->quantum = 300; + q->quantum = psched_mtu(qdisc_dev(sch)); q->perturbation = prandom_u32(); - INIT_LIST_HEAD(&q->new_flows); - INIT_LIST_HEAD(&q->old_flows); diff --git a/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch index f7f4659efc..8c99e62cec 100644 --- a/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch +++ b/target/linux/generic/patches-4.1/660-fq_codel_defaults.patch @@ -1,14 +1,11 @@ --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -387,9 +387,9 @@ static int fq_codel_init(struct Qdisc *s +@@ -387,7 +387,7 @@ static int fq_codel_init(struct Qdisc *s struct fq_codel_sched_data *q = qdisc_priv(sch); int i; - sch->limit = 10*1024; + sch->limit = 1024; q->flows_cnt = 1024; -- q->quantum = psched_mtu(qdisc_dev(sch)); -+ q->quantum = 300; + q->quantum = psched_mtu(qdisc_dev(sch)); q->perturbation = prandom_u32(); - INIT_LIST_HEAD(&q->new_flows); - INIT_LIST_HEAD(&q->old_flows); diff --git a/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch index a2ff805094..cf4ff6fb18 100644 --- a/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch +++ b/target/linux/generic/patches-4.3/660-fq_codel_defaults.patch @@ -1,14 +1,11 @@ --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -412,9 +412,9 @@ static int fq_codel_init(struct Qdisc *s +@@ -412,7 +412,7 @@ static int fq_codel_init(struct Qdisc *s struct fq_codel_sched_data *q = qdisc_priv(sch); int i; - sch->limit = 10*1024; + sch->limit = 1024; q->flows_cnt = 1024; -- q->quantum = psched_mtu(qdisc_dev(sch)); -+ q->quantum = 300; + q->quantum = psched_mtu(qdisc_dev(sch)); q->perturbation = prandom_u32(); - INIT_LIST_HEAD(&q->new_flows); - INIT_LIST_HEAD(&q->old_flows); diff --git a/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch b/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch index a2ff805094..cf4ff6fb18 100644 --- a/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch +++ b/target/linux/generic/patches-4.4/660-fq_codel_defaults.patch @@ -1,14 +1,11 @@ --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -412,9 +412,9 @@ static int fq_codel_init(struct Qdisc *s +@@ -412,7 +412,7 @@ static int fq_codel_init(struct Qdisc *s struct fq_codel_sched_data *q = qdisc_priv(sch); int i; - sch->limit = 10*1024; + sch->limit = 1024; q->flows_cnt = 1024; -- q->quantum = psched_mtu(qdisc_dev(sch)); -+ q->quantum = 300; + q->quantum = psched_mtu(qdisc_dev(sch)); q->perturbation = prandom_u32(); - INIT_LIST_HEAD(&q->new_flows); - INIT_LIST_HEAD(&q->old_flows); -- 2.11.0