From c86f34942a0ce9f8203c0c38f9fe9604f96be706 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 19 Nov 2008 16:08:05 +0100 Subject: [PATCH] iproute: add DRR support add DRR support This patch adds support for the DRR scheduler I just sent to iproute. Signed-off-by: Patrick McHardy --- include/linux/pkt_sched.h | 16 ++++++ tc/Makefile | 1 + tc/q_drr.c | 124 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 0 deletions(-) create mode 100644 tc/q_drr.c diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 5d921fa..8495053 100644 --- iproute-2.6.28/iproute2-2.6.28/include/linux/pkt_sched.h.old +++ iproute-2.6.28/iproute2-2.6.28/include/linux/pkt_sched.h @@ -500,4 +500,20 @@ struct tc_netem_corrupt #define NETEM_DIST_SCALE 8192 +/* DRR */ + +enum +{ + TCA_DRR_UNSPEC, + TCA_DRR_QUANTUM, + __TCA_DRR_MAX +}; + +#define TCA_DRR_MAX (__TCA_DRR_MAX - 1) + +struct tc_drr_stats +{ + __u32 deficit; +}; + #endif diff --git a/tc/Makefile b/tc/Makefile index bd9b833..eb67ede 100644 --- iproute-2.6.28/iproute2-2.6.28/tc/Makefile.old +++ iproute-2.6.28/iproute2-2.6.28/tc/Makefile @@ -26,6 +26,7 @@ TCMODULES += f_tcindex.o TCMODULES += q_ingress.o TCMODULES += q_hfsc.o TCMODULES += q_htb.o +TCMODULES += q_drr.o TCMODULES += m_gact.o TCMODULES += m_mirred.o TCMODULES += m_ipt.o diff --git a/tc/q_drr.c b/tc/q_drr.c new file mode 100644 index 0000000..7d2d874 --- /dev/null +++ iproute-2.6.28/iproute2-2.6.28/tc/q_drr.c @@ -0,0 +1,124 @@ +/* + * q_drr.c DRR. + * + * 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: Patrick McHardy + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utils.h" +#include "tc_util.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... drr\n"); +} + +static void explain2(void) +{ + fprintf(stderr, "Usage: ... drr quantum SIZE\n"); +} + +#define usage() return(-1) + +static int drr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) +{ + while (argc > 0) { + if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + return 0; +} + +static int drr_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, + struct nlmsghdr *n) +{ + struct rtattr *tail; + __u32 tmp; + + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + + while (argc > 0) { + if (strcmp(*argv, "quantum") == 0) { + NEXT_ARG(); + if (get_size(&tmp, *argv)) { + fprintf(stderr, "Illegal \"quantum\"\n"); + return -1; + } + addattr_l(n, 1024, TCA_DRR_QUANTUM, &tmp, sizeof(tmp)); + } else if (strcmp(*argv, "help") == 0) { + explain2(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain2(); + return -1; + } + argc--; argv++; + } + + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *)tail; + return 0; +} + +static int drr_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) +{ + struct rtattr *tb[TCA_DRR_MAX + 1]; + SPRINT_BUF(b1); + + if (opt == NULL) + return 0; + + parse_rtattr_nested(tb, TCA_DRR_MAX, opt); + + if (tb[TCA_DRR_QUANTUM]) + fprintf(f, "quantum %s ", + sprint_size(*(__u32 *)RTA_DATA(tb[TCA_DRR_QUANTUM]), b1)); + return 0; +} + +static int drr_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats) +{ + struct tc_drr_stats *x; + SPRINT_BUF(b1); + + if (xstats == NULL) + return 0; + if (RTA_PAYLOAD(xstats) < sizeof(*x)) + return -1; + x = RTA_DATA(xstats); + + fprintf(f, " deficit %s ", sprint_size(x->deficit, b1)); + return 0; +} + +struct qdisc_util drr_qdisc_util = { + .id = "drr", + .parse_qopt = drr_parse_opt, + .print_qopt = drr_print_opt, + .print_xstats = drr_print_xstats, + .parse_copt = drr_parse_class_opt, + .print_copt = drr_print_opt, +}; -- 1.6.0.6