From: Thomas Graf Date: Thu, 9 Apr 2009 11:01:51 +0000 (-0400) Subject: cgroup support X-Git-Tag: v2.6.31~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff213c4bf2df55e955a7dc4cce89bdbfa6bb2289;p=thirdparty%2Fiproute2.git cgroup support Stephen, iproute2 part of the cgroup classifier that has been included upstream for a while. Please apply. --- diff --git a/tc/Makefile b/tc/Makefile index 227fc400f..d74880e1d 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -20,6 +20,7 @@ TCMODULES += f_route.o TCMODULES += f_fw.o TCMODULES += f_basic.o TCMODULES += f_flow.o +TCMODULES += f_cgroup.o TCMODULES += q_dsmark.o TCMODULES += q_gred.o TCMODULES += f_tcindex.o diff --git a/tc/f_cgroup.c b/tc/f_cgroup.c new file mode 100644 index 000000000..192e69764 --- /dev/null +++ b/tc/f_cgroup.c @@ -0,0 +1,115 @@ +/* + * f_cgroup.c Control Group Classifier + * + * This program is free software; you can distribute 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: Thomas Graf + * + */ + +#include +#include +#include "utils.h" +#include "tc_util.h" +#include "m_ematch.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... cgroup [ match EMATCH_TREE ] [ police POLICE_SPEC ]\n"); + fprintf(stderr, " [ action ACTION_SPEC ]\n"); +} + +static int cgroup_parse_opt(struct filter_util *qu, char *handle, + int argc, char **argv, struct nlmsghdr *n) +{ + struct tcmsg *t = NLMSG_DATA(n); + struct rtattr *tail; + long h = 0; + + if (handle) { + h = strtol(handle, NULL, 0); + if (h == LONG_MIN || h == LONG_MAX) { + fprintf(stderr, "Illegal handle \"%s\", must be numeric.\n", + handle); + return -1; + } + } + + t->tcm_handle = h; + + tail = (struct rtattr*)(((void*)n)+NLMSG_ALIGN(n->nlmsg_len)); + addattr_l(n, MAX_MSG, TCA_OPTIONS, NULL, 0); + + while (argc > 0) { + if (matches(*argv, "match") == 0) { + NEXT_ARG(); + if (parse_ematch(&argc, &argv, TCA_CGROUP_EMATCHES, n)) { + fprintf(stderr, "Illegal \"ematch\"\n"); + return -1; + } + continue; + } else if (matches(*argv, "action") == 0) { + NEXT_ARG(); + if (parse_action(&argc, &argv, TCA_CGROUP_ACT, n)) { + fprintf(stderr, "Illegal \"action\"\n"); + return -1; + } + continue; + + } else if (matches(*argv, "police") == 0) { + NEXT_ARG(); + if (parse_police(&argc, &argv, TCA_CGROUP_POLICE, n)) { + fprintf(stderr, "Illegal \"police\"\n"); + return -1; + } + continue; + } else if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + + tail->rta_len = (((void*)n)+n->nlmsg_len) - (void*)tail; + return 0; +} + +static int cgroup_print_opt(struct filter_util *qu, FILE *f, + struct rtattr *opt, __u32 handle) +{ + struct rtattr *tb[TCA_CGROUP_MAX+1]; + + if (opt == NULL) + return 0; + + parse_rtattr_nested(tb, TCA_CGROUP_MAX, opt); + + if (handle) + fprintf(f, "handle 0x%x ", handle); + + if (tb[TCA_CGROUP_EMATCHES]) + print_ematch(f, tb[TCA_CGROUP_EMATCHES]); + + if (tb[TCA_CGROUP_POLICE]) { + fprintf(f, "\n"); + tc_print_police(f, tb[TCA_CGROUP_POLICE]); + } + + if (tb[TCA_CGROUP_ACT]) + tc_print_action(f, tb[TCA_CGROUP_ACT]); + + return 0; +} + +struct filter_util cgroup_filter_util = { + .id = "cgroup", + .parse_fopt = cgroup_parse_opt, + .print_fopt = cgroup_print_opt, +};