up to 2.6.32.63, use .xz patch

[packages/kernel.git] / kernel-wrr.patch

diff -urN linux-2.6.26.2.org/include/linux/pkt_sched.h linux-2.6.26.2/include/linux/pkt_sched.h
--- linux-2.6.26.2.org/include/linux/pkt_sched.h	2008-07-13 23:51:29.000000000 +0200
+++ linux-2.6.26.2/include/linux/pkt_sched.h	2008-08-19 11:20:27.000000000 +0200
@@ -23,6 +23,8 @@
 
 #define TC_PRIO_MAX			15
 
+#include <linux/if_ether.h>
+
 /* Generic queue statistics, available for all the elements.
    Particular schedulers may have also their private records.
  */
@@ -482,4 +484,96 @@
 
 #define NETEM_DIST_SCALE	8192
 
+
+/* WRR section */
+
+/*
+ * A sub weight and of a class
+ * All numbers are represented as parts of (2^64-1).
+ */
+struct tc_wrr_class_weight {
+	__u64	val;	// Current value	(0 is not valid)
+	__u64	decr;	// Value pr bytes	(2^64-1 is not valid)
+	__u64	incr;	// Value pr seconds	(2^64-1 is not valid)
+	__u64	min;	// Minimal value	(0 is not valid)
+	__u64	max;	// Minimal value	(0 is not valid)
+	time_t	tim;	// The time where the above information was correct
+};
+
+/* Packet send when modifying a class */
+struct tc_wrr_class_modf {
+	/* Not-valid values are ignored */
+	struct tc_wrr_class_weight weight1;
+	struct tc_wrr_class_weight weight2;
+};
+
+/* Packet returned when quering a class */
+struct tc_wrr_class_stats {
+	char	used;			/* If this is false the information below is invalid */
+	struct tc_wrr_class_modf class_modf;
+	unsigned char addr[ETH_ALEN];
+	char	usemac;			/* True if addr is a MAC address, else it is an IP address
+					   (this value is only for convience, it is always the same
+					    value as in the qdisc) */
+	int	heappos;		/* Current heap position or 0 if not in heap */
+	__u64	penal_ls;		/* Penalty value in heap (ls) */
+	__u64	penal_ms;		/* Penalty value in heap (ms) */
+};
+
+/* Qdisc-wide penalty information (boolean values - 2 not valid) */
+struct tc_wrr_qdisc_weight {
+	signed char	weight_mode;	/* 0=No automatic change to weight
+					   1=Decrease normally
+					   2=Also multiply with number of machines
+					   3=Instead multiply with priority divided
+					     with priority of the other.
+					   -1=no change */
+};
+
+/* Packet send when modifing a qdisc */
+struct tc_wrr_qdisc_modf {
+	/* Not-valid values are ignored */
+	struct tc_wrr_qdisc_weight weight1;
+	struct tc_wrr_qdisc_weight weight2;
+};
+
+/* Packet send when creating a qdisc */
+struct tc_wrr_qdisc_crt {
+	struct tc_wrr_qdisc_modf qdisc_modf;
+	char	srcaddr;	/* 1=lookup source, 0=lookup destination */
+	char	usemac;		/* 1=Classify on MAC addresses, 0=classify on IP */
+	char	usemasq;	/* 1=Classify based on masqgrading - only valid
+				     if usemac is zero */
+	int	bands_max;	/* Maximal number of bands (i.e.: classes) */
+	int	proxy_maxconn;	/* If differnt from 0 then we support proxy remapping
+				   of packets. And this is the number of maximal
+				   concurrent proxy connections. */
+};
+
+/* Packet returned when quering a qdisc */
+struct tc_wrr_qdisc_stats {
+	struct tc_wrr_qdisc_crt qdisc_crt;
+	int	proxy_curconn;		     
+	int	nodes_in_heap;	/* Current number of bands wanting to send something */
+	int	bands_cur;	/* Current number of bands used (i.e.: MAC/IP addresses seen) */
+	int	bands_reused;	/* Number of times this band has been reused. */
+	__u64	priosum;	/* Sum of priorities in heap where 1 is 2^32 */
+};
+
+struct tc_wrr_qdisc_modf_std {
+	char	proxy;		/* This indicates which of the tc_wrr_qdisc_modf structers this is. 0=This struct */
+	char	change_class;	/* Should we also change a class? */
+	struct tc_wrr_qdisc_modf qdisc_modf; /* Only valid if change_class is false */
+	unsigned char addr[ETH_ALEN]; /* Class to change (non-used bytes should be 0). Valid only of change_class is true */
+	struct tc_wrr_class_modf class_modf; /* The change */
+};
+
+/* Used for proxyremapping */
+struct tc_wrr_qdisc_modf_proxy {
+	char	proxy;		/* This indicates which of the tc_wrr_qdisc_modf structers this is. 1=This struct */
+	char	reset;		/* This is 1 if the proxyremap information should be reset */
+	int	changec;	/* changec is the number of elements in changes. */
+	long	changes[0];	/* This is an array of type ProxyRemapBlock */
+};
+
 #endif
