kernel: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36304 3c298f89-4303-0410-b956-a3cf2f4a3e73master
Felix Fietkau
parent
494a34245d
commit
87f078aee9
|
|
@ -0,0 +1,72 @@
|
|||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -5,6 +5,7 @@
|
||||
menuconfig NET_SCHED
|
||||
bool "QoS and/or fair queueing"
|
||||
select NET_SCH_FIFO
|
||||
+ select NET_SCH_FQ_CODEL
|
||||
---help---
|
||||
When the kernel has several packets to send out over a network
|
||||
device, it has to decide which ones to send first, which ones to
|
||||
--- a/net/sched/sch_fq_codel.c
|
||||
+++ b/net/sched/sch_fq_codel.c
|
||||
@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
|
||||
.walk = fq_codel_walk,
|
||||
};
|
||||
|
||||
-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
|
||||
+struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
|
||||
.cl_ops = &fq_codel_class_ops,
|
||||
.id = "fq_codel",
|
||||
.priv_size = sizeof(struct fq_codel_sched_data),
|
||||
@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
|
||||
.dump_stats = fq_codel_dump_stats,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
+EXPORT_SYMBOL(fq_codel_qdisc_ops);
|
||||
|
||||
static int __init fq_codel_module_init(void)
|
||||
{
|
||||
--- a/include/net/sch_generic.h
|
||||
+++ b/include/net/sch_generic.h
|
||||
@@ -315,6 +315,7 @@ extern struct Qdisc noop_qdisc;
|
||||
extern struct Qdisc_ops noop_qdisc_ops;
|
||||
extern struct Qdisc_ops pfifo_fast_ops;
|
||||
extern struct Qdisc_ops mq_qdisc_ops;
|
||||
+extern struct Qdisc_ops fq_codel_qdisc_ops;
|
||||
|
||||
struct Qdisc_class_common {
|
||||
u32 classid;
|
||||
--- a/net/sched/sch_generic.c
|
||||
+++ b/net/sched/sch_generic.c
|
||||
@@ -680,7 +680,7 @@ static void attach_one_default_qdisc(str
|
||||
|
||||
if (dev->tx_queue_len) {
|
||||
qdisc = qdisc_create_dflt(dev_queue,
|
||||
- &pfifo_fast_ops, TC_H_ROOT);
|
||||
+ &fq_codel_qdisc_ops, TC_H_ROOT);
|
||||
if (!qdisc) {
|
||||
netdev_info(dev, "activation failed\n");
|
||||
return;
|
||||
--- a/net/sched/sch_mq.c
|
||||
+++ b/net/sched/sch_mq.c
|
||||
@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
|
||||
|
||||
for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
|
||||
dev_queue = netdev_get_tx_queue(dev, ntx);
|
||||
- qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
|
||||
+ qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
|
||||
TC_H_MAKE(TC_H_MAJ(sch->handle),
|
||||
TC_H_MIN(ntx + 1)));
|
||||
if (qdisc == NULL)
|
||||
--- a/net/sched/sch_mqprio.c
|
||||
+++ b/net/sched/sch_mqprio.c
|
||||
@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
|
||||
|
||||
for (i = 0; i < dev->num_tx_queues; i++) {
|
||||
dev_queue = netdev_get_tx_queue(dev, i);
|
||||
- qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
|
||||
+ qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
|
||||
TC_H_MAKE(TC_H_MAJ(sch->handle),
|
||||
TC_H_MIN(i + 1)));
|
||||
if (qdisc == NULL) {
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
--- a/net/sched/sch_generic.c
|
||||
+++ b/net/sched/sch_generic.c
|
||||
@@ -391,141 +391,6 @@ static struct Qdisc noqueue_qdisc = {
|
||||
.busylock = __SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
|
||||
};
|
||||
|
||||
-
|
||||
-static const u8 prio2band[TC_PRIO_MAX + 1] = {
|
||||
- 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
|
||||
-};
|
||||
-
|
||||
-/* 3-band FIFO queue: old style, but should be a bit faster than
|
||||
- generic prio+fifo combination.
|
||||
- */
|
||||
-
|
||||
-#define PFIFO_FAST_BANDS 3
|
||||
-
|
||||
-/*
|
||||
- * Private data for a pfifo_fast scheduler containing:
|
||||
- * - queues for the three band
|
||||
- * - bitmap indicating which of the bands contain skbs
|
||||
- */
|
||||
-struct pfifo_fast_priv {
|
||||
- u32 bitmap;
|
||||
- struct sk_buff_head q[PFIFO_FAST_BANDS];
|
||||
-};
|
||||
-
|
||||
-/*
|
||||
- * Convert a bitmap to the first band number where an skb is queued, where:
|
||||
- * bitmap=0 means there are no skbs on any band.
|
||||
- * bitmap=1 means there is an skb on band 0.
|
||||
- * bitmap=7 means there are skbs on all 3 bands, etc.
|
||||
- */
|
||||
-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
|
||||
-
|
||||
-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
|
||||
- int band)
|
||||
-{
|
||||
- return priv->q + band;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
|
||||
-{
|
||||
- if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
|
||||
- int band = prio2band[skb->priority & TC_PRIO_MAX];
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
-
|
||||
- priv->bitmap |= (1 << band);
|
||||
- qdisc->q.qlen++;
|
||||
- return __qdisc_enqueue_tail(skb, qdisc, list);
|
||||
- }
|
||||
-
|
||||
- return qdisc_drop(skb, qdisc);
|
||||
-}
|
||||
-
|
||||
-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
|
||||
-{
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- int band = bitmap2band[priv->bitmap];
|
||||
-
|
||||
- if (likely(band >= 0)) {
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
- struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
|
||||
-
|
||||
- qdisc->q.qlen--;
|
||||
- if (skb_queue_empty(list))
|
||||
- priv->bitmap &= ~(1 << band);
|
||||
-
|
||||
- return skb;
|
||||
- }
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
|
||||
-{
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- int band = bitmap2band[priv->bitmap];
|
||||
-
|
||||
- if (band >= 0) {
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
-
|
||||
- return skb_peek(list);
|
||||
- }
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
-static void pfifo_fast_reset(struct Qdisc *qdisc)
|
||||
-{
|
||||
- int prio;
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
-
|
||||
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
|
||||
- __qdisc_reset_queue(qdisc, band2list(priv, prio));
|
||||
-
|
||||
- priv->bitmap = 0;
|
||||
- qdisc->qstats.backlog = 0;
|
||||
- qdisc->q.qlen = 0;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
|
||||
-{
|
||||
- struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
|
||||
-
|
||||
- memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
|
||||
- if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
|
||||
- goto nla_put_failure;
|
||||
- return skb->len;
|
||||
-
|
||||
-nla_put_failure:
|
||||
- return -1;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
|
||||
-{
|
||||
- int prio;
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
-
|
||||
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
|
||||
- skb_queue_head_init(band2list(priv, prio));
|
||||
-
|
||||
- /* Can by-pass the queue discipline */
|
||||
- qdisc->flags |= TCQ_F_CAN_BYPASS;
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
|
||||
- .id = "pfifo_fast",
|
||||
- .priv_size = sizeof(struct pfifo_fast_priv),
|
||||
- .enqueue = pfifo_fast_enqueue,
|
||||
- .dequeue = pfifo_fast_dequeue,
|
||||
- .peek = pfifo_fast_peek,
|
||||
- .init = pfifo_fast_init,
|
||||
- .reset = pfifo_fast_reset,
|
||||
- .dump = pfifo_fast_dump,
|
||||
- .owner = THIS_MODULE,
|
||||
-};
|
||||
-EXPORT_SYMBOL(pfifo_fast_ops);
|
||||
-
|
||||
static struct lock_class_key qdisc_tx_busylock;
|
||||
|
||||
struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -5,6 +5,7 @@
|
||||
menuconfig NET_SCHED
|
||||
bool "QoS and/or fair queueing"
|
||||
select NET_SCH_FIFO
|
||||
+ select NET_SCH_FQ_CODEL
|
||||
---help---
|
||||
When the kernel has several packets to send out over a network
|
||||
device, it has to decide which ones to send first, which ones to
|
||||
--- a/net/sched/sch_fq_codel.c
|
||||
+++ b/net/sched/sch_fq_codel.c
|
||||
@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
|
||||
.walk = fq_codel_walk,
|
||||
};
|
||||
|
||||
-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
|
||||
+struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
|
||||
.cl_ops = &fq_codel_class_ops,
|
||||
.id = "fq_codel",
|
||||
.priv_size = sizeof(struct fq_codel_sched_data),
|
||||
@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
|
||||
.dump_stats = fq_codel_dump_stats,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
+EXPORT_SYMBOL(fq_codel_qdisc_ops);
|
||||
|
||||
static int __init fq_codel_module_init(void)
|
||||
{
|
||||
--- a/include/net/sch_generic.h
|
||||
+++ b/include/net/sch_generic.h
|
||||
@@ -315,6 +315,7 @@ extern struct Qdisc noop_qdisc;
|
||||
extern struct Qdisc_ops noop_qdisc_ops;
|
||||
extern struct Qdisc_ops pfifo_fast_ops;
|
||||
extern struct Qdisc_ops mq_qdisc_ops;
|
||||
+extern struct Qdisc_ops fq_codel_qdisc_ops;
|
||||
|
||||
struct Qdisc_class_common {
|
||||
u32 classid;
|
||||
--- a/net/sched/sch_generic.c
|
||||
+++ b/net/sched/sch_generic.c
|
||||
@@ -681,7 +681,7 @@ static void attach_one_default_qdisc(str
|
||||
|
||||
if (dev->tx_queue_len) {
|
||||
qdisc = qdisc_create_dflt(dev_queue,
|
||||
- &pfifo_fast_ops, TC_H_ROOT);
|
||||
+ &fq_codel_qdisc_ops, TC_H_ROOT);
|
||||
if (!qdisc) {
|
||||
netdev_info(dev, "activation failed\n");
|
||||
return;
|
||||
--- a/net/sched/sch_mq.c
|
||||
+++ b/net/sched/sch_mq.c
|
||||
@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
|
||||
|
||||
for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
|
||||
dev_queue = netdev_get_tx_queue(dev, ntx);
|
||||
- qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
|
||||
+ qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
|
||||
TC_H_MAKE(TC_H_MAJ(sch->handle),
|
||||
TC_H_MIN(ntx + 1)));
|
||||
if (qdisc == NULL)
|
||||
--- a/net/sched/sch_mqprio.c
|
||||
+++ b/net/sched/sch_mqprio.c
|
||||
@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
|
||||
|
||||
for (i = 0; i < dev->num_tx_queues; i++) {
|
||||
dev_queue = netdev_get_tx_queue(dev, i);
|
||||
- qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
|
||||
+ qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
|
||||
TC_H_MAKE(TC_H_MAJ(sch->handle),
|
||||
TC_H_MIN(i + 1)));
|
||||
if (qdisc == NULL) {
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
--- a/net/sched/sch_generic.c
|
||||
+++ b/net/sched/sch_generic.c
|
||||
@@ -392,141 +392,6 @@ static struct Qdisc noqueue_qdisc = {
|
||||
.busylock = __SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
|
||||
};
|
||||
|
||||
-
|
||||
-static const u8 prio2band[TC_PRIO_MAX + 1] = {
|
||||
- 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
|
||||
-};
|
||||
-
|
||||
-/* 3-band FIFO queue: old style, but should be a bit faster than
|
||||
- generic prio+fifo combination.
|
||||
- */
|
||||
-
|
||||
-#define PFIFO_FAST_BANDS 3
|
||||
-
|
||||
-/*
|
||||
- * Private data for a pfifo_fast scheduler containing:
|
||||
- * - queues for the three band
|
||||
- * - bitmap indicating which of the bands contain skbs
|
||||
- */
|
||||
-struct pfifo_fast_priv {
|
||||
- u32 bitmap;
|
||||
- struct sk_buff_head q[PFIFO_FAST_BANDS];
|
||||
-};
|
||||
-
|
||||
-/*
|
||||
- * Convert a bitmap to the first band number where an skb is queued, where:
|
||||
- * bitmap=0 means there are no skbs on any band.
|
||||
- * bitmap=1 means there is an skb on band 0.
|
||||
- * bitmap=7 means there are skbs on all 3 bands, etc.
|
||||
- */
|
||||
-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
|
||||
-
|
||||
-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
|
||||
- int band)
|
||||
-{
|
||||
- return priv->q + band;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
|
||||
-{
|
||||
- if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
|
||||
- int band = prio2band[skb->priority & TC_PRIO_MAX];
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
-
|
||||
- priv->bitmap |= (1 << band);
|
||||
- qdisc->q.qlen++;
|
||||
- return __qdisc_enqueue_tail(skb, qdisc, list);
|
||||
- }
|
||||
-
|
||||
- return qdisc_drop(skb, qdisc);
|
||||
-}
|
||||
-
|
||||
-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
|
||||
-{
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- int band = bitmap2band[priv->bitmap];
|
||||
-
|
||||
- if (likely(band >= 0)) {
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
- struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
|
||||
-
|
||||
- qdisc->q.qlen--;
|
||||
- if (skb_queue_empty(list))
|
||||
- priv->bitmap &= ~(1 << band);
|
||||
-
|
||||
- return skb;
|
||||
- }
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
|
||||
-{
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
- int band = bitmap2band[priv->bitmap];
|
||||
-
|
||||
- if (band >= 0) {
|
||||
- struct sk_buff_head *list = band2list(priv, band);
|
||||
-
|
||||
- return skb_peek(list);
|
||||
- }
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
-static void pfifo_fast_reset(struct Qdisc *qdisc)
|
||||
-{
|
||||
- int prio;
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
-
|
||||
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
|
||||
- __qdisc_reset_queue(qdisc, band2list(priv, prio));
|
||||
-
|
||||
- priv->bitmap = 0;
|
||||
- qdisc->qstats.backlog = 0;
|
||||
- qdisc->q.qlen = 0;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
|
||||
-{
|
||||
- struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
|
||||
-
|
||||
- memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
|
||||
- if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
|
||||
- goto nla_put_failure;
|
||||
- return skb->len;
|
||||
-
|
||||
-nla_put_failure:
|
||||
- return -1;
|
||||
-}
|
||||
-
|
||||
-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
|
||||
-{
|
||||
- int prio;
|
||||
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
|
||||
-
|
||||
- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
|
||||
- skb_queue_head_init(band2list(priv, prio));
|
||||
-
|
||||
- /* Can by-pass the queue discipline */
|
||||
- qdisc->flags |= TCQ_F_CAN_BYPASS;
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
|
||||
- .id = "pfifo_fast",
|
||||
- .priv_size = sizeof(struct pfifo_fast_priv),
|
||||
- .enqueue = pfifo_fast_enqueue,
|
||||
- .dequeue = pfifo_fast_dequeue,
|
||||
- .peek = pfifo_fast_peek,
|
||||
- .init = pfifo_fast_init,
|
||||
- .reset = pfifo_fast_reset,
|
||||
- .dump = pfifo_fast_dump,
|
||||
- .owner = THIS_MODULE,
|
||||
-};
|
||||
-EXPORT_SYMBOL(pfifo_fast_ops);
|
||||
-
|
||||
static struct lock_class_key qdisc_tx_busylock;
|
||||
|
||||
struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
|
||||
Loading…
Reference in New Issue