diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/iproute2/patches/006-iproute2-tc_esfq.patch | 295 | 
1 files changed, 295 insertions, 0 deletions
diff --git a/package/iproute2/patches/006-iproute2-tc_esfq.patch b/package/iproute2/patches/006-iproute2-tc_esfq.patch new file mode 100644 index 000000000..d0347549d --- /dev/null +++ b/package/iproute2/patches/006-iproute2-tc_esfq.patch @@ -0,0 +1,295 @@ +diff -urN --exclude=.svn iproute2-2.6.11-050330/include/linux/pkt_sched.h iproute2-2.6.11-050330/include/linux/pkt_sched.h +--- iproute2-2.6.11-050330/include/linux/pkt_sched.h	2007-05-04 22:21:48.000000000 -0400 ++++ iproute2-2.6.11-050330/include/linux/pkt_sched.h	2007-05-04 22:27:12.000000000 -0400 +@@ -174,8 +174,38 @@ +  * +  *	The only reason for this is efficiency, it is possible +  *	to change these parameters in compile time. ++ * ++ *	If you need to play with these values use esfq instead. +  */ +  ++/* ESFQ section */ ++ ++enum ++{ ++	/* traditional */ ++	TCA_SFQ_HASH_CLASSIC, ++	TCA_SFQ_HASH_DST, ++	TCA_SFQ_HASH_SRC, ++	/* conntrack */ ++	TCA_SFQ_HASH_CTORIGDST, ++	TCA_SFQ_HASH_CTORIGSRC, ++	TCA_SFQ_HASH_CTREPLDST, ++	TCA_SFQ_HASH_CTREPLSRC, ++	TCA_SFQ_HASH_CTNATCHG, ++}; ++ ++struct tc_esfq_qopt ++{ ++	unsigned	quantum;	/* Bytes per round allocated to flow */ ++	int		perturb_period;	/* Period of hash perturbation */ ++	__u32		limit;		/* Maximal packets in queue */ ++	unsigned	divisor;	/* Hash divisor  */ ++	unsigned	flows;		/* Maximal number of flows  */ ++	unsigned        hash_kind;      /* Hash function to use for flow identification */ ++}; ++ ++ ++ + /* RED section */ +  + enum +@@ -551,8 +580,37 @@ +  * +  *	The only reason for this is efficiency, it is possible +  *	to change these parameters in compile time. ++ * ++ *	If you need to play with these values use esfq instead. +  */ +  ++/* ESFQ section */ ++ ++enum ++{ ++	/* traditional */ ++	TCA_SFQ_HASH_CLASSIC, ++	TCA_SFQ_HASH_DST, ++	TCA_SFQ_HASH_SRC, ++	/* conntrack */ ++	TCA_SFQ_HASH_CTORIGDST, ++	TCA_SFQ_HASH_CTORIGSRC, ++	TCA_SFQ_HASH_CTREPLDST, ++	TCA_SFQ_HASH_CTREPLSRC, ++	TCA_SFQ_HASH_CTNATCHG, ++}; ++ ++struct tc_esfq_qopt ++{ ++	unsigned	quantum;	/* Bytes per round allocated to flow */ ++	int		perturb_period;	/* Period of hash perturbation */ ++	__u32		limit;		/* Maximal packets in queue */ ++	unsigned	divisor;	/* Hash divisor  */ ++	unsigned	flows;		/* Maximal number of flows  */ ++	unsigned        hash_kind;      /* Hash function to use for flow identification */ ++}; ++ ++ + /* RED section */ +  + enum +diff -urN --exclude=.svn iproute2-2.6.11-050330/tc/Makefile iproute2-2.6.11-050330/tc/Makefile +--- iproute2-2.6.11-050330/tc/Makefile	2007-05-04 22:21:48.000000000 -0400 ++++ iproute2-2.6.11-050330/tc/Makefile	2007-05-04 22:27:37.000000000 -0400 +@@ -6,6 +6,7 @@ + TCMODULES := + TCMODULES += q_fifo.o + TCMODULES += q_sfq.o ++TCMODULES += q_esfq.o + TCMODULES += q_red.o + TCMODULES += q_prio.o + TCMODULES += q_tbf.o +diff -urN --exclude=.svn iproute2-2.6.11-050330/tc/q_esfq.c iproute2-2.6.11-050330/tc/q_esfq.c +--- iproute2-2.6.11-050330/tc/q_esfq.c	1969-12-31 19:00:00.000000000 -0500 ++++ iproute2-2.6.11-050330/tc/q_esfq.c	2007-05-04 22:37:54.000000000 -0400 +@@ -0,0 +1,200 @@ ++/* ++ * q_esfq.c		ESFQ. ++ * ++ *		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:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> ++ * ++ * Changes:	Alexander Atanasov, <alex@ssi.bg> ++ *		Alexander Clouter, <alex@digriz.org.uk> ++ *		Corey Hickey, <bugfood-c@fatooh.org> ++ * ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <syslog.h> ++#include <fcntl.h> ++#include <math.h>  ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <string.h> ++ ++#include "utils.h" ++#include "tc_util.h" ++ ++static void explain(void) ++{ ++	fprintf(stderr, "Usage: ... esfq [ perturb SECS ] [ quantum BYTES ] [ depth FLOWS ]\n\t[ divisor HASHBITS ] [ limit PKTS ] [ hash HASHTYPE]\n"); ++	fprintf(stderr,"Where: \n"); ++	fprintf(stderr,"HASHTYPE := { classic | src | dst | ctorigdst | ctorigsrc | ctrepldst | ctreplsrc | ctnatchg }\n"); ++} ++ ++#define usage() return(-1) ++ ++static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++	int ok=0; ++	struct tc_esfq_qopt opt; ++ ++	memset(&opt, 0, sizeof(opt)); ++ ++	opt.hash_kind= TCA_SFQ_HASH_CLASSIC; ++	 ++	while (argc > 0) { ++		if (strcmp(*argv, "quantum") == 0) { ++			NEXT_ARG(); ++			if (get_size(&opt.quantum, *argv)) { ++				fprintf(stderr, "Illegal \"quantum\"\n"); ++				return -1; ++			} ++			ok++; ++		} else if (strcmp(*argv, "perturb") == 0) { ++			NEXT_ARG(); ++			if (get_integer(&opt.perturb_period, *argv, 0)) { ++				fprintf(stderr, "Illegal \"perturb\"\n"); ++				return -1; ++			} ++			ok++; ++		} else if (strcmp(*argv, "depth") == 0) { ++			NEXT_ARG(); ++			if (get_integer((int *) &opt.flows, *argv, 0)) { ++				fprintf(stderr, "Illegal \"depth\"\n"); ++				return -1; ++			} ++			ok++; ++		} else if (strcmp(*argv, "divisor") == 0) { ++			NEXT_ARG(); ++			if (get_integer((int *) &opt.divisor, *argv, 0)) { ++				fprintf(stderr, "Illegal \"divisor\"\n"); ++				return -1; ++			} ++			if(opt.divisor >= 14) { ++				fprintf(stderr, "Illegal \"divisor\": must be < 14\n"); ++				return -1; ++			} ++			opt.divisor=pow(2,opt.divisor); ++			ok++; ++		} else if (strcmp(*argv, "limit") == 0) { ++			NEXT_ARG(); ++			if (get_integer((int *) &opt.limit, *argv, 0)) { ++				fprintf(stderr, "Illegal \"limit\"\n"); ++				return -1; ++			} ++			ok++; ++		} else if (strcmp(*argv, "hash") == 0) { ++			NEXT_ARG(); ++			if(strcmp(*argv, "classic") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CLASSIC; ++			} else  ++			if(strcmp(*argv, "dst") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_DST; ++			} else ++			if(strcmp(*argv, "src") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_SRC; ++			} else ++			if(strcmp(*argv, "ctorigsrc") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CTORIGSRC; ++			} else ++			if(strcmp(*argv, "ctorigdst") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CTORIGDST; ++			} else ++			if(strcmp(*argv, "ctreplsrc") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CTREPLSRC; ++			} else ++			if(strcmp(*argv, "ctrepldst") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CTREPLDST; ++			} else ++			if(strcmp(*argv, "ctnatchg") == 0) { ++				opt.hash_kind= TCA_SFQ_HASH_CTNATCHG; ++			} else { ++				fprintf(stderr, "Illegal \"hash\"\n"); ++				explain(); ++				return -1; ++			} ++			ok++; ++		} else if (strcmp(*argv, "help") == 0) { ++			explain(); ++			return -1; ++		} else { ++			fprintf(stderr, "What is \"%s\"?\n", *argv); ++			explain(); ++			return -1; ++		} ++		argc--; argv++; ++	} ++ ++	if (ok) ++		addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)); ++	return 0; ++} ++ ++static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++	struct tc_esfq_qopt *qopt; ++	SPRINT_BUF(b1); ++ ++	if (opt == NULL) ++		return 0; ++ ++	if (RTA_PAYLOAD(opt)  < sizeof(*qopt)) ++		return -1; ++	qopt = RTA_DATA(opt); ++	fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1)); ++	if (show_details) { ++		fprintf(f, "limit %up flows %u/%u ", ++			qopt->limit, qopt->flows, qopt->divisor); ++	} ++	if (qopt->perturb_period) ++		fprintf(f, "perturb %dsec ", qopt->perturb_period); ++ ++		fprintf(f,"hash: "); ++	switch(qopt->hash_kind) ++	{ ++	case TCA_SFQ_HASH_CLASSIC: ++		fprintf(f,"classic"); ++		break; ++	case TCA_SFQ_HASH_DST: ++		fprintf(f,"dst"); ++		break; ++	case TCA_SFQ_HASH_SRC: ++		fprintf(f,"src"); ++		break; ++	case TCA_SFQ_HASH_CTORIGSRC: ++		fprintf(f,"ctorigsrc"); ++		break; ++	case TCA_SFQ_HASH_CTORIGDST: ++		fprintf(f,"ctorigdst"); ++		break; ++	case TCA_SFQ_HASH_CTREPLSRC: ++		fprintf(f,"ctreplsrc"); ++		break; ++	case TCA_SFQ_HASH_CTREPLDST: ++		fprintf(f,"ctrepldst"); ++		break; ++	case TCA_SFQ_HASH_CTNATCHG: ++		fprintf(f,"ctnatchg"); ++		break; ++	default: ++		fprintf(f,"Unknown"); ++	} ++	return 0; ++} ++ ++static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats) ++{ ++	return 0; ++} ++ ++ ++struct qdisc_util esfq_qdisc_util = { ++	.id = "esfq", ++	.parse_qopt = esfq_parse_opt, ++	.print_qopt = esfq_print_opt, ++	.print_xstats = esfq_print_xstats, ++};  | 
