[packages/kernel.git] / imq_2.2.17.diff

--- linux-2.2.17orig/include/linux/skbuff.h	Thu May 13 19:33:17 1999
+++ linux-2.2/include/linux/skbuff.h	Mon Oct 15 21:03:31 2001
@@ -85,6 +85,9 @@ struct sk_buff {
   			pkt_type,		/* Packet class					*/
   			pkt_bridged,		/* Tracker for bridging 			*/
   			ip_summed;		/* Driver fed us an IP checksum			*/
+#ifdef CONFIG_IMQ
+	short		from_imq;		/* Pkt from IMQ */
+#endif
 	__u32		priority;		/* Packet queueing priority			*/
 	atomic_t	users;			/* User count - see datagram.c,tcp.c 		*/
 	unsigned short	protocol;		/* Packet protocol from driver. 		*/
--- linux-2.2.17orig/include/linux/netdevice.h	Tue Jan  4 19:12:25 2000
+++ linux-2.2/include/linux/netdevice.h	Mon Oct 15 21:35:35 2001
@@ -335,6 +335,9 @@ struct packet_type 
 #include <linux/notifier.h>
 
 extern struct device		loopback_dev;		/* The loopback */
+#ifdef CONFIG_IMQ
+extern struct device		imq_dev;		/* The IMQ */
+#endif
 extern struct device		*dev_base;		/* All devices */
 extern struct packet_type 	*ptype_base[16];	/* Hashed types */
 extern int			netdev_dropping;
--- linux-2.2.17orig/net/core/skbuff.c	Sun Mar  7 19:12:18 1999
+++ linux-2.2/net/core/skbuff.c	Mon Oct 15 21:06:41 2001
@@ -196,6 +196,9 @@
 
 	skb->destructor = NULL;
 	skb->pkt_type = PACKET_HOST;	/* Default type */
+#ifdef CONFIG_IMQ
+ 	skb->from_imq = 0;
+#endif
 	skb->prev = skb->next = NULL;
 	skb->list = NULL;
 	skb->sk = NULL;
@@ -312,6 +315,9 @@
 	n->is_clone=0;
 	atomic_set(&n->users, 1);
 	n->pkt_type=skb->pkt_type;
+#ifdef CONFIG_IMQ
+	n->from_imq=skb->from_imq;
+#endif
 	n->stamp=skb->stamp;
 	n->destructor = NULL;
 	n->security=skb->security;
@@ -361,6 +367,9 @@
 	n->is_clone=0;
 	atomic_set(&n->users, 1);
 	n->pkt_type=skb->pkt_type;
+#ifdef CONFIG_IMQ
+	n->from_imq=skb->from_imq;
+#endif
 	n->stamp=skb->stamp;
 	n->destructor = NULL;
 	n->security=skb->security;
--- linux-2.2.17orig/drivers/net/Config.in	Sun Sep  9 22:23:47 2001
+++ linux-2.2/drivers/net/Config.in	Mon Oct 15 21:40:48 2001
@@ -21,6 +21,7 @@ tristate 'Dummy net driver support' CONF
 tristate 'Bonding driver support' CONFIG_BONDING
 tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'IMQ (intermediate queue device) support' CONFIG_IMQ
   if [ "$CONFIG_NETLINK" = "y" ]; then
      tristate 'Ethertap network tap' CONFIG_ETHERTAP
   fi
--- linux-2.2.17orig/drivers/net/Makefile	Sun Sep  9 22:23:47 2001
+++ linux-2.2/drivers/net/Makefile	Mon Oct 15 21:41:59 2001
@@ -55,6 +55,10 @@ ifeq ($(CONFIG_NET),y)
 L_OBJS += Space.o net_init.o loopback.o
 endif
 
+ifeq ($(CONFIG_IMQ),y)
+L_OBJS += imq.o
+endif
+
 ifeq ($(CONFIG_SEEQ8005),y)
 L_OBJS += seeq8005.o
 endif
--- linux-2.2.17orig/Documentation/Configure.help	Sun Sep  9 22:23:46 2001
+++ linux-2.2/Documentation/Configure.help	Mon Oct 15 22:04:15 2001
@@ -16738,6 +16738,14 @@
   If you do not have a CompactPCI model CP1400 or CP1500, or 
   another UltraSPARC-IIi-cEngine boardset with digital display,
   you should say N to this option.
+ 
+Intermediate queue device (IMQ)
+CONFIG_IMQ
+  This is virtual network device which is mainly used as placeholder
+  for QoS qdisc. The attached qdisc is enqueued with all packets
+  before they go to their 'home' qdisc.
+  It enables qdisc to treat network devices as classes and distribute
+  bandwidth among them.
 
 CP1XXX Hardware Watchdog support
 CONFIG_WATCHDOG_CP1XXX
--- linux-2.2.17orig/drivers/net/Space.c	Sun Sep  9 22:23:47 2001
+++ linux-2.2/drivers/net/Space.c	Mon Oct 15 22:34:03 2001
@@ -979,6 +979,14 @@ static struct device tr0_dev = {
 #undef  NEXT_DEV
 #define NEXT_DEV        (&escon0_dev)                                  
 #endif  
+
+#ifdef CONFIG_IMQ
+   extern int imq_init(struct device *dev);
+   struct device imq_dev =
+	{"imq", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV, imq_init}; 
+#undef  NEXT_DEV
+#define NEXT_DEV        (&imq_dev)
+#endif  
         
 extern int loopback_init(struct device *dev);
 struct device loopback_dev = {
--- linux-2.2.17orig/drivers/net/imq.c	Tue Oct 16 12:52:09 2001
+++ linux-2.2/drivers/net/imq.c	Mon Oct 15 22:40:46 2001
@@ -0,0 +1,103 @@
+/*
+ *		Pseudo-driver for the intermediate queue interface.
+ *
+ * Authors:	Martin Devera, <devik@cdi.cz>
+ *
+ *		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.
+ */
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/socket.h>
+#include <linux/errno.h>
+#include <linux/fcntl.h>
+#include <linux/in.h>
+#include <linux/init.h>
+
+#include <asm/system.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#include <linux/inet.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+
+/*
+ * The higher levels take care of making this non-reentrant (it's
+ * called with bh's disabled).
+ */
+static int imq_xmit(struct sk_buff *skb, struct device *dev)
+{
+	struct net_device_stats *stats = (struct net_device_stats *)dev->priv;
+	struct device *sdev = skb->dev;
+
+	/*
+	 *	Optimise so buffers with skb->free=1 are not copied but
+	 *	instead are lobbed from tx queue to rx queue 
+	 */
+
+	if(atomic_read(&skb->users) != 1)
+	{
+	  	struct sk_buff *skb2=skb;
+	  	skb=skb_clone(skb, GFP_ATOMIC);		/* Clone the buffer */
+	  	if(skb==NULL) {
+			kfree_skb(skb2);
+			return 0;
+		}
+	  	kfree_skb(skb2);
+	}
+	else
+		skb_orphan(skb);
+
+	if (dev == sdev || skb->from_imq) {
+		if (net_ratelimit()) printk (KERN_ERR "imq device is looped !");
+		kfree_skb(skb);
+		return 0;
+	}
+
+	/* move the packet into correct device queue */
+	skb->dev = sdev;
+	skb->from_imq = 1;
+	if (dev_queue_xmit(skb) < 0 && net_ratelimit()) 
+		printk (KERN_ERR "Can't TX from imq device\n");
+
+	dev->last_rx = jiffies;
+	stats->rx_bytes+=skb->len;
+	stats->tx_bytes+=skb->len;
+	stats->rx_packets++;
+	stats->tx_packets++;
+
+	return(0);
+}
+
+static struct net_device_stats *get_stats(struct device *dev)
+{
+	return (struct net_device_stats *)dev->priv;
+}
+
+/* Initialize the rest of the imq device. */
+__initfunc(int imq_init(struct device *dev))
+{
+	dev->hard_start_xmit	= imq_xmit;
+
+	dev->type		= 0;
+	dev->mtu		= 1500;
+	dev->tx_queue_len	= 100;
+	dev->flags		= IFF_NOARP;
+	dev->hard_header_len	= LL_MAX_HEADER;
+	dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);
+	if (dev->priv == NULL)
+			return -ENOMEM;
+	memset(dev->priv, 0, sizeof(struct net_device_stats));
+	dev->get_stats = get_stats;
+
+	return(0);
+};
--- linux-2.2.17orig/net/core/dev.c	Sun Sep  9 22:23:50 2001
+++ linux-2.2/net/core/dev.c	Mon Oct 15 22:23:30 2001
@@ -595,6 +595,21 @@ int dev_queue_xmit(struct sk_buff *skb)
 #endif
 
 	start_bh_atomic();
+#ifdef CONFIG_IMQ
+	/* if skb have not visited enabled IMQ yet then push it there */
+	q = imq_dev.qdisc;
+	if (imq_dev.flags&IFF_UP && !skb->from_imq && q->enqueue) {
+		q->enqueue(skb, q);
+		qdisc_wakeup(&imq_dev);
+		end_bh_atomic();
+
+#ifdef CONFIG_NET_PROFILE
+	        NET_PROFILE_LEAVE(dev_queue_xmit);
+		end_bh_atomic();
+#endif
+		return 0;
+	}
+#endif
 	q = dev->qdisc;
 	if (q->enqueue) {
 		q->enqueue(skb, q);
@@ -618,8 +633,11 @@ int dev_queue_xmit(struct sk_buff *skb)
 	   made by us here.
 	 */
 	if (dev->flags&IFF_UP) {
-		if (netdev_nit) 
-			dev_queue_xmit_nit(skb,dev);
+		if (netdev_nit
+#ifdef CONFIG_IMQ
+			&& !skb->from_imq
+#endif
+			) dev_queue_xmit_nit(skb,dev);
 		if (dev->hard_start_xmit(skb, dev) == 0) {
 			end_bh_atomic();
 
--- linux-2.2.17orig/net/sched/sch_generic.c	Wed Oct 27 02:53:42 1999
+++ linux-2.2/net/sched/sch_generic.c	Mon Oct 15 21:29:27 2001
@@ -53,8 +53,11 @@ int qdisc_restart(struct device *dev)
 	struct sk_buff *skb;
 
 	if ((skb = q->dequeue(q)) != NULL) {
-		if (netdev_nit)
-			dev_queue_xmit_nit(skb, dev);
+		if (netdev_nit
+#ifdef CONFIG_IMQ
+			&& !skb->from_imq
+#endif
+			) dev_queue_xmit_nit(skb, dev);
 
 		if (dev->hard_start_xmit(skb, dev) == 0) {
 			q->tx_last = jiffies;
Commit	Line	Data
9d88dd62 KT	1	--- linux-2.2.17orig/include/linux/skbuff.h Thu May 13 19:33:17 1999
	2	+++ linux-2.2/include/linux/skbuff.h Mon Oct 15 21:03:31 2001
	3	@@ -85,6 +85,9 @@ struct sk_buff {
	4	pkt_type, /* Packet class */
	5	pkt_bridged, /* Tracker for bridging */
	6	ip_summed; /* Driver fed us an IP checksum */
	7	+#ifdef CONFIG_IMQ
	8	+ short from_imq; /* Pkt from IMQ */
	9	+#endif
	10	__u32 priority; /* Packet queueing priority */
	11	atomic_t users; /* User count - see datagram.c,tcp.c */
	12	unsigned short protocol; /* Packet protocol from driver. */
	13	--- linux-2.2.17orig/include/linux/netdevice.h Tue Jan 4 19:12:25 2000
	14	+++ linux-2.2/include/linux/netdevice.h Mon Oct 15 21:35:35 2001
	15	@@ -335,6 +335,9 @@ struct packet_type
	16	#include <linux/notifier.h>
	17
	18	extern struct device loopback_dev; /* The loopback */
	19	+#ifdef CONFIG_IMQ
	20	+extern struct device imq_dev; /* The IMQ */
	21	+#endif
	22	extern struct device dev_base; / All devices */
	23	extern struct packet_type ptype_base[16]; / Hashed types */
	24	extern int netdev_dropping;
	25	--- linux-2.2.17orig/net/core/skbuff.c Sun Mar 7 19:12:18 1999
	26	+++ linux-2.2/net/core/skbuff.c Mon Oct 15 21:06:41 2001
81ea5fb3 KT	27	@@ -196,6 +196,9 @@
81ea5fb3 KT	28
9d88dd62 KT	29	skb->destructor = NULL;
9d88dd62 KT	30	skb->pkt_type = PACKET_HOST; /* Default type */
9d88dd62	31	+#ifdef CONFIG_IMQ
81ea5fb3	32	+ skb->from_imq = 0;
9d88dd62 KT	33	+#endif
	34	skb->prev = skb->next = NULL;
	35	skb->list = NULL;
	36	skb->sk = NULL;
81ea5fb3	37	@@ -312,6 +315,9 @@
9d88dd62 KT	38	n->is_clone=0;
	39	atomic_set(&n->users, 1);
	40	n->pkt_type=skb->pkt_type;
	41	+#ifdef CONFIG_IMQ
	42	+ n->from_imq=skb->from_imq;
	43	+#endif
	44	n->stamp=skb->stamp;
	45	n->destructor = NULL;
	46	n->security=skb->security;
81ea5fb3	47	@@ -361,6 +367,9 @@
9d88dd62 KT	48	n->is_clone=0;
	49	atomic_set(&n->users, 1);
	50	n->pkt_type=skb->pkt_type;
	51	+#ifdef CONFIG_IMQ
	52	+ n->from_imq=skb->from_imq;
	53	+#endif
	54	n->stamp=skb->stamp;
	55	n->destructor = NULL;
	56	n->security=skb->security;
	57	--- linux-2.2.17orig/drivers/net/Config.in Sun Sep 9 22:23:47 2001
	58	+++ linux-2.2/drivers/net/Config.in Mon Oct 15 21:40:48 2001
	59	@@ -21,6 +21,7 @@ tristate 'Dummy net driver support' CONF
	60	tristate 'Bonding driver support' CONFIG_BONDING
	61	tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
	62	if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
	63	+ bool 'IMQ (intermediate queue device) support' CONFIG_IMQ
	64	if [ "$CONFIG_NETLINK" = "y" ]; then
	65	tristate 'Ethertap network tap' CONFIG_ETHERTAP
	66	fi
	67	--- linux-2.2.17orig/drivers/net/Makefile Sun Sep 9 22:23:47 2001
	68	+++ linux-2.2/drivers/net/Makefile Mon Oct 15 21:41:59 2001
	69	@@ -55,6 +55,10 @@ ifeq ($(CONFIG_NET),y)
	70	L_OBJS += Space.o net_init.o loopback.o
	71	endif
	72
	73	+ifeq ($(CONFIG_IMQ),y)
	74	+L_OBJS += imq.o
	75	+endif
	76	+
	77	ifeq ($(CONFIG_SEEQ8005),y)
	78	L_OBJS += seeq8005.o
	79	endif
	80	--- linux-2.2.17orig/Documentation/Configure.help Sun Sep 9 22:23:46 2001
	81	+++ linux-2.2/Documentation/Configure.help Mon Oct 15 22:04:15 2001
81ea5fb3	82	@@ -16738,6 +16738,14 @@
9d88dd62 KT	83	If you do not have a CompactPCI model CP1400 or CP1500, or
	84	another UltraSPARC-IIi-cEngine boardset with digital display,
	85	you should say N to this option.
81ea5fb3	86	+
9d88dd62 KT	87	+Intermediate queue device (IMQ)
	88	+CONFIG_IMQ
	89	+ This is virtual network device which is mainly used as placeholder
	90	+ for QoS qdisc. The attached qdisc is enqueued with all packets
	91	+ before they go to their 'home' qdisc.
	92	+ It enables qdisc to treat network devices as classes and distribute
	93	+ bandwidth among them.
81ea5fb3 KT	94
	95	CP1XXX Hardware Watchdog support
	96	CONFIG_WATCHDOG_CP1XXX
9d88dd62 KT	97	--- linux-2.2.17orig/drivers/net/Space.c Sun Sep 9 22:23:47 2001
	98	+++ linux-2.2/drivers/net/Space.c Mon Oct 15 22:34:03 2001
	99	@@ -979,6 +979,14 @@ static struct device tr0_dev = {
	100	#undef NEXT_DEV
	101	#define NEXT_DEV (&escon0_dev)
	102	#endif
	103	+
	104	+#ifdef CONFIG_IMQ
	105	+ extern int imq_init(struct device *dev);
	106	+ struct device imq_dev =
	107	+ {"imq", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV, imq_init};
	108	+#undef NEXT_DEV
	109	+#define NEXT_DEV (&imq_dev)
	110	+#endif
	111
	112	extern int loopback_init(struct device *dev);
	113	struct device loopback_dev = {
	114	--- linux-2.2.17orig/drivers/net/imq.c Tue Oct 16 12:52:09 2001
	115	+++ linux-2.2/drivers/net/imq.c Mon Oct 15 22:40:46 2001
	116	@@ -0,0 +1,103 @@
	117	+/*
	118	+ * Pseudo-driver for the intermediate queue interface.
	119	+ *
	120	+ * Authors: Martin Devera, <devik@cdi.cz>
	121	+ *
	122	+ * This program is free software; you can redistribute it and/or
	123	+ * modify it under the terms of the GNU General Public License
	124	+ * as published by the Free Software Foundation; either version
	125	+ * 2 of the License, or (at your option) any later version.
	126	+ */
	127	+#include <linux/kernel.h>
	128	+#include <linux/sched.h>
	129	+#include <linux/interrupt.h>
	130	+#include <linux/fs.h>
	131	+#include <linux/types.h>
	132	+#include <linux/string.h>
	133	+#include <linux/socket.h>
	134	+#include <linux/errno.h>
	135	+#include <linux/fcntl.h>
	136	+#include <linux/in.h>
	137	+#include <linux/init.h>
	138	+
	139	+#include <asm/system.h>
	140	+#include <asm/uaccess.h>
	141	+#include <asm/io.h>
	142	+
	143	+#include <linux/inet.h>
	144	+#include <linux/netdevice.h>
	145	+#include <linux/etherdevice.h>
	146	+#include <linux/skbuff.h>
	147	+#include <net/sock.h>
	148	+
	149	+/*
	150	+ * The higher levels take care of making this non-reentrant (it's
	151	+ * called with bh's disabled).
	152	+ */
	153	+static int imq_xmit(struct sk_buff skb, struct device dev)
	154	+{
	155	+ struct net_device_stats stats = (struct net_device_stats )dev->priv;
	156	+ struct device *sdev = skb->dev;
	157	+
	158	+ /*
	159	+ * Optimise so buffers with skb->free=1 are not copied but
	160	+ * instead are lobbed from tx queue to rx queue
161	+ */
162	+
163	+ if(atomic_read(&skb->users) != 1)
164	+ {
165	+ struct sk_buff *skb2=skb;
166	+ skb=skb_clone(skb, GFP_ATOMIC); /* Clone the buffer */
167	+ if(skb==NULL) {
168	+ kfree_skb(skb2);
169	+ return 0;
170	+ }
171	+ kfree_skb(skb2);
172	+ }
173	+ else
174	+ skb_orphan(skb);
175	+
176	+ if (dev == sdev \|\| skb->from_imq) {
177	+ if (net_ratelimit()) printk (KERN_ERR "imq device is looped !");
178	+ kfree_skb(skb);
179	+ return 0;
180	+ }
181	+
182	+ /* move the packet into correct device queue */
183	+ skb->dev = sdev;
184	+ skb->from_imq = 1;
185	+ if (dev_queue_xmit(skb) < 0 && net_ratelimit())
186	+ printk (KERN_ERR "Can't TX from imq device\n");
187	+
188	+ dev->last_rx = jiffies;
189	+ stats->rx_bytes+=skb->len;
190	+ stats->tx_bytes+=skb->len;
191	+ stats->rx_packets++;
192	+ stats->tx_packets++;
193	+
194	+ return(0);
195	+}
196	+
197	+static struct net_device_stats get_stats(struct device dev)
198	+{
199	+ return (struct net_device_stats *)dev->priv;
200	+}
201	+
202	+/* Initialize the rest of the imq device. */
203	+__initfunc(int imq_init(struct device *dev))
204	+{
205	+ dev->hard_start_xmit = imq_xmit;
206	+
207	+ dev->type = 0;
208	+ dev->mtu = 1500;
209	+ dev->tx_queue_len = 100;
210	+ dev->flags = IFF_NOARP;
211	+ dev->hard_header_len = LL_MAX_HEADER;
212	+ dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);
213	+ if (dev->priv == NULL)
214	+ return -ENOMEM;
215	+ memset(dev->priv, 0, sizeof(struct net_device_stats));
216	+ dev->get_stats = get_stats;
217	+
218	+ return(0);
219	+};
220	--- linux-2.2.17orig/net/core/dev.c Sun Sep 9 22:23:50 2001
221	+++ linux-2.2/net/core/dev.c Mon Oct 15 22:23:30 2001
222	@@ -595,6 +595,21 @@ int dev_queue_xmit(struct sk_buff *skb)
223	#endif
224
225	start_bh_atomic();
226	+#ifdef CONFIG_IMQ
227	+ /* if skb have not visited enabled IMQ yet then push it there */
228	+ q = imq_dev.qdisc;
229	+ if (imq_dev.flags&IFF_UP && !skb->from_imq && q->enqueue) {
230	+ q->enqueue(skb, q);
231	+ qdisc_wakeup(&imq_dev);
232	+ end_bh_atomic();
233	+
234	+#ifdef CONFIG_NET_PROFILE
235	+ NET_PROFILE_LEAVE(dev_queue_xmit);
236	+ end_bh_atomic();
237	+#endif
238	+ return 0;
239	+ }
240	+#endif
241	q = dev->qdisc;
242	if (q->enqueue) {
243	q->enqueue(skb, q);
244	@@ -618,8 +633,11 @@ int dev_queue_xmit(struct sk_buff *skb)
245	made by us here.
246	*/
247	if (dev->flags&IFF_UP) {
248	- if (netdev_nit)
249	- dev_queue_xmit_nit(skb,dev);
250	+ if (netdev_nit
251	+#ifdef CONFIG_IMQ
252	+ && !skb->from_imq
253	+#endif
254	+ ) dev_queue_xmit_nit(skb,dev);
255	if (dev->hard_start_xmit(skb, dev) == 0) {
256	end_bh_atomic();
257
258	--- linux-2.2.17orig/net/sched/sch_generic.c Wed Oct 27 02:53:42 1999
259	+++ linux-2.2/net/sched/sch_generic.c Mon Oct 15 21:29:27 2001
260	@@ -53,8 +53,11 @@ int qdisc_restart(struct device *dev)
261	struct sk_buff *skb;
262
263	if ((skb = q->dequeue(q)) != NULL) {
264	- if (netdev_nit)
265	- dev_queue_xmit_nit(skb, dev);
266	+ if (netdev_nit
267	+#ifdef CONFIG_IMQ
268	+ && !skb->from_imq
269	+#endif
270	+ ) dev_queue_xmit_nit(skb, dev);
271
272	if (dev->hard_start_xmit(skb, dev) == 0) {
273	q->tx_last = jiffies;