netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Corey Hickey <bugfood-ml@fatooh.org>
To: netdev@vger.kernel.org
Cc: Corey Hickey <bugfood-ml@fatooh.org>
Subject: [PATCH 6/7] Make qdisc changeable.
Date: Sun, 29 Jul 2007 17:21:15 -0700	[thread overview]
Message-ID: <11857548783311-git-send-email-bugfood-ml@fatooh.org> (raw)
In-Reply-To: <11857548771998-git-send-email-bugfood-ml@fatooh.org>

Re-implement sfq_change() and enable Qdisc_opts.change so "tc qdisc
change" will work.

Signed-off-by: Corey Hickey <bugfood-ml@fatooh.org>
---
 net/sched/sch_sfq.c |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index e6a6a21..e042cd0 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -485,6 +485,55 @@ 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;
+	int err;
+	
+	/* set up tmp queue */
+	memset(&tmp, 0, sizeof(struct sfq_sched_data));
+	tmp.quantum = psched_mtu(sch->dev); /* default */
+	if ((err = sfq_q_init(&tmp, opt)))
+		return err;
+
+	/* copy packets from the old queue to the tmp queue */
+	sch_tree_lock(sch);
+	while (sch->q.qlen >= tmp.limit - 1)
+		sfq_drop(sch);
+	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 */
+	q->perturb_period = tmp.perturb_period;
+	q->quantum        = tmp.quantum;
+	q->limit          = tmp.limit;
+	q->depth          = tmp.depth;
+	q->hash_divisor   = tmp.hash_divisor;
+	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 */
+	if (q->perturb_period) {
+		q->perturb_timer.expires = jiffies + q->perturb_period;
+		add_timer(&q->perturb_timer);
+	} else {
+		q->perturbation = 0;
+	}
+	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);
@@ -519,7 +568,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.2.4


  parent reply	other threads:[~2007-07-30  0:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-30  0:21 SFQ: backport some features from ESFQ (try 2) Corey Hickey
2007-07-30  0:21 ` [PATCH 1/7] Preparatory refactoring part 1 Corey Hickey
2007-07-30 13:51   ` Patrick McHardy
2007-07-31  1:26     ` Corey Hickey
2007-07-31 10:46       ` Patrick McHardy
2007-07-30  0:21 ` [PATCH 2/7] Preparatory refactoring part 2 Corey Hickey
2007-07-30 13:59   ` Patrick McHardy
2007-07-31  7:43     ` Corey Hickey
2007-07-30  0:21 ` [PATCH 3/7] Move two functions Corey Hickey
2007-07-30  0:21 ` [PATCH 4/7] Add "depth" Corey Hickey
2007-07-30  0:21 ` [PATCH 5/7] Add divisor Corey Hickey
2007-07-30  0:21 ` Corey Hickey [this message]
2007-07-30 14:11   ` [PATCH 6/7] Make qdisc changeable Patrick McHardy
2007-07-31  7:43     ` Corey Hickey
2007-08-06  2:47     ` Corey Hickey
2007-08-06 12:06       ` Patrick McHardy
2007-07-30  0:21 ` [PATCH 7/7] Remove comments about hardcoded values Corey Hickey
2007-07-30  0:21 ` [PATCH] [iproute2] SFQ: Support changing depth and divisor Corey Hickey
  -- strict thread matches above, loose matches on Subject: below --
2007-07-29  7:08 [PATCH 0/7] SFQ: backport some features from ESFQ Corey Hickey
2007-07-29  7:08 ` [PATCH 1/7] Preparatory refactoring part 1 Corey Hickey
2007-07-29  7:08   ` [PATCH 2/7] Preparatory refactoring part 2 Corey Hickey
2007-07-29  7:08     ` [PATCH 3/7] Move two functions Corey Hickey
2007-07-29  7:08       ` [PATCH 4/7] Add "depth" Corey Hickey
2007-07-29  7:08         ` [PATCH 5/7] Add divisor Corey Hickey
2007-07-29  7:08           ` [PATCH 6/7] Make qdisc changeable Corey Hickey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11857548783311-git-send-email-bugfood-ml@fatooh.org \
    --to=bugfood-ml@fatooh.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).