From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ey0-f171.google.com (mail-ey0-f171.google.com [209.85.215.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by huchra.bufferbloat.net (Postfix) with ESMTPS id A29A2201AF7 for ; Mon, 7 May 2012 11:15:50 -0700 (PDT) Received: by eaal11 with SMTP id l11so2099666eaa.16 for ; Mon, 07 May 2012 11:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=9AHQjUSbgd4vBV5Xwt5SN2hsKo3UvecGLUiJeB1C4i8=; b=U11JbSeA4mRIn3xLoDnb6lfHHTBi8PNqBB71FBtlp6XJOXduK871IbBiJrc7eyKFeK yDM5hQvDHAiynbdFU04UZcTp/psODPpAFn7aX6LrBv0ZwLGcikEL33PsOrX26+Q3UJq/ 948+BD3OPuclmYnYbNy5wM9kw6MVjcM4R14fcRwpdPWRKjnvYXY3pFbSmPfbtt8WuwoV Y1b2fM618aoouAsXMaX0xUs1LGysOzjU5zRoIuyMErq1ol6/SCDXoDbnYxQmLMRmntXF +ivBSQBXhWKJBnjXzhCfEt+qcNfRU4ai/fLmiCdFN/+BCAaan86k214N5jU+t3aZr9SL OFMg== Received: by 10.213.34.71 with SMTP id k7mr1185933ebd.62.1336414548702; Mon, 07 May 2012 11:15:48 -0700 (PDT) Received: from [192.168.163.193] ([74.125.121.33]) by mx.google.com with ESMTPS id z47sm89943527een.5.2012.05.07.11.15.46 (version=SSLv3 cipher=OTHER); Mon, 07 May 2012 11:15:47 -0700 (PDT) From: Eric Dumazet To: Dave Taht In-Reply-To: <1336414149.3752.2336.camel@edumazet-glaptop> References: <1336246349-20228-1-git-send-email-dave.taht@bufferbloat.net> <4FA7FBC7.2040501@hp.com> <1336410626.3752.2329.camel@edumazet-glaptop> <4FA805F9.20004@hp.com> <1336412079.3752.2333.camel@edumazet-glaptop> <1336413705.3752.2334.camel@edumazet-glaptop> <1336414149.3752.2336.camel@edumazet-glaptop> Content-Type: text/plain; charset="UTF-8" Date: Mon, 07 May 2012 20:15:45 +0200 Message-ID: <1336414545.3752.2338.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Cc: Eric Dumazet , codel@lists.bufferbloat.net, Dave Taht Subject: Re: [Codel] [PATCH 1/2] codel: Controlled Delay AQM X-BeenThere: codel@lists.bufferbloat.net X-Mailman-Version: 2.1.13 Precedence: list List-Id: CoDel AQM discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 18:15:51 -0000 On Mon, 2012-05-07 at 20:09 +0200, Eric Dumazet wrote: > On Mon, 2012-05-07 at 20:01 +0200, Eric Dumazet wrote: > > On Mon, 2012-05-07 at 10:52 -0700, Dave Taht wrote: > > > > > so perhaps ecn and noecn? And ecn be the default (after some serious testing?) > > > > This is what I coded. > > > > Oh I forgot to send iproute2 patch it seems > > > > include/linux/pkt_sched.h | 27 ++++++ > tc/Makefile | 1 > tc/q_codel.c | 160 ++++++++++++++++++++++++++++++++++++ > tc/q_sfq.c | 14 +-- > 4 files changed, 196 insertions(+), 6 deletions(-) Sorry forgot one updated file... Here is good one include/linux/pkt_sched.h | 27 +++++ tc/Makefile | 1 tc/q_codel.c | 176 ++++++++++++++++++++++++++++++++++++ tc/q_sfq.c | 14 +- 4 files changed, 212 insertions(+), 6 deletions(-) diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 410b33d..3c2a239 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -654,4 +654,31 @@ struct tc_qfq_stats { __u32 lmax; }; +/* CODEL */ + +enum { + TCA_CODEL_UNSPEC, + TCA_CODEL_TARGET, + TCA_CODEL_LIMIT, + TCA_CODEL_MINBYTES, + TCA_CODEL_INTERVAL, + TCA_CODEL_ECN, + __TCA_CODEL_MAX +}; + +#define TCA_CODEL_MAX (__TCA_CODEL_MAX - 1) + +struct tc_codel_xstats { + __u32 count; + __u32 delay; /* time elapsed since next packet was queued (in us) */ + __u32 drop_next; + __u32 drop_overlimit; + __u32 ecn_mark; + __u32 dropping; + __u32 state1; + __u32 state2; + __u32 state3; + __u32 states; +}; + #endif diff --git a/tc/Makefile b/tc/Makefile index be8cd5a..8a7cc8d 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -47,6 +47,7 @@ TCMODULES += em_cmp.o TCMODULES += em_u32.o TCMODULES += em_meta.o TCMODULES += q_mqprio.o +TCMODULES += q_codel.o TCSO := ifeq ($(TC_CONFIG_ATM),y) diff --git a/tc/q_codel.c b/tc/q_codel.c new file mode 100644 index 0000000..8547d19 --- /dev/null +++ b/tc/q_codel.c @@ -0,0 +1,176 @@ +/* + * q_codel.c Codel. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Authors: Eric Dumazet + * Dave Taht + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utils.h" +#include "tc_util.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... codel [ limit PACKETS ] [ target TIME]\n"); + fprintf(stderr, " [ interval TIME ] [ minbytes BYTES ]\n"); +} + +static int codel_parse_opt(struct qdisc_util *qu, int argc, char **argv, + struct nlmsghdr *n) +{ + unsigned limit = 0; + unsigned target = 0; + unsigned interval = 0; + unsigned minbytes = 0; + int ecn = -1; + struct rtattr *tail; + + while (argc > 0) { + if (strcmp(*argv, "limit") == 0) { + NEXT_ARG(); + if (get_unsigned(&limit, *argv, 0)) { + fprintf(stderr, "Illegal \"limit\"\n"); + return -1; + } + } else if (strcmp(*argv, "minbytes") == 0) { + NEXT_ARG(); + if (get_unsigned(&minbytes, *argv, 0)) { + fprintf(stderr, "Illegal \"minbytes\"\n"); + return -1; + } + } else if (strcmp(*argv, "target") == 0) { + NEXT_ARG(); + if (get_time(&target, *argv)) { + fprintf(stderr, "Illegal \"target\"\n"); + return -1; + } + } else if (strcmp(*argv, "interval") == 0) { + NEXT_ARG(); + if (get_time(&interval, *argv)) { + fprintf(stderr, "Illegal \"interval\"\n"); + return -1; + } + } else if (strcmp(*argv, "ecn") == 0) { + ecn = 1; + } else if (strcmp(*argv, "noecn") == 0) { + ecn = 0; + } else if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + if (limit) + addattr_l(n, 1024, TCA_CODEL_LIMIT, &limit, sizeof(limit)); + if (minbytes) + addattr_l(n, 1024, TCA_CODEL_MINBYTES, &minbytes, sizeof(minbytes)); + if (interval) + addattr_l(n, 1024, TCA_CODEL_INTERVAL, &interval, sizeof(interval)); + if (target) + addattr_l(n, 1024, TCA_CODEL_TARGET, &target, sizeof(target)); + if (ecn != -1) + addattr_l(n, 1024, TCA_CODEL_ECN, &ecn, sizeof(ecn)); + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; + return 0; +} + +static int codel_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) +{ + struct rtattr *tb[TCA_CODEL_MAX + 1]; + unsigned limit; + unsigned interval; + unsigned target; + unsigned minbytes; + unsigned ecn; + SPRINT_BUF(b1); + + if (opt == NULL) + return 0; + + parse_rtattr_nested(tb, TCA_CODEL_MAX, opt); + + if (tb[TCA_CODEL_ECN] && + RTA_PAYLOAD(tb[TCA_CODEL_ECN]) >= sizeof(__u32)) { + ecn = rta_getattr_u32(tb[TCA_CODEL_ECN]); + if (ecn) + fprintf(f, "ecn "); + } + if (tb[TCA_CODEL_LIMIT] && + RTA_PAYLOAD(tb[TCA_CODEL_LIMIT]) >= sizeof(__u32)) { + limit = rta_getattr_u32(tb[TCA_CODEL_LIMIT]); + fprintf(f, "limit %up ", limit); + } + if (tb[TCA_CODEL_MINBYTES] && + RTA_PAYLOAD(tb[TCA_CODEL_MINBYTES]) >= sizeof(__u32)) { + minbytes = rta_getattr_u32(tb[TCA_CODEL_MINBYTES]); + fprintf(f, "minbytes %u ", minbytes); + } + if (tb[TCA_CODEL_TARGET] && + RTA_PAYLOAD(tb[TCA_CODEL_TARGET]) >= sizeof(__u32)) { + target = rta_getattr_u32(tb[TCA_CODEL_TARGET]); + fprintf(f, "target %s ", sprint_time(target, b1)); + } + if (tb[TCA_CODEL_INTERVAL] && + RTA_PAYLOAD(tb[TCA_CODEL_INTERVAL]) >= sizeof(__u32)) { + interval = rta_getattr_u32(tb[TCA_CODEL_INTERVAL]); + fprintf(f, "interval %s ", sprint_time(interval, b1)); + } + + return 0; +} + +static int codel_print_xstats(struct qdisc_util *qu, FILE *f, + struct rtattr *xstats) +{ + struct tc_codel_xstats *st; + SPRINT_BUF(b1); + + if (xstats == NULL) + return 0; + + if (RTA_PAYLOAD(xstats) < sizeof(*st)) + return -1; + + st = RTA_DATA(xstats); + fprintf(f, " count %u delay %s", + st->count, sprint_time(st->delay, b1)); + if (st->dropping) + fprintf(f, " dropping"); + if (st->drop_next) + fprintf(f, " drop_next %s", sprint_time(st->drop_next, b1)); + if (st->ecn_mark) + fprintf(f, " ecn_mark %u", st->ecn_mark); + fprintf(f, "\n drop_overlimit %u", st->drop_overlimit); + fprintf(f, " states %u : %u %u %u", + st->states, st->state1, st->state2, st->state3); + return 0; + +} + +struct qdisc_util codel_qdisc_util = { + .id = "codel", + .parse_qopt = codel_parse_opt, + .print_qopt = codel_print_opt, + .print_xstats = codel_print_xstats, +}; diff --git a/tc/q_sfq.c b/tc/q_sfq.c index 96f63ff..e1a57d4 100644 --- a/tc/q_sfq.c +++ b/tc/q_sfq.c @@ -231,12 +231,14 @@ static int sfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) fprintf(f, "divisor %u ", qopt->divisor); if (qopt->perturb_period) fprintf(f, "perturb %dsec ", qopt->perturb_period); - if (qopt_ext && qopt_ext->qth_min) { - fprintf(f, "\n ewma %u ", qopt_ext->Wlog); - fprintf(f, "min %s max %s probability %g ", - sprint_size(qopt_ext->qth_min, b2), - sprint_size(qopt_ext->qth_max, b3), - qopt_ext->max_P / pow(2, 32)); + if (qopt_ext) { + if (qopt_ext->qth_min) { + fprintf(f, "\n ewma %u ", qopt_ext->Wlog); + fprintf(f, "min %s max %s probability %g ", + sprint_size(qopt_ext->qth_min, b2), + sprint_size(qopt_ext->qth_max, b3), + qopt_ext->max_P / pow(2, 32)); + } if (qopt_ext->flags & TC_RED_ECN) fprintf(f, "ecn "); if (show_stats) {