lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 29 Oct 2007 00:23:04 -0700 From: Corey Hickey <bugfood-ml@...ooh.org> To: netdev@...r.kernel.org Cc: Corey Hickey <bugfood-ml@...ooh.org> Subject: [PATCH 5/8] Make qdisc changeable. Re-implement sfq_change() and enable Qdisc_opts.change so "tc qdisc change" will work. Signed-off-by: Corey Hickey <bugfood-ml@...ooh.org> --- net/sched/sch_sfq.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index c74d5ce..ca8716f 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -454,6 +454,17 @@ sfq_default_parameters(struct Qdisc *sch) q->limit = SFQ_DEPTH_DEFAULT - 1; } +static void +sfq_copy_parameters(struct sfq_sched_data *dst, struct sfq_sched_data *src) +{ + dst->quantum = src->quantum; + dst->perturbation = src->perturbation; + dst->perturb_period = src->perturb_period; + dst->hash_divisor = src->hash_divisor; + dst->limit = src->limit; + dst->depth = src->depth; +} + static int sfq_q_init(struct sfq_sched_data *q, struct rtattr *opt) { @@ -542,6 +553,60 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt) return 0; } +static int sfq_change(struct Qdisc *sch, struct rtattr *opt) +{ + struct sfq_sched_data *q = qdisc_priv(sch); + struct sfq_sched_data tmp; + struct sk_buff *skb; + unsigned int qlen; + int err; + + /* set up tmp queue */ + memset(&tmp, 0, sizeof(struct sfq_sched_data)); + sfq_copy_parameters(&tmp, q); + if ((err = sfq_q_init(&tmp, opt))) + return err; + + /* handle perturbation */ + /* This code avoids resetting the perturb_timer unless perturb_period + * is changed. Note that the rest of this function leaves + * q->perturb_timer alone, whereas all other members of q get + * overwritten from tmp. */ + if (!tmp.perturb_period) { + tmp.perturbation = 0; + del_timer(&q->perturb_timer); + } else if (tmp.perturb_period != q->perturb_period) { + mod_timer(&q->perturb_timer, jiffies + tmp.perturb_period); + } + + /* move packets from the old queue to the tmp queue */ + sch_tree_lock(sch); + qlen = sch->q.qlen; + while (sch->q.qlen >= tmp.limit - 1) + sfq_drop(sch); + qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen); + while ((skb = sfq_q_dequeue(q)) != NULL) + sfq_q_enqueue(skb, &tmp, SFQ_TAIL); + + /* clean up the old queue */ + sfq_q_destroy(q); + + /* copy elements of the tmp queue into the old queue */ + sfq_copy_parameters(q, &tmp); + q->tail = tmp.tail; + q->max_depth = tmp.max_depth; + q->ht = tmp.ht; + q->dep = tmp.dep; + q->next = tmp.next; + q->allot = tmp.allot; + q->hash = tmp.hash; + q->qs = tmp.qs; + + /* finish up */ + sch_tree_unlock(sch); + return 0; +} + static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb) { struct sfq_sched_data *q = qdisc_priv(sch); @@ -576,7 +641,7 @@ static struct Qdisc_ops sfq_qdisc_ops = { .init = sfq_init, .reset = sfq_reset, .destroy = sfq_destroy, - .change = NULL, + .change = sfq_change, .dump = sfq_dump, .owner = THIS_MODULE, }; -- 1.5.3.4 - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists