proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 23:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: q_red: Add support for qevents "mark" and "early_drop"

Browse Source 
The "early_drop" qevent matches packets that have been early-dropped. The
"mark" qevent matches packets that have been ECN-marked.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Petr Machata 2020-06-30 13:14:52 +03:00 committed by David Ahern
parent 3cf51fb3c8
commit d0e4504385
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
man/man8/tc-red.8
View File

@ -17,7 +17,11 @@ packets
rate rate
.B ] [ probability .B ] [ probability
chance chance
.B ] [ adaptive ] .B ] [ adaptive ] [ qevent early_drop block
index
.B ] [ qevent mark block
index
.B ]
.SH DESCRIPTION .SH DESCRIPTION
Random Early Detection is a classless qdisc which manages its queue size Random Early Detection is a classless qdisc which manages its queue size
@ -134,6 +138,18 @@ Goal of Adaptive RED is to make 'probability' dynamic value between 1% and 50% t
.B (max - min) / 2 .B (max - min) / 2
.fi .fi
.SH QEVENTS
See tc (8) for some general notes about qevents. The RED qdisc supports the
following qevents:
.TP
early_drop
The associated block is executed when packets are early-dropped. This includes
non-ECT packets in ECN mode.
.TP
mark
The associated block is executed when packets are marked in ECN mode.
.SH EXAMPLE .SH EXAMPLE
.P .P

30
tc/q_red.c
View File

@ -22,6 +22,7 @@
#include "utils.h" #include "utils.h"
#include "tc_util.h" #include "tc_util.h"
#include "tc_qevent.h"
#include "tc_red.h" #include "tc_red.h"
@ -30,11 +31,20 @@ static void explain(void)
fprintf(stderr, fprintf(stderr,
"Usage: ... red limit BYTES [min BYTES] [max BYTES] avpkt BYTES [burst PACKETS]\n" "Usage: ... red limit BYTES [min BYTES] [max BYTES] avpkt BYTES [burst PACKETS]\n"
" [adaptive] [probability PROBABILITY] [bandwidth KBPS]\n" " [adaptive] [probability PROBABILITY] [bandwidth KBPS]\n"
" [ecn] [harddrop] [nodrop]\n"); " [ecn] [harddrop] [nodrop]\n"
" [qevent early_drop block IDX] [qevent mark block IDX]\n");
} }
#define RED_SUPPORTED_FLAGS (TC_RED_HISTORIC_FLAGS | TC_RED_NODROP) #define RED_SUPPORTED_FLAGS (TC_RED_HISTORIC_FLAGS | TC_RED_NODROP)
static struct qevent_plain qe_early_drop = {};
static struct qevent_plain qe_mark = {};
static struct qevent_util qevents[] = {
QEVENT("early_drop", plain, &qe_early_drop, TCA_RED_EARLY_DROP_BLOCK),
QEVENT("mark", plain, &qe_mark, TCA_RED_MARK_BLOCK),
{},
};
static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv,
struct nlmsghdr *n, const char *dev) struct nlmsghdr *n, const char *dev)
{ {
@ -51,6 +61,8 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv,
__u32 max_P; __u32 max_P;
struct rtattr *tail; struct rtattr *tail;
qevents_init(qevents);
while (argc > 0) { while (argc > 0) {
if (strcmp(*argv, "limit") == 0) { if (strcmp(*argv, "limit") == 0) {
NEXT_ARG(); NEXT_ARG();
@ -109,6 +121,11 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv,
flags_bf.value |= TC_RED_ADAPTATIVE; flags_bf.value |= TC_RED_ADAPTATIVE;
} else if (strcmp(*argv, "adaptive") == 0) { } else if (strcmp(*argv, "adaptive") == 0) {
flags_bf.value |= TC_RED_ADAPTATIVE; flags_bf.value |= TC_RED_ADAPTATIVE;
} else if (matches(*argv, "qevent") == 0) {
NEXT_ARG();
if (qevent_parse(qevents, &argc, &argv))
return -1;
continue;
} else if (strcmp(*argv, "help") == 0) { } else if (strcmp(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;
@ -162,6 +179,8 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv,
max_P = probability * pow(2, 32); max_P = probability * pow(2, 32);
addattr_l(n, 1024, TCA_RED_MAX_P, &max_P, sizeof(max_P)); addattr_l(n, 1024, TCA_RED_MAX_P, &max_P, sizeof(max_P));
addattr_l(n, 1024, TCA_RED_FLAGS, &flags_bf, sizeof(flags_bf)); addattr_l(n, 1024, TCA_RED_FLAGS, &flags_bf, sizeof(flags_bf));
if (qevents_dump(qevents, n))
return -1;
addattr_nest_end(n, tail); addattr_nest_end(n, tail);
return 0; return 0;
} }
@ -203,12 +222,12 @@ static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
print_uint(PRINT_JSON, "min", NULL, qopt->qth_min); print_uint(PRINT_JSON, "min", NULL, qopt->qth_min);
print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt->qth_min, b2)); print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt->qth_min, b2));
print_uint(PRINT_JSON, "max", NULL, qopt->qth_max); print_uint(PRINT_JSON, "max", NULL, qopt->qth_max);
print_string(PRINT_FP, NULL, "max %s ", sprint_size(qopt->qth_max, b3)); print_string(PRINT_FP, NULL, "max %s", sprint_size(qopt->qth_max, b3));
tc_red_print_flags(qopt->flags); tc_red_print_flags(qopt->flags);
if (show_details) { if (show_details) {
print_uint(PRINT_ANY, "ewma", "ewma %u ", qopt->Wlog); print_uint(PRINT_ANY, "ewma", " ewma %u ", qopt->Wlog);
if (max_P) if (max_P)
print_float(PRINT_ANY, "probability", print_float(PRINT_ANY, "probability",
"probability %lg ", max_P / pow(2, 32)); "probability %lg ", max_P / pow(2, 32));
@ -217,6 +236,11 @@ static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
print_uint(PRINT_ANY, "Scell_log", "Scell_log %u", print_uint(PRINT_ANY, "Scell_log", "Scell_log %u",
qopt->Scell_log); qopt->Scell_log);
} }
qevents_init(qevents);
if (qevents_read(qevents, tb))
return -1;
qevents_print(qevents, f);
return 0; return 0;
} }