matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gred: support TCA_GRED_MAX_P attribute 

TCA_GRED_MAX_P permits to express high resolution probabilities.

New output (on 3.3+ kernel) :

disc gred 9442: root refcnt 17
 DP:0 (prio 1) Average Queue 0b Measured Queue 0b
	 Packet drops: 0 (forced 0 early 0)
	 Packet totals: 20 (bytes 2584)
 limit 31460b min 3000b max 9000b ewma 5 probability 0.05 Scell_log 15

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
This commit is contained in:
Eric Dumazet 2012-01-20 16:27:50 +01:00 committed by Stephen Hemminger
parent 650252d8c3
commit 1b6f0bb5be
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tc/q_gred.c
View File

@ -21,6 +21,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
#include <math.h>
#include "utils.h" #include "utils.h"
#include "tc_util.h" #include "tc_util.h"
@ -125,6 +126,7 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
int wlog; int wlog;
__u8 sbuf[256]; __u8 sbuf[256];
struct rtattr *tail; struct rtattr *tail;
__u32 max_P;
memset(&opt, 0, sizeof(opt)); memset(&opt, 0, sizeof(opt));
@ -251,14 +253,17 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
addattr_l(n, 1024, TCA_GRED_PARMS, &opt, sizeof(opt)); addattr_l(n, 1024, TCA_GRED_PARMS, &opt, sizeof(opt));
addattr_l(n, 1024, TCA_GRED_STAB, sbuf, 256); addattr_l(n, 1024, TCA_GRED_STAB, sbuf, 256);
max_P = probability * pow(2, 32);
addattr32(n, 1024, TCA_GRED_MAX_P, max_P);
tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
return 0; return 0;
} }
static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
{ {
struct rtattr *tb[TCA_GRED_STAB+1]; struct rtattr *tb[TCA_GRED_MAX + 1];
struct tc_gred_qopt *qopt; struct tc_gred_qopt *qopt;
__u32 *max_p = NULL;
int i; int i;
SPRINT_BUF(b1); SPRINT_BUF(b1);
SPRINT_BUF(b2); SPRINT_BUF(b2);
@ -269,11 +274,15 @@ static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (opt == NULL) if (opt == NULL)
return 0; return 0;
parse_rtattr_nested(tb, TCA_GRED_STAB, opt); parse_rtattr_nested(tb, TCA_GRED_MAX, opt);
if (tb[TCA_GRED_PARMS] == NULL) if (tb[TCA_GRED_PARMS] == NULL)
return -1; return -1;
if (tb[TCA_GRED_MAX_P] &&
RTA_PAYLOAD(tb[TCA_GRED_MAX_P]) >= sizeof(__u32) * MAX_DPs)
max_p = RTA_DATA(tb[TCA_GRED_MAX_P]);
qopt = RTA_DATA(tb[TCA_GRED_PARMS]); qopt = RTA_DATA(tb[TCA_GRED_PARMS]);
if (RTA_PAYLOAD(tb[TCA_GRED_PARMS]) < sizeof(*qopt)*MAX_DPs) { if (RTA_PAYLOAD(tb[TCA_GRED_PARMS]) < sizeof(*qopt)*MAX_DPs) {
fprintf(f,"\n GRED received message smaller than expected\n"); fprintf(f,"\n GRED received message smaller than expected\n");
@ -302,8 +311,12 @@ static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
sprint_size(qopt->limit, b1), sprint_size(qopt->limit, b1),
sprint_size(qopt->qth_min, b2), sprint_size(qopt->qth_min, b2),
sprint_size(qopt->qth_max, b3)); sprint_size(qopt->qth_max, b3));
fprintf(f, "ewma %u Plog %u Scell_log %u", fprintf(f, "ewma %u ", qopt->Wlog);
qopt->Wlog, qopt->Plog, qopt->Scell_log); if (max_p)
fprintf(f, "probability %lg ", max_p[i] / pow(2, 32));
else
fprintf(f, "Plog %u ", qopt->Plog);
fprintf(f, "Scell_log %u", qopt->Scell_log);
} }
return 0; return 0;
} }