diff -urN linux-2.6.26.2.org/include/linux/wrr.h linux-2.6.26.2/include/linux/wrr.h
--- linux-2.6.26.2.org/include/linux/wrr.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.26.2/include/linux/wrr.h	2008-08-19 11:20:27.000000000 +0200
@@ -0,0 +1,67 @@
+#ifndef WRR_H
+#define WRR_H
+
+/*
+ * This describes the information that is written in proxyremap.log and which
+ * are used in the communication between proxyremapserver and proxyremapclient.
+ * Everything is in network order.
+ */
+
+/* First this header is send */
+#define PROXY_WELCOME_LINE "ProxyRemap 1.02. This is a binary protocol.\r\n"
+
+/* 
+ * Then this block is send every time a connection is opened or closed.
+ * Note how it is alligned to use small space usage - arrays of this
+ * structure are saved in many places.
+ */
+typedef struct {
+	/* Server endpoint of connection */
+	unsigned saddr; 
+	unsigned short sport;
+
+	/* IP protocol for this connection (typically udp or tcp) */
+	unsigned char proto;
+
+	/* Is the connection opened or closed? */
+	unsigned char open;
+
+	/* Client the packets should be accounted to */
+	unsigned caddr;
+	unsigned char macaddr[6];	/* Might be 0. */
+
+	/* An informal two-charecter code from the proxyserver. Used for debugging. */
+	char proxyinfo[2];
+} ProxyRemapBlock;
+
+
+/*
+ * This is common code for for handling the tables containing information about 
+ * which proxyserver connections are associated with which machines..
+ */
+
+/* Returns the number of bytes that should be available in the area
+ * maintained by this module given the maximal number of concurrent 
+ * connections. */
+int proxyGetMemSize(int max_connections);
+
+/* Initializes a memory area to use. There must be as many bytes
+   available as returned by getMemSize. */
+void proxyInitMem(void *data, int max_connections);
+
+/* Queries */
+int proxyGetCurConn(void *data);	/* Returns current number of connections */
+int proxyMaxCurConn(void *data);	/* Returns maximal number of connections */
+
+/* This is called to open and close conenctions. Returns -1 if
+   a protocol error occores (i.e.: If it is discovered) */
+int proxyConsumeBlock(void *data, ProxyRemapBlock *);
+
+/* Returns the RemapBlock associated with this connection or 0: */
+ProxyRemapBlock *proxyLookup(void *data, unsigned ipaddr, unsigned short port,
+			     char proto);
+
+/* Return the maximum number of connections */
+int proxyGetMaxConn(void *data);
+
+#endif
diff -urN linux-2.6.26.2.org/MAINTAINERS linux-2.6.26.2/MAINTAINERS
--- linux-2.6.26.2.org/MAINTAINERS	2008-07-13 23:51:29.000000000 +0200
+++ linux-2.6.26.2/MAINTAINERS	2008-08-19 11:20:27.000000000 +0200
@@ -4500,6 +4500,12 @@
 W:	http://opensource.wolfsonmicro.com/node/7
 S:	Supported
 
+WRR NETWORK SCHEDULER