| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | /* drivers/net/ifb.c:
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	The purpose of this driver is to provide a device that allows | 
					
						
							|  |  |  | 	for sharing of resources: | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	1) qdiscs/policies that are per device as opposed to system wide. | 
					
						
							|  |  |  | 	ifb allows for a device which can be redirected to thus providing | 
					
						
							|  |  |  | 	an impression of sharing. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	2) Allows for queueing incoming traffic for shaping instead of | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | 	dropping. | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	The original concept is based on what is known as the IMQ | 
					
						
							|  |  |  | 	driver initially written by Martin Devera, later rewritten | 
					
						
							|  |  |  | 	by Patrick McHardy and then maintained by Andre Correa. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	You need the tc action  mirror or redirect to feed this device | 
					
						
							|  |  |  |        	packets. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	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. | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  |   	Authors:	Jamal Hadi Salim (2005) | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include <linux/module.h>
 | 
					
						
							|  |  |  | #include <linux/kernel.h>
 | 
					
						
							|  |  |  | #include <linux/netdevice.h>
 | 
					
						
							|  |  |  | #include <linux/etherdevice.h>
 | 
					
						
							|  |  |  | #include <linux/init.h>
 | 
					
						
							| 
									
										
										
										
											2011-06-06 10:43:46 +00:00
										 |  |  | #include <linux/interrupt.h>
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | #include <linux/moduleparam.h>
 | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | #include <net/pkt_sched.h>
 | 
					
						
							| 
									
										
										
										
											2007-09-17 11:56:21 -07:00
										 |  |  | #include <net/net_namespace.h>
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define TX_Q_LIMIT    32
 | 
					
						
							|  |  |  | struct ifb_private { | 
					
						
							|  |  |  | 	struct tasklet_struct   ifb_tasklet; | 
					
						
							|  |  |  | 	int     tasklet_pending; | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	struct u64_stats_sync	rsync; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	struct sk_buff_head     rq; | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 	u64 rx_packets; | 
					
						
							|  |  |  | 	u64 rx_bytes; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	struct u64_stats_sync	tsync; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	struct sk_buff_head     tq; | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 	u64 tx_packets; | 
					
						
							|  |  |  | 	u64 tx_bytes; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-02-23 16:23:51 -08:00
										 |  |  | static int numifbs = 2; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | static void ri_tasklet(unsigned long dev); | 
					
						
							| 
									
										
										
										
											2009-08-31 19:50:51 +00:00
										 |  |  | static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | static int ifb_open(struct net_device *dev); | 
					
						
							|  |  |  | static int ifb_close(struct net_device *dev); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | static void ri_tasklet(unsigned long dev) | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | { | 
					
						
							|  |  |  | 	struct net_device *_dev = (struct net_device *)dev; | 
					
						
							|  |  |  | 	struct ifb_private *dp = netdev_priv(_dev); | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 	struct netdev_queue *txq; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	struct sk_buff *skb; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 	txq = netdev_get_tx_queue(_dev, 0); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	if ((skb = skb_peek(&dp->tq)) == NULL) { | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 		if (__netif_tx_trylock(txq)) { | 
					
						
							| 
									
										
										
										
											2010-12-04 15:01:52 +00:00
										 |  |  | 			skb_queue_splice_tail_init(&dp->rq, &dp->tq); | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 			__netif_tx_unlock(txq); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 		} else { | 
					
						
							|  |  |  | 			/* reschedule */ | 
					
						
							|  |  |  | 			goto resched; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-12-15 23:52:55 +00:00
										 |  |  | 	while ((skb = __skb_dequeue(&dp->tq)) != NULL) { | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 		u32 from = G_TC_FROM(skb->tc_verd); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		skb->tc_verd = 0; | 
					
						
							|  |  |  | 		skb->tc_verd = SET_TC_NCLS(skb->tc_verd); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 		u64_stats_update_begin(&dp->tsync); | 
					
						
							|  |  |  | 		dp->tx_packets++; | 
					
						
							|  |  |  | 		dp->tx_bytes += skb->len; | 
					
						
							|  |  |  | 		u64_stats_update_end(&dp->tsync); | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-11-01 19:45:16 +00:00
										 |  |  | 		rcu_read_lock(); | 
					
						
							| 
									
										
										
										
											2013-01-13 07:46:34 +00:00
										 |  |  | 		skb->dev = dev_get_by_index_rcu(dev_net(_dev), skb->skb_iif); | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 		if (!skb->dev) { | 
					
						
							| 
									
										
										
										
											2009-11-01 19:45:16 +00:00
										 |  |  | 			rcu_read_unlock(); | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 			dev_kfree_skb(skb); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 			_dev->stats.tx_dropped++; | 
					
						
							| 
									
										
										
										
											2010-12-04 14:09:08 +00:00
										 |  |  | 			if (skb_queue_len(&dp->tq) != 0) | 
					
						
							|  |  |  | 				goto resched; | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 			break; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2009-11-01 19:45:16 +00:00
										 |  |  | 		rcu_read_unlock(); | 
					
						
							| 
									
										
										
										
											2009-11-20 15:35:04 -08:00
										 |  |  | 		skb->skb_iif = _dev->ifindex; | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 		if (from & AT_EGRESS) { | 
					
						
							|  |  |  | 			dev_queue_xmit(skb); | 
					
						
							|  |  |  | 		} else if (from & AT_INGRESS) { | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 			skb_pull(skb, skb->dev->hard_header_len); | 
					
						
							| 
									
										
										
										
											2010-12-14 22:39:58 +00:00
										 |  |  | 			netif_receive_skb(skb); | 
					
						
							| 
									
										
										
										
											2007-03-29 11:46:52 -07:00
										 |  |  | 		} else | 
					
						
							|  |  |  | 			BUG(); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 	if (__netif_tx_trylock(txq)) { | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 		if ((skb = skb_peek(&dp->rq)) == NULL) { | 
					
						
							|  |  |  | 			dp->tasklet_pending = 0; | 
					
						
							|  |  |  | 			if (netif_queue_stopped(_dev)) | 
					
						
							|  |  |  | 				netif_wake_queue(_dev); | 
					
						
							|  |  |  | 		} else { | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 			__netif_tx_unlock(txq); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 			goto resched; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2008-07-31 16:58:50 -07:00
										 |  |  | 		__netif_tx_unlock(txq); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	} else { | 
					
						
							|  |  |  | resched: | 
					
						
							|  |  |  | 		dp->tasklet_pending = 1; | 
					
						
							|  |  |  | 		tasklet_schedule(&dp->ifb_tasklet); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | static struct rtnl_link_stats64 *ifb_stats64(struct net_device *dev, | 
					
						
							|  |  |  | 					     struct rtnl_link_stats64 *stats) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct ifb_private *dp = netdev_priv(dev); | 
					
						
							|  |  |  | 	unsigned int start; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	do { | 
					
						
							| 
									
										
										
										
											2014-03-13 21:26:42 -07:00
										 |  |  | 		start = u64_stats_fetch_begin_irq(&dp->rsync); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 		stats->rx_packets = dp->rx_packets; | 
					
						
							|  |  |  | 		stats->rx_bytes = dp->rx_bytes; | 
					
						
							| 
									
										
										
										
											2014-03-13 21:26:42 -07:00
										 |  |  | 	} while (u64_stats_fetch_retry_irq(&dp->rsync, start)); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	do { | 
					
						
							| 
									
										
										
										
											2014-03-13 21:26:42 -07:00
										 |  |  | 		start = u64_stats_fetch_begin_irq(&dp->tsync); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 		stats->tx_packets = dp->tx_packets; | 
					
						
							|  |  |  | 		stats->tx_bytes = dp->tx_bytes; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-03-13 21:26:42 -07:00
										 |  |  | 	} while (u64_stats_fetch_retry_irq(&dp->tsync, start)); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	stats->rx_dropped = dev->stats.rx_dropped; | 
					
						
							|  |  |  | 	stats->tx_dropped = dev->stats.tx_dropped; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return stats; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-11-19 21:47:07 -08:00
										 |  |  | static const struct net_device_ops ifb_netdev_ops = { | 
					
						
							|  |  |  | 	.ndo_open	= ifb_open, | 
					
						
							|  |  |  | 	.ndo_stop	= ifb_close, | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 	.ndo_get_stats64 = ifb_stats64, | 
					
						
							| 
									
										
										
										
											2008-11-20 20:14:53 -08:00
										 |  |  | 	.ndo_start_xmit	= ifb_xmit, | 
					
						
							|  |  |  | 	.ndo_validate_addr = eth_validate_addr, | 
					
						
							| 
									
										
										
										
											2008-11-19 21:47:07 -08:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-11-15 15:29:55 +00:00
										 |  |  | #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST	| \
 | 
					
						
							| 
									
										
											  
											
												ifb: add performance flags
Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
> From: Jarek Poplawski <jarkao2@gmail.com>
> Date: Mon, 3 Jan 2011 20:37:03 +0100
>
> > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
> >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit :
> >>
> >> > Ingress is before vlans handler so these features and the
> >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
> >> > dev_hard_start_xmit() checks.
> >>
> >> OK, here is v2 of the patch then, thanks everybody.
> >>
> >>
> >> [PATCH v2 net-next-2.6] ifb: add performance flags
> >>
> >> IFB can use the full set of features flags (NETIF_F_SG |
> >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
> >> avoid unnecessary split of some packets (GRO for example)
> >>
> >> Changli suggested to also set vlan_features,
> >
> > He also suggested more GSO flags of which especially NETIF_F_TSO6
> > seems interesting (wrt GRO)?
>
> I think at least TSO6 would very much be appropriate here.
Yes, why not, I am only wondering why loopback / dummy (and others ?)
only set NETIF_F_TSO :)
Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
For other flags, I really doubt it can matter on ifb ?
[PATCH v3 net-next-2.6] ifb: add performance flags
IFB can use the full set of features flags (NETIF_F_SG |
NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
avoid unnecessary split of some packets (GRO for example)
Changli suggested to also set vlan_features, NETIF_F_TSO6,
NETIF_F_TSO_ECN.
Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Changli Gao <xiaosuo@gmail.com>
Cc: Jarek Poplawski <jarkao2@gmail.com>
Cc: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2011-01-03 10:35:22 +00:00
										 |  |  | 		      NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6	| \ | 
					
						
							| 
									
										
										
										
											2013-04-19 02:04:32 +00:00
										 |  |  | 		      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX		| \ | 
					
						
							|  |  |  | 		      NETIF_F_HW_VLAN_STAG_TX) | 
					
						
							| 
									
										
											  
											
												ifb: add performance flags
Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
> From: Jarek Poplawski <jarkao2@gmail.com>
> Date: Mon, 3 Jan 2011 20:37:03 +0100
>
> > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
> >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit :
> >>
> >> > Ingress is before vlans handler so these features and the
> >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
> >> > dev_hard_start_xmit() checks.
> >>
> >> OK, here is v2 of the patch then, thanks everybody.
> >>
> >>
> >> [PATCH v2 net-next-2.6] ifb: add performance flags
> >>
> >> IFB can use the full set of features flags (NETIF_F_SG |
> >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
> >> avoid unnecessary split of some packets (GRO for example)
> >>
> >> Changli suggested to also set vlan_features,
> >
> > He also suggested more GSO flags of which especially NETIF_F_TSO6
> > seems interesting (wrt GRO)?
>
> I think at least TSO6 would very much be appropriate here.
Yes, why not, I am only wondering why loopback / dummy (and others ?)
only set NETIF_F_TSO :)
Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
For other flags, I really doubt it can matter on ifb ?
[PATCH v3 net-next-2.6] ifb: add performance flags
IFB can use the full set of features flags (NETIF_F_SG |
NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
avoid unnecessary split of some packets (GRO for example)
Changli suggested to also set vlan_features, NETIF_F_TSO6,
NETIF_F_TSO_ECN.
Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Changli Gao <xiaosuo@gmail.com>
Cc: Jarek Poplawski <jarkao2@gmail.com>
Cc: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2011-01-03 10:35:22 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | static void ifb_setup(struct net_device *dev) | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | { | 
					
						
							|  |  |  | 	/* Initialize the device structure. */ | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 	dev->destructor = free_netdev; | 
					
						
							| 
									
										
										
										
											2008-11-19 21:47:07 -08:00
										 |  |  | 	dev->netdev_ops = &ifb_netdev_ops; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* Fill in device structure with ethernet-generic values. */ | 
					
						
							|  |  |  | 	ether_setup(dev); | 
					
						
							|  |  |  | 	dev->tx_queue_len = TX_Q_LIMIT; | 
					
						
							| 
									
										
										
										
											2008-11-19 21:47:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												ifb: add performance flags
Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
> From: Jarek Poplawski <jarkao2@gmail.com>
> Date: Mon, 3 Jan 2011 20:37:03 +0100
>
> > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
> >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit :
> >>
> >> > Ingress is before vlans handler so these features and the
> >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
> >> > dev_hard_start_xmit() checks.
> >>
> >> OK, here is v2 of the patch then, thanks everybody.
> >>
> >>
> >> [PATCH v2 net-next-2.6] ifb: add performance flags
> >>
> >> IFB can use the full set of features flags (NETIF_F_SG |
> >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
> >> avoid unnecessary split of some packets (GRO for example)
> >>
> >> Changli suggested to also set vlan_features,
> >
> > He also suggested more GSO flags of which especially NETIF_F_TSO6
> > seems interesting (wrt GRO)?
>
> I think at least TSO6 would very much be appropriate here.
Yes, why not, I am only wondering why loopback / dummy (and others ?)
only set NETIF_F_TSO :)
Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
For other flags, I really doubt it can matter on ifb ?
[PATCH v3 net-next-2.6] ifb: add performance flags
IFB can use the full set of features flags (NETIF_F_SG |
NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
avoid unnecessary split of some packets (GRO for example)
Changli suggested to also set vlan_features, NETIF_F_TSO6,
NETIF_F_TSO_ECN.
Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Changli Gao <xiaosuo@gmail.com>
Cc: Jarek Poplawski <jarkao2@gmail.com>
Cc: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2011-01-03 10:35:22 +00:00
										 |  |  | 	dev->features |= IFB_FEATURES; | 
					
						
							| 
									
										
										
										
											2014-03-27 22:14:47 -04:00
										 |  |  | 	dev->vlan_features |= IFB_FEATURES & ~(NETIF_F_HW_VLAN_CTAG_TX | | 
					
						
							|  |  |  | 					       NETIF_F_HW_VLAN_STAG_TX); | 
					
						
							| 
									
										
											  
											
												ifb: add performance flags
Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
> From: Jarek Poplawski <jarkao2@gmail.com>
> Date: Mon, 3 Jan 2011 20:37:03 +0100
>
> > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
> >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit :
> >>
> >> > Ingress is before vlans handler so these features and the
> >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
> >> > dev_hard_start_xmit() checks.
> >>
> >> OK, here is v2 of the patch then, thanks everybody.
> >>
> >>
> >> [PATCH v2 net-next-2.6] ifb: add performance flags
> >>
> >> IFB can use the full set of features flags (NETIF_F_SG |
> >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
> >> avoid unnecessary split of some packets (GRO for example)
> >>
> >> Changli suggested to also set vlan_features,
> >
> > He also suggested more GSO flags of which especially NETIF_F_TSO6
> > seems interesting (wrt GRO)?
>
> I think at least TSO6 would very much be appropriate here.
Yes, why not, I am only wondering why loopback / dummy (and others ?)
only set NETIF_F_TSO :)
Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
For other flags, I really doubt it can matter on ifb ?
[PATCH v3 net-next-2.6] ifb: add performance flags
IFB can use the full set of features flags (NETIF_F_SG |
NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
avoid unnecessary split of some packets (GRO for example)
Changli suggested to also set vlan_features, NETIF_F_TSO6,
NETIF_F_TSO_ECN.
Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Changli Gao <xiaosuo@gmail.com>
Cc: Jarek Poplawski <jarkao2@gmail.com>
Cc: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2011-01-03 10:35:22 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	dev->flags |= IFF_NOARP; | 
					
						
							|  |  |  | 	dev->flags &= ~IFF_MULTICAST; | 
					
						
							| 
									
										
										
										
											2014-10-05 18:38:35 -07:00
										 |  |  | 	dev->priv_flags &= ~IFF_TX_SKB_SHARING; | 
					
						
							|  |  |  | 	netif_keep_dst(dev); | 
					
						
							| 
									
										
										
										
											2012-02-15 06:45:39 +00:00
										 |  |  | 	eth_hw_addr_random(dev); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-08-31 19:50:51 +00:00
										 |  |  | static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev) | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | { | 
					
						
							|  |  |  | 	struct ifb_private *dp = netdev_priv(dev); | 
					
						
							|  |  |  | 	u32 from = G_TC_FROM(skb->tc_verd); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 	u64_stats_update_begin(&dp->rsync); | 
					
						
							|  |  |  | 	dp->rx_packets++; | 
					
						
							|  |  |  | 	dp->rx_bytes += skb->len; | 
					
						
							|  |  |  | 	u64_stats_update_end(&dp->rsync); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-11-20 15:35:04 -08:00
										 |  |  | 	if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->skb_iif) { | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 		dev_kfree_skb(skb); | 
					
						
							| 
									
										
										
										
											2011-06-20 11:42:30 +00:00
										 |  |  | 		dev->stats.rx_dropped++; | 
					
						
							| 
									
										
										
										
											2009-08-31 19:50:51 +00:00
										 |  |  | 		return NETDEV_TX_OK; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (skb_queue_len(&dp->rq) >= dev->tx_queue_len) { | 
					
						
							|  |  |  | 		netif_stop_queue(dev); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-12-04 15:01:52 +00:00
										 |  |  | 	__skb_queue_tail(&dp->rq, skb); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	if (!dp->tasklet_pending) { | 
					
						
							|  |  |  | 		dp->tasklet_pending = 1; | 
					
						
							|  |  |  | 		tasklet_schedule(&dp->ifb_tasklet); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-08-31 19:50:51 +00:00
										 |  |  | 	return NETDEV_TX_OK; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int ifb_close(struct net_device *dev) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct ifb_private *dp = netdev_priv(dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	tasklet_kill(&dp->ifb_tasklet); | 
					
						
							|  |  |  | 	netif_stop_queue(dev); | 
					
						
							| 
									
										
										
										
											2010-12-04 15:01:52 +00:00
										 |  |  | 	__skb_queue_purge(&dp->rq); | 
					
						
							|  |  |  | 	__skb_queue_purge(&dp->tq); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int ifb_open(struct net_device *dev) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct ifb_private *dp = netdev_priv(dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	tasklet_init(&dp->ifb_tasklet, ri_tasklet, (unsigned long)dev); | 
					
						
							| 
									
										
										
										
											2010-12-04 15:01:52 +00:00
										 |  |  | 	__skb_queue_head_init(&dp->rq); | 
					
						
							|  |  |  | 	__skb_queue_head_init(&dp->tq); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	netif_start_queue(dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-07-11 19:42:31 -07:00
										 |  |  | static int ifb_validate(struct nlattr *tb[], struct nlattr *data[]) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	if (tb[IFLA_ADDRESS]) { | 
					
						
							|  |  |  | 		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) | 
					
						
							|  |  |  | 			return -EINVAL; | 
					
						
							|  |  |  | 		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) | 
					
						
							|  |  |  | 			return -EADDRNOTAVAIL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | static struct rtnl_link_ops ifb_link_ops __read_mostly = { | 
					
						
							|  |  |  | 	.kind		= "ifb", | 
					
						
							|  |  |  | 	.priv_size	= sizeof(struct ifb_private), | 
					
						
							|  |  |  | 	.setup		= ifb_setup, | 
					
						
							| 
									
										
										
										
											2007-07-11 19:42:31 -07:00
										 |  |  | 	.validate	= ifb_validate, | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-07-11 19:42:13 -07:00
										 |  |  | /* Number of ifb devices to be set up by this module. */ | 
					
						
							|  |  |  | module_param(numifbs, int, 0); | 
					
						
							|  |  |  | MODULE_PARM_DESC(numifbs, "Number of ifb devices"); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | static int __init ifb_init_one(int index) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct net_device *dev_ifb; | 
					
						
							| 
									
										
										
										
											2013-10-07 15:51:58 -07:00
										 |  |  | 	struct ifb_private *dp; | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 	int err; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
											
												net: set name_assign_type in alloc_netdev()
Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
all users to pass NET_NAME_UNKNOWN.
Coccinelle patch:
@@
expression sizeof_priv, name, setup, txqs, rxqs, count;
@@
(
-alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
+alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
|
-alloc_netdev_mq(sizeof_priv, name, setup, count)
+alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
|
-alloc_netdev(sizeof_priv, name, setup)
+alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
)
v9: move comments here from the wrong commit
Signed-off-by: Tom Gundersen <teg@jklm.no>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2014-07-14 16:37:24 +02:00
										 |  |  | 	dev_ifb = alloc_netdev(sizeof(struct ifb_private), "ifb%d", | 
					
						
							|  |  |  | 			       NET_NAME_UNKNOWN, ifb_setup); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (!dev_ifb) | 
					
						
							|  |  |  | 		return -ENOMEM; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-10-07 15:51:58 -07:00
										 |  |  | 	dp = netdev_priv(dev_ifb); | 
					
						
							|  |  |  | 	u64_stats_init(&dp->rsync); | 
					
						
							|  |  |  | 	u64_stats_init(&dp->tsync); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 	dev_ifb->rtnl_link_ops = &ifb_link_ops; | 
					
						
							|  |  |  | 	err = register_netdevice(dev_ifb); | 
					
						
							|  |  |  | 	if (err < 0) | 
					
						
							|  |  |  | 		goto err; | 
					
						
							| 
									
										
										
										
											2008-03-20 17:05:13 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 	return 0; | 
					
						
							| 
									
										
										
										
											2007-06-13 12:04:51 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | err: | 
					
						
							|  |  |  | 	free_netdev(dev_ifb); | 
					
						
							|  |  |  | 	return err; | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | static int __init ifb_init_module(void) | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 	int i, err; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	rtnl_lock(); | 
					
						
							|  |  |  | 	err = __rtnl_link_register(&ifb_link_ops); | 
					
						
							| 
									
										
										
										
											2013-07-11 19:04:06 +08:00
										 |  |  | 	if (err < 0) | 
					
						
							|  |  |  | 		goto out; | 
					
						
							| 
									
										
										
										
											2007-06-13 12:04:51 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-07-10 12:04:02 +08:00
										 |  |  | 	for (i = 0; i < numifbs && !err; i++) { | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | 		err = ifb_init_one(i); | 
					
						
							| 
									
										
										
										
											2013-07-10 12:04:02 +08:00
										 |  |  | 		cond_resched(); | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2007-07-11 19:42:13 -07:00
										 |  |  | 	if (err) | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 		__rtnl_link_unregister(&ifb_link_ops); | 
					
						
							| 
									
										
										
										
											2013-07-11 19:04:06 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | out: | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | 	rtnl_unlock(); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	return err; | 
					
						
							| 
									
										
										
										
											2006-09-13 13:24:59 -04:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | static void __exit ifb_cleanup_module(void) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2007-07-11 19:42:13 -07:00
										 |  |  | 	rtnl_link_unregister(&ifb_link_ops); | 
					
						
							| 
									
										
										
										
											2006-01-08 22:34:25 -08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | module_init(ifb_init_module); | 
					
						
							|  |  |  | module_exit(ifb_cleanup_module); | 
					
						
							|  |  |  | MODULE_LICENSE("GPL"); | 
					
						
							|  |  |  | MODULE_AUTHOR("Jamal Hadi Salim"); | 
					
						
							| 
									
										
										
										
											2007-06-13 12:05:06 -07:00
										 |  |  | MODULE_ALIAS_RTNL_LINK("ifb"); |