[iproute2/tc] tc_core: add size table From: Jussi Kivilinna Patch adds generic size table that is similiar to rate table, with difference that size table stores link layer packet size. Based on patch by Patrick McHardy http://marc.info/?l=linux-netdev&m=115201979221729&w=2 Signed-off-by: Jussi Kivilinna --- include/linux/pkt_sched.h | 21 +++++++++++++++ include/linux/rtnetlink.h | 1 + tc/Makefile | 1 + tc/tc_class.c | 1 + tc/tc_common.h | 5 ++++ tc/tc_core.c | 64 ++++++++++++++++++++++++++++++++++----------- tc/tc_core.h | 6 +++- tc/tc_qdisc.c | 32 +++++++++++++++++++++++ tc/tc_util.c | 26 ++++++++++++++++++ tc/tc_util.h | 2 + 10 files changed, 141 insertions(+), 18 deletions(-) diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index dbb7ac3..eae53bf 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -85,6 +85,27 @@ struct tc_ratespec #define TC_RTAB_SIZE 1024 +struct tc_sizespec { + unsigned char cell_log; + unsigned char size_log; + short cell_align; + int overhead; + unsigned linklayer; + unsigned mpu; + unsigned mtu; +}; + +#define TC_STAB_DATA_SIZE 1024 + +enum { + TCA_STAB_UNSPEC, + TCA_STAB_BASE, + TCA_STAB_DATA, + __TCA_STAB_MAX +}; + +#define TCA_STAB_MAX (__TCA_STAB_MAX - 1) + /* FIFO section */ struct tc_fifo_qopt diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index c1f2d50..a125692 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -482,6 +482,7 @@ enum TCA_RATE, TCA_FCNT, TCA_STATS2, + TCA_STAB, __TCA_MAX }; diff --git a/tc/Makefile b/tc/Makefile index bf2df00..a5ac841 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -45,6 +45,7 @@ TCLIB := tc_core.o TCLIB += tc_red.o TCLIB += tc_cbq.o TCLIB += tc_estimator.o +TCLIB += tc_stab.o CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB diff --git a/tc/tc_class.c b/tc/tc_class.c index 774497a..6cf19d4 100644 --- a/tc/tc_class.c +++ b/tc/tc_class.c @@ -31,6 +31,7 @@ static void usage(void) { fprintf(stderr, "Usage: tc class [ add | del | change | replace | show ] dev STRING\n"); fprintf(stderr, " [ classid CLASSID ] [ root | parent CLASSID ]\n"); + fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); fprintf(stderr, " [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"); fprintf(stderr, "\n"); fprintf(stderr, " tc class show [ dev STRING ] [ root | parent CLASSID ]\n"); diff --git a/tc/tc_common.h b/tc/tc_common.h index e01b037..4f88856 100644 --- a/tc/tc_common.h +++ b/tc/tc_common.h @@ -11,6 +11,11 @@ extern int print_action(const struct sockaddr_nl *who, struct nlmsghdr *n, void extern int print_filter(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); extern int print_qdisc(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); extern int print_class(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); +extern void print_size_table(FILE *fp, const char *prefix, struct rtattr *rta); struct tc_estimator; extern int parse_estimator(int *p_argc, char ***p_argv, struct tc_estimator *est); + +struct tc_sizespec; +extern int parse_size_table(int *p_argc, char ***p_argv, struct tc_sizespec *s); +extern int check_size_table_opts(struct tc_sizespec *s); diff --git a/tc/tc_core.c b/tc/tc_core.c index 855c115..dd7885c 100644 --- a/tc/tc_core.c +++ b/tc/tc_core.c @@ -87,6 +87,21 @@ unsigned tc_align_to_atm(unsigned size) return linksize; } +unsigned tc_adjust_size(unsigned sz, unsigned mpu, enum link_layer linklayer) +{ + if (sz < mpu) + sz = mpu; + + switch (linklayer) { + case LINKLAYER_ATM: + return tc_align_to_atm(sz); + case LINKLAYER_ETHERNET: + default: + // No size adjustments on Ethernet + return sz; + } +} + /* rtab[pkt_len>>cell_log] = pkt_xmit_time */ @@ -96,6 +111,7 @@ int tc_calc_rtable(struct tc_ratespec *r, __u32 *rtab, enum link_layer linklayer) { int i; + unsigned sz; unsigned bps = r->rate; unsigned mpu = r->mpu; @@ -109,21 +125,7 @@ int tc_calc_rtable(struct tc_ratespec *r, __u32 *rtab, } for (i=0; i<256; i++) { - unsigned sz = (i+1)<>cell_log] = pkt_xmit_size>>size_log + */ + +int tc_calc_size_table(struct tc_sizespec *s, __u16 *stab) +{ + int i; + enum link_layer linklayer = s->linklayer; + unsigned mtu = s->mtu; + unsigned sz; + + if (mtu == 0) + mtu = 2047; + + s->cell_log = 0; + while ((mtu >> s->cell_log) > 512 - 1) + s->cell_log++; + +again: + for (i = 512 - 1; i >= 0; i--) { + sz = tc_adjust_size((i + 1) << s->cell_log, s->mpu, linklayer); + if ((sz >> s->size_log) > UINT16_MAX) { + s->size_log++; + goto again; + } + stab[i] = sz >> s->size_log; + } + + s->cell_align = -1; // Due to the sz calc + return s->cell_log; +} + int tc_core_init() { FILE *fp; diff --git a/tc/tc_core.h b/tc/tc_core.h index 9f835e8..b82d2b8 100644 --- a/tc/tc_core.h +++ b/tc/tc_core.h @@ -7,8 +7,9 @@ #define TIME_UNITS_PER_SEC 1000000 enum link_layer { - LINKLAYER_ETHERNET=1, - LINKLAYER_ATM =2, + LINKLAYER_UNSPEC, + LINKLAYER_ETHERNET, + LINKLAYER_ATM, }; @@ -21,6 +22,7 @@ unsigned tc_calc_xmittime(unsigned rate, unsigned size); unsigned tc_calc_xmitsize(unsigned rate, unsigned ticks); int tc_calc_rtable(struct tc_ratespec *r, __u32 *rtab, int cell_log, unsigned mtu, enum link_layer link_layer); +int tc_calc_size_table(struct tc_sizespec *s, __u16 *stab); int tc_setup_estimator(unsigned A, unsigned time_const, struct tc_estimator *est); diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c index 1256f07..60388a4 100644 --- a/tc/tc_qdisc.c +++ b/tc/tc_qdisc.c @@ -32,12 +32,14 @@ static int usage(void) fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change | show ] dev STRING\n"); fprintf(stderr, " [ handle QHANDLE ] [ root | ingress | parent CLASSID ]\n"); fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); + fprintf(stderr, " [ stab [ help | STAB_OPTIONS] ]\n"); fprintf(stderr, " [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"); fprintf(stderr, "\n"); fprintf(stderr, " tc qdisc show [ dev STRING ] [ingress]\n"); fprintf(stderr, "Where:\n"); fprintf(stderr, "QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n"); fprintf(stderr, "OPTIONS := ... try tc qdisc add help\n"); + fprintf(stderr, "STAB_OPTIONS := ... try tc qdisc add stab help\n"); return -1; } @@ -45,6 +47,10 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv) { struct qdisc_util *q = NULL; struct tc_estimator est; + struct { + struct tc_sizespec szopts; + __u16 data[512]; + } stab; char d[16]; char k[16]; struct { @@ -54,6 +60,7 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv) } req; memset(&req, 0, sizeof(req)); + memset(&stab, 0, sizeof(stab)); memset(&est, 0, sizeof(est)); memset(&d, 0, sizeof(d)); memset(&k, 0, sizeof(k)); @@ -108,6 +115,10 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv) } else if (matches(*argv, "estimator") == 0) { if (parse_estimator(&argc, &argv, &est)) return -1; + } else if (matches(*argv, "stab") == 0) { + if (parse_size_table(&argc, &argv, &stab.szopts) < 0) + return -1; + continue; } else if (matches(*argv, "help") == 0) { usage(); } else { @@ -142,6 +153,23 @@ int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv) } } + if (check_size_table_opts(&stab.szopts)) { + struct rtattr *tail; + + if (tc_calc_size_table(&stab.szopts, stab.data) < 0) { + fprintf(stderr, "failed to calculate size table.\n"); + return -1; + } + + tail = NLMSG_TAIL(&req.n); + addattr_l(&req.n, sizeof(req), TCA_STAB, NULL, 0); + addattr_l(&req.n, sizeof(req), TCA_STAB_BASE, &stab.szopts, + sizeof(stab.szopts)); + addattr_l(&req.n, sizeof(req), TCA_STAB_DATA, stab.data, + TC_STAB_DATA_SIZE); + tail->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)tail; + } + if (d[0]) { int idx; @@ -223,6 +251,10 @@ int print_qdisc(const struct sockaddr_nl *who, fprintf(fp, "[cannot parse qdisc parameters]"); } fprintf(fp, "\n"); + if (tb[TCA_STAB]) { + print_size_table(fp, " ", tb[TCA_STAB]); + fprintf(fp, "\n"); + } if (show_stats) { struct rtattr *xstats = NULL; diff --git a/tc/tc_util.c b/tc/tc_util.c index cd9dd59..8ec8ec2 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -435,7 +435,7 @@ int action_a2n(char *arg, int *result) return 0; } -int get_linklayer(unsigned int *val, const char *arg) +int get_linklayer(unsigned *val, const char *arg) { int res; @@ -452,6 +452,30 @@ int get_linklayer(unsigned int *val, const char *arg) return 0; } +void print_linklayer(char *buf, int len, unsigned linklayer) +{ + switch (linklayer) { + case LINKLAYER_UNSPEC: + snprintf(buf, len, "%s", "unspec"); + return; + case LINKLAYER_ETHERNET: + snprintf(buf, len, "%s", "ethernet"); + return; + case LINKLAYER_ATM: + snprintf(buf, len, "%s", "atm"); + return; + default: + snprintf(buf, len, "%s", "unknown"); + return; + } +} + +char *sprint_linklayer(unsigned linklayer, char *buf) +{ + print_linklayer(buf, SPRINT_BSIZE-1, linklayer); + return buf; +} + void print_tm(FILE * f, const struct tcf_t *tm) { int hz = get_user_hz(); diff --git a/tc/tc_util.h b/tc/tc_util.h index 796da54..c4a386c 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -57,6 +57,7 @@ extern void print_size(char *buf, int len, __u32 size); extern void print_percent(char *buf, int len, __u32 percent); extern void print_qdisc_handle(char *buf, int len, __u32 h); extern void print_time(char *buf, int len, __u32 time); +extern void print_linklayer(char *buf, int len, unsigned linklayer); extern char * sprint_rate(__u32 rate, char *buf); extern char * sprint_size(__u32 size, char *buf); extern char * sprint_qdisc_handle(__u32 h, char *buf); @@ -64,6 +65,7 @@ extern char * sprint_tc_classid(__u32 h, char *buf); extern char * sprint_time(__u32 time, char *buf); extern char * sprint_ticks(__u32 ticks, char *buf); extern char * sprint_percent(__u32 percent, char *buf); +extern char * sprint_linklayer(unsigned linklayer, char *buf); extern void print_tcstats_attr(FILE *fp, struct rtattr *tb[], char *prefix, struct rtattr **xstats); extern void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtattr **xstats);