From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.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 E81DB2012AC for ; Sat, 5 May 2012 12:08:47 -0700 (PDT) Received: by wejx9 with SMTP id x9so4508274wej.16 for ; Sat, 05 May 2012 12:08:46 -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=2cRVkwu9h6WOvfAny+b0TEos8kiHHwp/xrZb+rmxwWk=; b=U1m0X51WkEybt0zWvHJZ3yx3ATje8595mU1K2b43tX0DgseNjB9prLIundtUJPvYGT 9nN0ekIDbIkb0d5RtkX4ZeqW+NP6EfUZ11muW38VpM+boYNdXWebO99Cq+aMhai3F/aq 1oGH30/4imJFrtqdiTr00lTRoXJfF+MZc9343DX++4y/qhCdkOEP0XRohcL2iAwR4BaA 8bqGVJ4+ScQskgQCNCr4sYCM/WYBXBu4qTzUtSWtRSxTl85q5B/1E5XeexqXt+DTKMoq EclNotfOjayunSPqlifPdh68oTngEBCN33zx6Gqo4ZMszT6euDBNDJrUyodYxOt+veAN a5ag== Received: by 10.216.132.150 with SMTP id o22mr1767181wei.109.1336244925909; Sat, 05 May 2012 12:08:45 -0700 (PDT) Received: from [172.28.130.107] ([74.125.122.49]) by mx.google.com with ESMTPS id ff2sm12273568wib.9.2012.05.05.12.08.44 (version=SSLv3 cipher=OTHER); Sat, 05 May 2012 12:08:45 -0700 (PDT) From: Eric Dumazet To: Dave Taht In-Reply-To: <1336244088.3752.528.camel@edumazet-glaptop> References: <1336217671-20384-1-git-send-email-dave.taht@bufferbloat.net> <1336218794.3752.508.camel@edumazet-glaptop> <1336229343.3752.516.camel@edumazet-glaptop> <1336237654.3752.524.camel@edumazet-glaptop> <1336244088.3752.528.camel@edumazet-glaptop> Content-Type: text/plain; charset="UTF-8" Date: Sat, 05 May 2012 21:08:42 +0200 Message-ID: <1336244922.3752.530.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Cc: codel@lists.bufferbloat.net, Dave =?ISO-8859-1?Q?T=E4ht?= Subject: Re: [Codel] [PATCH iproute2] 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: Sat, 05 May 2012 19:08:48 -0000 On Sat, 2012-05-05 at 20:54 +0200, Eric Dumazet wrote: > From: Eric Dumazet > > tc qdisc .... codel [ limit PACKETS ] [ target TIME] > [ interval TIME ] [ minbytes BYTES ] > > Signed-off-by: Eric Dumazet > --- > include/linux/pkt_sched.h | 14 +++ > tc/Makefile | 1 > tc/q_codel.c | 134 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 149 insertions(+) > > diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h > index 410b33d..62a73bf 100644 > --- a/include/linux/pkt_sched.h > +++ b/include/linux/pkt_sched.h > @@ -509,6 +509,7 @@ enum { > TCA_NETEM_CORRUPT, > TCA_NETEM_LOSS, > TCA_NETEM_RATE, > + TCA_NETEM_ECN, > __TCA_NETEM_MAX, > }; > > @@ -654,4 +655,17 @@ 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_MAX > +}; > + > +#define TCA_CODEL_MAX (__TCA_CODEL_MAX - 1) > + > #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..c711b6f > --- /dev/null > +++ b/tc/q_codel.c > @@ -0,0 +1,134 @@ > +/* > + * 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 > + */ > + > +#include > +#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) > +{ > + struct tc_red_qopt opt; > + unsigned limit = 0; > + unsigned target = 0; > + unsigned interval = 0; > + unsigned minbytes = 0; > + 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, "help") == 0) { > + explain(); > + return -1; > + } else { > + fprintf(stderr, "What is \"%s\"?\n", *argv); > + explain(); > + return -1; > + } > + argc--; argv++; > + } > + > + tail = NLMSG_TAIL(n); A line is missing here , please add : 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)); > + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; > + return 0; > +} > +