2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* NET3 Protocol independent device support routines.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* Derived from the non IP parts of dev.c 1.0.19
|
2005-05-06 03:16:16 +04:00
|
|
|
* Authors: Ross Biro
|
2005-04-17 02:20:36 +04:00
|
|
|
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
|
|
* Mark Evans, <evansmp@uhura.aston.ac.uk>
|
|
|
|
*
|
|
|
|
* Additional Authors:
|
|
|
|
* Florian la Roche <rzsfl@rz.uni-sb.de>
|
|
|
|
* Alan Cox <gw4pts@gw4pts.ampr.org>
|
|
|
|
* David Hinds <dahinds@users.sourceforge.net>
|
|
|
|
* Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
|
|
|
|
* Adam Sulmicki <adam@cfar.umd.edu>
|
|
|
|
* Pekka Riikonen <priikone@poesidon.pspt.fi>
|
|
|
|
*
|
|
|
|
* Changes:
|
|
|
|
* D.J. Barrow : Fixed bug where dev->refcnt gets set
|
|
|
|
* to 2 if register_netdev gets called
|
|
|
|
* before net_dev_init & also removed a
|
|
|
|
* few lines of code in the process.
|
|
|
|
* Alan Cox : device private ioctl copies fields back.
|
|
|
|
* Alan Cox : Transmit queue code does relevant
|
|
|
|
* stunts to keep the queue safe.
|
|
|
|
* Alan Cox : Fixed double lock.
|
|
|
|
* Alan Cox : Fixed promisc NULL pointer trap
|
|
|
|
* ???????? : Support the full private ioctl range
|
|
|
|
* Alan Cox : Moved ioctl permission check into
|
|
|
|
* drivers
|
|
|
|
* Tim Kordas : SIOCADDMULTI/SIOCDELMULTI
|
|
|
|
* Alan Cox : 100 backlog just doesn't cut it when
|
|
|
|
* you start doing multicast video 8)
|
|
|
|
* Alan Cox : Rewrote net_bh and list manager.
|
|
|
|
* Alan Cox : Fix ETH_P_ALL echoback lengths.
|
|
|
|
* Alan Cox : Took out transmit every packet pass
|
|
|
|
* Saved a few bytes in the ioctl handler
|
|
|
|
* Alan Cox : Network driver sets packet type before
|
|
|
|
* calling netif_rx. Saves a function
|
|
|
|
* call a packet.
|
|
|
|
* Alan Cox : Hashed net_bh()
|
|
|
|
* Richard Kooijman: Timestamp fixes.
|
|
|
|
* Alan Cox : Wrong field in SIOCGIFDSTADDR
|
|
|
|
* Alan Cox : Device lock protection.
|
|
|
|
* Alan Cox : Fixed nasty side effect of device close
|
|
|
|
* changes.
|
|
|
|
* Rudi Cilibrasi : Pass the right thing to
|
|
|
|
* set_mac_address()
|
|
|
|
* Dave Miller : 32bit quantity for the device lock to
|
|
|
|
* make it work out on a Sparc.
|
|
|
|
* Bjorn Ekwall : Added KERNELD hack.
|
|
|
|
* Alan Cox : Cleaned up the backlog initialise.
|
|
|
|
* Craig Metz : SIOCGIFCONF fix if space for under
|
|
|
|
* 1 device.
|
|
|
|
* Thomas Bogendoerfer : Return ENODEV for dev_open, if there
|
|
|
|
* is no device open function.
|
|
|
|
* Andi Kleen : Fix error reporting for SIOCGIFCONF
|
|
|
|
* Michael Chastain : Fix signed/unsigned for SIOCGIFCONF
|
|
|
|
* Cyrus Durgin : Cleaned for KMOD
|
|
|
|
* Adam Sulmicki : Bug Fix : Network Device Unload
|
|
|
|
* A network device unload needs to purge
|
|
|
|
* the backlog queue.
|
|
|
|
* Paul Rusty Russell : SIOCSIFNAME
|
|
|
|
* Pekka Riikonen : Netdev boot-time settings code
|
|
|
|
* Andrew Morton : Make unregister_netdevice wait
|
|
|
|
* indefinitely on dev->refcnt
|
|
|
|
* J Hadi Salim : - Backlog queue sampling
|
|
|
|
* - netif_rx() feedback
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
#include <linux/bitops.h>
|
2006-01-11 23:17:47 +03:00
|
|
|
#include <linux/capability.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/kernel.h>
|
2009-11-10 10:20:34 +03:00
|
|
|
#include <linux/hash.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/sched.h>
|
2006-03-21 09:33:17 +03:00
|
|
|
#include <linux/mutex.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/socket.h>
|
|
|
|
#include <linux/sockios.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/if_ether.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
2008-06-20 03:15:47 +04:00
|
|
|
#include <linux/ethtool.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/notifier.h>
|
|
|
|
#include <linux/skbuff.h>
|
2007-09-12 14:01:34 +04:00
|
|
|
#include <net/net_namespace.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/seq_file.h>
|
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <net/dst.h>
|
|
|
|
#include <net/pkt_sched.h>
|
|
|
|
#include <net/checksum.h>
|
2009-11-26 09:07:08 +03:00
|
|
|
#include <net/xfrm.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/highmem.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kmod.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/netpoll.h>
|
|
|
|
#include <linux/rcupdate.h>
|
|
|
|
#include <linux/delay.h>
|
2007-04-27 07:43:56 +04:00
|
|
|
#include <net/wext.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <net/iw_handler.h>
|
|
|
|
#include <asm/current.h>
|
2005-12-03 16:39:35 +03:00
|
|
|
#include <linux/audit.h>
|
2006-06-18 08:24:58 +04:00
|
|
|
#include <linux/dmaengine.h>
|
2006-06-22 13:57:17 +04:00
|
|
|
#include <linux/err.h>
|
2006-08-16 03:34:13 +04:00
|
|
|
#include <linux/ctype.h>
|
2007-05-16 09:46:18 +04:00
|
|
|
#include <linux/if_arp.h>
|
2008-06-17 04:02:28 +04:00
|
|
|
#include <linux/if_vlan.h>
|
2008-07-15 14:47:03 +04:00
|
|
|
#include <linux/ip.h>
|
2008-09-21 09:05:50 +04:00
|
|
|
#include <net/ip.h>
|
2008-07-15 14:47:03 +04:00
|
|
|
#include <linux/ipv6.h>
|
|
|
|
#include <linux/in.h>
|
2008-07-21 20:48:06 +04:00
|
|
|
#include <linux/jhash.h>
|
|
|
|
#include <linux/random.h>
|
2009-06-15 14:02:23 +04:00
|
|
|
#include <trace/events/napi.h>
|
2010-08-23 13:45:02 +04:00
|
|
|
#include <trace/events/net.h>
|
2010-08-23 13:46:12 +04:00
|
|
|
#include <trace/events/skb.h>
|
2010-03-31 02:35:50 +04:00
|
|
|
#include <linux/pci.h>
|
2010-09-17 08:39:16 +04:00
|
|
|
#include <linux/inetdevice.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-10-24 08:14:45 +04:00
|
|
|
#include "net-sysfs.h"
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
/* Instead of increasing this, you should create a hash table. */
|
|
|
|
#define MAX_GRO_SKBS 8
|
|
|
|
|
2009-01-05 03:13:40 +03:00
|
|
|
/* This should be increased if a protocol with a bigger head is added. */
|
|
|
|
#define GRO_MAX_HEAD (MAX_HEADER + 128)
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* The list of packet types we will receive (as opposed to discard)
|
|
|
|
* and the routines to invoke.
|
|
|
|
*
|
|
|
|
* Why 16. Because with 16 the only overlap we get on a hash of the
|
|
|
|
* low nibble of the protocol value is RARP/SNAP/X.25.
|
|
|
|
*
|
|
|
|
* NOTE: That is no longer true with the addition of VLAN tags. Not
|
|
|
|
* sure which should go first, but I bet it won't make much
|
|
|
|
* difference if we are running VLANs. The good news is that
|
|
|
|
* this protocol won't be in the list unless compiled in, so
|
2006-05-27 00:25:24 +04:00
|
|
|
* the average user (w/out VLANs) will not be adversely affected.
|
2005-04-17 02:20:36 +04:00
|
|
|
* --BLG
|
|
|
|
*
|
|
|
|
* 0800 IP
|
|
|
|
* 8100 802.1Q VLAN
|
|
|
|
* 0001 802.3
|
|
|
|
* 0002 AX.25
|
|
|
|
* 0004 802.2
|
|
|
|
* 8035 RARP
|
|
|
|
* 0005 SNAP
|
|
|
|
* 0805 X.25
|
|
|
|
* 0806 ARP
|
|
|
|
* 8137 IPX
|
|
|
|
* 0009 Localtalk
|
|
|
|
* 86DD IPv6
|
|
|
|
*/
|
|
|
|
|
2007-11-26 15:12:58 +03:00
|
|
|
#define PTYPE_HASH_SIZE (16)
|
|
|
|
#define PTYPE_HASH_MASK (PTYPE_HASH_SIZE - 1)
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static DEFINE_SPINLOCK(ptype_lock);
|
2007-11-26 15:12:58 +03:00
|
|
|
static struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly;
|
2007-03-13 00:33:50 +03:00
|
|
|
static struct list_head ptype_all __read_mostly; /* Taps */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
2007-05-04 02:13:45 +04:00
|
|
|
* The @dev_base_head list is protected by @dev_base_lock and the rtnl
|
2005-04-17 02:20:36 +04:00
|
|
|
* semaphore.
|
|
|
|
*
|
2009-11-04 16:43:23 +03:00
|
|
|
* Pure readers hold dev_base_lock for reading, or rcu_read_lock()
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Writers must hold the rtnl semaphore while they loop through the
|
2007-05-04 02:13:45 +04:00
|
|
|
* dev_base_head list, and hold dev_base_lock for writing when they do the
|
2005-04-17 02:20:36 +04:00
|
|
|
* actual updates. This allows pure readers to access the list even
|
|
|
|
* while a writer is preparing to update it.
|
|
|
|
*
|
|
|
|
* To put it another way, dev_base_lock is held for writing only to
|
|
|
|
* protect against pure readers; the rtnl semaphore provides the
|
|
|
|
* protection against other writers.
|
|
|
|
*
|
|
|
|
* See, for example usages, register_netdevice() and
|
|
|
|
* unregister_netdevice(), which must be called with the rtnl
|
|
|
|
* semaphore held.
|
|
|
|
*/
|
|
|
|
DEFINE_RWLOCK(dev_base_lock);
|
|
|
|
EXPORT_SYMBOL(dev_base_lock);
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
static inline struct hlist_head *dev_name_hash(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
unsigned hash = full_name_hash(name, strnlen(name, IFNAMSIZ));
|
2009-11-10 10:20:34 +03:00
|
|
|
return &net->dev_name_head[hash_32(hash, NETDEV_HASHBITS)];
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2009-10-24 17:13:17 +04:00
|
|
|
return &net->dev_index_head[ifindex & (NETDEV_HASHENTRIES - 1)];
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
static inline void rps_lock(struct softnet_data *sd)
|
2010-03-31 00:16:22 +04:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
2010-04-20 01:17:14 +04:00
|
|
|
spin_lock(&sd->input_pkt_queue.lock);
|
2010-03-31 00:16:22 +04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
static inline void rps_unlock(struct softnet_data *sd)
|
2010-03-31 00:16:22 +04:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
2010-04-20 01:17:14 +04:00
|
|
|
spin_unlock(&sd->input_pkt_queue.lock);
|
2010-03-31 00:16:22 +04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-09-12 15:53:49 +04:00
|
|
|
/* Device list insertion */
|
|
|
|
static int list_netdevice(struct net_device *dev)
|
|
|
|
{
|
2008-03-25 15:47:49 +03:00
|
|
|
struct net *net = dev_net(dev);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
write_lock_bh(&dev_base_lock);
|
2009-11-04 16:43:23 +03:00
|
|
|
list_add_tail_rcu(&dev->dev_list, &net->dev_base_head);
|
2009-10-30 10:11:27 +03:00
|
|
|
hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name));
|
2009-10-19 23:18:49 +04:00
|
|
|
hlist_add_head_rcu(&dev->index_hlist,
|
|
|
|
dev_index_hash(net, dev->ifindex));
|
2007-09-12 15:53:49 +04:00
|
|
|
write_unlock_bh(&dev_base_lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-19 23:18:49 +04:00
|
|
|
/* Device list removal
|
|
|
|
* caller must respect a RCU grace period before freeing/reusing dev
|
|
|
|
*/
|
2007-09-12 15:53:49 +04:00
|
|
|
static void unlist_netdevice(struct net_device *dev)
|
|
|
|
{
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
/* Unlink dev from the device chain */
|
|
|
|
write_lock_bh(&dev_base_lock);
|
2009-11-04 16:43:23 +03:00
|
|
|
list_del_rcu(&dev->dev_list);
|
2009-10-30 10:11:27 +03:00
|
|
|
hlist_del_rcu(&dev->name_hlist);
|
2009-10-19 23:18:49 +04:00
|
|
|
hlist_del_rcu(&dev->index_hlist);
|
2007-09-12 15:53:49 +04:00
|
|
|
write_unlock_bh(&dev_base_lock);
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Our notifier list
|
|
|
|
*/
|
|
|
|
|
2006-05-10 02:23:03 +04:00
|
|
|
static RAW_NOTIFIER_HEAD(netdev_chain);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Device drivers call our routines to queue packets here. We empty the
|
|
|
|
* queue in the local softnet handler.
|
|
|
|
*/
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
|
2010-04-17 08:17:02 +04:00
|
|
|
DEFINE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_PER_CPU_SYMBOL(softnet_data);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-23 01:16:42 +04:00
|
|
|
#ifdef CONFIG_LOCKDEP
|
2007-05-16 09:46:18 +04:00
|
|
|
/*
|
2008-07-09 10:13:53 +04:00
|
|
|
* register_netdevice() inits txq->_xmit_lock and sets lockdep class
|
2007-05-16 09:46:18 +04:00
|
|
|
* according to dev->type
|
|
|
|
*/
|
|
|
|
static const unsigned short netdev_lock_type[] =
|
|
|
|
{ARPHRD_NETROM, ARPHRD_ETHER, ARPHRD_EETHER, ARPHRD_AX25,
|
|
|
|
ARPHRD_PRONET, ARPHRD_CHAOS, ARPHRD_IEEE802, ARPHRD_ARCNET,
|
|
|
|
ARPHRD_APPLETLK, ARPHRD_DLCI, ARPHRD_ATM, ARPHRD_METRICOM,
|
|
|
|
ARPHRD_IEEE1394, ARPHRD_EUI64, ARPHRD_INFINIBAND, ARPHRD_SLIP,
|
|
|
|
ARPHRD_CSLIP, ARPHRD_SLIP6, ARPHRD_CSLIP6, ARPHRD_RSRVD,
|
|
|
|
ARPHRD_ADAPT, ARPHRD_ROSE, ARPHRD_X25, ARPHRD_HWX25,
|
|
|
|
ARPHRD_PPP, ARPHRD_CISCO, ARPHRD_LAPB, ARPHRD_DDCMP,
|
|
|
|
ARPHRD_RAWHDLC, ARPHRD_TUNNEL, ARPHRD_TUNNEL6, ARPHRD_FRAD,
|
|
|
|
ARPHRD_SKIP, ARPHRD_LOOPBACK, ARPHRD_LOCALTLK, ARPHRD_FDDI,
|
|
|
|
ARPHRD_BIF, ARPHRD_SIT, ARPHRD_IPDDP, ARPHRD_IPGRE,
|
|
|
|
ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET,
|
|
|
|
ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,
|
|
|
|
ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,
|
2008-12-18 02:47:29 +03:00
|
|
|
ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET,
|
2009-08-14 20:00:20 +04:00
|
|
|
ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154,
|
2009-06-08 16:18:47 +04:00
|
|
|
ARPHRD_VOID, ARPHRD_NONE};
|
2007-05-16 09:46:18 +04:00
|
|
|
|
2009-08-05 21:42:58 +04:00
|
|
|
static const char *const netdev_lock_name[] =
|
2007-05-16 09:46:18 +04:00
|
|
|
{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
|
|
|
|
"_xmit_PRONET", "_xmit_CHAOS", "_xmit_IEEE802", "_xmit_ARCNET",
|
|
|
|
"_xmit_APPLETLK", "_xmit_DLCI", "_xmit_ATM", "_xmit_METRICOM",
|
|
|
|
"_xmit_IEEE1394", "_xmit_EUI64", "_xmit_INFINIBAND", "_xmit_SLIP",
|
|
|
|
"_xmit_CSLIP", "_xmit_SLIP6", "_xmit_CSLIP6", "_xmit_RSRVD",
|
|
|
|
"_xmit_ADAPT", "_xmit_ROSE", "_xmit_X25", "_xmit_HWX25",
|
|
|
|
"_xmit_PPP", "_xmit_CISCO", "_xmit_LAPB", "_xmit_DDCMP",
|
|
|
|
"_xmit_RAWHDLC", "_xmit_TUNNEL", "_xmit_TUNNEL6", "_xmit_FRAD",
|
|
|
|
"_xmit_SKIP", "_xmit_LOOPBACK", "_xmit_LOCALTLK", "_xmit_FDDI",
|
|
|
|
"_xmit_BIF", "_xmit_SIT", "_xmit_IPDDP", "_xmit_IPGRE",
|
|
|
|
"_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET",
|
|
|
|
"_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",
|
|
|
|
"_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211",
|
2008-12-18 02:47:29 +03:00
|
|
|
"_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET",
|
2009-08-14 20:00:20 +04:00
|
|
|
"_xmit_PHONET_PIPE", "_xmit_IEEE802154",
|
2009-06-08 16:18:47 +04:00
|
|
|
"_xmit_VOID", "_xmit_NONE"};
|
2007-05-16 09:46:18 +04:00
|
|
|
|
|
|
|
static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];
|
2008-07-23 01:16:42 +04:00
|
|
|
static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)];
|
2007-05-16 09:46:18 +04:00
|
|
|
|
|
|
|
static inline unsigned short netdev_lock_pos(unsigned short dev_type)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(netdev_lock_type); i++)
|
|
|
|
if (netdev_lock_type[i] == dev_type)
|
|
|
|
return i;
|
|
|
|
/* the last key is used by default */
|
|
|
|
return ARRAY_SIZE(netdev_lock_type) - 1;
|
|
|
|
}
|
|
|
|
|
2008-07-23 01:16:42 +04:00
|
|
|
static inline void netdev_set_xmit_lockdep_class(spinlock_t *lock,
|
|
|
|
unsigned short dev_type)
|
2007-05-16 09:46:18 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i = netdev_lock_pos(dev_type);
|
|
|
|
lockdep_set_class_and_name(lock, &netdev_xmit_lock_key[i],
|
|
|
|
netdev_lock_name[i]);
|
|
|
|
}
|
2008-07-23 01:16:42 +04:00
|
|
|
|
|
|
|
static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i = netdev_lock_pos(dev->type);
|
|
|
|
lockdep_set_class_and_name(&dev->addr_list_lock,
|
|
|
|
&netdev_addr_lock_key[i],
|
|
|
|
netdev_lock_name[i]);
|
|
|
|
}
|
2007-05-16 09:46:18 +04:00
|
|
|
#else
|
2008-07-23 01:16:42 +04:00
|
|
|
static inline void netdev_set_xmit_lockdep_class(spinlock_t *lock,
|
|
|
|
unsigned short dev_type)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
|
2007-05-16 09:46:18 +04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
Protocol management and registration routines
|
|
|
|
|
|
|
|
*******************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a protocol ID to the list. Now that the input handler is
|
|
|
|
* smarter we can dispense with all the messy stuff that used to be
|
|
|
|
* here.
|
|
|
|
*
|
|
|
|
* BEWARE!!! Protocol handlers, mangling input packets,
|
|
|
|
* MUST BE last in hash buckets and checking protocol handlers
|
|
|
|
* MUST start from promiscuous ptype_all chain in net_bh.
|
|
|
|
* It is true now, do not change it.
|
|
|
|
* Explanation follows: if protocol handler, mangling packet, will
|
|
|
|
* be the first on list, it is not able to sense, that packet
|
|
|
|
* is cloned and should be copied-on-write, so that it will
|
|
|
|
* change it and subsequent readers will get broken packet.
|
|
|
|
* --ANK (980803)
|
|
|
|
*/
|
|
|
|
|
2010-09-02 07:53:46 +04:00
|
|
|
static inline struct list_head *ptype_head(const struct packet_type *pt)
|
|
|
|
{
|
|
|
|
if (pt->type == htons(ETH_P_ALL))
|
|
|
|
return &ptype_all;
|
|
|
|
else
|
|
|
|
return &ptype_base[ntohs(pt->type) & PTYPE_HASH_MASK];
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* dev_add_pack - add packet handler
|
|
|
|
* @pt: packet type declaration
|
|
|
|
*
|
|
|
|
* Add a protocol handler to the networking stack. The passed &packet_type
|
|
|
|
* is linked into kernel lists and may not be freed until it has been
|
|
|
|
* removed from the kernel lists.
|
|
|
|
*
|
2007-02-09 17:24:36 +03:00
|
|
|
* This call does not sleep therefore it can not
|
2005-04-17 02:20:36 +04:00
|
|
|
* guarantee all CPU's that are in middle of receiving packets
|
|
|
|
* will see the new packet type (until the next received packet).
|
|
|
|
*/
|
|
|
|
|
|
|
|
void dev_add_pack(struct packet_type *pt)
|
|
|
|
{
|
2010-09-02 07:53:46 +04:00
|
|
|
struct list_head *head = ptype_head(pt);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-02 07:53:46 +04:00
|
|
|
spin_lock(&ptype_lock);
|
|
|
|
list_add_rcu(&pt->list, head);
|
|
|
|
spin_unlock(&ptype_lock);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_add_pack);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* __dev_remove_pack - remove packet handler
|
|
|
|
* @pt: packet type declaration
|
|
|
|
*
|
|
|
|
* Remove a protocol handler that was previously added to the kernel
|
|
|
|
* protocol handlers by dev_add_pack(). The passed &packet_type is removed
|
|
|
|
* from the kernel lists and can be freed or reused once this function
|
2007-02-09 17:24:36 +03:00
|
|
|
* returns.
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* The packet type might still be in use by receivers
|
|
|
|
* and must not be freed until after all the CPU's have gone
|
|
|
|
* through a quiescent state.
|
|
|
|
*/
|
|
|
|
void __dev_remove_pack(struct packet_type *pt)
|
|
|
|
{
|
2010-09-02 07:53:46 +04:00
|
|
|
struct list_head *head = ptype_head(pt);
|
2005-04-17 02:20:36 +04:00
|
|
|
struct packet_type *pt1;
|
|
|
|
|
2010-09-02 07:53:46 +04:00
|
|
|
spin_lock(&ptype_lock);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
list_for_each_entry(pt1, head, list) {
|
|
|
|
if (pt == pt1) {
|
|
|
|
list_del_rcu(&pt->list);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
printk(KERN_WARNING "dev_remove_pack: %p not found.\n", pt);
|
|
|
|
out:
|
2010-09-02 07:53:46 +04:00
|
|
|
spin_unlock(&ptype_lock);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(__dev_remove_pack);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* dev_remove_pack - remove packet handler
|
|
|
|
* @pt: packet type declaration
|
|
|
|
*
|
|
|
|
* Remove a protocol handler that was previously added to the kernel
|
|
|
|
* protocol handlers by dev_add_pack(). The passed &packet_type is removed
|
|
|
|
* from the kernel lists and can be freed or reused once this function
|
|
|
|
* returns.
|
|
|
|
*
|
|
|
|
* This call sleeps to guarantee that no CPU is looking at the packet
|
|
|
|
* type after return.
|
|
|
|
*/
|
|
|
|
void dev_remove_pack(struct packet_type *pt)
|
|
|
|
{
|
|
|
|
__dev_remove_pack(pt);
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
synchronize_net();
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_remove_pack);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
|
|
Device Boot-time Settings Routines
|
|
|
|
|
|
|
|
*******************************************************************************/
|
|
|
|
|
|
|
|
/* Boot time configuration table */
|
|
|
|
static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX];
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_boot_setup_add - add new setup entry
|
|
|
|
* @name: name of the device
|
|
|
|
* @map: configured settings for the device
|
|
|
|
*
|
|
|
|
* Adds new setup entry to the dev_boot_setup list. The function
|
|
|
|
* returns 0 on error and 1 on success. This is a generic routine to
|
|
|
|
* all netdevices.
|
|
|
|
*/
|
|
|
|
static int netdev_boot_setup_add(char *name, struct ifmap *map)
|
|
|
|
{
|
|
|
|
struct netdev_boot_setup *s;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
s = dev_boot_setup;
|
|
|
|
for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {
|
|
|
|
if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {
|
|
|
|
memset(s[i].name, 0, sizeof(s[i].name));
|
2008-07-02 06:57:19 +04:00
|
|
|
strlcpy(s[i].name, name, IFNAMSIZ);
|
2005-04-17 02:20:36 +04:00
|
|
|
memcpy(&s[i].map, map, sizeof(s[i].map));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return i >= NETDEV_BOOT_SETUP_MAX ? 0 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_boot_setup_check - check boot time settings
|
|
|
|
* @dev: the netdevice
|
|
|
|
*
|
|
|
|
* Check boot time settings for the device.
|
|
|
|
* The found settings are set for the device to be used
|
|
|
|
* later in the device probing.
|
|
|
|
* Returns 0 if no settings found, 1 if they are.
|
|
|
|
*/
|
|
|
|
int netdev_boot_setup_check(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct netdev_boot_setup *s = dev_boot_setup;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {
|
|
|
|
if (s[i].name[0] != '\0' && s[i].name[0] != ' ' &&
|
2008-07-02 06:57:19 +04:00
|
|
|
!strcmp(dev->name, s[i].name)) {
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->irq = s[i].map.irq;
|
|
|
|
dev->base_addr = s[i].map.base_addr;
|
|
|
|
dev->mem_start = s[i].map.mem_start;
|
|
|
|
dev->mem_end = s[i].map.mem_end;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(netdev_boot_setup_check);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_boot_base - get address from boot time settings
|
|
|
|
* @prefix: prefix for network device
|
|
|
|
* @unit: id for network device
|
|
|
|
*
|
|
|
|
* Check boot time settings for the base address of device.
|
|
|
|
* The found settings are set for the device to be used
|
|
|
|
* later in the device probing.
|
|
|
|
* Returns 0 if no settings found.
|
|
|
|
*/
|
|
|
|
unsigned long netdev_boot_base(const char *prefix, int unit)
|
|
|
|
{
|
|
|
|
const struct netdev_boot_setup *s = dev_boot_setup;
|
|
|
|
char name[IFNAMSIZ];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
sprintf(name, "%s%d", prefix, unit);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If device already registered then return base of 1
|
|
|
|
* to indicate not to probe for this interface
|
|
|
|
*/
|
2007-09-17 22:56:21 +04:00
|
|
|
if (__dev_get_by_name(&init_net, name))
|
2005-04-17 02:20:36 +04:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++)
|
|
|
|
if (!strcmp(name, s[i].name))
|
|
|
|
return s[i].map.base_addr;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Saves at boot time configured settings for any netdevice.
|
|
|
|
*/
|
|
|
|
int __init netdev_boot_setup(char *str)
|
|
|
|
{
|
|
|
|
int ints[5];
|
|
|
|
struct ifmap map;
|
|
|
|
|
|
|
|
str = get_options(str, ARRAY_SIZE(ints), ints);
|
|
|
|
if (!str || !*str)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Save settings */
|
|
|
|
memset(&map, 0, sizeof(map));
|
|
|
|
if (ints[0] > 0)
|
|
|
|
map.irq = ints[1];
|
|
|
|
if (ints[0] > 1)
|
|
|
|
map.base_addr = ints[2];
|
|
|
|
if (ints[0] > 2)
|
|
|
|
map.mem_start = ints[3];
|
|
|
|
if (ints[0] > 3)
|
|
|
|
map.mem_end = ints[4];
|
|
|
|
|
|
|
|
/* Add new entry to the list */
|
|
|
|
return netdev_boot_setup_add(str, &map);
|
|
|
|
}
|
|
|
|
|
|
|
|
__setup("netdev=", netdev_boot_setup);
|
|
|
|
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
Device Interface Subroutines
|
|
|
|
|
|
|
|
*******************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* __dev_get_by_name - find a device by its name
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @name: name to find
|
|
|
|
*
|
|
|
|
* Find an interface by name. Must be called under RTNL semaphore
|
|
|
|
* or @dev_base_lock. If the name is found a pointer to the device
|
|
|
|
* is returned. If the name is not found then %NULL is returned. The
|
|
|
|
* reference counters are not incremented so the caller must be
|
|
|
|
* careful with locks.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *__dev_get_by_name(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct hlist_node *p;
|
2009-10-30 11:40:11 +03:00
|
|
|
struct net_device *dev;
|
|
|
|
struct hlist_head *head = dev_name_hash(net, name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-30 11:40:11 +03:00
|
|
|
hlist_for_each_entry(dev, p, head, name_hlist)
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!strncmp(dev->name, name, IFNAMSIZ))
|
|
|
|
return dev;
|
2009-10-30 11:40:11 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(__dev_get_by_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-30 10:11:27 +03:00
|
|
|
/**
|
|
|
|
* dev_get_by_name_rcu - find a device by its name
|
|
|
|
* @net: the applicable net namespace
|
|
|
|
* @name: name to find
|
|
|
|
*
|
|
|
|
* Find an interface by name.
|
|
|
|
* If the name is found a pointer to the device is returned.
|
|
|
|
* If the name is not found then %NULL is returned.
|
|
|
|
* The reference counters are not incremented so the caller must be
|
|
|
|
* careful with locks. The caller must hold RCU lock.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct net_device *dev_get_by_name_rcu(struct net *net, const char *name)
|
|
|
|
{
|
|
|
|
struct hlist_node *p;
|
|
|
|
struct net_device *dev;
|
|
|
|
struct hlist_head *head = dev_name_hash(net, name);
|
|
|
|
|
|
|
|
hlist_for_each_entry_rcu(dev, p, head, name_hlist)
|
|
|
|
if (!strncmp(dev->name, name, IFNAMSIZ))
|
|
|
|
return dev;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_get_by_name_rcu);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* dev_get_by_name - find a device by its name
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @name: name to find
|
|
|
|
*
|
|
|
|
* Find an interface by name. This can be called from any
|
|
|
|
* context and does its own locking. The returned handle has
|
|
|
|
* the usage count incremented and the caller must use dev_put() to
|
|
|
|
* release it when it is no longer needed. %NULL is returned if no
|
|
|
|
* matching device is found.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *dev_get_by_name(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
|
2009-10-30 10:11:27 +03:00
|
|
|
rcu_read_lock();
|
|
|
|
dev = dev_get_by_name_rcu(net, name);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev)
|
|
|
|
dev_hold(dev);
|
2009-10-30 10:11:27 +03:00
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
return dev;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_get_by_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* __dev_get_by_index - find a device by its ifindex
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @ifindex: index of device
|
|
|
|
*
|
|
|
|
* Search for an interface by index. Returns %NULL if the device
|
|
|
|
* is not found or a pointer to the device. The device has not
|
|
|
|
* had its reference counter increased so the caller must be careful
|
|
|
|
* about locking. The caller must hold either the RTNL semaphore
|
|
|
|
* or @dev_base_lock.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *__dev_get_by_index(struct net *net, int ifindex)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct hlist_node *p;
|
2009-10-30 11:40:11 +03:00
|
|
|
struct net_device *dev;
|
|
|
|
struct hlist_head *head = dev_index_hash(net, ifindex);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-30 11:40:11 +03:00
|
|
|
hlist_for_each_entry(dev, p, head, index_hlist)
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev->ifindex == ifindex)
|
|
|
|
return dev;
|
2009-10-30 11:40:11 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(__dev_get_by_index);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-19 23:18:49 +04:00
|
|
|
/**
|
|
|
|
* dev_get_by_index_rcu - find a device by its ifindex
|
|
|
|
* @net: the applicable net namespace
|
|
|
|
* @ifindex: index of device
|
|
|
|
*
|
|
|
|
* Search for an interface by index. Returns %NULL if the device
|
|
|
|
* is not found or a pointer to the device. The device has not
|
|
|
|
* had its reference counter increased so the caller must be careful
|
|
|
|
* about locking. The caller must hold RCU lock.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
|
|
|
|
{
|
|
|
|
struct hlist_node *p;
|
|
|
|
struct net_device *dev;
|
|
|
|
struct hlist_head *head = dev_index_hash(net, ifindex);
|
|
|
|
|
|
|
|
hlist_for_each_entry_rcu(dev, p, head, index_hlist)
|
|
|
|
if (dev->ifindex == ifindex)
|
|
|
|
return dev;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_get_by_index_rcu);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_get_by_index - find a device by its ifindex
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @ifindex: index of device
|
|
|
|
*
|
|
|
|
* Search for an interface by index. Returns NULL if the device
|
|
|
|
* is not found or a pointer to the device. The device returned has
|
|
|
|
* had a reference added and the pointer is safe until the user calls
|
|
|
|
* dev_put to indicate they have finished with it.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *dev_get_by_index(struct net *net, int ifindex)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
|
2009-10-19 23:18:49 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
dev = dev_get_by_index_rcu(net, ifindex);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev)
|
|
|
|
dev_hold(dev);
|
2009-10-19 23:18:49 +04:00
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
return dev;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_get_by_index);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
2010-12-05 04:23:53 +03:00
|
|
|
* dev_getbyhwaddr_rcu - find a device by its hardware address
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @type: media type of device
|
|
|
|
* @ha: hardware address
|
|
|
|
*
|
|
|
|
* Search for an interface by MAC address. Returns NULL if the device
|
2010-12-05 04:23:53 +03:00
|
|
|
* is not found or a pointer to the device. The caller must hold RCU
|
|
|
|
* The returned device has not had its ref count increased
|
2005-04-17 02:20:36 +04:00
|
|
|
* and the caller must therefore be careful about locking
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2010-12-05 04:23:53 +03:00
|
|
|
struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,
|
|
|
|
const char *ha)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
|
2010-12-05 04:23:53 +03:00
|
|
|
for_each_netdev_rcu(net, dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev->type == type &&
|
|
|
|
!memcmp(dev->dev_addr, ha, dev->addr_len))
|
2007-05-04 02:13:45 +04:00
|
|
|
return dev;
|
|
|
|
|
|
|
|
return NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2010-12-05 04:23:53 +03:00
|
|
|
EXPORT_SYMBOL(dev_getbyhwaddr_rcu);
|
2005-09-22 11:44:55 +04:00
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
|
2007-05-03 14:28:13 +04:00
|
|
|
ASSERT_RTNL();
|
2007-09-17 22:56:21 +04:00
|
|
|
for_each_netdev(net, dev)
|
2007-05-03 14:28:13 +04:00
|
|
|
if (dev->type == type)
|
2007-05-04 02:13:45 +04:00
|
|
|
return dev;
|
|
|
|
|
|
|
|
return NULL;
|
2007-05-03 14:28:13 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__dev_getfirstbyhwtype);
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
|
2007-05-03 14:28:13 +04:00
|
|
|
{
|
2010-03-18 14:27:25 +03:00
|
|
|
struct net_device *dev, *ret = NULL;
|
2007-05-03 14:28:13 +04:00
|
|
|
|
2010-03-18 14:27:25 +03:00
|
|
|
rcu_read_lock();
|
|
|
|
for_each_netdev_rcu(net, dev)
|
|
|
|
if (dev->type == type) {
|
|
|
|
dev_hold(dev);
|
|
|
|
ret = dev;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_getfirstbyhwtype);
|
|
|
|
|
|
|
|
/**
|
2010-06-07 15:42:13 +04:00
|
|
|
* dev_get_by_flags_rcu - find any device with given flags
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @if_flags: IFF_* values
|
|
|
|
* @mask: bitmask of bits in if_flags to check
|
|
|
|
*
|
|
|
|
* Search for any interface with the given flags. Returns NULL if a device
|
2010-06-07 15:42:13 +04:00
|
|
|
* is not found or a pointer to the device. Must be called inside
|
|
|
|
* rcu_read_lock(), and result refcount is unchanged.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
2010-06-07 15:42:13 +04:00
|
|
|
struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short if_flags,
|
2009-09-03 12:29:39 +04:00
|
|
|
unsigned short mask)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-05-04 02:13:45 +04:00
|
|
|
struct net_device *dev, *ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-05-04 02:13:45 +04:00
|
|
|
ret = NULL;
|
2009-11-04 16:43:23 +03:00
|
|
|
for_each_netdev_rcu(net, dev) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (((dev->flags ^ if_flags) & mask) == 0) {
|
2007-05-04 02:13:45 +04:00
|
|
|
ret = dev;
|
2005-04-17 02:20:36 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-05-04 02:13:45 +04:00
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2010-06-07 15:42:13 +04:00
|
|
|
EXPORT_SYMBOL(dev_get_by_flags_rcu);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_valid_name - check if name is okay for network device
|
|
|
|
* @name: name string
|
|
|
|
*
|
|
|
|
* Network device names need to be valid file names to
|
2006-08-16 03:34:13 +04:00
|
|
|
* to allow sysfs to work. We also disallow any kind of
|
|
|
|
* whitespace.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2005-11-09 21:34:45 +03:00
|
|
|
int dev_valid_name(const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-08-16 03:34:13 +04:00
|
|
|
if (*name == '\0')
|
|
|
|
return 0;
|
2006-08-30 04:06:13 +04:00
|
|
|
if (strlen(name) >= IFNAMSIZ)
|
|
|
|
return 0;
|
2006-08-16 03:34:13 +04:00
|
|
|
if (!strcmp(name, ".") || !strcmp(name, ".."))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
while (*name) {
|
|
|
|
if (*name == '/' || isspace(*name))
|
|
|
|
return 0;
|
|
|
|
name++;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_valid_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
2007-09-12 15:48:45 +04:00
|
|
|
* __dev_alloc_name - allocate a name for a device
|
|
|
|
* @net: network namespace to allocate the device name in
|
2005-04-17 02:20:36 +04:00
|
|
|
* @name: name format string
|
2007-09-12 15:48:45 +04:00
|
|
|
* @buf: scratch buffer and result name string
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Passed a format string - eg "lt%d" it will try and find a suitable
|
2006-05-27 00:25:24 +04:00
|
|
|
* id. It scans list of devices to build up a free map, then chooses
|
|
|
|
* the first empty slot. The caller must hold the dev_base or rtnl lock
|
|
|
|
* while allocating the name and adding the device in order to avoid
|
|
|
|
* duplicates.
|
|
|
|
* Limited to bits_per_byte * page size devices (ie 32K on most platforms).
|
|
|
|
* Returns the number of the unit assigned or a negative errno code.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
2007-09-12 15:48:45 +04:00
|
|
|
static int __dev_alloc_name(struct net *net, const char *name, char *buf)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
const char *p;
|
|
|
|
const int max_netdevices = 8*PAGE_SIZE;
|
2007-10-09 12:59:42 +04:00
|
|
|
unsigned long *inuse;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct net_device *d;
|
|
|
|
|
|
|
|
p = strnchr(name, IFNAMSIZ-1, '%');
|
|
|
|
if (p) {
|
|
|
|
/*
|
|
|
|
* Verify the string as this thing may have come from
|
|
|
|
* the user. There must be either one "%d" and no other "%"
|
|
|
|
* characters.
|
|
|
|
*/
|
|
|
|
if (p[1] != 'd' || strchr(p + 2, '%'))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Use one page as a bit array of possible slots */
|
2007-10-09 12:59:42 +04:00
|
|
|
inuse = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!inuse)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
for_each_netdev(net, d) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!sscanf(d->name, name, &i))
|
|
|
|
continue;
|
|
|
|
if (i < 0 || i >= max_netdevices)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* avoid cases where sscanf is not exact inverse of printf */
|
2007-09-12 15:48:45 +04:00
|
|
|
snprintf(buf, IFNAMSIZ, name, i);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!strncmp(buf, d->name, IFNAMSIZ))
|
|
|
|
set_bit(i, inuse);
|
|
|
|
}
|
|
|
|
|
|
|
|
i = find_first_zero_bit(inuse, max_netdevices);
|
|
|
|
free_page((unsigned long) inuse);
|
|
|
|
}
|
|
|
|
|
2009-11-18 05:36:59 +03:00
|
|
|
if (buf != name)
|
|
|
|
snprintf(buf, IFNAMSIZ, name, i);
|
2007-09-12 15:48:45 +04:00
|
|
|
if (!__dev_get_by_name(net, buf))
|
2005-04-17 02:20:36 +04:00
|
|
|
return i;
|
|
|
|
|
|
|
|
/* It is possible to run out of possible slots
|
|
|
|
* when the name is long and there isn't enough space left
|
|
|
|
* for the digits, or if all bits are used.
|
|
|
|
*/
|
|
|
|
return -ENFILE;
|
|
|
|
}
|
|
|
|
|
2007-09-12 15:48:45 +04:00
|
|
|
/**
|
|
|
|
* dev_alloc_name - allocate a name for a device
|
|
|
|
* @dev: device
|
|
|
|
* @name: name format string
|
|
|
|
*
|
|
|
|
* Passed a format string - eg "lt%d" it will try and find a suitable
|
|
|
|
* id. It scans list of devices to build up a free map, then chooses
|
|
|
|
* the first empty slot. The caller must hold the dev_base or rtnl lock
|
|
|
|
* while allocating the name and adding the device in order to avoid
|
|
|
|
* duplicates.
|
|
|
|
* Limited to bits_per_byte * page size devices (ie 32K on most platforms).
|
|
|
|
* Returns the number of the unit assigned or a negative errno code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int dev_alloc_name(struct net_device *dev, const char *name)
|
|
|
|
{
|
|
|
|
char buf[IFNAMSIZ];
|
|
|
|
struct net *net;
|
|
|
|
int ret;
|
|
|
|
|
2008-03-25 15:47:49 +03:00
|
|
|
BUG_ON(!dev_net(dev));
|
|
|
|
net = dev_net(dev);
|
2007-09-12 15:48:45 +04:00
|
|
|
ret = __dev_alloc_name(net, name, buf);
|
|
|
|
if (ret >= 0)
|
|
|
|
strlcpy(dev->name, buf, IFNAMSIZ);
|
|
|
|
return ret;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_alloc_name);
|
2007-09-12 15:48:45 +04:00
|
|
|
|
2010-05-19 14:12:19 +04:00
|
|
|
static int dev_get_valid_name(struct net_device *dev, const char *name, bool fmt)
|
2009-11-18 05:36:59 +03:00
|
|
|
{
|
2010-05-19 14:12:19 +04:00
|
|
|
struct net *net;
|
|
|
|
|
|
|
|
BUG_ON(!dev_net(dev));
|
|
|
|
net = dev_net(dev);
|
|
|
|
|
2009-11-18 05:36:59 +03:00
|
|
|
if (!dev_valid_name(name))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (fmt && strchr(name, '%'))
|
2010-05-19 14:12:19 +04:00
|
|
|
return dev_alloc_name(dev, name);
|
2009-11-18 05:36:59 +03:00
|
|
|
else if (__dev_get_by_name(net, name))
|
|
|
|
return -EEXIST;
|
2010-05-19 14:12:19 +04:00
|
|
|
else if (dev->name != name)
|
|
|
|
strlcpy(dev->name, name, IFNAMSIZ);
|
2009-11-18 05:36:59 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_change_name - change name of a device
|
|
|
|
* @dev: device
|
|
|
|
* @newname: name (or format string) must be at least IFNAMSIZ
|
|
|
|
*
|
|
|
|
* Change name of a device, can pass format strings "eth%d".
|
|
|
|
* for wildcarding.
|
|
|
|
*/
|
2008-09-30 13:22:14 +04:00
|
|
|
int dev_change_name(struct net_device *dev, const char *newname)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-07-31 04:03:38 +04:00
|
|
|
char oldname[IFNAMSIZ];
|
2005-04-17 02:20:36 +04:00
|
|
|
int err = 0;
|
2007-07-31 04:03:38 +04:00
|
|
|
int ret;
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net *net;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
2008-03-25 15:47:49 +03:00
|
|
|
BUG_ON(!dev_net(dev));
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-03-25 15:47:49 +03:00
|
|
|
net = dev_net(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev->flags & IFF_UP)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2007-10-26 14:53:42 +04:00
|
|
|
if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
|
|
|
|
return 0;
|
|
|
|
|
2007-07-31 04:03:38 +04:00
|
|
|
memcpy(oldname, dev->name, IFNAMSIZ);
|
|
|
|
|
2010-05-19 14:12:19 +04:00
|
|
|
err = dev_get_valid_name(dev, newname, 1);
|
2009-11-18 05:36:59 +03:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-07-31 04:03:38 +04:00
|
|
|
rollback:
|
2010-05-05 04:36:49 +04:00
|
|
|
ret = device_rename(&dev->dev, dev->name);
|
|
|
|
if (ret) {
|
|
|
|
memcpy(dev->name, oldname, IFNAMSIZ);
|
|
|
|
return ret;
|
2008-05-15 09:33:38 +04:00
|
|
|
}
|
2007-07-31 03:35:46 +04:00
|
|
|
|
|
|
|
write_lock_bh(&dev_base_lock);
|
[PATCH] net: Ignore sysfs network device rename bugs.
The generic networking code ensures that no two networking devices
have the same name, so there is no time except when sysfs has
implementation bugs that device_rename when called from
dev_change_name will fail.
The current error handling for errors from device_rename in
dev_change_name is wrong and results in an unusable and unrecoverable
network device if device_rename is happens to return an error.
This patch removes the buggy error handling. Which confines the mess
when device_rename hits a problem to sysfs, instead of propagating it
the rest of the network stack. Making linux a little more robust.
Without this patch you can observe what happens when sysfs has a bug
when CONFIG_SYSFS_DEPRECATED is not set and you attempt to rename
a real network device to a name like (broken_parity_status, device,
modalias, power, resource2, subsystem_vendor, class, driver, irq,
msi_bus, resource, subsystem, uevent, config, enable, local_cpus,
numa_node, resource0, subsystem_device, vendor)
Greg has a patch that fixes the sysfs bugs but he doesn't trust it
for a 2.6.21 timeframe. This patch which just ignores errors should
be safe and it keeps the system from going completely wacky.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-04-03 10:07:30 +04:00
|
|
|
hlist_del(&dev->name_hlist);
|
2009-10-30 10:11:27 +03:00
|
|
|
write_unlock_bh(&dev_base_lock);
|
|
|
|
|
|
|
|
synchronize_rcu();
|
|
|
|
|
|
|
|
write_lock_bh(&dev_base_lock);
|
|
|
|
hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name));
|
2007-07-31 03:35:46 +04:00
|
|
|
write_unlock_bh(&dev_base_lock);
|
|
|
|
|
2007-09-17 02:42:43 +04:00
|
|
|
ret = call_netdevice_notifiers(NETDEV_CHANGENAME, dev);
|
2007-07-31 04:03:38 +04:00
|
|
|
ret = notifier_to_errno(ret);
|
|
|
|
|
|
|
|
if (ret) {
|
2009-11-16 02:30:24 +03:00
|
|
|
/* err >= 0 after dev_alloc_name() or stores the first errno */
|
|
|
|
if (err >= 0) {
|
2007-07-31 04:03:38 +04:00
|
|
|
err = ret;
|
|
|
|
memcpy(dev->name, oldname, IFNAMSIZ);
|
|
|
|
goto rollback;
|
2009-11-16 02:30:24 +03:00
|
|
|
} else {
|
|
|
|
printk(KERN_ERR
|
|
|
|
"%s: name change rollback failed: %d.\n",
|
|
|
|
dev->name, ret);
|
2007-07-31 04:03:38 +04:00
|
|
|
}
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-09-23 08:28:11 +04:00
|
|
|
/**
|
|
|
|
* dev_set_alias - change ifalias of a device
|
|
|
|
* @dev: device
|
|
|
|
* @alias: name up to IFALIASZ
|
2008-09-30 13:23:58 +04:00
|
|
|
* @len: limit of bytes to copy from info
|
2008-09-23 08:28:11 +04:00
|
|
|
*
|
|
|
|
* Set ifalias for a device,
|
|
|
|
*/
|
|
|
|
int dev_set_alias(struct net_device *dev, const char *alias, size_t len)
|
|
|
|
{
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
if (len >= IFALIASZ)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-09-24 08:23:19 +04:00
|
|
|
if (!len) {
|
|
|
|
if (dev->ifalias) {
|
|
|
|
kfree(dev->ifalias);
|
|
|
|
dev->ifalias = NULL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
dev->ifalias = krealloc(dev->ifalias, len + 1, GFP_KERNEL);
|
2008-09-23 08:28:11 +04:00
|
|
|
if (!dev->ifalias)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
strlcpy(dev->ifalias, alias, len+1);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-30 01:13:47 +04:00
|
|
|
/**
|
2006-05-27 00:25:24 +04:00
|
|
|
* netdev_features_change - device changes features
|
2005-05-30 01:13:47 +04:00
|
|
|
* @dev: device to cause notification
|
|
|
|
*
|
|
|
|
* Called to indicate a device has changed features.
|
|
|
|
*/
|
|
|
|
void netdev_features_change(struct net_device *dev)
|
|
|
|
{
|
2007-09-17 02:42:43 +04:00
|
|
|
call_netdevice_notifiers(NETDEV_FEAT_CHANGE, dev);
|
2005-05-30 01:13:47 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_features_change);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* netdev_state_change - device changes state
|
|
|
|
* @dev: device to cause notification
|
|
|
|
*
|
|
|
|
* Called to indicate a device has changed state. This function calls
|
|
|
|
* the notifier chains for netdev_chain and sends a NEWLINK message
|
|
|
|
* to the routing socket.
|
|
|
|
*/
|
|
|
|
void netdev_state_change(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (dev->flags & IFF_UP) {
|
2007-09-17 02:42:43 +04:00
|
|
|
call_netdevice_notifiers(NETDEV_CHANGE, dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, 0);
|
|
|
|
}
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(netdev_state_change);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-03-10 13:29:35 +03:00
|
|
|
int netdev_bonding_change(struct net_device *dev, unsigned long event)
|
2008-06-14 05:12:00 +04:00
|
|
|
{
|
2010-03-10 13:29:35 +03:00
|
|
|
return call_netdevice_notifiers(event, dev);
|
2008-06-14 05:12:00 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_bonding_change);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* dev_load - load a network module
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @name: name of interface
|
|
|
|
*
|
|
|
|
* If a network interface is not present and the process has suitable
|
|
|
|
* privileges this function loads the module. If module loading is not
|
|
|
|
* available in this kernel then it becomes a nop.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
void dev_load(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-02-09 17:24:36 +03:00
|
|
|
struct net_device *dev;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-30 10:11:27 +03:00
|
|
|
rcu_read_lock();
|
|
|
|
dev = dev_get_by_name_rcu(net, name);
|
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-08-13 17:44:51 +04:00
|
|
|
if (!dev && capable(CAP_NET_ADMIN))
|
2005-04-17 02:20:36 +04:00
|
|
|
request_module("%s", name);
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_load);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-26 09:34:53 +03:00
|
|
|
static int __dev_open(struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2008-11-20 08:32:24 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2009-05-30 03:39:53 +04:00
|
|
|
int ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-05-08 13:53:17 +04:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Is it even present?
|
|
|
|
*/
|
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
|
|
|
|
2009-05-30 03:39:53 +04:00
|
|
|
ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev);
|
|
|
|
ret = notifier_to_errno(ret);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Call device private open method
|
|
|
|
*/
|
|
|
|
set_bit(__LINK_STATE_START, &dev->state);
|
2007-10-24 07:19:37 +04:00
|
|
|
|
2008-11-20 08:32:24 +03:00
|
|
|
if (ops->ndo_validate_addr)
|
|
|
|
ret = ops->ndo_validate_addr(dev);
|
2007-10-24 07:19:37 +04:00
|
|
|
|
2008-11-20 08:32:24 +03:00
|
|
|
if (!ret && ops->ndo_open)
|
|
|
|
ret = ops->ndo_open(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-02-09 17:24:36 +03:00
|
|
|
/*
|
2005-04-17 02:20:36 +04:00
|
|
|
* If it went open OK then:
|
|
|
|
*/
|
|
|
|
|
2007-10-24 07:19:37 +04:00
|
|
|
if (ret)
|
|
|
|
clear_bit(__LINK_STATE_START, &dev->state);
|
|
|
|
else {
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Set the flags.
|
|
|
|
*/
|
|
|
|
dev->flags |= IFF_UP;
|
|
|
|
|
2009-01-11 11:20:39 +03:00
|
|
|
/*
|
|
|
|
* Enable NET_DMA
|
|
|
|
*/
|
2009-02-07 09:06:43 +03:00
|
|
|
net_dmaengine_get();
|
2009-01-11 11:20:39 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Initialize multicasting status
|
|
|
|
*/
|
2007-06-27 12:28:10 +04:00
|
|
|
dev_set_rx_mode(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Wakeup transmit queue engine
|
|
|
|
*/
|
|
|
|
dev_activate(dev);
|
|
|
|
}
|
2007-10-24 07:19:37 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2010-02-26 09:34:53 +03:00
|
|
|
* dev_open - prepare an interface for use.
|
|
|
|
* @dev: device to open
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
2010-02-26 09:34:53 +03:00
|
|
|
* Takes a device from down to up state. The device's private open
|
|
|
|
* function is invoked and then the multicast lists are loaded. Finally
|
|
|
|
* the device is moved into the up state and a %NETDEV_UP message is
|
|
|
|
* sent to the netdev notifier chain.
|
|
|
|
*
|
|
|
|
* Calling this function on an active interface is a nop. On a failure
|
|
|
|
* a negative errno code is returned.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2010-02-26 09:34:53 +03:00
|
|
|
int dev_open(struct net_device *dev)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Is it already up?
|
|
|
|
*/
|
|
|
|
if (dev->flags & IFF_UP)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open device
|
|
|
|
*/
|
|
|
|
ret = __dev_open(dev);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ... and announce new interface.
|
|
|
|
*/
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
|
|
|
|
call_netdevice_notifiers(NETDEV_UP, dev);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_open);
|
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
static int __dev_close_many(struct list_head *head)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-12-13 15:44:07 +03:00
|
|
|
struct net_device *dev;
|
2008-05-08 13:53:17 +04:00
|
|
|
|
2010-02-26 09:34:53 +03:00
|
|
|
ASSERT_RTNL();
|
2007-09-12 16:33:25 +04:00
|
|
|
might_sleep();
|
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list) {
|
|
|
|
/*
|
|
|
|
* Tell people we are going down, so that they can
|
|
|
|
* prepare to death, when device is still operating.
|
|
|
|
*/
|
|
|
|
call_netdevice_notifiers(NETDEV_GOING_DOWN, dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
clear_bit(__LINK_STATE_START, &dev->state);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
/* Synchronize to scheduled poll. We cannot touch poll list, it
|
|
|
|
* can be even on different cpu. So just clear netif_running().
|
|
|
|
*
|
|
|
|
* dev->stop() will invoke napi_disable() on all of it's
|
|
|
|
* napi_struct instances on this device.
|
|
|
|
*/
|
|
|
|
smp_mb__after_clear_bit(); /* Commit netif_running(). */
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
dev_deactivate_many(head);
|
2008-02-13 10:10:11 +03:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list) {
|
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
/*
|
|
|
|
* Call the device specific close. This cannot fail.
|
|
|
|
* Only if device is UP
|
|
|
|
*
|
|
|
|
* We allow it to be called even after a DETACH hot-plug
|
|
|
|
* event.
|
|
|
|
*/
|
|
|
|
if (ops->ndo_stop)
|
|
|
|
ops->ndo_stop(dev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Device is now down.
|
|
|
|
*/
|
|
|
|
|
|
|
|
dev->flags &= ~IFF_UP;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Shutdown NET_DMA
|
|
|
|
*/
|
|
|
|
net_dmaengine_put();
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __dev_close(struct net_device *dev)
|
|
|
|
{
|
|
|
|
LIST_HEAD(single);
|
|
|
|
|
|
|
|
list_add(&dev->unreg_list, &single);
|
|
|
|
return __dev_close_many(&single);
|
|
|
|
}
|
|
|
|
|
|
|
|
int dev_close_many(struct list_head *head)
|
|
|
|
{
|
|
|
|
struct net_device *dev, *tmp;
|
|
|
|
LIST_HEAD(tmp_list);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
list_for_each_entry_safe(dev, tmp, head, unreg_list)
|
|
|
|
if (!(dev->flags & IFF_UP))
|
|
|
|
list_move(&dev->unreg_list, &tmp_list);
|
|
|
|
|
|
|
|
__dev_close_many(head);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
2010-12-13 15:44:07 +03:00
|
|
|
* Tell people we are down
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2010-12-13 15:44:07 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list) {
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
|
|
|
|
call_netdevice_notifiers(NETDEV_DOWN, dev);
|
|
|
|
}
|
2010-02-26 09:34:53 +03:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
/* rollback_registered_many needs the complete original list */
|
|
|
|
list_splice(&tmp_list, head);
|
2010-02-26 09:34:53 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_close - shutdown an interface.
|
|
|
|
* @dev: device to shutdown
|
|
|
|
*
|
|
|
|
* This function moves an active device into down state. A
|
|
|
|
* %NETDEV_GOING_DOWN is sent to the netdev notifier chain. The device
|
|
|
|
* is then deactivated and finally a %NETDEV_DOWN is sent to the notifier
|
|
|
|
* chain.
|
|
|
|
*/
|
|
|
|
int dev_close(struct net_device *dev)
|
|
|
|
{
|
2010-12-13 15:44:07 +03:00
|
|
|
LIST_HEAD(single);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
list_add(&dev->unreg_list, &single);
|
|
|
|
dev_close_many(&single);
|
2009-01-11 11:20:39 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_close);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
2008-06-20 03:15:47 +04:00
|
|
|
/**
|
|
|
|
* dev_disable_lro - disable Large Receive Offload on a device
|
|
|
|
* @dev: device
|
|
|
|
*
|
|
|
|
* Disable Large Receive Offload (LRO) on a net device. Must be
|
|
|
|
* called under RTNL. This is needed if received packets may be
|
|
|
|
* forwarded to another interface.
|
|
|
|
*/
|
|
|
|
void dev_disable_lro(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (dev->ethtool_ops && dev->ethtool_ops->get_flags &&
|
|
|
|
dev->ethtool_ops->set_flags) {
|
|
|
|
u32 flags = dev->ethtool_ops->get_flags(dev);
|
|
|
|
if (flags & ETH_FLAG_LRO) {
|
|
|
|
flags &= ~ETH_FLAG_LRO;
|
|
|
|
dev->ethtool_ops->set_flags(dev, flags);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
WARN_ON(dev->features & NETIF_F_LRO);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_disable_lro);
|
|
|
|
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
static int dev_boot_phase = 1;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Device change register/unregister. These are not inline or static
|
|
|
|
* as we export them to the world.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* register_netdevice_notifier - register a network notifier block
|
|
|
|
* @nb: notifier
|
|
|
|
*
|
|
|
|
* Register a notifier to be called when network device events occur.
|
|
|
|
* The notifier passed is linked into the kernel structures and must
|
|
|
|
* not be reused until it has been unregistered. A negative errno code
|
|
|
|
* is returned on a failure.
|
|
|
|
*
|
|
|
|
* When registered all registration and up events are replayed
|
2007-02-09 17:24:36 +03:00
|
|
|
* to the new notifier to allow device to have a race free
|
2005-04-17 02:20:36 +04:00
|
|
|
* view of the network device list.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int register_netdevice_notifier(struct notifier_block *nb)
|
|
|
|
{
|
|
|
|
struct net_device *dev;
|
2007-07-31 04:03:38 +04:00
|
|
|
struct net_device *last;
|
2007-09-17 22:56:21 +04:00
|
|
|
struct net *net;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
|
|
|
rtnl_lock();
|
2006-05-10 02:23:03 +04:00
|
|
|
err = raw_notifier_chain_register(&netdev_chain, nb);
|
2007-07-31 04:03:38 +04:00
|
|
|
if (err)
|
|
|
|
goto unlock;
|
2007-09-17 22:56:21 +04:00
|
|
|
if (dev_boot_phase)
|
|
|
|
goto unlock;
|
|
|
|
for_each_net(net) {
|
|
|
|
for_each_netdev(net, dev) {
|
|
|
|
err = nb->notifier_call(nb, NETDEV_REGISTER, dev);
|
|
|
|
err = notifier_to_errno(err);
|
|
|
|
if (err)
|
|
|
|
goto rollback;
|
|
|
|
|
|
|
|
if (!(dev->flags & IFF_UP))
|
|
|
|
continue;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
nb->notifier_call(nb, NETDEV_UP, dev);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-07-31 04:03:38 +04:00
|
|
|
|
|
|
|
unlock:
|
2005-04-17 02:20:36 +04:00
|
|
|
rtnl_unlock();
|
|
|
|
return err;
|
2007-07-31 04:03:38 +04:00
|
|
|
|
|
|
|
rollback:
|
|
|
|
last = dev;
|
2007-09-17 22:56:21 +04:00
|
|
|
for_each_net(net) {
|
|
|
|
for_each_netdev(net, dev) {
|
|
|
|
if (dev == last)
|
|
|
|
break;
|
2007-07-31 04:03:38 +04:00
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
if (dev->flags & IFF_UP) {
|
|
|
|
nb->notifier_call(nb, NETDEV_GOING_DOWN, dev);
|
|
|
|
nb->notifier_call(nb, NETDEV_DOWN, dev);
|
|
|
|
}
|
|
|
|
nb->notifier_call(nb, NETDEV_UNREGISTER, dev);
|
2009-11-29 18:45:58 +03:00
|
|
|
nb->notifier_call(nb, NETDEV_UNREGISTER_BATCH, dev);
|
2007-07-31 04:03:38 +04:00
|
|
|
}
|
|
|
|
}
|
2007-11-15 02:53:16 +03:00
|
|
|
|
|
|
|
raw_notifier_chain_unregister(&netdev_chain, nb);
|
2007-07-31 04:03:38 +04:00
|
|
|
goto unlock;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(register_netdevice_notifier);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* unregister_netdevice_notifier - unregister a network notifier block
|
|
|
|
* @nb: notifier
|
|
|
|
*
|
|
|
|
* Unregister a notifier previously registered by
|
|
|
|
* register_netdevice_notifier(). The notifier is unlinked into the
|
|
|
|
* kernel structures and may then be reused. A negative errno code
|
|
|
|
* is returned on a failure.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int unregister_netdevice_notifier(struct notifier_block *nb)
|
|
|
|
{
|
2006-03-25 12:24:25 +03:00
|
|
|
int err;
|
|
|
|
|
|
|
|
rtnl_lock();
|
2006-05-10 02:23:03 +04:00
|
|
|
err = raw_notifier_chain_unregister(&netdev_chain, nb);
|
2006-03-25 12:24:25 +03:00
|
|
|
rtnl_unlock();
|
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(unregister_netdevice_notifier);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* call_netdevice_notifiers - call all network notifier blocks
|
|
|
|
* @val: value passed unmodified to notifier function
|
2007-10-13 08:17:49 +04:00
|
|
|
* @dev: net_device pointer passed unmodified to notifier function
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Call all network notifier blocks. Parameters and return value
|
2006-05-10 02:23:03 +04:00
|
|
|
* are as for raw_notifier_call_chain().
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
2007-09-17 02:33:32 +04:00
|
|
|
int call_netdevice_notifiers(unsigned long val, struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-04-20 12:45:37 +04:00
|
|
|
ASSERT_RTNL();
|
2007-09-17 02:33:32 +04:00
|
|
|
return raw_notifier_call_chain(&netdev_chain, val, dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* When > 0 there are consumers of rx skb time stamps */
|
|
|
|
static atomic_t netstamp_needed = ATOMIC_INIT(0);
|
|
|
|
|
|
|
|
void net_enable_timestamp(void)
|
|
|
|
{
|
|
|
|
atomic_inc(&netstamp_needed);
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(net_enable_timestamp);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
void net_disable_timestamp(void)
|
|
|
|
{
|
|
|
|
atomic_dec(&netstamp_needed);
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(net_disable_timestamp);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
static inline void net_timestamp_set(struct sk_buff *skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
if (atomic_read(&netstamp_needed))
|
2005-08-15 04:24:31 +04:00
|
|
|
__net_timestamp(skb);
|
2007-04-20 03:16:32 +04:00
|
|
|
else
|
|
|
|
skb->tstamp.tv64 = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
static inline void net_timestamp_check(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (!skb->tstamp.tv64 && atomic_read(&netstamp_needed))
|
|
|
|
__net_timestamp(skb);
|
|
|
|
}
|
|
|
|
|
2009-11-26 09:07:08 +03:00
|
|
|
/**
|
|
|
|
* dev_forward_skb - loopback an skb to another netif
|
|
|
|
*
|
|
|
|
* @dev: destination network device
|
|
|
|
* @skb: buffer to forward
|
|
|
|
*
|
|
|
|
* return values:
|
|
|
|
* NET_RX_SUCCESS (no congestion)
|
2010-05-06 11:53:53 +04:00
|
|
|
* NET_RX_DROP (packet was dropped, but freed)
|
2009-11-26 09:07:08 +03:00
|
|
|
*
|
|
|
|
* dev_forward_skb can be used for injecting an skb from the
|
|
|
|
* start_xmit function of one device into the receive queue
|
|
|
|
* of another device.
|
|
|
|
*
|
|
|
|
* The receiving device may be in another namespace, so
|
|
|
|
* we have to clear all information in the skb that could
|
|
|
|
* impact namespace isolation.
|
|
|
|
*/
|
|
|
|
int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb_orphan(skb);
|
2010-07-22 13:54:47 +04:00
|
|
|
nf_reset(skb);
|
2009-11-26 09:07:08 +03:00
|
|
|
|
2010-10-01 01:06:55 +04:00
|
|
|
if (unlikely(!(dev->flags & IFF_UP) ||
|
2010-10-21 19:43:05 +04:00
|
|
|
(skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN)))) {
|
2010-10-01 01:06:55 +04:00
|
|
|
atomic_long_inc(&dev->rx_dropped);
|
2010-05-06 11:53:53 +04:00
|
|
|
kfree_skb(skb);
|
2009-11-26 09:07:08 +03:00
|
|
|
return NET_RX_DROP;
|
2010-05-06 11:53:53 +04:00
|
|
|
}
|
2010-01-30 15:23:03 +03:00
|
|
|
skb_set_dev(skb, dev);
|
2009-11-26 09:07:08 +03:00
|
|
|
skb->tstamp.tv64 = 0;
|
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
skb->protocol = eth_type_trans(skb, dev);
|
|
|
|
return netif_rx(skb);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(dev_forward_skb);
|
|
|
|
|
2010-12-15 22:57:25 +03:00
|
|
|
static inline int deliver_skb(struct sk_buff *skb,
|
|
|
|
struct packet_type *pt_prev,
|
|
|
|
struct net_device *orig_dev)
|
|
|
|
{
|
|
|
|
atomic_inc(&skb->users);
|
|
|
|
return pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Support routine. Sends outgoing frames to any network
|
|
|
|
* taps currently in use.
|
|
|
|
*/
|
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct packet_type *ptype;
|
2010-12-15 22:57:25 +03:00
|
|
|
struct sk_buff *skb2 = NULL;
|
|
|
|
struct packet_type *pt_prev = NULL;
|
2005-08-15 04:24:31 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(ptype, &ptype_all, list) {
|
|
|
|
/* Never send packets back to the socket
|
|
|
|
* they originated from - MvS (miquels@drinkel.ow.org)
|
|
|
|
*/
|
|
|
|
if ((ptype->dev == dev || !ptype->dev) &&
|
|
|
|
(ptype->af_packet_priv == NULL ||
|
|
|
|
(struct sock *)ptype->af_packet_priv != skb->sk)) {
|
2010-12-15 22:57:25 +03:00
|
|
|
if (pt_prev) {
|
|
|
|
deliver_skb(skb2, pt_prev, skb->dev);
|
|
|
|
pt_prev = ptype;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb2 = skb_clone(skb, GFP_ATOMIC);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!skb2)
|
|
|
|
break;
|
|
|
|
|
2010-12-21 00:22:51 +03:00
|
|
|
net_timestamp_set(skb2);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* skb->nh should be correctly
|
|
|
|
set by sender, so that the second statement is
|
|
|
|
just protection against buggy protocols.
|
|
|
|
*/
|
2007-03-20 01:30:44 +03:00
|
|
|
skb_reset_mac_header(skb2);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-04-11 07:50:43 +04:00
|
|
|
if (skb_network_header(skb2) < skb2->data ||
|
2007-04-20 07:29:13 +04:00
|
|
|
skb2->network_header > skb2->tail) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (net_ratelimit())
|
|
|
|
printk(KERN_CRIT "protocol %04x is "
|
|
|
|
"buggy, dev %s\n",
|
2010-06-30 21:39:19 +04:00
|
|
|
ntohs(skb2->protocol),
|
|
|
|
dev->name);
|
2007-04-11 07:45:18 +04:00
|
|
|
skb_reset_network_header(skb2);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-04-11 08:21:55 +04:00
|
|
|
skb2->transport_header = skb2->network_header;
|
2005-04-17 02:20:36 +04:00
|
|
|
skb2->pkt_type = PACKET_OUTGOING;
|
2010-12-15 22:57:25 +03:00
|
|
|
pt_prev = ptype;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
2010-12-15 22:57:25 +03:00
|
|
|
if (pt_prev)
|
|
|
|
pt_prev->func(skb2, skb->dev, pt_prev, skb->dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2011-01-17 11:06:04 +03:00
|
|
|
/* netif_setup_tc - Handle tc mappings on real_num_tx_queues change
|
|
|
|
* @dev: Network device
|
|
|
|
* @txq: number of queues available
|
|
|
|
*
|
|
|
|
* If real_num_tx_queues is changed the tc mappings may no longer be
|
|
|
|
* valid. To resolve this verify the tc mapping remains valid and if
|
|
|
|
* not NULL the mapping. With no priorities mapping to this
|
|
|
|
* offset/count pair it will no longer be used. In the worst case TC0
|
|
|
|
* is invalid nothing can be done so disable priority mappings. If is
|
|
|
|
* expected that drivers will fix this mapping if they can before
|
|
|
|
* calling netif_set_real_num_tx_queues.
|
|
|
|
*/
|
|
|
|
void netif_setup_tc(struct net_device *dev, unsigned int txq)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct netdev_tc_txq *tc = &dev->tc_to_txq[0];
|
|
|
|
|
|
|
|
/* If TC0 is invalidated disable TC mapping */
|
|
|
|
if (tc->offset + tc->count > txq) {
|
|
|
|
pr_warning("Number of in use tx queues changed "
|
|
|
|
"invalidating tc mappings. Priority "
|
|
|
|
"traffic classification disabled!\n");
|
|
|
|
dev->num_tc = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Invalidated prio to tc mappings set to TC0 */
|
|
|
|
for (i = 1; i < TC_BITMASK + 1; i++) {
|
|
|
|
int q = netdev_get_prio_tc_map(dev, i);
|
|
|
|
|
|
|
|
tc = &dev->tc_to_txq[q];
|
|
|
|
if (tc->offset + tc->count > txq) {
|
|
|
|
pr_warning("Number of in use tx queues "
|
|
|
|
"changed. Priority %i to tc "
|
|
|
|
"mapping %i is no longer valid "
|
|
|
|
"setting map to 0\n",
|
|
|
|
i, q);
|
|
|
|
netdev_set_prio_tc_map(dev, i, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-01 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Routine to help set real_num_tx_queues. To avoid skbs mapped to queues
|
|
|
|
* greater then real_num_tx_queues stale skbs on the qdisc must be flushed.
|
|
|
|
*/
|
2010-10-18 22:04:39 +04:00
|
|
|
int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
|
2010-07-01 17:21:57 +04:00
|
|
|
{
|
2010-11-21 16:17:27 +03:00
|
|
|
int rc;
|
|
|
|
|
2010-10-18 22:04:39 +04:00
|
|
|
if (txq < 1 || txq > dev->num_tx_queues)
|
|
|
|
return -EINVAL;
|
2010-07-01 17:21:57 +04:00
|
|
|
|
2010-10-18 22:04:39 +04:00
|
|
|
if (dev->reg_state == NETREG_REGISTERED) {
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2010-11-21 16:17:27 +03:00
|
|
|
rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues,
|
|
|
|
txq);
|
2010-11-26 11:36:09 +03:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2011-01-17 11:06:04 +03:00
|
|
|
if (dev->num_tc)
|
|
|
|
netif_setup_tc(dev, txq);
|
|
|
|
|
2010-10-18 22:04:39 +04:00
|
|
|
if (txq < dev->real_num_tx_queues)
|
|
|
|
qdisc_reset_all_tx_gt(dev, txq);
|
2010-07-01 17:21:57 +04:00
|
|
|
}
|
2010-10-18 22:04:39 +04:00
|
|
|
|
|
|
|
dev->real_num_tx_queues = txq;
|
|
|
|
return 0;
|
2010-07-01 17:21:57 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_set_real_num_tx_queues);
|
2006-03-30 03:57:29 +04:00
|
|
|
|
2010-09-27 12:24:33 +04:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
/**
|
|
|
|
* netif_set_real_num_rx_queues - set actual number of RX queues used
|
|
|
|
* @dev: Network device
|
|
|
|
* @rxq: Actual number of RX queues
|
|
|
|
*
|
|
|
|
* This must be called either with the rtnl_lock held or before
|
|
|
|
* registration of the net device. Returns 0 on success, or a
|
2010-10-08 21:33:39 +04:00
|
|
|
* negative error code. If called before registration, it always
|
|
|
|
* succeeds.
|
2010-09-27 12:24:33 +04:00
|
|
|
*/
|
|
|
|
int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
2010-10-18 22:00:16 +04:00
|
|
|
if (rxq < 1 || rxq > dev->num_rx_queues)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-09-27 12:24:33 +04:00
|
|
|
if (dev->reg_state == NETREG_REGISTERED) {
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
rc = net_rx_queue_update_kobjects(dev, dev->real_num_rx_queues,
|
|
|
|
rxq);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev->real_num_rx_queues = rxq;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_set_real_num_rx_queues);
|
|
|
|
#endif
|
|
|
|
|
2008-08-18 08:54:43 +04:00
|
|
|
static inline void __netif_reschedule(struct Qdisc *q)
|
2006-03-30 03:57:29 +04:00
|
|
|
{
|
2008-08-18 08:54:43 +04:00
|
|
|
struct softnet_data *sd;
|
|
|
|
unsigned long flags;
|
2006-03-30 03:57:29 +04:00
|
|
|
|
2008-08-18 08:54:43 +04:00
|
|
|
local_irq_save(flags);
|
|
|
|
sd = &__get_cpu_var(softnet_data);
|
2010-04-27 03:06:24 +04:00
|
|
|
q->next_sched = NULL;
|
|
|
|
*sd->output_queue_tailp = q;
|
|
|
|
sd->output_queue_tailp = &q->next_sched;
|
2008-08-18 08:54:43 +04:00
|
|
|
raise_softirq_irqoff(NET_TX_SOFTIRQ);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void __netif_schedule(struct Qdisc *q)
|
|
|
|
{
|
|
|
|
if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state))
|
|
|
|
__netif_reschedule(q);
|
2006-03-30 03:57:29 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__netif_schedule);
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
void dev_kfree_skb_irq(struct sk_buff *skb)
|
2006-03-30 03:57:29 +04:00
|
|
|
{
|
2010-08-03 11:24:04 +04:00
|
|
|
if (atomic_dec_and_test(&skb->users)) {
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
struct softnet_data *sd;
|
|
|
|
unsigned long flags;
|
2006-03-30 03:57:29 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
local_irq_save(flags);
|
|
|
|
sd = &__get_cpu_var(softnet_data);
|
|
|
|
skb->next = sd->completion_queue;
|
|
|
|
sd->completion_queue = skb;
|
|
|
|
raise_softirq_irqoff(NET_TX_SOFTIRQ);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
2006-03-30 03:57:29 +04:00
|
|
|
}
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
EXPORT_SYMBOL(dev_kfree_skb_irq);
|
2006-03-30 03:57:29 +04:00
|
|
|
|
|
|
|
void dev_kfree_skb_any(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (in_irq() || irqs_disabled())
|
|
|
|
dev_kfree_skb_irq(skb);
|
|
|
|
else
|
|
|
|
dev_kfree_skb(skb);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_kfree_skb_any);
|
|
|
|
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
/**
|
|
|
|
* netif_device_detach - mark device as removed
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Mark device as removed from system and therefore no longer available.
|
|
|
|
*/
|
2006-03-30 03:57:29 +04:00
|
|
|
void netif_device_detach(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (test_and_clear_bit(__LINK_STATE_PRESENT, &dev->state) &&
|
|
|
|
netif_running(dev)) {
|
2009-04-08 17:15:22 +04:00
|
|
|
netif_tx_stop_all_queues(dev);
|
2006-03-30 03:57:29 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_device_detach);
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
/**
|
|
|
|
* netif_device_attach - mark device as attached
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Mark device as attached from system and restart if needed.
|
|
|
|
*/
|
2006-03-30 03:57:29 +04:00
|
|
|
void netif_device_attach(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (!test_and_set_bit(__LINK_STATE_PRESENT, &dev->state) &&
|
|
|
|
netif_running(dev)) {
|
2009-04-08 17:15:22 +04:00
|
|
|
netif_tx_wake_all_queues(dev);
|
2007-02-09 17:24:36 +03:00
|
|
|
__netdev_watchdog_up(dev);
|
2006-03-30 03:57:29 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_device_attach);
|
|
|
|
|
2010-01-30 15:23:03 +03:00
|
|
|
/**
|
|
|
|
* skb_dev_set -- assign a new device to a buffer
|
|
|
|
* @skb: buffer for the new device
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* If an skb is owned by a device already, we have to reset
|
|
|
|
* all data private to the namespace a device belongs to
|
|
|
|
* before assigning it a new device.
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_NET_NS
|
|
|
|
void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
{
|
|
|
|
skb_dst_drop(skb);
|
|
|
|
if (skb->dev && !net_eq(dev_net(skb->dev), dev_net(dev))) {
|
|
|
|
secpath_reset(skb);
|
|
|
|
nf_reset(skb);
|
|
|
|
skb_init_secmark(skb);
|
|
|
|
skb->mark = 0;
|
|
|
|
skb->priority = 0;
|
|
|
|
skb->nf_trace = 0;
|
|
|
|
skb->ipvs_property = 0;
|
|
|
|
#ifdef CONFIG_NET_SCHED
|
|
|
|
skb->tc_index = 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
skb->dev = dev;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(skb_set_dev);
|
|
|
|
#endif /* CONFIG_NET_NS */
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Invalidate hardware checksum when packet is to be mangled, and
|
|
|
|
* complete checksum manually on outgoing path.
|
|
|
|
*/
|
2006-08-30 03:44:56 +04:00
|
|
|
int skb_checksum_help(struct sk_buff *skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-11-15 08:24:49 +03:00
|
|
|
__wsum csum;
|
2007-04-09 22:59:07 +04:00
|
|
|
int ret = 0, offset;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-08-30 03:44:56 +04:00
|
|
|
if (skb->ip_summed == CHECKSUM_COMPLETE)
|
2006-07-09 00:34:56 +04:00
|
|
|
goto out_set_summed;
|
|
|
|
|
|
|
|
if (unlikely(skb_shinfo(skb)->gso_size)) {
|
|
|
|
/* Let GSO fix up the checksum. */
|
|
|
|
goto out_set_summed;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2010-12-14 18:24:08 +03:00
|
|
|
offset = skb_checksum_start_offset(skb);
|
2007-10-15 12:47:15 +04:00
|
|
|
BUG_ON(offset >= skb_headlen(skb));
|
|
|
|
csum = skb_checksum(skb, offset, skb->len - offset, 0);
|
|
|
|
|
|
|
|
offset += skb->csum_offset;
|
|
|
|
BUG_ON(offset + sizeof(__sum16) > skb_headlen(skb));
|
|
|
|
|
|
|
|
if (skb_cloned(skb) &&
|
|
|
|
!skb_clone_writable(skb, offset + sizeof(__sum16))) {
|
2005-04-17 02:20:36 +04:00
|
|
|
ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2007-10-15 12:47:15 +04:00
|
|
|
*(__sum16 *)(skb->data + offset) = csum_fold(csum);
|
2006-07-09 00:34:56 +04:00
|
|
|
out_set_summed:
|
2005-04-17 02:20:36 +04:00
|
|
|
skb->ip_summed = CHECKSUM_NONE;
|
2007-02-09 17:24:36 +03:00
|
|
|
out:
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(skb_checksum_help);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
/**
|
|
|
|
* skb_gso_segment - Perform segmentation on skb.
|
|
|
|
* @skb: buffer to segment
|
2006-06-28 00:22:38 +04:00
|
|
|
* @features: features for the output path (see dev->features)
|
2006-06-22 13:57:17 +04:00
|
|
|
*
|
|
|
|
* This function segments the given skb and returns a list of segments.
|
2006-06-28 00:22:38 +04:00
|
|
|
*
|
|
|
|
* It may return NULL if the skb requires no segmentation. This is
|
|
|
|
* only possible when GSO is used for verifying header integrity.
|
2006-06-22 13:57:17 +04:00
|
|
|
*/
|
2006-06-28 00:22:38 +04:00
|
|
|
struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
|
2006-06-22 13:57:17 +04:00
|
|
|
{
|
|
|
|
struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
|
|
|
|
struct packet_type *ptype;
|
2006-11-15 07:48:11 +03:00
|
|
|
__be16 type = skb->protocol;
|
2010-10-29 16:14:54 +04:00
|
|
|
int vlan_depth = ETH_HLEN;
|
2006-07-09 00:34:56 +04:00
|
|
|
int err;
|
2006-06-22 13:57:17 +04:00
|
|
|
|
2010-10-29 16:14:54 +04:00
|
|
|
while (type == htons(ETH_P_8021Q)) {
|
|
|
|
struct vlan_hdr *vh;
|
2010-10-20 17:56:04 +04:00
|
|
|
|
2010-10-29 16:14:54 +04:00
|
|
|
if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))
|
2010-10-20 17:56:04 +04:00
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
|
2010-10-29 16:14:54 +04:00
|
|
|
vh = (struct vlan_hdr *)(skb->data + vlan_depth);
|
|
|
|
type = vh->h_vlan_encapsulated_proto;
|
|
|
|
vlan_depth += VLAN_HLEN;
|
2010-10-20 17:56:04 +04:00
|
|
|
}
|
|
|
|
|
2007-03-20 01:30:44 +03:00
|
|
|
skb_reset_mac_header(skb);
|
2007-04-11 08:21:55 +04:00
|
|
|
skb->mac_len = skb->network_header - skb->mac_header;
|
2006-06-22 13:57:17 +04:00
|
|
|
__skb_pull(skb, skb->mac_len);
|
|
|
|
|
2009-01-20 03:26:44 +03:00
|
|
|
if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
|
|
|
|
struct net_device *dev = skb->dev;
|
|
|
|
struct ethtool_drvinfo info = {};
|
|
|
|
|
|
|
|
if (dev && dev->ethtool_ops && dev->ethtool_ops->get_drvinfo)
|
|
|
|
dev->ethtool_ops->get_drvinfo(dev, &info);
|
|
|
|
|
2010-10-30 15:08:52 +04:00
|
|
|
WARN(1, "%s: caps=(0x%lx, 0x%lx) len=%d data_len=%d ip_summed=%d\n",
|
2009-01-20 03:26:44 +03:00
|
|
|
info.driver, dev ? dev->features : 0L,
|
|
|
|
skb->sk ? skb->sk->sk_route_caps : 0L,
|
|
|
|
skb->len, skb->data_len, skb->ip_summed);
|
|
|
|
|
2006-07-09 00:34:56 +04:00
|
|
|
if (skb_header_cloned(skb) &&
|
|
|
|
(err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
rcu_read_lock();
|
2007-11-26 15:12:58 +03:00
|
|
|
list_for_each_entry_rcu(ptype,
|
|
|
|
&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
|
2006-06-22 13:57:17 +04:00
|
|
|
if (ptype->type == type && !ptype->dev && ptype->gso_segment) {
|
2006-08-30 03:44:56 +04:00
|
|
|
if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
|
2006-07-09 00:34:56 +04:00
|
|
|
err = ptype->gso_send_check(skb);
|
|
|
|
segs = ERR_PTR(err);
|
|
|
|
if (err || skb_gso_ok(skb, features))
|
|
|
|
break;
|
2007-04-11 07:50:43 +04:00
|
|
|
__skb_push(skb, (skb->data -
|
|
|
|
skb_network_header(skb)));
|
2006-07-09 00:34:56 +04:00
|
|
|
}
|
2006-06-28 00:22:38 +04:00
|
|
|
segs = ptype->gso_segment(skb, features);
|
2006-06-22 13:57:17 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2007-03-20 01:33:04 +03:00
|
|
|
__skb_push(skb, skb->data - skb_mac_header(skb));
|
2006-06-28 00:22:38 +04:00
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
return segs;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(skb_gso_segment);
|
|
|
|
|
2005-11-11 00:01:24 +03:00
|
|
|
/* Take action when hardware reception checksum errors are detected. */
|
|
|
|
#ifdef CONFIG_BUG
|
|
|
|
void netdev_rx_csum_fault(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (net_ratelimit()) {
|
2007-02-09 17:24:36 +03:00
|
|
|
printk(KERN_ERR "%s: hw csum failure.\n",
|
2005-12-09 02:21:39 +03:00
|
|
|
dev ? dev->name : "<unknown>");
|
2005-11-11 00:01:24 +03:00
|
|
|
dump_stack();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_rx_csum_fault);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Actually, we should eliminate this check as soon as we know, that:
|
|
|
|
* 1. IOMMU is present and allows to map all the memory.
|
|
|
|
* 2. No high memory really exists on this machine.
|
|
|
|
*/
|
|
|
|
|
2010-04-03 00:34:49 +04:00
|
|
|
static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-28 00:33:10 +04:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2005-04-17 02:20:36 +04:00
|
|
|
int i;
|
2010-03-31 02:35:50 +04:00
|
|
|
if (!(dev->features & NETIF_F_HIGHDMA)) {
|
|
|
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
|
|
|
|
if (PageHighMem(skb_shinfo(skb)->frags[i].page))
|
|
|
|
return 1;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-03-31 02:35:50 +04:00
|
|
|
if (PCI_DMA_BUS_IS_PHYS) {
|
|
|
|
struct device *pdev = dev->dev.parent;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-04-03 00:34:49 +04:00
|
|
|
if (!pdev)
|
|
|
|
return 0;
|
2010-03-31 02:35:50 +04:00
|
|
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
|
|
|
dma_addr_t addr = page_to_phys(skb_shinfo(skb)->frags[i].page);
|
|
|
|
if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2006-06-28 00:33:10 +04:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
struct dev_gso_cb {
|
|
|
|
void (*destructor)(struct sk_buff *skb);
|
|
|
|
};
|
|
|
|
|
|
|
|
#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
|
|
|
|
|
|
|
|
static void dev_gso_skb_destructor(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct dev_gso_cb *cb;
|
|
|
|
|
|
|
|
do {
|
|
|
|
struct sk_buff *nskb = skb->next;
|
|
|
|
|
|
|
|
skb->next = nskb->next;
|
|
|
|
nskb->next = NULL;
|
|
|
|
kfree_skb(nskb);
|
|
|
|
} while (skb->next);
|
|
|
|
|
|
|
|
cb = DEV_GSO_CB(skb);
|
|
|
|
if (cb->destructor)
|
|
|
|
cb->destructor(skb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_gso_segment - Perform emulated hardware segmentation on skb.
|
|
|
|
* @skb: buffer to segment
|
2011-01-09 09:23:33 +03:00
|
|
|
* @features: device features as applicable to this skb
|
2006-06-22 13:57:17 +04:00
|
|
|
*
|
|
|
|
* This function segments the given skb and stores the list of segments
|
|
|
|
* in skb->next.
|
|
|
|
*/
|
2011-01-09 09:23:33 +03:00
|
|
|
static int dev_gso_segment(struct sk_buff *skb, int features)
|
2006-06-22 13:57:17 +04:00
|
|
|
{
|
|
|
|
struct sk_buff *segs;
|
2006-06-28 00:22:38 +04:00
|
|
|
|
|
|
|
segs = skb_gso_segment(skb, features);
|
|
|
|
|
|
|
|
/* Verifying header integrity only. */
|
|
|
|
if (!segs)
|
|
|
|
return 0;
|
2006-06-22 13:57:17 +04:00
|
|
|
|
2008-04-29 12:03:09 +04:00
|
|
|
if (IS_ERR(segs))
|
2006-06-22 13:57:17 +04:00
|
|
|
return PTR_ERR(segs);
|
|
|
|
|
|
|
|
skb->next = segs;
|
|
|
|
DEV_GSO_CB(skb)->destructor = skb->destructor;
|
|
|
|
skb->destructor = dev_gso_skb_destructor;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
net: Introduce skb_orphan_try()
Transmitted skb might be attached to a socket and a destructor, for
memory accounting purposes.
Traditionally, this destructor is called at tx completion time, when skb
is freed.
When tx completion is performed by another cpu than the sender, this
forces some cache lines to change ownership. XPS was an attempt to give
tx completion to initial cpu.
David idea is to call destructor right before giving skb to device (call
to ndo_start_xmit()). Because device queues are usually small, orphaning
skb before tx completion is not a big deal. Some drivers already do
this, we could do it in upper level.
There is one known exception to this early orphaning, called tx
timestamping. It needs to keep a reference to socket until device can
give a hardware or software timestamp.
This patch adds a skb_orphan_try() helper, to centralize all exceptions
to early orphaning in one spot, and use it in dev_hard_start_xmit().
"tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz)
before: Throughput 4428.9 MB/sec 16 procs
after: Throughput 4448.14 MB/sec 16 procs
UDP should get even better results, its destructor being more complex,
since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-16 16:18:22 +04:00
|
|
|
/*
|
|
|
|
* Try to orphan skb early, right before transmission by the device.
|
2010-08-17 12:59:14 +04:00
|
|
|
* We cannot orphan skb if tx timestamp is requested or the sk-reference
|
|
|
|
* is needed on driver level for other reasons, e.g. see net/can/raw.c
|
net: Introduce skb_orphan_try()
Transmitted skb might be attached to a socket and a destructor, for
memory accounting purposes.
Traditionally, this destructor is called at tx completion time, when skb
is freed.
When tx completion is performed by another cpu than the sender, this
forces some cache lines to change ownership. XPS was an attempt to give
tx completion to initial cpu.
David idea is to call destructor right before giving skb to device (call
to ndo_start_xmit()). Because device queues are usually small, orphaning
skb before tx completion is not a big deal. Some drivers already do
this, we could do it in upper level.
There is one known exception to this early orphaning, called tx
timestamping. It needs to keep a reference to socket until device can
give a hardware or software timestamp.
This patch adds a skb_orphan_try() helper, to centralize all exceptions
to early orphaning in one spot, and use it in dev_hard_start_xmit().
"tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz)
before: Throughput 4428.9 MB/sec 16 procs
after: Throughput 4448.14 MB/sec 16 procs
UDP should get even better results, its destructor being more complex,
since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-16 16:18:22 +04:00
|
|
|
*/
|
|
|
|
static inline void skb_orphan_try(struct sk_buff *skb)
|
|
|
|
{
|
2010-07-13 09:24:20 +04:00
|
|
|
struct sock *sk = skb->sk;
|
|
|
|
|
2010-08-17 12:59:14 +04:00
|
|
|
if (sk && !skb_shinfo(skb)->tx_flags) {
|
2010-07-13 09:24:20 +04:00
|
|
|
/* skb_tx_hash() wont be able to get sk.
|
|
|
|
* We copy sk_hash into skb->rxhash
|
|
|
|
*/
|
|
|
|
if (!skb->rxhash)
|
|
|
|
skb->rxhash = sk->sk_hash;
|
net: Introduce skb_orphan_try()
Transmitted skb might be attached to a socket and a destructor, for
memory accounting purposes.
Traditionally, this destructor is called at tx completion time, when skb
is freed.
When tx completion is performed by another cpu than the sender, this
forces some cache lines to change ownership. XPS was an attempt to give
tx completion to initial cpu.
David idea is to call destructor right before giving skb to device (call
to ndo_start_xmit()). Because device queues are usually small, orphaning
skb before tx completion is not a big deal. Some drivers already do
this, we could do it in upper level.
There is one known exception to this early orphaning, called tx
timestamping. It needs to keep a reference to socket until device can
give a hardware or software timestamp.
This patch adds a skb_orphan_try() helper, to centralize all exceptions
to early orphaning in one spot, and use it in dev_hard_start_xmit().
"tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz)
before: Throughput 4428.9 MB/sec 16 procs
after: Throughput 4448.14 MB/sec 16 procs
UDP should get even better results, its destructor being more complex,
since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-16 16:18:22 +04:00
|
|
|
skb_orphan(skb);
|
2010-07-13 09:24:20 +04:00
|
|
|
}
|
net: Introduce skb_orphan_try()
Transmitted skb might be attached to a socket and a destructor, for
memory accounting purposes.
Traditionally, this destructor is called at tx completion time, when skb
is freed.
When tx completion is performed by another cpu than the sender, this
forces some cache lines to change ownership. XPS was an attempt to give
tx completion to initial cpu.
David idea is to call destructor right before giving skb to device (call
to ndo_start_xmit()). Because device queues are usually small, orphaning
skb before tx completion is not a big deal. Some drivers already do
this, we could do it in upper level.
There is one known exception to this early orphaning, called tx
timestamping. It needs to keep a reference to socket until device can
give a hardware or software timestamp.
This patch adds a skb_orphan_try() helper, to centralize all exceptions
to early orphaning in one spot, and use it in dev_hard_start_xmit().
"tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz)
before: Throughput 4428.9 MB/sec 16 procs
after: Throughput 4448.14 MB/sec 16 procs
UDP should get even better results, its destructor being more complex,
since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-16 16:18:22 +04:00
|
|
|
}
|
|
|
|
|
2011-01-09 09:23:35 +03:00
|
|
|
static bool can_checksum_protocol(unsigned long features, __be16 protocol)
|
|
|
|
{
|
|
|
|
return ((features & NETIF_F_GEN_CSUM) ||
|
|
|
|
((features & NETIF_F_V4_CSUM) &&
|
|
|
|
protocol == htons(ETH_P_IP)) ||
|
|
|
|
((features & NETIF_F_V6_CSUM) &&
|
|
|
|
protocol == htons(ETH_P_IPV6)) ||
|
|
|
|
((features & NETIF_F_FCOE_CRC) &&
|
|
|
|
protocol == htons(ETH_P_FCOE)));
|
|
|
|
}
|
|
|
|
|
2011-01-09 09:23:31 +03:00
|
|
|
static int harmonize_features(struct sk_buff *skb, __be16 protocol, int features)
|
|
|
|
{
|
|
|
|
if (!can_checksum_protocol(protocol, features)) {
|
|
|
|
features &= ~NETIF_F_ALL_CSUM;
|
|
|
|
features &= ~NETIF_F_SG;
|
|
|
|
} else if (illegal_highdma(skb->dev, skb)) {
|
|
|
|
features &= ~NETIF_F_SG;
|
|
|
|
}
|
|
|
|
|
|
|
|
return features;
|
|
|
|
}
|
|
|
|
|
|
|
|
int netif_skb_features(struct sk_buff *skb)
|
2010-10-29 16:14:55 +04:00
|
|
|
{
|
|
|
|
__be16 protocol = skb->protocol;
|
2011-01-09 09:23:31 +03:00
|
|
|
int features = skb->dev->features;
|
2010-10-29 16:14:55 +04:00
|
|
|
|
|
|
|
if (protocol == htons(ETH_P_8021Q)) {
|
|
|
|
struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
|
|
|
|
protocol = veh->h_vlan_encapsulated_proto;
|
2011-01-09 09:23:31 +03:00
|
|
|
} else if (!vlan_tx_tag_present(skb)) {
|
|
|
|
return harmonize_features(skb, protocol, features);
|
|
|
|
}
|
2010-10-29 16:14:55 +04:00
|
|
|
|
2011-01-17 23:46:00 +03:00
|
|
|
features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_TX);
|
2011-01-09 09:23:31 +03:00
|
|
|
|
|
|
|
if (protocol != htons(ETH_P_8021Q)) {
|
|
|
|
return harmonize_features(skb, protocol, features);
|
|
|
|
} else {
|
|
|
|
features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
|
2011-01-17 23:46:00 +03:00
|
|
|
NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX;
|
2011-01-09 09:23:31 +03:00
|
|
|
return harmonize_features(skb, protocol, features);
|
|
|
|
}
|
2010-10-29 16:14:55 +04:00
|
|
|
}
|
2011-01-09 09:23:31 +03:00
|
|
|
EXPORT_SYMBOL(netif_skb_features);
|
2010-10-29 16:14:55 +04:00
|
|
|
|
2010-06-16 18:18:12 +04:00
|
|
|
/*
|
|
|
|
* Returns true if either:
|
|
|
|
* 1. skb has frag_list and the device doesn't support FRAGLIST, or
|
|
|
|
* 2. skb is fragmented and the device does not support SG, or if
|
|
|
|
* at least one of fragments is in highmem and device does not
|
|
|
|
* support DMA from it.
|
|
|
|
*/
|
|
|
|
static inline int skb_needs_linearize(struct sk_buff *skb,
|
2011-01-09 09:23:34 +03:00
|
|
|
int features)
|
2010-06-16 18:18:12 +04:00
|
|
|
{
|
2011-01-09 09:23:34 +03:00
|
|
|
return skb_is_nonlinear(skb) &&
|
|
|
|
((skb_has_frag_list(skb) &&
|
|
|
|
!(features & NETIF_F_FRAGLIST)) ||
|
2010-10-29 16:14:53 +04:00
|
|
|
(skb_shinfo(skb)->nr_frags &&
|
2011-01-09 09:23:34 +03:00
|
|
|
!(features & NETIF_F_SG)));
|
2010-06-16 18:18:12 +04:00
|
|
|
}
|
|
|
|
|
2008-07-17 12:56:23 +04:00
|
|
|
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
struct netdev_queue *txq)
|
2006-06-22 13:57:17 +04:00
|
|
|
{
|
2008-11-21 07:14:53 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2009-11-10 09:14:14 +03:00
|
|
|
int rc = NETDEV_TX_OK;
|
2008-11-21 07:14:53 +03:00
|
|
|
|
2006-06-22 13:57:17 +04:00
|
|
|
if (likely(!skb->next)) {
|
2011-01-09 09:23:32 +03:00
|
|
|
int features;
|
|
|
|
|
net: release dst entry in dev_hard_start_xmit()
One point of contention in high network loads is the dst_release() performed
when a transmited skb is freed. This is because NIC tx completion calls
dev_kree_skb() long after original call to dev_queue_xmit(skb).
CPU cache is cold and the atomic op in dst_release() stalls. On SMP, this is
quite visible if one CPU is 100% handling softirqs for a network device,
since dst_clone() is done by other cpus, involving cache line ping pongs.
It seems right place to release dst is in dev_hard_start_xmit(), for most
devices but ones that are virtual, and some exceptions.
David Miller suggested to define a new device flag, set in alloc_netdev_mq()
(so that most devices set it at init time), and carefuly unset in devices
which dont want a NULL skb->dst in their ndo_start_xmit().
List of devices that must clear this flag is :
- loopback device, because it calls netif_rx() and quoting Patrick :
"ip_route_input() doesn't accept loopback addresses, so loopback packets
already need to have a dst_entry attached."
- appletalk/ipddp.c : needs skb->dst in its xmit function
- And all devices that call again dev_queue_xmit() from their xmit function
(as some classifiers need skb->dst) : bonding, vlan, macvlan, eql, ifb, hdlc_fr
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-05-19 09:19:19 +04:00
|
|
|
/*
|
|
|
|
* If device doesnt need skb->dst, release it right now while
|
|
|
|
* its hot in this cpu cache
|
|
|
|
*/
|
2009-06-02 09:19:30 +04:00
|
|
|
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
|
|
|
|
skb_dst_drop(skb);
|
|
|
|
|
2010-12-07 03:30:37 +03:00
|
|
|
if (!list_empty(&ptype_all))
|
|
|
|
dev_queue_xmit_nit(skb, dev);
|
|
|
|
|
net: Introduce skb_orphan_try()
Transmitted skb might be attached to a socket and a destructor, for
memory accounting purposes.
Traditionally, this destructor is called at tx completion time, when skb
is freed.
When tx completion is performed by another cpu than the sender, this
forces some cache lines to change ownership. XPS was an attempt to give
tx completion to initial cpu.
David idea is to call destructor right before giving skb to device (call
to ndo_start_xmit()). Because device queues are usually small, orphaning
skb before tx completion is not a big deal. Some drivers already do
this, we could do it in upper level.
There is one known exception to this early orphaning, called tx
timestamping. It needs to keep a reference to socket until device can
give a hardware or software timestamp.
This patch adds a skb_orphan_try() helper, to centralize all exceptions
to early orphaning in one spot, and use it in dev_hard_start_xmit().
"tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz)
before: Throughput 4428.9 MB/sec 16 procs
after: Throughput 4448.14 MB/sec 16 procs
UDP should get even better results, its destructor being more complex,
since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-16 16:18:22 +04:00
|
|
|
skb_orphan_try(skb);
|
2010-04-22 12:02:07 +04:00
|
|
|
|
2011-01-09 09:23:32 +03:00
|
|
|
features = netif_skb_features(skb);
|
|
|
|
|
2010-10-20 17:56:04 +04:00
|
|
|
if (vlan_tx_tag_present(skb) &&
|
2011-01-09 09:23:32 +03:00
|
|
|
!(features & NETIF_F_HW_VLAN_TX)) {
|
2010-10-20 17:56:04 +04:00
|
|
|
skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
|
|
|
|
if (unlikely(!skb))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
skb->vlan_tci = 0;
|
|
|
|
}
|
|
|
|
|
2011-01-09 09:23:32 +03:00
|
|
|
if (netif_needs_gso(skb, features)) {
|
2011-01-09 09:23:33 +03:00
|
|
|
if (unlikely(dev_gso_segment(skb, features)))
|
2010-04-22 12:02:07 +04:00
|
|
|
goto out_kfree_skb;
|
|
|
|
if (skb->next)
|
|
|
|
goto gso;
|
2010-06-16 18:18:12 +04:00
|
|
|
} else {
|
2011-01-09 09:23:34 +03:00
|
|
|
if (skb_needs_linearize(skb, features) &&
|
2010-06-16 18:18:12 +04:00
|
|
|
__skb_linearize(skb))
|
|
|
|
goto out_kfree_skb;
|
|
|
|
|
|
|
|
/* If packet is not checksummed and device does not
|
|
|
|
* support checksumming for this protocol, complete
|
|
|
|
* checksumming here.
|
|
|
|
*/
|
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
2010-12-14 18:24:08 +03:00
|
|
|
skb_set_transport_header(skb,
|
|
|
|
skb_checksum_start_offset(skb));
|
2011-01-09 09:23:35 +03:00
|
|
|
if (!(features & NETIF_F_ALL_CSUM) &&
|
2010-06-16 18:18:12 +04:00
|
|
|
skb_checksum_help(skb))
|
|
|
|
goto out_kfree_skb;
|
|
|
|
}
|
2010-04-22 12:02:07 +04:00
|
|
|
}
|
|
|
|
|
2009-02-12 08:03:37 +03:00
|
|
|
rc = ops->ndo_start_xmit(skb, dev);
|
2010-08-23 13:45:02 +04:00
|
|
|
trace_net_dev_xmit(skb, rc);
|
2009-07-06 06:23:38 +04:00
|
|
|
if (rc == NETDEV_TX_OK)
|
2009-05-26 09:58:01 +04:00
|
|
|
txq_trans_update(txq);
|
2009-02-12 08:03:37 +03:00
|
|
|
return rc;
|
2006-06-22 13:57:17 +04:00
|
|
|
}
|
|
|
|
|
2006-06-28 00:22:38 +04:00
|
|
|
gso:
|
2006-06-22 13:57:17 +04:00
|
|
|
do {
|
|
|
|
struct sk_buff *nskb = skb->next;
|
|
|
|
|
|
|
|
skb->next = nskb->next;
|
|
|
|
nskb->next = NULL;
|
2009-12-09 23:59:58 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If device doesnt need nskb->dst, release it right now while
|
|
|
|
* its hot in this cpu cache
|
|
|
|
*/
|
|
|
|
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
|
|
|
|
skb_dst_drop(nskb);
|
|
|
|
|
2008-11-21 07:14:53 +03:00
|
|
|
rc = ops->ndo_start_xmit(nskb, dev);
|
2010-08-23 13:45:02 +04:00
|
|
|
trace_net_dev_xmit(nskb, rc);
|
2009-07-06 06:23:38 +04:00
|
|
|
if (unlikely(rc != NETDEV_TX_OK)) {
|
2009-11-10 09:14:14 +03:00
|
|
|
if (rc & ~NETDEV_TX_MASK)
|
|
|
|
goto out_kfree_gso_skb;
|
2006-06-26 10:57:04 +04:00
|
|
|
nskb->next = skb->next;
|
2006-06-22 13:57:17 +04:00
|
|
|
skb->next = nskb;
|
|
|
|
return rc;
|
|
|
|
}
|
2009-05-26 09:58:01 +04:00
|
|
|
txq_trans_update(txq);
|
2008-07-17 12:56:23 +04:00
|
|
|
if (unlikely(netif_tx_queue_stopped(txq) && skb->next))
|
2006-06-26 10:57:04 +04:00
|
|
|
return NETDEV_TX_BUSY;
|
2006-06-22 13:57:17 +04:00
|
|
|
} while (skb->next);
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2009-11-10 09:14:14 +03:00
|
|
|
out_kfree_gso_skb:
|
|
|
|
if (likely(skb->next == NULL))
|
|
|
|
skb->destructor = DEV_GSO_CB(skb)->destructor;
|
2006-06-22 13:57:17 +04:00
|
|
|
out_kfree_skb:
|
|
|
|
kfree_skb(skb);
|
2010-10-20 17:56:04 +04:00
|
|
|
out:
|
2009-11-10 09:14:14 +03:00
|
|
|
return rc;
|
2006-06-22 13:57:17 +04:00
|
|
|
}
|
|
|
|
|
2010-03-16 11:03:29 +03:00
|
|
|
static u32 hashrnd __read_mostly;
|
2008-07-21 20:48:06 +04:00
|
|
|
|
2010-12-13 09:27:10 +03:00
|
|
|
/*
|
|
|
|
* Returns a Tx hash based on the given packet descriptor a Tx queues' number
|
|
|
|
* to be used as a distribution range.
|
|
|
|
*/
|
|
|
|
u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,
|
|
|
|
unsigned int num_tx_queues)
|
2008-07-15 14:47:03 +04:00
|
|
|
{
|
2009-01-28 03:34:47 +03:00
|
|
|
u32 hash;
|
2011-01-17 11:06:04 +03:00
|
|
|
u16 qoffset = 0;
|
|
|
|
u16 qcount = num_tx_queues;
|
2008-07-21 20:48:06 +04:00
|
|
|
|
2009-05-04 01:43:10 +04:00
|
|
|
if (skb_rx_queue_recorded(skb)) {
|
|
|
|
hash = skb_get_rx_queue(skb);
|
2010-12-13 09:27:10 +03:00
|
|
|
while (unlikely(hash >= num_tx_queues))
|
|
|
|
hash -= num_tx_queues;
|
2009-05-04 01:43:10 +04:00
|
|
|
return hash;
|
|
|
|
}
|
2009-05-01 20:05:06 +04:00
|
|
|
|
2011-01-17 11:06:04 +03:00
|
|
|
if (dev->num_tc) {
|
|
|
|
u8 tc = netdev_get_prio_tc_map(dev, skb->priority);
|
|
|
|
qoffset = dev->tc_to_txq[tc].offset;
|
|
|
|
qcount = dev->tc_to_txq[tc].count;
|
|
|
|
}
|
|
|
|
|
2009-05-01 20:05:06 +04:00
|
|
|
if (skb->sk && skb->sk->sk_hash)
|
2009-01-28 03:34:47 +03:00
|
|
|
hash = skb->sk->sk_hash;
|
2009-05-01 20:05:06 +04:00
|
|
|
else
|
2010-07-13 09:24:20 +04:00
|
|
|
hash = (__force u16) skb->protocol ^ skb->rxhash;
|
2010-03-16 11:03:29 +03:00
|
|
|
hash = jhash_1word(hash, hashrnd);
|
2008-07-21 20:48:06 +04:00
|
|
|
|
2011-01-17 11:06:04 +03:00
|
|
|
return (u16) (((u64) hash * qcount) >> 32) + qoffset;
|
2008-07-15 14:47:03 +04:00
|
|
|
}
|
2010-12-13 09:27:10 +03:00
|
|
|
EXPORT_SYMBOL(__skb_tx_hash);
|
2008-07-15 14:47:03 +04:00
|
|
|
|
2009-11-14 00:54:04 +03:00
|
|
|
static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
|
|
|
|
{
|
|
|
|
if (unlikely(queue_index >= dev->real_num_tx_queues)) {
|
|
|
|
if (net_ratelimit()) {
|
2010-04-09 01:26:13 +04:00
|
|
|
pr_warning("%s selects TX queue %d, but "
|
|
|
|
"real number of TX queues is %d\n",
|
|
|
|
dev->name, queue_index, dev->real_num_tx_queues);
|
2009-11-14 00:54:04 +03:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return queue_index;
|
|
|
|
}
|
|
|
|
|
2010-11-21 16:17:27 +03:00
|
|
|
static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb)
|
|
|
|
{
|
2010-11-26 11:36:09 +03:00
|
|
|
#ifdef CONFIG_XPS
|
2010-11-21 16:17:27 +03:00
|
|
|
struct xps_dev_maps *dev_maps;
|
|
|
|
struct xps_map *map;
|
|
|
|
int queue_index = -1;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
dev_maps = rcu_dereference(dev->xps_maps);
|
|
|
|
if (dev_maps) {
|
|
|
|
map = rcu_dereference(
|
|
|
|
dev_maps->cpu_map[raw_smp_processor_id()]);
|
|
|
|
if (map) {
|
|
|
|
if (map->len == 1)
|
|
|
|
queue_index = map->queues[0];
|
|
|
|
else {
|
|
|
|
u32 hash;
|
|
|
|
if (skb->sk && skb->sk->sk_hash)
|
|
|
|
hash = skb->sk->sk_hash;
|
|
|
|
else
|
|
|
|
hash = (__force u16) skb->protocol ^
|
|
|
|
skb->rxhash;
|
|
|
|
hash = jhash_1word(hash, hashrnd);
|
|
|
|
queue_index = map->queues[
|
|
|
|
((u64)hash * map->len) >> 32];
|
|
|
|
}
|
|
|
|
if (unlikely(queue_index >= dev->real_num_tx_queues))
|
|
|
|
queue_index = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return queue_index;
|
|
|
|
#else
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-07-17 11:34:19 +04:00
|
|
|
static struct netdev_queue *dev_pick_tx(struct net_device *dev,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
2010-07-15 07:50:29 +04:00
|
|
|
int queue_index;
|
2010-09-03 06:39:56 +04:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2009-10-20 03:50:07 +04:00
|
|
|
|
2010-11-21 16:17:29 +03:00
|
|
|
if (dev->real_num_tx_queues == 1)
|
|
|
|
queue_index = 0;
|
|
|
|
else if (ops->ndo_select_queue) {
|
2010-09-03 06:39:56 +04:00
|
|
|
queue_index = ops->ndo_select_queue(dev, skb);
|
|
|
|
queue_index = dev_cap_txqueue(dev, queue_index);
|
|
|
|
} else {
|
|
|
|
struct sock *sk = skb->sk;
|
|
|
|
queue_index = sk_tx_queue_get(sk);
|
2009-10-20 03:50:07 +04:00
|
|
|
|
2010-11-21 16:17:29 +03:00
|
|
|
if (queue_index < 0 || skb->ooo_okay ||
|
|
|
|
queue_index >= dev->real_num_tx_queues) {
|
|
|
|
int old_index = queue_index;
|
2008-07-17 12:56:23 +04:00
|
|
|
|
2010-11-21 16:17:27 +03:00
|
|
|
queue_index = get_xps_queue(dev, skb);
|
|
|
|
if (queue_index < 0)
|
|
|
|
queue_index = skb_tx_hash(dev, skb);
|
2010-11-21 16:17:29 +03:00
|
|
|
|
|
|
|
if (queue_index != old_index && sk) {
|
|
|
|
struct dst_entry *dst =
|
|
|
|
rcu_dereference_check(sk->sk_dst_cache, 1);
|
2010-04-12 01:18:17 +04:00
|
|
|
|
|
|
|
if (dst && skb_dst(skb) == dst)
|
|
|
|
sk_tx_queue_set(sk, queue_index);
|
|
|
|
}
|
2009-10-20 03:50:07 +04:00
|
|
|
}
|
|
|
|
}
|
2008-07-15 14:03:33 +04:00
|
|
|
|
2008-07-17 12:56:23 +04:00
|
|
|
skb_set_queue_mapping(skb, queue_index);
|
|
|
|
return netdev_get_tx_queue(dev, queue_index);
|
2008-07-17 11:34:19 +04:00
|
|
|
}
|
|
|
|
|
2009-08-06 05:44:21 +04:00
|
|
|
static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
|
|
|
|
struct net_device *dev,
|
|
|
|
struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
spinlock_t *root_lock = qdisc_lock(q);
|
2010-06-02 16:09:29 +04:00
|
|
|
bool contended = qdisc_is_running(q);
|
2009-08-06 05:44:21 +04:00
|
|
|
int rc;
|
|
|
|
|
2010-06-02 16:09:29 +04:00
|
|
|
/*
|
|
|
|
* Heuristic to force contended enqueues to serialize on a
|
|
|
|
* separate lock before trying to get qdisc main lock.
|
|
|
|
* This permits __QDISC_STATE_RUNNING owner to get the lock more often
|
|
|
|
* and dequeue packets faster.
|
|
|
|
*/
|
|
|
|
if (unlikely(contended))
|
|
|
|
spin_lock(&q->busylock);
|
|
|
|
|
2009-08-06 05:44:21 +04:00
|
|
|
spin_lock(root_lock);
|
|
|
|
if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
rc = NET_XMIT_DROP;
|
|
|
|
} else if ((q->flags & TCQ_F_CAN_BYPASS) && !qdisc_qlen(q) &&
|
2010-06-02 14:23:51 +04:00
|
|
|
qdisc_run_begin(q)) {
|
2009-08-06 05:44:21 +04:00
|
|
|
/*
|
|
|
|
* This is a work-conserving queue; there are no old skbs
|
|
|
|
* waiting to be sent out; and the qdisc is not running -
|
|
|
|
* xmit the skb directly.
|
|
|
|
*/
|
2010-05-12 03:19:48 +04:00
|
|
|
if (!(dev->priv_flags & IFF_XMIT_DST_RELEASE))
|
|
|
|
skb_dst_force(skb);
|
2011-01-09 11:30:54 +03:00
|
|
|
|
|
|
|
qdisc_skb_cb(skb)->pkt_len = skb->len;
|
|
|
|
qdisc_bstats_update(q, skb);
|
|
|
|
|
2010-06-02 16:09:29 +04:00
|
|
|
if (sch_direct_xmit(skb, q, dev, txq, root_lock)) {
|
|
|
|
if (unlikely(contended)) {
|
|
|
|
spin_unlock(&q->busylock);
|
|
|
|
contended = false;
|
|
|
|
}
|
2009-08-06 05:44:21 +04:00
|
|
|
__qdisc_run(q);
|
2010-06-02 16:09:29 +04:00
|
|
|
} else
|
2010-06-02 14:23:51 +04:00
|
|
|
qdisc_run_end(q);
|
2009-08-06 05:44:21 +04:00
|
|
|
|
|
|
|
rc = NET_XMIT_SUCCESS;
|
|
|
|
} else {
|
2010-05-12 03:19:48 +04:00
|
|
|
skb_dst_force(skb);
|
2009-08-06 05:44:21 +04:00
|
|
|
rc = qdisc_enqueue_root(skb, q);
|
2010-06-02 16:09:29 +04:00
|
|
|
if (qdisc_run_begin(q)) {
|
|
|
|
if (unlikely(contended)) {
|
|
|
|
spin_unlock(&q->busylock);
|
|
|
|
contended = false;
|
|
|
|
}
|
|
|
|
__qdisc_run(q);
|
|
|
|
}
|
2009-08-06 05:44:21 +04:00
|
|
|
}
|
|
|
|
spin_unlock(root_lock);
|
2010-06-02 16:09:29 +04:00
|
|
|
if (unlikely(contended))
|
|
|
|
spin_unlock(&q->busylock);
|
2009-08-06 05:44:21 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-09-30 00:23:09 +04:00
|
|
|
static DEFINE_PER_CPU(int, xmit_recursion);
|
2010-10-25 23:51:55 +04:00
|
|
|
#define RECURSION_LIMIT 10
|
2010-09-30 00:23:09 +04:00
|
|
|
|
2008-07-23 01:09:06 +04:00
|
|
|
/**
|
|
|
|
* dev_queue_xmit - transmit a buffer
|
|
|
|
* @skb: buffer to transmit
|
|
|
|
*
|
|
|
|
* Queue a buffer for transmission to a network device. The caller must
|
|
|
|
* have set the device and priority and built the buffer before calling
|
|
|
|
* this function. The function can be called from an interrupt.
|
|
|
|
*
|
|
|
|
* A negative errno code is returned on a failure. A success does not
|
|
|
|
* guarantee the frame will be transmitted as it may be dropped due
|
|
|
|
* to congestion or traffic shaping.
|
|
|
|
*
|
|
|
|
* -----------------------------------------------------------------------------------
|
|
|
|
* I notice this method can also return errors from the queue disciplines,
|
|
|
|
* including NET_XMIT_DROP, which is a positive value. So, errors can also
|
|
|
|
* be positive.
|
|
|
|
*
|
|
|
|
* Regardless of the return value, the skb is consumed, so it is currently
|
|
|
|
* difficult to retry a send to this method. (You can bump the ref count
|
|
|
|
* before sending to hold a reference for retry if you are careful.)
|
|
|
|
*
|
|
|
|
* When calling this method, interrupts MUST be enabled. This is because
|
|
|
|
* the BH enable code must have IRQs enabled so that it will not deadlock.
|
|
|
|
* --BLG
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
int dev_queue_xmit(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct net_device *dev = skb->dev;
|
2008-07-09 04:18:23 +04:00
|
|
|
struct netdev_queue *txq;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct Qdisc *q;
|
|
|
|
int rc = -ENOMEM;
|
|
|
|
|
2007-02-09 17:24:36 +03:00
|
|
|
/* Disable soft irqs for various locks below. Also
|
|
|
|
* stops preemption for RCU.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2007-02-09 17:24:36 +03:00
|
|
|
rcu_read_lock_bh();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-15 14:03:33 +04:00
|
|
|
txq = dev_pick_tx(dev, skb);
|
2010-02-23 04:04:49 +03:00
|
|
|
q = rcu_dereference_bh(txq->qdisc);
|
2008-07-16 13:15:04 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
2009-09-03 12:29:39 +04:00
|
|
|
skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_EGRESS);
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif
|
2010-08-23 13:45:02 +04:00
|
|
|
trace_net_dev_queue(skb);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (q->enqueue) {
|
2009-08-06 05:44:21 +04:00
|
|
|
rc = __dev_xmit_skb(skb, q, dev, txq);
|
2008-07-16 13:15:04 +04:00
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The device has no queue. Common case for software devices:
|
|
|
|
loopback, all the sorts of tunnels...
|
|
|
|
|
2006-06-09 23:20:56 +04:00
|
|
|
Really, it is unlikely that netif_tx_lock protection is necessary
|
|
|
|
here. (f.e. loopback and IP tunnels are clean ignoring statistics
|
2005-04-17 02:20:36 +04:00
|
|
|
counters.)
|
|
|
|
However, it is possible, that they rely on protection
|
|
|
|
made by us here.
|
|
|
|
|
|
|
|
Check this and shot the lock. It is not prone from deadlocks.
|
|
|
|
Either shot noqueue qdisc, it is even simpler 8)
|
|
|
|
*/
|
|
|
|
if (dev->flags & IFF_UP) {
|
|
|
|
int cpu = smp_processor_id(); /* ok because BHs are off */
|
|
|
|
|
2008-07-09 10:13:53 +04:00
|
|
|
if (txq->xmit_lock_owner != cpu) {
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-30 00:23:09 +04:00
|
|
|
if (__this_cpu_read(xmit_recursion) > RECURSION_LIMIT)
|
|
|
|
goto recursion_alert;
|
|
|
|
|
2008-07-09 10:13:53 +04:00
|
|
|
HARD_TX_LOCK(dev, txq, cpu);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-17 12:56:23 +04:00
|
|
|
if (!netif_tx_queue_stopped(txq)) {
|
2010-09-30 00:23:09 +04:00
|
|
|
__this_cpu_inc(xmit_recursion);
|
2009-11-10 09:14:14 +03:00
|
|
|
rc = dev_hard_start_xmit(skb, dev, txq);
|
2010-09-30 00:23:09 +04:00
|
|
|
__this_cpu_dec(xmit_recursion);
|
2009-11-10 09:14:14 +03:00
|
|
|
if (dev_xmit_complete(rc)) {
|
2008-07-09 10:13:53 +04:00
|
|
|
HARD_TX_UNLOCK(dev, txq);
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2008-07-09 10:13:53 +04:00
|
|
|
HARD_TX_UNLOCK(dev, txq);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (net_ratelimit())
|
|
|
|
printk(KERN_CRIT "Virtual device %s asks to "
|
|
|
|
"queue packet!\n", dev->name);
|
|
|
|
} else {
|
|
|
|
/* Recursion is detected! It is possible,
|
2010-09-30 00:23:09 +04:00
|
|
|
* unfortunately
|
|
|
|
*/
|
|
|
|
recursion_alert:
|
2005-04-17 02:20:36 +04:00
|
|
|
if (net_ratelimit())
|
|
|
|
printk(KERN_CRIT "Dead loop on virtual device "
|
|
|
|
"%s, fix it urgently!\n", dev->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = -ENETDOWN;
|
2006-06-22 13:28:18 +04:00
|
|
|
rcu_read_unlock_bh();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
kfree_skb(skb);
|
|
|
|
return rc;
|
|
|
|
out:
|
2006-06-22 13:28:18 +04:00
|
|
|
rcu_read_unlock_bh();
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_queue_xmit);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
|
|
|
/*=======================================================================
|
|
|
|
Receiver routines
|
|
|
|
=======================================================================*/
|
|
|
|
|
2007-03-13 00:33:50 +03:00
|
|
|
int netdev_max_backlog __read_mostly = 1000;
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
int netdev_tstamp_prequeue __read_mostly = 1;
|
2007-03-13 00:33:50 +03:00
|
|
|
int netdev_budget __read_mostly = 300;
|
|
|
|
int weight_p __read_mostly = 64; /* old backlog weight */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-05-07 09:07:48 +04:00
|
|
|
/* Called with irq disabled */
|
|
|
|
static inline void ____napi_schedule(struct softnet_data *sd,
|
|
|
|
struct napi_struct *napi)
|
|
|
|
{
|
|
|
|
list_add_tail(&napi->poll_list, &sd->poll_list);
|
|
|
|
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
|
|
|
|
}
|
|
|
|
|
2010-03-16 11:03:29 +03:00
|
|
|
/*
|
2010-08-04 10:15:52 +04:00
|
|
|
* __skb_get_rxhash: calculate a flow hash based on src/dst addresses
|
|
|
|
* and src/dst port numbers. Returns a non-zero hash number on success
|
|
|
|
* and 0 on failure.
|
2010-03-16 11:03:29 +03:00
|
|
|
*/
|
2010-08-04 10:15:52 +04:00
|
|
|
__u32 __skb_get_rxhash(struct sk_buff *skb)
|
2010-03-16 11:03:29 +03:00
|
|
|
{
|
2010-08-17 23:04:32 +04:00
|
|
|
int nhoff, hash = 0, poff;
|
2010-03-16 11:03:29 +03:00
|
|
|
struct ipv6hdr *ip6;
|
|
|
|
struct iphdr *ip;
|
|
|
|
u8 ip_proto;
|
2010-04-25 09:50:10 +04:00
|
|
|
u32 addr1, addr2, ihl;
|
|
|
|
union {
|
|
|
|
u32 v32;
|
|
|
|
u16 v16[2];
|
|
|
|
} ports;
|
2010-03-16 11:03:29 +03:00
|
|
|
|
2010-08-04 10:15:52 +04:00
|
|
|
nhoff = skb_network_offset(skb);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
|
|
|
switch (skb->protocol) {
|
|
|
|
case __constant_htons(ETH_P_IP):
|
2010-08-04 10:15:52 +04:00
|
|
|
if (!pskb_may_pull(skb, sizeof(*ip) + nhoff))
|
2010-03-16 11:03:29 +03:00
|
|
|
goto done;
|
|
|
|
|
2010-08-21 10:13:28 +04:00
|
|
|
ip = (struct iphdr *) (skb->data + nhoff);
|
2010-08-17 23:01:38 +04:00
|
|
|
if (ip->frag_off & htons(IP_MF | IP_OFFSET))
|
|
|
|
ip_proto = 0;
|
|
|
|
else
|
|
|
|
ip_proto = ip->protocol;
|
2010-04-20 01:56:38 +04:00
|
|
|
addr1 = (__force u32) ip->saddr;
|
|
|
|
addr2 = (__force u32) ip->daddr;
|
2010-03-16 11:03:29 +03:00
|
|
|
ihl = ip->ihl;
|
|
|
|
break;
|
|
|
|
case __constant_htons(ETH_P_IPV6):
|
2010-08-04 10:15:52 +04:00
|
|
|
if (!pskb_may_pull(skb, sizeof(*ip6) + nhoff))
|
2010-03-16 11:03:29 +03:00
|
|
|
goto done;
|
|
|
|
|
2010-08-21 10:13:28 +04:00
|
|
|
ip6 = (struct ipv6hdr *) (skb->data + nhoff);
|
2010-03-16 11:03:29 +03:00
|
|
|
ip_proto = ip6->nexthdr;
|
2010-04-20 01:56:38 +04:00
|
|
|
addr1 = (__force u32) ip6->saddr.s6_addr32[3];
|
|
|
|
addr2 = (__force u32) ip6->daddr.s6_addr32[3];
|
2010-03-16 11:03:29 +03:00
|
|
|
ihl = (40 >> 2);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto done;
|
|
|
|
}
|
2010-08-04 10:15:52 +04:00
|
|
|
|
2010-08-17 23:04:32 +04:00
|
|
|
ports.v32 = 0;
|
|
|
|
poff = proto_ports_offset(ip_proto);
|
|
|
|
if (poff >= 0) {
|
|
|
|
nhoff += ihl * 4 + poff;
|
|
|
|
if (pskb_may_pull(skb, nhoff + 4)) {
|
|
|
|
ports.v32 = * (__force u32 *) (skb->data + nhoff);
|
2010-04-25 09:50:10 +04:00
|
|
|
if (ports.v16[1] < ports.v16[0])
|
|
|
|
swap(ports.v16[0], ports.v16[1]);
|
2010-04-20 01:56:38 +04:00
|
|
|
}
|
2010-03-16 11:03:29 +03:00
|
|
|
}
|
|
|
|
|
2010-04-20 01:56:38 +04:00
|
|
|
/* get a consistent hash (same value on both flow directions) */
|
|
|
|
if (addr2 < addr1)
|
|
|
|
swap(addr1, addr2);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
2010-08-04 10:15:52 +04:00
|
|
|
hash = jhash_3words(addr1, addr2, ports.v32, hashrnd);
|
|
|
|
if (!hash)
|
|
|
|
hash = 1;
|
|
|
|
|
|
|
|
done:
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__skb_get_rxhash);
|
|
|
|
|
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
|
|
|
|
/* One global table that all flow-based protocols share. */
|
2010-10-25 07:02:02 +04:00
|
|
|
struct rps_sock_flow_table __rcu *rps_sock_flow_table __read_mostly;
|
2010-08-04 10:15:52 +04:00
|
|
|
EXPORT_SYMBOL(rps_sock_flow_table);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* get_rps_cpu is called from netif_receive_skb and returns the target
|
|
|
|
* CPU from the RPS map of the receiving queue for a given skb.
|
|
|
|
* rcu_read_lock must be held on entry.
|
|
|
|
*/
|
|
|
|
static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
|
|
|
|
struct rps_dev_flow **rflowp)
|
|
|
|
{
|
|
|
|
struct netdev_rx_queue *rxqueue;
|
2010-10-25 07:02:02 +04:00
|
|
|
struct rps_map *map;
|
2010-08-04 10:15:52 +04:00
|
|
|
struct rps_dev_flow_table *flow_table;
|
|
|
|
struct rps_sock_flow_table *sock_flow_table;
|
|
|
|
int cpu = -1;
|
|
|
|
u16 tcpu;
|
|
|
|
|
|
|
|
if (skb_rx_queue_recorded(skb)) {
|
|
|
|
u16 index = skb_get_rx_queue(skb);
|
2010-09-27 12:24:33 +04:00
|
|
|
if (unlikely(index >= dev->real_num_rx_queues)) {
|
|
|
|
WARN_ONCE(dev->real_num_rx_queues > 1,
|
|
|
|
"%s received packet on queue %u, but number "
|
|
|
|
"of RX queues is %u\n",
|
|
|
|
dev->name, index, dev->real_num_rx_queues);
|
2010-08-04 10:15:52 +04:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
rxqueue = dev->_rx + index;
|
|
|
|
} else
|
|
|
|
rxqueue = dev->_rx;
|
|
|
|
|
2010-10-25 07:02:02 +04:00
|
|
|
map = rcu_dereference(rxqueue->rps_map);
|
|
|
|
if (map) {
|
|
|
|
if (map->len == 1) {
|
2010-09-04 03:12:37 +04:00
|
|
|
tcpu = map->cpus[0];
|
|
|
|
if (cpu_online(tcpu))
|
|
|
|
cpu = tcpu;
|
|
|
|
goto done;
|
|
|
|
}
|
2010-10-25 07:02:02 +04:00
|
|
|
} else if (!rcu_dereference_raw(rxqueue->rps_flow_table)) {
|
2010-08-04 10:15:52 +04:00
|
|
|
goto done;
|
2010-09-04 03:12:37 +04:00
|
|
|
}
|
2010-08-04 10:15:52 +04:00
|
|
|
|
2010-08-17 23:00:56 +04:00
|
|
|
skb_reset_network_header(skb);
|
2010-08-04 10:15:52 +04:00
|
|
|
if (!skb_get_rxhash(skb))
|
|
|
|
goto done;
|
|
|
|
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
flow_table = rcu_dereference(rxqueue->rps_flow_table);
|
|
|
|
sock_flow_table = rcu_dereference(rps_sock_flow_table);
|
|
|
|
if (flow_table && sock_flow_table) {
|
|
|
|
u16 next_cpu;
|
|
|
|
struct rps_dev_flow *rflow;
|
|
|
|
|
|
|
|
rflow = &flow_table->flows[skb->rxhash & flow_table->mask];
|
|
|
|
tcpu = rflow->cpu;
|
|
|
|
|
|
|
|
next_cpu = sock_flow_table->ents[skb->rxhash &
|
|
|
|
sock_flow_table->mask];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the desired CPU (where last recvmsg was done) is
|
|
|
|
* different from current CPU (one in the rx-queue flow
|
|
|
|
* table entry), switch if one of the following holds:
|
|
|
|
* - Current CPU is unset (equal to RPS_NO_CPU).
|
|
|
|
* - Current CPU is offline.
|
|
|
|
* - The current CPU's queue tail has advanced beyond the
|
|
|
|
* last packet that was enqueued using this table entry.
|
|
|
|
* This guarantees that all previous packets for the flow
|
|
|
|
* have been dequeued, thus preserving in order delivery.
|
|
|
|
*/
|
|
|
|
if (unlikely(tcpu != next_cpu) &&
|
|
|
|
(tcpu == RPS_NO_CPU || !cpu_online(tcpu) ||
|
|
|
|
((int)(per_cpu(softnet_data, tcpu).input_queue_head -
|
|
|
|
rflow->last_qtail)) >= 0)) {
|
|
|
|
tcpu = rflow->cpu = next_cpu;
|
|
|
|
if (tcpu != RPS_NO_CPU)
|
|
|
|
rflow->last_qtail = per_cpu(softnet_data,
|
|
|
|
tcpu).input_queue_head;
|
|
|
|
}
|
|
|
|
if (tcpu != RPS_NO_CPU && cpu_online(tcpu)) {
|
|
|
|
*rflowp = rflow;
|
|
|
|
cpu = tcpu;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-16 11:03:29 +03:00
|
|
|
if (map) {
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
tcpu = map->cpus[((u64) skb->rxhash * map->len) >> 32];
|
2010-03-16 11:03:29 +03:00
|
|
|
|
|
|
|
if (cpu_online(tcpu)) {
|
|
|
|
cpu = tcpu;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
return cpu;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called from hardirq (IPI) context */
|
2010-04-20 01:17:14 +04:00
|
|
|
static void rps_trigger_softirq(void *data)
|
2010-03-16 11:03:29 +03:00
|
|
|
{
|
2010-04-20 01:17:14 +04:00
|
|
|
struct softnet_data *sd = data;
|
|
|
|
|
2010-05-07 09:07:48 +04:00
|
|
|
____napi_schedule(sd, &sd->backlog);
|
2010-05-02 09:42:16 +04:00
|
|
|
sd->received_rps++;
|
2010-03-16 11:03:29 +03:00
|
|
|
}
|
2010-04-20 01:17:14 +04:00
|
|
|
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
#endif /* CONFIG_RPS */
|
2010-03-16 11:03:29 +03:00
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
/*
|
|
|
|
* Check if this softnet_data structure is another cpu one
|
|
|
|
* If yes, queue it to our IPI list and return 1
|
|
|
|
* If no, return 0
|
|
|
|
*/
|
|
|
|
static int rps_ipi_queued(struct softnet_data *sd)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
struct softnet_data *mysd = &__get_cpu_var(softnet_data);
|
|
|
|
|
|
|
|
if (sd != mysd) {
|
|
|
|
sd->rps_ipi_next = mysd->rps_ipi_list;
|
|
|
|
mysd->rps_ipi_list = sd;
|
|
|
|
|
|
|
|
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_RPS */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-03-16 11:03:29 +03:00
|
|
|
/*
|
|
|
|
* enqueue_to_backlog is called to queue an skb to a per CPU backlog
|
|
|
|
* queue (may be a remote CPU queue).
|
|
|
|
*/
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
|
|
|
|
unsigned int *qtail)
|
2010-03-16 11:03:29 +03:00
|
|
|
{
|
2010-04-20 01:17:14 +04:00
|
|
|
struct softnet_data *sd;
|
2010-03-16 11:03:29 +03:00
|
|
|
unsigned long flags;
|
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
sd = &per_cpu(softnet_data, cpu);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_lock(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
if (skb_queue_len(&sd->input_pkt_queue) <= netdev_max_backlog) {
|
|
|
|
if (skb_queue_len(&sd->input_pkt_queue)) {
|
2010-03-16 11:03:29 +03:00
|
|
|
enqueue:
|
2010-04-20 01:17:14 +04:00
|
|
|
__skb_queue_tail(&sd->input_pkt_queue, skb);
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_tail_incr_save(sd, qtail);
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_unlock(sd);
|
2010-03-31 00:16:22 +04:00
|
|
|
local_irq_restore(flags);
|
2010-03-16 11:03:29 +03:00
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2010-05-07 03:51:21 +04:00
|
|
|
/* Schedule NAPI for backlog device
|
|
|
|
* We can use non atomic operation since we own the queue lock
|
|
|
|
*/
|
|
|
|
if (!__test_and_set_bit(NAPI_STATE_SCHED, &sd->backlog.state)) {
|
2010-04-20 01:17:14 +04:00
|
|
|
if (!rps_ipi_queued(sd))
|
2010-05-07 09:07:48 +04:00
|
|
|
____napi_schedule(sd, &sd->backlog);
|
2010-03-16 11:03:29 +03:00
|
|
|
}
|
|
|
|
goto enqueue;
|
|
|
|
}
|
|
|
|
|
2010-05-02 09:42:16 +04:00
|
|
|
sd->dropped++;
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_unlock(sd);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
|
|
|
local_irq_restore(flags);
|
|
|
|
|
2010-10-01 01:06:55 +04:00
|
|
|
atomic_long_inc(&skb->dev->rx_dropped);
|
2010-03-16 11:03:29 +03:00
|
|
|
kfree_skb(skb);
|
|
|
|
return NET_RX_DROP;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* netif_rx - post buffer to the network code
|
|
|
|
* @skb: buffer to post
|
|
|
|
*
|
|
|
|
* This function receives a packet from a device driver and queues it for
|
|
|
|
* the upper (protocol) levels to process. It always succeeds. The buffer
|
|
|
|
* may be dropped during processing for congestion control or by the
|
|
|
|
* protocol layers.
|
|
|
|
*
|
|
|
|
* return values:
|
|
|
|
* NET_RX_SUCCESS (no congestion)
|
|
|
|
* NET_RX_DROP (packet was dropped)
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
int netif_rx(struct sk_buff *skb)
|
|
|
|
{
|
2010-04-15 11:14:07 +04:00
|
|
|
int ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* if netpoll wants it, pretend we never saw it */
|
|
|
|
if (netpoll_rx(skb))
|
|
|
|
return NET_RX_DROP;
|
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
if (netdev_tstamp_prequeue)
|
|
|
|
net_timestamp_check(skb);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-08-23 13:45:02 +04:00
|
|
|
trace_netif_rx(skb);
|
2010-03-24 22:13:54 +03:00
|
|
|
#ifdef CONFIG_RPS
|
2010-04-15 11:14:07 +04:00
|
|
|
{
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
struct rps_dev_flow voidflow, *rflow = &voidflow;
|
2010-04-15 11:14:07 +04:00
|
|
|
int cpu;
|
|
|
|
|
2010-08-08 07:35:43 +04:00
|
|
|
preempt_disable();
|
2010-04-15 11:14:07 +04:00
|
|
|
rcu_read_lock();
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
|
|
|
cpu = get_rps_cpu(skb->dev, skb, &rflow);
|
2010-04-15 11:14:07 +04:00
|
|
|
if (cpu < 0)
|
|
|
|
cpu = smp_processor_id();
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
|
|
|
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
|
|
|
|
|
2010-04-15 11:14:07 +04:00
|
|
|
rcu_read_unlock();
|
2010-08-08 07:35:43 +04:00
|
|
|
preempt_enable();
|
2010-04-15 11:14:07 +04:00
|
|
|
}
|
2010-03-19 03:45:44 +03:00
|
|
|
#else
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
{
|
|
|
|
unsigned int qtail;
|
|
|
|
ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
|
|
|
|
put_cpu();
|
|
|
|
}
|
2010-03-19 03:45:44 +03:00
|
|
|
#endif
|
2010-04-15 11:14:07 +04:00
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(netif_rx);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
int netif_rx_ni(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
preempt_disable();
|
|
|
|
err = netif_rx(skb);
|
|
|
|
if (local_softirq_pending())
|
|
|
|
do_softirq();
|
|
|
|
preempt_enable();
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_rx_ni);
|
|
|
|
|
|
|
|
static void net_tx_action(struct softirq_action *h)
|
|
|
|
{
|
|
|
|
struct softnet_data *sd = &__get_cpu_var(softnet_data);
|
|
|
|
|
|
|
|
if (sd->completion_queue) {
|
|
|
|
struct sk_buff *clist;
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
clist = sd->completion_queue;
|
|
|
|
sd->completion_queue = NULL;
|
|
|
|
local_irq_enable();
|
|
|
|
|
|
|
|
while (clist) {
|
|
|
|
struct sk_buff *skb = clist;
|
|
|
|
clist = clist->next;
|
|
|
|
|
2008-07-26 08:43:18 +04:00
|
|
|
WARN_ON(atomic_read(&skb->users));
|
2010-08-23 13:46:12 +04:00
|
|
|
trace_kfree_skb(skb, net_tx_action);
|
2005-04-17 02:20:36 +04:00
|
|
|
__kfree_skb(skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sd->output_queue) {
|
2008-07-16 13:15:04 +04:00
|
|
|
struct Qdisc *head;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
head = sd->output_queue;
|
|
|
|
sd->output_queue = NULL;
|
2010-04-27 03:06:24 +04:00
|
|
|
sd->output_queue_tailp = &sd->output_queue;
|
2005-04-17 02:20:36 +04:00
|
|
|
local_irq_enable();
|
|
|
|
|
|
|
|
while (head) {
|
2008-07-16 13:15:04 +04:00
|
|
|
struct Qdisc *q = head;
|
|
|
|
spinlock_t *root_lock;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
head = head->next_sched;
|
|
|
|
|
2008-08-03 07:02:43 +04:00
|
|
|
root_lock = qdisc_lock(q);
|
2008-07-16 13:15:04 +04:00
|
|
|
if (spin_trylock(root_lock)) {
|
2008-08-18 08:54:43 +04:00
|
|
|
smp_mb__before_clear_bit();
|
|
|
|
clear_bit(__QDISC_STATE_SCHED,
|
|
|
|
&q->state);
|
2008-07-16 13:15:04 +04:00
|
|
|
qdisc_run(q);
|
|
|
|
spin_unlock(root_lock);
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
2008-08-19 15:00:36 +04:00
|
|
|
if (!test_bit(__QDISC_STATE_DEACTIVATED,
|
2008-09-08 05:41:21 +04:00
|
|
|
&q->state)) {
|
2008-08-19 15:00:36 +04:00
|
|
|
__netif_reschedule(q);
|
2008-09-08 05:41:21 +04:00
|
|
|
} else {
|
|
|
|
smp_mb__before_clear_bit();
|
|
|
|
clear_bit(__QDISC_STATE_SCHED,
|
|
|
|
&q->state);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-02 01:52:08 +04:00
|
|
|
#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \
|
|
|
|
(defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))
|
2009-06-05 09:35:28 +04:00
|
|
|
/* This hook is defined here for ATM LANE */
|
|
|
|
int (*br_fdb_test_addr_hook)(struct net_device *dev,
|
|
|
|
unsigned char *addr) __read_mostly;
|
2009-09-11 22:50:08 +04:00
|
|
|
EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);
|
2009-06-05 09:35:28 +04:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
/* TODO: Maybe we should just force sch_ingress to be compiled in
|
|
|
|
* when CONFIG_NET_CLS_ACT is? otherwise some useless instructions
|
|
|
|
* a compare and 2 stores extra right now if we dont have it on
|
|
|
|
* but have CONFIG_NET_CLS_ACT
|
2007-02-09 17:24:36 +03:00
|
|
|
* NOTE: This doesnt stop any functionality; if you dont have
|
2005-04-17 02:20:36 +04:00
|
|
|
* the ingress scheduler, you just cant add policies on ingress.
|
|
|
|
*
|
|
|
|
*/
|
2010-10-02 10:11:55 +04:00
|
|
|
static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev = skb->dev;
|
2007-10-14 11:38:47 +04:00
|
|
|
u32 ttl = G_TC_RTTL(skb->tc_verd);
|
2008-07-09 04:33:13 +04:00
|
|
|
int result = TC_ACT_OK;
|
|
|
|
struct Qdisc *q;
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2010-08-01 11:33:23 +04:00
|
|
|
if (unlikely(MAX_RED_LOOP < ttl++)) {
|
|
|
|
if (net_ratelimit())
|
|
|
|
pr_warning( "Redir loop detected Dropping packet (%d->%d)\n",
|
|
|
|
skb->skb_iif, dev->ifindex);
|
2007-10-14 11:38:47 +04:00
|
|
|
return TC_ACT_SHOT;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-10-14 11:38:47 +04:00
|
|
|
skb->tc_verd = SET_TC_RTTL(skb->tc_verd, ttl);
|
|
|
|
skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-17 11:53:03 +04:00
|
|
|
q = rxq->qdisc;
|
2008-07-30 13:37:46 +04:00
|
|
|
if (q != &noop_qdisc) {
|
2008-07-17 11:53:03 +04:00
|
|
|
spin_lock(qdisc_lock(q));
|
2008-08-18 08:51:03 +04:00
|
|
|
if (likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state)))
|
|
|
|
result = qdisc_enqueue_root(skb, q);
|
2008-07-17 11:53:03 +04:00
|
|
|
spin_unlock(qdisc_lock(q));
|
|
|
|
}
|
2007-10-14 11:38:47 +04:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2005-08-10 06:36:29 +04:00
|
|
|
|
2007-10-14 11:38:47 +04:00
|
|
|
static inline struct sk_buff *handle_ing(struct sk_buff *skb,
|
|
|
|
struct packet_type **pt_prev,
|
|
|
|
int *ret, struct net_device *orig_dev)
|
|
|
|
{
|
2010-10-02 10:11:55 +04:00
|
|
|
struct netdev_queue *rxq = rcu_dereference(skb->dev->ingress_queue);
|
|
|
|
|
|
|
|
if (!rxq || rxq->qdisc == &noop_qdisc)
|
2007-10-14 11:38:47 +04:00
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-10-14 11:38:47 +04:00
|
|
|
if (*pt_prev) {
|
|
|
|
*ret = deliver_skb(skb, *pt_prev, orig_dev);
|
|
|
|
*pt_prev = NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2010-10-02 10:11:55 +04:00
|
|
|
switch (ing_filter(skb, rxq)) {
|
2007-10-14 11:38:47 +04:00
|
|
|
case TC_ACT_SHOT:
|
|
|
|
case TC_ACT_STOLEN:
|
|
|
|
kfree_skb(skb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
skb->tc_verd = 0;
|
|
|
|
return skb;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-06-02 01:52:08 +04:00
|
|
|
/**
|
|
|
|
* netdev_rx_handler_register - register receive handler
|
|
|
|
* @dev: device to register a handler for
|
|
|
|
* @rx_handler: receive handler to register
|
2010-06-10 07:34:59 +04:00
|
|
|
* @rx_handler_data: data pointer that is used by rx handler
|
2010-06-02 01:52:08 +04:00
|
|
|
*
|
|
|
|
* Register a receive hander for a device. This handler will then be
|
|
|
|
* called from __netif_receive_skb. A negative errno code is returned
|
|
|
|
* on a failure.
|
|
|
|
*
|
|
|
|
* The caller must hold the rtnl_mutex.
|
|
|
|
*/
|
|
|
|
int netdev_rx_handler_register(struct net_device *dev,
|
2010-06-10 07:34:59 +04:00
|
|
|
rx_handler_func_t *rx_handler,
|
|
|
|
void *rx_handler_data)
|
2010-06-02 01:52:08 +04:00
|
|
|
{
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
if (dev->rx_handler)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2010-06-10 07:34:59 +04:00
|
|
|
rcu_assign_pointer(dev->rx_handler_data, rx_handler_data);
|
2010-06-02 01:52:08 +04:00
|
|
|
rcu_assign_pointer(dev->rx_handler, rx_handler);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(netdev_rx_handler_register);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_rx_handler_unregister - unregister receive handler
|
|
|
|
* @dev: device to unregister a handler from
|
|
|
|
*
|
|
|
|
* Unregister a receive hander from a device.
|
|
|
|
*
|
|
|
|
* The caller must hold the rtnl_mutex.
|
|
|
|
*/
|
|
|
|
void netdev_rx_handler_unregister(struct net_device *dev)
|
|
|
|
{
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
rcu_assign_pointer(dev->rx_handler, NULL);
|
2010-06-10 07:34:59 +04:00
|
|
|
rcu_assign_pointer(dev->rx_handler_data, NULL);
|
2010-06-02 01:52:08 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
|
|
|
|
2010-04-11 10:56:11 +04:00
|
|
|
static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,
|
|
|
|
struct net_device *master)
|
|
|
|
{
|
|
|
|
if (skb->pkt_type == PACKET_HOST) {
|
|
|
|
u16 *dest = (u16 *) eth_hdr(skb)->h_dest;
|
|
|
|
|
|
|
|
memcpy(dest, master->dev_addr, ETH_ALEN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On bonding slaves other than the currently active slave, suppress
|
|
|
|
* duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
|
|
|
|
* ARP on active-backup slaves with arp_validate enabled.
|
|
|
|
*/
|
|
|
|
int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)
|
|
|
|
{
|
|
|
|
struct net_device *dev = skb->dev;
|
|
|
|
|
|
|
|
if (master->priv_flags & IFF_MASTER_ARPMON)
|
|
|
|
dev->last_rx = jiffies;
|
|
|
|
|
2010-06-15 10:50:45 +04:00
|
|
|
if ((master->priv_flags & IFF_MASTER_ALB) &&
|
|
|
|
(master->priv_flags & IFF_BRIDGE_PORT)) {
|
2010-04-11 10:56:11 +04:00
|
|
|
/* Do address unmangle. The local destination address
|
|
|
|
* will be always the one master has. Provides the right
|
|
|
|
* functionality in a bridge.
|
|
|
|
*/
|
|
|
|
skb_bond_set_mac_by_master(skb, master);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
|
|
|
|
if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
|
|
|
|
skb->protocol == __cpu_to_be16(ETH_P_ARP))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (master->priv_flags & IFF_MASTER_ALB) {
|
|
|
|
if (skb->pkt_type != PACKET_BROADCAST &&
|
|
|
|
skb->pkt_type != PACKET_MULTICAST)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (master->priv_flags & IFF_MASTER_8023AD &&
|
|
|
|
skb->protocol == __cpu_to_be16(ETH_P_SLOW))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__skb_bond_should_drop);
|
|
|
|
|
2010-03-29 10:07:20 +04:00
|
|
|
static int __netif_receive_skb(struct sk_buff *skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct packet_type *ptype, *pt_prev;
|
2010-06-02 01:52:08 +04:00
|
|
|
rx_handler_func_t *rx_handler;
|
2005-08-10 06:34:12 +04:00
|
|
|
struct net_device *orig_dev;
|
2010-03-19 07:16:45 +03:00
|
|
|
struct net_device *master;
|
2008-07-03 05:22:01 +04:00
|
|
|
struct net_device *null_or_orig;
|
2010-05-13 01:31:11 +04:00
|
|
|
struct net_device *orig_or_bond;
|
2005-04-17 02:20:36 +04:00
|
|
|
int ret = NET_RX_DROP;
|
2006-11-15 07:48:11 +03:00
|
|
|
__be16 type;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
if (!netdev_tstamp_prequeue)
|
|
|
|
net_timestamp_check(skb);
|
2009-10-01 03:42:42 +04:00
|
|
|
|
2010-08-23 13:45:02 +04:00
|
|
|
trace_netif_receive_skb(skb);
|
2008-11-05 01:49:57 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* if we've gotten here through NAPI, check netpoll */
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
if (netpoll_receive_skb(skb))
|
2005-04-17 02:20:36 +04:00
|
|
|
return NET_RX_DROP;
|
|
|
|
|
2009-11-21 02:35:04 +03:00
|
|
|
if (!skb->skb_iif)
|
|
|
|
skb->skb_iif = skb->dev->ifindex;
|
2005-08-10 06:36:29 +04:00
|
|
|
|
2010-06-03 13:30:11 +04:00
|
|
|
/*
|
|
|
|
* bonding note: skbs received on inactive slaves should only
|
|
|
|
* be delivered to pkt handlers that are exact matches. Also
|
|
|
|
* the deliver_no_wcard flag will be set. If packet handlers
|
|
|
|
* are sensitive to duplicate packets these skbs will need to
|
2010-10-20 17:56:06 +04:00
|
|
|
* be dropped at the handler.
|
2010-06-03 13:30:11 +04:00
|
|
|
*/
|
2008-07-03 05:22:01 +04:00
|
|
|
null_or_orig = NULL;
|
2008-07-03 05:22:00 +04:00
|
|
|
orig_dev = skb->dev;
|
2010-03-19 07:16:45 +03:00
|
|
|
master = ACCESS_ONCE(orig_dev->master);
|
2010-06-03 13:30:11 +04:00
|
|
|
if (skb->deliver_no_wcard)
|
|
|
|
null_or_orig = orig_dev;
|
|
|
|
else if (master) {
|
|
|
|
if (skb_bond_should_drop(skb, master)) {
|
|
|
|
skb->deliver_no_wcard = 1;
|
2008-07-03 05:22:01 +04:00
|
|
|
null_or_orig = orig_dev; /* deliver only exact match */
|
2010-06-03 13:30:11 +04:00
|
|
|
} else
|
2010-03-19 07:16:45 +03:00
|
|
|
skb->dev = master;
|
2008-07-03 05:22:00 +04:00
|
|
|
}
|
2006-02-22 03:36:44 +03:00
|
|
|
|
2010-05-20 02:07:23 +04:00
|
|
|
__this_cpu_inc(softnet_data.processed);
|
2007-04-11 07:45:18 +04:00
|
|
|
skb_reset_network_header(skb);
|
2007-03-13 19:06:52 +03:00
|
|
|
skb_reset_transport_header(skb);
|
2007-04-11 08:21:55 +04:00
|
|
|
skb->mac_len = skb->network_header - skb->mac_header;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
pt_prev = NULL;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
if (skb->tc_verd & TC_NCLS) {
|
|
|
|
skb->tc_verd = CLR_TC_NCLS(skb->tc_verd);
|
|
|
|
goto ncls;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(ptype, &ptype_all, list) {
|
2008-07-03 05:22:02 +04:00
|
|
|
if (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
|
|
|
|
ptype->dev == orig_dev) {
|
2007-02-09 17:24:36 +03:00
|
|
|
if (pt_prev)
|
2005-08-10 06:34:12 +04:00
|
|
|
ret = deliver_skb(skb, pt_prev, orig_dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
pt_prev = ptype;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
2007-10-14 11:38:47 +04:00
|
|
|
skb = handle_ing(skb, &pt_prev, &ret, orig_dev);
|
|
|
|
if (!skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
ncls:
|
|
|
|
#endif
|
|
|
|
|
2010-06-02 01:52:08 +04:00
|
|
|
/* Handle special case of bridge or macvlan */
|
|
|
|
rx_handler = rcu_dereference(skb->dev->rx_handler);
|
|
|
|
if (rx_handler) {
|
|
|
|
if (pt_prev) {
|
|
|
|
ret = deliver_skb(skb, pt_prev, orig_dev);
|
|
|
|
pt_prev = NULL;
|
|
|
|
}
|
|
|
|
skb = rx_handler(skb);
|
|
|
|
if (!skb)
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-10-20 17:56:06 +04:00
|
|
|
if (vlan_tx_tag_present(skb)) {
|
|
|
|
if (pt_prev) {
|
|
|
|
ret = deliver_skb(skb, pt_prev, orig_dev);
|
|
|
|
pt_prev = NULL;
|
|
|
|
}
|
|
|
|
if (vlan_hwaccel_do_receive(&skb)) {
|
|
|
|
ret = __netif_receive_skb(skb);
|
|
|
|
goto out;
|
|
|
|
} else if (unlikely(!skb))
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
bonding: allow arp_ip_targets on separate vlans to use arp validation
This allows a bond device to specify an arp_ip_target as a host that is
not on the same vlan as the base bond device and still use arp
validation. A configuration like this, now works:
BONDING_OPTS="mode=active-backup arp_interval=1000 arp_ip_target=10.0.100.1 arp_validate=3"
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
inet 127.0.0.1/8 scope host lo
inet6 ::1/128 scope host
valid_lft forever preferred_lft forever
2: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
3: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
8: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
9: bond0.100@bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
Bonding Mode: fault-tolerance (active-backup)
Primary Slave: None
Currently Active Slave: eth1
MII Status: up
MII Polling Interval (ms): 0
Up Delay (ms): 0
Down Delay (ms): 0
ARP Polling Interval (ms): 1000
ARP IP target/s (n.n.n.n form): 10.0.100.1
Slave Interface: eth1
MII Status: up
Link Failure Count: 1
Permanent HW addr: 00:40:05:30:ff:30
Slave Interface: eth0
MII Status: up
Link Failure Count: 0
Permanent HW addr: 00:13:21:be:33:e9
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-14 13:48:58 +03:00
|
|
|
/*
|
|
|
|
* Make sure frames received on VLAN interfaces stacked on
|
|
|
|
* bonding interfaces still make their way to any base bonding
|
|
|
|
* device that may have registered for a specific ptype. The
|
|
|
|
* handler may have to adjust skb->dev and orig_dev.
|
|
|
|
*/
|
2010-05-13 01:31:11 +04:00
|
|
|
orig_or_bond = orig_dev;
|
bonding: allow arp_ip_targets on separate vlans to use arp validation
This allows a bond device to specify an arp_ip_target as a host that is
not on the same vlan as the base bond device and still use arp
validation. A configuration like this, now works:
BONDING_OPTS="mode=active-backup arp_interval=1000 arp_ip_target=10.0.100.1 arp_validate=3"
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
inet 127.0.0.1/8 scope host lo
inet6 ::1/128 scope host
valid_lft forever preferred_lft forever
2: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
3: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
8: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
9: bond0.100@bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
Bonding Mode: fault-tolerance (active-backup)
Primary Slave: None
Currently Active Slave: eth1
MII Status: up
MII Polling Interval (ms): 0
Up Delay (ms): 0
Down Delay (ms): 0
ARP Polling Interval (ms): 1000
ARP IP target/s (n.n.n.n form): 10.0.100.1
Slave Interface: eth1
MII Status: up
Link Failure Count: 1
Permanent HW addr: 00:40:05:30:ff:30
Slave Interface: eth0
MII Status: up
Link Failure Count: 0
Permanent HW addr: 00:13:21:be:33:e9
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-14 13:48:58 +03:00
|
|
|
if ((skb->dev->priv_flags & IFF_802_1Q_VLAN) &&
|
|
|
|
(vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) {
|
2010-05-13 01:31:11 +04:00
|
|
|
orig_or_bond = vlan_dev_real_dev(skb->dev);
|
bonding: allow arp_ip_targets on separate vlans to use arp validation
This allows a bond device to specify an arp_ip_target as a host that is
not on the same vlan as the base bond device and still use arp
validation. A configuration like this, now works:
BONDING_OPTS="mode=active-backup arp_interval=1000 arp_ip_target=10.0.100.1 arp_validate=3"
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
inet 127.0.0.1/8 scope host lo
inet6 ::1/128 scope host
valid_lft forever preferred_lft forever
2: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
3: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
8: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
9: bond0.100@bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
Bonding Mode: fault-tolerance (active-backup)
Primary Slave: None
Currently Active Slave: eth1
MII Status: up
MII Polling Interval (ms): 0
Up Delay (ms): 0
Down Delay (ms): 0
ARP Polling Interval (ms): 1000
ARP IP target/s (n.n.n.n form): 10.0.100.1
Slave Interface: eth1
MII Status: up
Link Failure Count: 1
Permanent HW addr: 00:40:05:30:ff:30
Slave Interface: eth0
MII Status: up
Link Failure Count: 0
Permanent HW addr: 00:13:21:be:33:e9
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-14 13:48:58 +03:00
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
type = skb->protocol;
|
2007-11-26 15:12:58 +03:00
|
|
|
list_for_each_entry_rcu(ptype,
|
|
|
|
&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
|
bonding: allow arp_ip_targets on separate vlans to use arp validation
This allows a bond device to specify an arp_ip_target as a host that is
not on the same vlan as the base bond device and still use arp
validation. A configuration like this, now works:
BONDING_OPTS="mode=active-backup arp_interval=1000 arp_ip_target=10.0.100.1 arp_validate=3"
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
inet 127.0.0.1/8 scope host lo
inet6 ::1/128 scope host
valid_lft forever preferred_lft forever
2: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
3: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 qlen 1000
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
8: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
9: bond0.100@bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff
inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100
inet6 fe80::213:21ff:febe:33e9/64 scope link
valid_lft forever preferred_lft forever
Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
Bonding Mode: fault-tolerance (active-backup)
Primary Slave: None
Currently Active Slave: eth1
MII Status: up
MII Polling Interval (ms): 0
Up Delay (ms): 0
Down Delay (ms): 0
ARP Polling Interval (ms): 1000
ARP IP target/s (n.n.n.n form): 10.0.100.1
Slave Interface: eth1
MII Status: up
Link Failure Count: 1
Permanent HW addr: 00:40:05:30:ff:30
Slave Interface: eth0
MII Status: up
Link Failure Count: 0
Permanent HW addr: 00:13:21:be:33:e9
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-14 13:48:58 +03:00
|
|
|
if (ptype->type == type && (ptype->dev == null_or_orig ||
|
fix bonding: allow arp_ip_targets on separate vlans to use arp validation
On Wed, Jan 06, 2010 at 10:10:03PM +0100, Eric Dumazet wrote:
> Le 06/01/2010 19:38, Eric Dumazet a écrit :
> >
> > (net-next-2.6 doesnt work well on my bond/vlan setup, I suspect I need a bisection)
>
> David, I had to revert 1f3c8804acba841b5573b953f5560d2683d2db0d
> (bonding: allow arp_ip_targets on separate vlans to use arp validation)
>
> Or else, my vlan devices dont work (unfortunatly I dont have much time
> these days to debug the thing)
>
> My config :
>
> +---------+
> vlan.103 -----+ bond0 +--- eth1 (bnx2)
> | +
> vlan.825 -----+ +--- eth2 (tg3)
> +---------+
>
> $ cat /proc/net/bonding/bond0
> Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
>
> Bonding Mode: fault-tolerance (active-backup)
> Primary Slave: None
> Currently Active Slave: eth2
> MII Status: up
> MII Polling Interval (ms): 100
> Up Delay (ms): 0
> Down Delay (ms): 0
>
> Slave Interface: eth1 (bnx2)
> MII Status: down
> Link Failure Count: 1
> Permanent HW addr: 00:1e:0b:ec:d3:d2
>
> Slave Interface: eth2 (tg3)
> MII Status: up
> Link Failure Count: 0
> Permanent HW addr: 00:1e:0b:92:78:50
>
This patch fixes up a problem with found with commit
1f3c8804acba841b5573b953f5560d2683d2db0d. The original change
overloaded null_or_orig, but doing that prevented any packet handlers
that were not tied to a specific device (i.e. ptype->dev == NULL) from
ever receiving any frames.
The null_or_orig variable cannot be overloaded, and must be kept as NULL
to prevent the frame from being ignored by packet handlers designed to
accept frames on any interface.
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-01-06 15:56:37 +03:00
|
|
|
ptype->dev == skb->dev || ptype->dev == orig_dev ||
|
2010-05-13 01:31:11 +04:00
|
|
|
ptype->dev == orig_or_bond)) {
|
2007-02-09 17:24:36 +03:00
|
|
|
if (pt_prev)
|
2005-08-10 06:34:12 +04:00
|
|
|
ret = deliver_skb(skb, pt_prev, orig_dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
pt_prev = ptype;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pt_prev) {
|
2005-08-10 06:34:12 +04:00
|
|
|
ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
2010-10-01 01:06:55 +04:00
|
|
|
atomic_long_inc(&skb->dev->rx_dropped);
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree_skb(skb);
|
|
|
|
/* Jamal, now you will not able to escape explaining
|
|
|
|
* me how you were going to use this. :-)
|
|
|
|
*/
|
|
|
|
ret = NET_RX_DROP;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return ret;
|
|
|
|
}
|
2010-03-16 11:03:29 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* netif_receive_skb - process receive buffer from network
|
|
|
|
* @skb: buffer to process
|
|
|
|
*
|
|
|
|
* netif_receive_skb() is the main receive data processing function.
|
|
|
|
* It always succeeds. The buffer may be dropped during processing
|
|
|
|
* for congestion control or by the protocol layers.
|
|
|
|
*
|
|
|
|
* This function may only be called from softirq context and interrupts
|
|
|
|
* should be enabled.
|
|
|
|
*
|
|
|
|
* Return values (usually ignored):
|
|
|
|
* NET_RX_SUCCESS: no congestion
|
|
|
|
* NET_RX_DROP: packet was dropped
|
|
|
|
*/
|
|
|
|
int netif_receive_skb(struct sk_buff *skb)
|
|
|
|
{
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
if (netdev_tstamp_prequeue)
|
|
|
|
net_timestamp_check(skb);
|
|
|
|
|
2010-07-17 12:49:36 +04:00
|
|
|
if (skb_defer_rx_timestamp(skb))
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
|
2010-03-24 22:13:54 +03:00
|
|
|
#ifdef CONFIG_RPS
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
{
|
|
|
|
struct rps_dev_flow voidflow, *rflow = &voidflow;
|
|
|
|
int cpu, ret;
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
|
|
|
|
cpu = get_rps_cpu(skb->dev, skb, &rflow);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
if (cpu >= 0) {
|
|
|
|
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
|
|
|
|
rcu_read_unlock();
|
|
|
|
} else {
|
|
|
|
rcu_read_unlock();
|
|
|
|
ret = __netif_receive_skb(skb);
|
|
|
|
}
|
2010-03-16 11:03:29 +03:00
|
|
|
|
net: Consistent skb timestamping
With RPS inclusion, skb timestamping is not consistent in RX path.
If netif_receive_skb() is used, its deferred after RPS dispatch.
If netif_rx() is used, its done before RPS dispatch.
This can give strange tcpdump timestamps results.
I think timestamping should be done as soon as possible in the receive
path, to get meaningful values (ie timestamps taken at the time packet
was delivered by NIC driver to our stack), even if NAPI already can
defer timestamping a bit (RPS can help to reduce the gap)
Tom Herbert prefer to sample timestamps after RPS dispatch. In case
sampling is expensive (HPET/acpi_pm on x86), this makes sense.
Let admins switch from one mode to another, using a new
sysctl, /proc/sys/net/core/netdev_tstamp_prequeue
Its default value (1), means timestamps are taken as soon as possible,
before backlog queueing, giving accurate timestamps.
Setting a 0 value permits to sample timestamps when processing backlog,
after RPS dispatch, to lower the load of the pre-RPS cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-16 10:57:10 +04:00
|
|
|
return ret;
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
}
|
2010-03-19 03:45:44 +03:00
|
|
|
#else
|
|
|
|
return __netif_receive_skb(skb);
|
|
|
|
#endif
|
2010-03-16 11:03:29 +03:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(netif_receive_skb);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-04-19 09:07:33 +04:00
|
|
|
/* Network device is going away, flush any packets still pending
|
|
|
|
* Called with irqs disabled.
|
|
|
|
*/
|
2010-03-31 00:16:22 +04:00
|
|
|
static void flush_backlog(void *arg)
|
2008-08-04 08:29:57 +04:00
|
|
|
{
|
2010-03-31 00:16:22 +04:00
|
|
|
struct net_device *dev = arg;
|
2010-04-20 01:17:14 +04:00
|
|
|
struct softnet_data *sd = &__get_cpu_var(softnet_data);
|
2008-08-04 08:29:57 +04:00
|
|
|
struct sk_buff *skb, *tmp;
|
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_lock(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
|
2008-08-04 08:29:57 +04:00
|
|
|
if (skb->dev == dev) {
|
2010-04-20 01:17:14 +04:00
|
|
|
__skb_unlink(skb, &sd->input_pkt_queue);
|
2008-08-04 08:29:57 +04:00
|
|
|
kfree_skb(skb);
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_head_incr(sd);
|
2008-08-04 08:29:57 +04:00
|
|
|
}
|
2010-04-28 02:07:33 +04:00
|
|
|
}
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_unlock(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
|
|
|
|
skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
|
|
|
|
if (skb->dev == dev) {
|
|
|
|
__skb_unlink(skb, &sd->process_queue);
|
|
|
|
kfree_skb(skb);
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_head_incr(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
}
|
|
|
|
}
|
2008-08-04 08:29:57 +04:00
|
|
|
}
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
static int napi_gro_complete(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct packet_type *ptype;
|
|
|
|
__be16 type = skb->protocol;
|
|
|
|
struct list_head *head = &ptype_base[ntohs(type) & PTYPE_HASH_MASK];
|
|
|
|
int err = -ENOENT;
|
|
|
|
|
2009-04-15 02:11:06 +04:00
|
|
|
if (NAPI_GRO_CB(skb)->count == 1) {
|
|
|
|
skb_shinfo(skb)->gso_size = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
goto out;
|
2009-04-15 02:11:06 +04:00
|
|
|
}
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(ptype, head, list) {
|
|
|
|
if (ptype->type != type || ptype->dev || !ptype->gro_complete)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
err = ptype->gro_complete(skb);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
WARN_ON(&ptype->list == head);
|
|
|
|
kfree_skb(skb);
|
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
return netif_receive_skb(skb);
|
|
|
|
}
|
|
|
|
|
2010-08-31 22:25:32 +04:00
|
|
|
inline void napi_gro_flush(struct napi_struct *napi)
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
{
|
|
|
|
struct sk_buff *skb, *next;
|
|
|
|
|
|
|
|
for (skb = napi->gro_list; skb; skb = next) {
|
|
|
|
next = skb->next;
|
|
|
|
skb->next = NULL;
|
|
|
|
napi_gro_complete(skb);
|
|
|
|
}
|
|
|
|
|
2009-02-08 21:00:36 +03:00
|
|
|
napi->gro_count = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
napi->gro_list = NULL;
|
|
|
|
}
|
2010-08-31 22:25:32 +04:00
|
|
|
EXPORT_SYMBOL(napi_gro_flush);
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
2009-10-29 10:17:09 +03:00
|
|
|
enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
{
|
|
|
|
struct sk_buff **pp = NULL;
|
|
|
|
struct packet_type *ptype;
|
|
|
|
__be16 type = skb->protocol;
|
|
|
|
struct list_head *head = &ptype_base[ntohs(type) & PTYPE_HASH_MASK];
|
2008-12-27 01:57:42 +03:00
|
|
|
int same_flow;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
int mac_len;
|
2009-10-29 10:17:09 +03:00
|
|
|
enum gro_result ret;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
2010-08-05 05:19:11 +04:00
|
|
|
if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb))
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
goto normal;
|
|
|
|
|
2010-08-23 11:13:46 +04:00
|
|
|
if (skb_is_gso(skb) || skb_has_frag_list(skb))
|
2009-01-15 01:36:12 +03:00
|
|
|
goto normal;
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(ptype, head, list) {
|
|
|
|
if (ptype->type != type || ptype->dev || !ptype->gro_receive)
|
|
|
|
continue;
|
|
|
|
|
2009-01-29 17:19:50 +03:00
|
|
|
skb_set_network_header(skb, skb_gro_offset(skb));
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
mac_len = skb->network_header - skb->mac_header;
|
|
|
|
skb->mac_len = mac_len;
|
|
|
|
NAPI_GRO_CB(skb)->same_flow = 0;
|
|
|
|
NAPI_GRO_CB(skb)->flush = 0;
|
2009-01-05 03:13:40 +03:00
|
|
|
NAPI_GRO_CB(skb)->free = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
|
|
|
pp = ptype->gro_receive(&napi->gro_list, skb);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
if (&ptype->list == head)
|
|
|
|
goto normal;
|
|
|
|
|
2008-12-27 01:57:42 +03:00
|
|
|
same_flow = NAPI_GRO_CB(skb)->same_flow;
|
2009-01-29 17:19:48 +03:00
|
|
|
ret = NAPI_GRO_CB(skb)->free ? GRO_MERGED_FREE : GRO_MERGED;
|
2008-12-27 01:57:42 +03:00
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
if (pp) {
|
|
|
|
struct sk_buff *nskb = *pp;
|
|
|
|
|
|
|
|
*pp = nskb->next;
|
|
|
|
nskb->next = NULL;
|
|
|
|
napi_gro_complete(nskb);
|
2009-02-08 21:00:36 +03:00
|
|
|
napi->gro_count--;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
}
|
|
|
|
|
2008-12-27 01:57:42 +03:00
|
|
|
if (same_flow)
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
goto ok;
|
|
|
|
|
2009-02-08 21:00:36 +03:00
|
|
|
if (NAPI_GRO_CB(skb)->flush || napi->gro_count >= MAX_GRO_SKBS)
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
goto normal;
|
|
|
|
|
2009-02-08 21:00:36 +03:00
|
|
|
napi->gro_count++;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
NAPI_GRO_CB(skb)->count = 1;
|
2009-01-29 17:19:50 +03:00
|
|
|
skb_shinfo(skb)->gso_size = skb_gro_len(skb);
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
skb->next = napi->gro_list;
|
|
|
|
napi->gro_list = skb;
|
2009-01-29 17:19:48 +03:00
|
|
|
ret = GRO_HELD;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
2009-02-01 12:24:55 +03:00
|
|
|
pull:
|
2009-05-26 22:50:31 +04:00
|
|
|
if (skb_headlen(skb) < skb_gro_offset(skb)) {
|
|
|
|
int grow = skb_gro_offset(skb) - skb_headlen(skb);
|
|
|
|
|
|
|
|
BUG_ON(skb->end - skb->tail < grow);
|
|
|
|
|
|
|
|
memcpy(skb_tail_pointer(skb), NAPI_GRO_CB(skb)->frag0, grow);
|
|
|
|
|
|
|
|
skb->tail += grow;
|
|
|
|
skb->data_len -= grow;
|
|
|
|
|
|
|
|
skb_shinfo(skb)->frags[0].page_offset += grow;
|
|
|
|
skb_shinfo(skb)->frags[0].size -= grow;
|
|
|
|
|
|
|
|
if (unlikely(!skb_shinfo(skb)->frags[0].size)) {
|
|
|
|
put_page(skb_shinfo(skb)->frags[0].page);
|
|
|
|
memmove(skb_shinfo(skb)->frags,
|
|
|
|
skb_shinfo(skb)->frags + 1,
|
2010-08-11 06:02:10 +04:00
|
|
|
--skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t));
|
2009-05-26 22:50:31 +04:00
|
|
|
}
|
2009-02-01 12:24:55 +03:00
|
|
|
}
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
ok:
|
2009-01-29 17:19:48 +03:00
|
|
|
return ret;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
|
|
|
normal:
|
2009-02-01 12:24:55 +03:00
|
|
|
ret = GRO_NORMAL;
|
|
|
|
goto pull;
|
2009-01-05 03:13:40 +03:00
|
|
|
}
|
2009-01-06 21:49:34 +03:00
|
|
|
EXPORT_SYMBOL(dev_gro_receive);
|
|
|
|
|
2010-08-27 09:03:08 +04:00
|
|
|
static inline gro_result_t
|
2009-10-29 10:17:09 +03:00
|
|
|
__napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
|
2009-01-06 21:49:34 +03:00
|
|
|
{
|
|
|
|
struct sk_buff *p;
|
|
|
|
|
|
|
|
for (p = napi->gro_list; p; p = p->next) {
|
2010-08-27 09:03:08 +04:00
|
|
|
unsigned long diffs;
|
|
|
|
|
|
|
|
diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
|
2010-10-20 17:56:06 +04:00
|
|
|
diffs |= p->vlan_tci ^ skb->vlan_tci;
|
2010-08-27 09:03:08 +04:00
|
|
|
diffs |= compare_ether_header(skb_mac_header(p),
|
2009-11-30 03:55:45 +03:00
|
|
|
skb_gro_mac_header(skb));
|
2010-08-27 09:03:08 +04:00
|
|
|
NAPI_GRO_CB(p)->same_flow = !diffs;
|
2009-01-06 21:49:34 +03:00
|
|
|
NAPI_GRO_CB(p)->flush = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dev_gro_receive(napi, skb);
|
|
|
|
}
|
2009-01-05 03:13:40 +03:00
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
|
2009-01-05 03:13:40 +03:00
|
|
|
{
|
2009-01-29 17:19:48 +03:00
|
|
|
switch (ret) {
|
|
|
|
case GRO_NORMAL:
|
2009-10-30 07:36:53 +03:00
|
|
|
if (netif_receive_skb(skb))
|
|
|
|
ret = GRO_DROP;
|
|
|
|
break;
|
2009-01-05 03:13:40 +03:00
|
|
|
|
2009-01-29 17:19:48 +03:00
|
|
|
case GRO_DROP:
|
|
|
|
case GRO_MERGED_FREE:
|
2009-01-05 03:13:40 +03:00
|
|
|
kfree_skb(skb);
|
|
|
|
break;
|
2009-10-29 10:17:09 +03:00
|
|
|
|
|
|
|
case GRO_HELD:
|
|
|
|
case GRO_MERGED:
|
|
|
|
break;
|
2009-01-05 03:13:40 +03:00
|
|
|
}
|
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
return ret;
|
2009-01-29 17:19:48 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(napi_skb_finish);
|
|
|
|
|
2009-05-26 22:50:21 +04:00
|
|
|
void skb_gro_reset_offset(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
NAPI_GRO_CB(skb)->data_offset = 0;
|
|
|
|
NAPI_GRO_CB(skb)->frag0 = NULL;
|
2009-05-26 22:50:27 +04:00
|
|
|
NAPI_GRO_CB(skb)->frag0_len = 0;
|
2009-05-26 22:50:21 +04:00
|
|
|
|
2009-05-26 22:50:23 +04:00
|
|
|
if (skb->mac_header == skb->tail &&
|
2009-05-26 22:50:27 +04:00
|
|
|
!PageHighMem(skb_shinfo(skb)->frags[0].page)) {
|
2009-05-26 22:50:21 +04:00
|
|
|
NAPI_GRO_CB(skb)->frag0 =
|
|
|
|
page_address(skb_shinfo(skb)->frags[0].page) +
|
|
|
|
skb_shinfo(skb)->frags[0].page_offset;
|
2009-05-26 22:50:27 +04:00
|
|
|
NAPI_GRO_CB(skb)->frag0_len = skb_shinfo(skb)->frags[0].size;
|
|
|
|
}
|
2009-05-26 22:50:21 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(skb_gro_reset_offset);
|
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
|
2009-01-29 17:19:48 +03:00
|
|
|
{
|
2009-01-29 17:19:50 +03:00
|
|
|
skb_gro_reset_offset(skb);
|
|
|
|
|
2009-01-29 17:19:48 +03:00
|
|
|
return napi_skb_finish(__napi_gro_receive(napi, skb), skb);
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(napi_gro_receive);
|
|
|
|
|
2010-10-19 11:12:10 +04:00
|
|
|
static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
|
2009-01-06 21:49:34 +03:00
|
|
|
{
|
|
|
|
__skb_pull(skb, skb_headlen(skb));
|
|
|
|
skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
|
2010-10-20 17:56:06 +04:00
|
|
|
skb->vlan_tci = 0;
|
2009-01-06 21:49:34 +03:00
|
|
|
|
|
|
|
napi->skb = skb;
|
|
|
|
}
|
|
|
|
|
2009-04-16 13:02:07 +04:00
|
|
|
struct sk_buff *napi_get_frags(struct napi_struct *napi)
|
2009-01-05 03:13:40 +03:00
|
|
|
{
|
|
|
|
struct sk_buff *skb = napi->skb;
|
|
|
|
|
|
|
|
if (!skb) {
|
2009-10-13 09:34:20 +04:00
|
|
|
skb = netdev_alloc_skb_ip_align(napi->dev, GRO_MAX_HEAD);
|
|
|
|
if (skb)
|
|
|
|
napi->skb = skb;
|
2009-01-29 17:19:52 +03:00
|
|
|
}
|
2009-01-06 21:49:34 +03:00
|
|
|
return skb;
|
|
|
|
}
|
2009-04-16 13:02:07 +04:00
|
|
|
EXPORT_SYMBOL(napi_get_frags);
|
2009-01-06 21:49:34 +03:00
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,
|
|
|
|
gro_result_t ret)
|
2009-01-06 21:49:34 +03:00
|
|
|
{
|
2009-01-29 17:19:48 +03:00
|
|
|
switch (ret) {
|
|
|
|
case GRO_NORMAL:
|
2009-01-29 17:19:50 +03:00
|
|
|
case GRO_HELD:
|
2010-02-16 23:25:43 +03:00
|
|
|
skb->protocol = eth_type_trans(skb, skb->dev);
|
2009-01-29 17:19:50 +03:00
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
if (ret == GRO_HELD)
|
|
|
|
skb_gro_pull(skb, -ETH_HLEN);
|
|
|
|
else if (netif_receive_skb(skb))
|
|
|
|
ret = GRO_DROP;
|
2009-01-29 17:19:50 +03:00
|
|
|
break;
|
2009-01-05 03:13:40 +03:00
|
|
|
|
2009-01-29 17:19:48 +03:00
|
|
|
case GRO_DROP:
|
|
|
|
case GRO_MERGED_FREE:
|
|
|
|
napi_reuse_skb(napi, skb);
|
|
|
|
break;
|
2009-10-29 10:17:09 +03:00
|
|
|
|
|
|
|
case GRO_MERGED:
|
|
|
|
break;
|
2009-01-29 17:19:48 +03:00
|
|
|
}
|
2009-01-05 03:13:40 +03:00
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
return ret;
|
2009-01-05 03:13:40 +03:00
|
|
|
}
|
2009-01-29 17:19:48 +03:00
|
|
|
EXPORT_SYMBOL(napi_frags_finish);
|
|
|
|
|
2009-04-16 13:02:07 +04:00
|
|
|
struct sk_buff *napi_frags_skb(struct napi_struct *napi)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb = napi->skb;
|
|
|
|
struct ethhdr *eth;
|
2009-05-26 22:50:28 +04:00
|
|
|
unsigned int hlen;
|
|
|
|
unsigned int off;
|
2009-04-16 13:02:07 +04:00
|
|
|
|
|
|
|
napi->skb = NULL;
|
|
|
|
|
|
|
|
skb_reset_mac_header(skb);
|
|
|
|
skb_gro_reset_offset(skb);
|
|
|
|
|
2009-05-26 22:50:28 +04:00
|
|
|
off = skb_gro_offset(skb);
|
|
|
|
hlen = off + sizeof(*eth);
|
|
|
|
eth = skb_gro_header_fast(skb, off);
|
|
|
|
if (skb_gro_header_hard(skb, hlen)) {
|
|
|
|
eth = skb_gro_header_slow(skb, hlen, off);
|
|
|
|
if (unlikely(!eth)) {
|
|
|
|
napi_reuse_skb(napi, skb);
|
|
|
|
skb = NULL;
|
|
|
|
goto out;
|
|
|
|
}
|
2009-04-16 13:02:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
skb_gro_pull(skb, sizeof(*eth));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This works because the only protocols we care about don't require
|
|
|
|
* special handling. We'll fix it up properly at the end.
|
|
|
|
*/
|
|
|
|
skb->protocol = eth->h_proto;
|
|
|
|
|
|
|
|
out:
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(napi_frags_skb);
|
|
|
|
|
2009-10-30 07:36:53 +03:00
|
|
|
gro_result_t napi_gro_frags(struct napi_struct *napi)
|
2009-01-29 17:19:48 +03:00
|
|
|
{
|
2009-04-16 13:02:07 +04:00
|
|
|
struct sk_buff *skb = napi_frags_skb(napi);
|
2009-01-29 17:19:48 +03:00
|
|
|
|
|
|
|
if (!skb)
|
2009-10-30 07:36:53 +03:00
|
|
|
return GRO_DROP;
|
2009-01-29 17:19:48 +03:00
|
|
|
|
|
|
|
return napi_frags_finish(napi, skb, __napi_gro_receive(napi, skb));
|
|
|
|
}
|
2009-01-05 03:13:40 +03:00
|
|
|
EXPORT_SYMBOL(napi_gro_frags);
|
|
|
|
|
2010-04-22 11:22:45 +04:00
|
|
|
/*
|
|
|
|
* net_rps_action sends any pending IPI's for rps.
|
|
|
|
* Note: called with local irq disabled, but exits with local irq enabled.
|
|
|
|
*/
|
|
|
|
static void net_rps_action_and_irq_enable(struct softnet_data *sd)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
struct softnet_data *remsd = sd->rps_ipi_list;
|
|
|
|
|
|
|
|
if (remsd) {
|
|
|
|
sd->rps_ipi_list = NULL;
|
|
|
|
|
|
|
|
local_irq_enable();
|
|
|
|
|
|
|
|
/* Send pending IPI's to kick RPS processing on remote cpus. */
|
|
|
|
while (remsd) {
|
|
|
|
struct softnet_data *next = remsd->rps_ipi_next;
|
|
|
|
|
|
|
|
if (cpu_online(remsd->cpu))
|
|
|
|
__smp_call_function_single(remsd->cpu,
|
|
|
|
&remsd->csd, 0);
|
|
|
|
remsd = next;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
local_irq_enable();
|
|
|
|
}
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
static int process_backlog(struct napi_struct *napi, int quota)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int work = 0;
|
2010-05-07 09:07:48 +04:00
|
|
|
struct softnet_data *sd = container_of(napi, struct softnet_data, backlog);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-04-22 11:22:45 +04:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
/* Check if we have pending ipi, its better to send them now,
|
|
|
|
* not waiting net_rx_action() end.
|
|
|
|
*/
|
|
|
|
if (sd->rps_ipi_list) {
|
|
|
|
local_irq_disable();
|
|
|
|
net_rps_action_and_irq_enable(sd);
|
|
|
|
}
|
|
|
|
#endif
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
napi->weight = weight_p;
|
2010-04-28 02:07:33 +04:00
|
|
|
local_irq_disable();
|
|
|
|
while (work < quota) {
|
2005-04-17 02:20:36 +04:00
|
|
|
struct sk_buff *skb;
|
2010-04-28 02:07:33 +04:00
|
|
|
unsigned int qlen;
|
|
|
|
|
|
|
|
while ((skb = __skb_dequeue(&sd->process_queue))) {
|
|
|
|
local_irq_enable();
|
|
|
|
__netif_receive_skb(skb);
|
|
|
|
local_irq_disable();
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_head_incr(sd);
|
|
|
|
if (++work >= quota) {
|
|
|
|
local_irq_enable();
|
|
|
|
return work;
|
|
|
|
}
|
2010-04-28 02:07:33 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_lock(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
qlen = skb_queue_len(&sd->input_pkt_queue);
|
2010-05-20 22:37:59 +04:00
|
|
|
if (qlen)
|
2010-04-28 02:07:33 +04:00
|
|
|
skb_queue_splice_tail_init(&sd->input_pkt_queue,
|
|
|
|
&sd->process_queue);
|
2010-05-20 22:37:59 +04:00
|
|
|
|
2010-04-28 02:07:33 +04:00
|
|
|
if (qlen < quota - work) {
|
2010-05-07 09:07:48 +04:00
|
|
|
/*
|
|
|
|
* Inline a custom version of __napi_complete().
|
|
|
|
* only current cpu owns and manipulates this napi,
|
|
|
|
* and NAPI_STATE_SCHED is the only possible flag set on backlog.
|
|
|
|
* we can use a plain write instead of clear_bit(),
|
|
|
|
* and we dont need an smp_mb() memory barrier.
|
|
|
|
*/
|
|
|
|
list_del(&napi->poll_list);
|
|
|
|
napi->state = 0;
|
|
|
|
|
2010-04-28 02:07:33 +04:00
|
|
|
quota = work + qlen;
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
}
|
2010-04-20 01:17:14 +04:00
|
|
|
rps_unlock(sd);
|
2010-04-28 02:07:33 +04:00
|
|
|
}
|
|
|
|
local_irq_enable();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
return work;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
/**
|
|
|
|
* __napi_schedule - schedule for receive
|
2007-10-13 08:17:49 +04:00
|
|
|
* @n: entry to schedule
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
*
|
|
|
|
* The entry's receive function will be scheduled to run
|
|
|
|
*/
|
2008-02-14 02:03:16 +03:00
|
|
|
void __napi_schedule(struct napi_struct *n)
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
local_irq_save(flags);
|
2010-05-07 09:07:48 +04:00
|
|
|
____napi_schedule(&__get_cpu_var(softnet_data), n);
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
local_irq_restore(flags);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
EXPORT_SYMBOL(__napi_schedule);
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
void __napi_complete(struct napi_struct *n)
|
|
|
|
{
|
|
|
|
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
|
|
|
|
BUG_ON(n->gro_list);
|
|
|
|
|
|
|
|
list_del(&n->poll_list);
|
|
|
|
smp_mb__before_clear_bit();
|
|
|
|
clear_bit(NAPI_STATE_SCHED, &n->state);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__napi_complete);
|
|
|
|
|
|
|
|
void napi_complete(struct napi_struct *n)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* don't let napi dequeue from the cpu poll list
|
|
|
|
* just in case its running on a different cpu
|
|
|
|
*/
|
|
|
|
if (unlikely(test_bit(NAPI_STATE_NPSVC, &n->state)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
napi_gro_flush(n);
|
|
|
|
local_irq_save(flags);
|
|
|
|
__napi_complete(n);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(napi_complete);
|
|
|
|
|
|
|
|
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
|
|
|
|
int (*poll)(struct napi_struct *, int), int weight)
|
|
|
|
{
|
|
|
|
INIT_LIST_HEAD(&napi->poll_list);
|
2009-02-08 21:00:36 +03:00
|
|
|
napi->gro_count = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
napi->gro_list = NULL;
|
2009-01-05 03:13:40 +03:00
|
|
|
napi->skb = NULL;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
napi->poll = poll;
|
|
|
|
napi->weight = weight;
|
|
|
|
list_add(&napi->dev_list, &dev->napi_list);
|
|
|
|
napi->dev = dev;
|
2009-01-05 03:13:40 +03:00
|
|
|
#ifdef CONFIG_NETPOLL
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
spin_lock_init(&napi->poll_lock);
|
|
|
|
napi->poll_owner = -1;
|
|
|
|
#endif
|
|
|
|
set_bit(NAPI_STATE_SCHED, &napi->state);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_napi_add);
|
|
|
|
|
|
|
|
void netif_napi_del(struct napi_struct *napi)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb, *next;
|
|
|
|
|
2008-12-26 12:35:35 +03:00
|
|
|
list_del_init(&napi->dev_list);
|
2009-04-16 13:02:07 +04:00
|
|
|
napi_free_frags(napi);
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
|
|
|
|
for (skb = napi->gro_list; skb; skb = next) {
|
|
|
|
next = skb->next;
|
|
|
|
skb->next = NULL;
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
|
|
|
napi->gro_list = NULL;
|
2009-02-08 21:00:36 +03:00
|
|
|
napi->gro_count = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_napi_del);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static void net_rx_action(struct softirq_action *h)
|
|
|
|
{
|
2010-04-22 11:22:45 +04:00
|
|
|
struct softnet_data *sd = &__get_cpu_var(softnet_data);
|
2008-11-04 04:14:38 +03:00
|
|
|
unsigned long time_limit = jiffies + 2;
|
2005-06-24 07:14:40 +04:00
|
|
|
int budget = netdev_budget;
|
2005-08-12 06:27:43 +04:00
|
|
|
void *have;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
local_irq_disable();
|
|
|
|
|
2010-04-22 11:22:45 +04:00
|
|
|
while (!list_empty(&sd->poll_list)) {
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
struct napi_struct *n;
|
|
|
|
int work, weight;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
/* If softirq window is exhuasted then punt.
|
2008-11-04 04:14:38 +03:00
|
|
|
* Allow this to run for 2 jiffies since which will allow
|
|
|
|
* an average latency of 1.5/HZ.
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
*/
|
2008-11-04 04:14:38 +03:00
|
|
|
if (unlikely(budget <= 0 || time_after(jiffies, time_limit)))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto softnet_break;
|
|
|
|
|
|
|
|
local_irq_enable();
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
/* Even though interrupts have been re-enabled, this
|
|
|
|
* access is safe because interrupts can only add new
|
|
|
|
* entries to the tail of this list, and only ->poll()
|
|
|
|
* calls can remove this head entry from the list.
|
|
|
|
*/
|
2010-04-22 11:22:45 +04:00
|
|
|
n = list_first_entry(&sd->poll_list, struct napi_struct, poll_list);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
have = netpoll_poll_lock(n);
|
|
|
|
|
|
|
|
weight = n->weight;
|
|
|
|
|
2007-10-30 07:28:47 +03:00
|
|
|
/* This NAPI_STATE_SCHED test is for avoiding a race
|
|
|
|
* with netpoll's poll_napi(). Only the entity which
|
|
|
|
* obtains the lock and sees NAPI_STATE_SCHED set will
|
|
|
|
* actually make the ->poll() call. Therefore we avoid
|
|
|
|
* accidently calling ->poll() when NAPI is not scheduled.
|
|
|
|
*/
|
|
|
|
work = 0;
|
2009-05-21 11:36:08 +04:00
|
|
|
if (test_bit(NAPI_STATE_SCHED, &n->state)) {
|
2007-10-30 07:28:47 +03:00
|
|
|
work = n->poll(n, weight);
|
2009-05-21 11:36:08 +04:00
|
|
|
trace_napi_poll(n);
|
|
|
|
}
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
|
|
|
|
WARN_ON_ONCE(work > weight);
|
|
|
|
|
|
|
|
budget -= work;
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
|
|
|
|
/* Drivers must not modify the NAPI state if they
|
|
|
|
* consume the entire weight. In such cases this code
|
|
|
|
* still "owns" the NAPI instance and therefore can
|
|
|
|
* move the instance around on the list at-will.
|
|
|
|
*/
|
2008-01-08 08:00:40 +03:00
|
|
|
if (unlikely(work == weight)) {
|
2009-06-27 06:27:04 +04:00
|
|
|
if (unlikely(napi_disable_pending(n))) {
|
|
|
|
local_irq_enable();
|
|
|
|
napi_complete(n);
|
|
|
|
local_irq_disable();
|
|
|
|
} else
|
2010-04-22 11:22:45 +04:00
|
|
|
list_move_tail(&n->poll_list, &sd->poll_list);
|
2008-01-08 08:00:40 +03:00
|
|
|
}
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
|
|
|
|
netpoll_poll_unlock(have);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
out:
|
2010-04-22 11:22:45 +04:00
|
|
|
net_rps_action_and_irq_enable(sd);
|
2010-03-16 11:03:29 +03:00
|
|
|
|
2006-06-18 08:24:58 +04:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
/*
|
|
|
|
* There may not be any more sk_buffs coming right now, so push
|
|
|
|
* any pending DMA copies to hardware
|
|
|
|
*/
|
2009-01-06 21:38:14 +03:00
|
|
|
dma_issue_pending_all();
|
2006-06-18 08:24:58 +04:00
|
|
|
#endif
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 03:41:36 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
softnet_break:
|
2010-05-02 09:42:16 +04:00
|
|
|
sd->time_squeeze++;
|
2005-04-17 02:20:36 +04:00
|
|
|
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
static gifconf_func_t *gifconf_list[NPROTO];
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* register_gifconf - register a SIOCGIF handler
|
|
|
|
* @family: Address family
|
|
|
|
* @gifconf: Function handler
|
|
|
|
*
|
|
|
|
* Register protocol dependent address dumping routines. The handler
|
|
|
|
* that is passed must not be freed or reused until it has been replaced
|
|
|
|
* by another handler.
|
|
|
|
*/
|
2009-09-03 12:29:39 +04:00
|
|
|
int register_gifconf(unsigned int family, gifconf_func_t *gifconf)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
if (family >= NPROTO)
|
|
|
|
return -EINVAL;
|
|
|
|
gifconf_list[family] = gifconf;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(register_gifconf);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Map an interface index to its name (SIOCGIFNAME)
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We need this ioctl for efficient implementation of the
|
|
|
|
* if_indextoname() function required by the IPv6 API. Without
|
|
|
|
* it, we would have to search all the interfaces to find a
|
|
|
|
* match. --pb
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
static int dev_ifname(struct net *net, struct ifreq __user *arg)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
struct ifreq ifr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetch the caller's info block.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
2009-10-19 23:18:49 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
dev = dev_get_by_index_rcu(net, ifr.ifr_ifindex);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!dev) {
|
2009-10-19 23:18:49 +04:00
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
strcpy(ifr.ifr_name, dev->name);
|
2009-10-19 23:18:49 +04:00
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (copy_to_user(arg, &ifr, sizeof(struct ifreq)))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform a SIOCGIFCONF call. This structure will change
|
|
|
|
* size eventually, and there is nothing I can do about it.
|
|
|
|
* Thus we will need a 'compatibility mode'.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
static int dev_ifconf(struct net *net, char __user *arg)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct ifconf ifc;
|
|
|
|
struct net_device *dev;
|
|
|
|
char __user *pos;
|
|
|
|
int len;
|
|
|
|
int total;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetch the caller's info block.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (copy_from_user(&ifc, arg, sizeof(struct ifconf)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
pos = ifc.ifc_buf;
|
|
|
|
len = ifc.ifc_len;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Loop over the interfaces, and write an info block for each.
|
|
|
|
*/
|
|
|
|
|
|
|
|
total = 0;
|
2007-09-17 22:56:21 +04:00
|
|
|
for_each_netdev(net, dev) {
|
2005-04-17 02:20:36 +04:00
|
|
|
for (i = 0; i < NPROTO; i++) {
|
|
|
|
if (gifconf_list[i]) {
|
|
|
|
int done;
|
|
|
|
if (!pos)
|
|
|
|
done = gifconf_list[i](dev, NULL, 0);
|
|
|
|
else
|
|
|
|
done = gifconf_list[i](dev, pos + total,
|
|
|
|
len - total);
|
|
|
|
if (done < 0)
|
|
|
|
return -EFAULT;
|
|
|
|
total += done;
|
|
|
|
}
|
|
|
|
}
|
2007-02-09 17:24:36 +03:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* All done. Write the updated control block back to the caller.
|
|
|
|
*/
|
|
|
|
ifc.ifc_len = total;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Both BSD and Solaris return 0 here, so we do too.
|
|
|
|
*/
|
|
|
|
return copy_to_user(arg, &ifc, sizeof(struct ifconf)) ? -EFAULT : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
/*
|
|
|
|
* This is invoked by the /proc filesystem handler to display a device
|
|
|
|
* in detail.
|
|
|
|
*/
|
2007-05-04 02:13:45 +04:00
|
|
|
void *dev_seq_start(struct seq_file *seq, loff_t *pos)
|
2009-11-04 16:43:23 +03:00
|
|
|
__acquires(RCU)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-11-20 09:31:54 +03:00
|
|
|
struct net *net = seq_file_net(seq);
|
2007-05-04 02:13:45 +04:00
|
|
|
loff_t off;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct net_device *dev;
|
|
|
|
|
2009-11-04 16:43:23 +03:00
|
|
|
rcu_read_lock();
|
2007-05-04 02:13:45 +04:00
|
|
|
if (!*pos)
|
|
|
|
return SEQ_START_TOKEN;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-05-04 02:13:45 +04:00
|
|
|
off = 1;
|
2009-11-04 16:43:23 +03:00
|
|
|
for_each_netdev_rcu(net, dev)
|
2007-05-04 02:13:45 +04:00
|
|
|
if (off++ == *pos)
|
|
|
|
return dev;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-05-04 02:13:45 +04:00
|
|
|
return NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
{
|
2009-11-04 16:43:23 +03:00
|
|
|
struct net_device *dev = (v == SEQ_START_TOKEN) ?
|
|
|
|
first_net_device(seq_file_net(seq)) :
|
|
|
|
next_net_device((struct net_device *)v);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
++*pos;
|
2009-11-04 16:43:23 +03:00
|
|
|
return rcu_dereference(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void dev_seq_stop(struct seq_file *seq, void *v)
|
2009-11-04 16:43:23 +03:00
|
|
|
__releases(RCU)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2009-11-04 16:43:23 +03:00
|
|
|
rcu_read_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
|
|
|
|
{
|
2010-07-08 01:58:56 +04:00
|
|
|
struct rtnl_link_stats64 temp;
|
|
|
|
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-06-08 11:19:54 +04:00
|
|
|
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
|
|
|
|
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
|
2007-04-29 08:04:03 +04:00
|
|
|
dev->name, stats->rx_bytes, stats->rx_packets,
|
|
|
|
stats->rx_errors,
|
|
|
|
stats->rx_dropped + stats->rx_missed_errors,
|
|
|
|
stats->rx_fifo_errors,
|
|
|
|
stats->rx_length_errors + stats->rx_over_errors +
|
|
|
|
stats->rx_crc_errors + stats->rx_frame_errors,
|
|
|
|
stats->rx_compressed, stats->multicast,
|
|
|
|
stats->tx_bytes, stats->tx_packets,
|
|
|
|
stats->tx_errors, stats->tx_dropped,
|
|
|
|
stats->tx_fifo_errors, stats->collisions,
|
|
|
|
stats->tx_carrier_errors +
|
|
|
|
stats->tx_aborted_errors +
|
|
|
|
stats->tx_window_errors +
|
|
|
|
stats->tx_heartbeat_errors,
|
|
|
|
stats->tx_compressed);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called from the PROCfs module. This now uses the new arbitrary sized
|
|
|
|
* /proc/net interface to create /proc/net/dev
|
|
|
|
*/
|
|
|
|
static int dev_seq_show(struct seq_file *seq, void *v)
|
|
|
|
{
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
seq_puts(seq, "Inter-| Receive "
|
|
|
|
" | Transmit\n"
|
|
|
|
" face |bytes packets errs drop fifo frame "
|
|
|
|
"compressed multicast|bytes packets errs "
|
|
|
|
"drop fifo colls carrier compressed\n");
|
|
|
|
else
|
|
|
|
dev_seq_printf_stats(seq, v);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-05-02 09:42:16 +04:00
|
|
|
static struct softnet_data *softnet_get_online(loff_t *pos)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-05-02 09:42:16 +04:00
|
|
|
struct softnet_data *sd = NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-05-03 03:43:08 +04:00
|
|
|
while (*pos < nr_cpu_ids)
|
2007-02-09 17:24:36 +03:00
|
|
|
if (cpu_online(*pos)) {
|
2010-05-02 09:42:16 +04:00
|
|
|
sd = &per_cpu(softnet_data, *pos);
|
2005-04-17 02:20:36 +04:00
|
|
|
break;
|
|
|
|
} else
|
|
|
|
++*pos;
|
2010-05-02 09:42:16 +04:00
|
|
|
return sd;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void *softnet_seq_start(struct seq_file *seq, loff_t *pos)
|
|
|
|
{
|
|
|
|
return softnet_get_online(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *softnet_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
{
|
|
|
|
++*pos;
|
|
|
|
return softnet_get_online(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void softnet_seq_stop(struct seq_file *seq, void *v)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static int softnet_seq_show(struct seq_file *seq, void *v)
|
|
|
|
{
|
2010-05-02 09:42:16 +04:00
|
|
|
struct softnet_data *sd = v;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-03-16 11:03:29 +03:00
|
|
|
seq_printf(seq, "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
|
2010-05-02 09:42:16 +04:00
|
|
|
sd->processed, sd->dropped, sd->time_squeeze, 0,
|
2005-06-24 07:08:59 +04:00
|
|
|
0, 0, 0, 0, /* was fastroute */
|
2010-05-02 09:42:16 +04:00
|
|
|
sd->cpu_collision, sd->received_rps);
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-03-13 00:34:29 +03:00
|
|
|
static const struct seq_operations dev_seq_ops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.start = dev_seq_start,
|
|
|
|
.next = dev_seq_next,
|
|
|
|
.stop = dev_seq_stop,
|
|
|
|
.show = dev_seq_show,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int dev_seq_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
2007-11-20 09:31:54 +03:00
|
|
|
return seq_open_net(inode, file, &dev_seq_ops,
|
|
|
|
sizeof(struct seq_net_private));
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-02-12 11:55:35 +03:00
|
|
|
static const struct file_operations dev_seq_fops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = dev_seq_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
2007-11-20 09:31:54 +03:00
|
|
|
.release = seq_release_net,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2007-03-13 00:34:29 +03:00
|
|
|
static const struct seq_operations softnet_seq_ops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.start = softnet_seq_start,
|
|
|
|
.next = softnet_seq_next,
|
|
|
|
.stop = softnet_seq_stop,
|
|
|
|
.show = softnet_seq_show,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int softnet_seq_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
return seq_open(file, &softnet_seq_ops);
|
|
|
|
}
|
|
|
|
|
2007-02-12 11:55:35 +03:00
|
|
|
static const struct file_operations softnet_seq_fops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = softnet_seq_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = seq_release,
|
|
|
|
};
|
|
|
|
|
2007-03-13 00:35:37 +03:00
|
|
|
static void *ptype_get_idx(loff_t pos)
|
|
|
|
{
|
|
|
|
struct packet_type *pt = NULL;
|
|
|
|
loff_t i = 0;
|
|
|
|
int t;
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(pt, &ptype_all, list) {
|
|
|
|
if (i == pos)
|
|
|
|
return pt;
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
|
2007-11-26 15:12:58 +03:00
|
|
|
for (t = 0; t < PTYPE_HASH_SIZE; t++) {
|
2007-03-13 00:35:37 +03:00
|
|
|
list_for_each_entry_rcu(pt, &ptype_base[t], list) {
|
|
|
|
if (i == pos)
|
|
|
|
return pt;
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *ptype_seq_start(struct seq_file *seq, loff_t *pos)
|
2008-01-21 13:27:29 +03:00
|
|
|
__acquires(RCU)
|
2007-03-13 00:35:37 +03:00
|
|
|
{
|
|
|
|
rcu_read_lock();
|
|
|
|
return *pos ? ptype_get_idx(*pos - 1) : SEQ_START_TOKEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *ptype_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
{
|
|
|
|
struct packet_type *pt;
|
|
|
|
struct list_head *nxt;
|
|
|
|
int hash;
|
|
|
|
|
|
|
|
++*pos;
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
return ptype_get_idx(0);
|
|
|
|
|
|
|
|
pt = v;
|
|
|
|
nxt = pt->list.next;
|
|
|
|
if (pt->type == htons(ETH_P_ALL)) {
|
|
|
|
if (nxt != &ptype_all)
|
|
|
|
goto found;
|
|
|
|
hash = 0;
|
|
|
|
nxt = ptype_base[0].next;
|
|
|
|
} else
|
2007-11-26 15:12:58 +03:00
|
|
|
hash = ntohs(pt->type) & PTYPE_HASH_MASK;
|
2007-03-13 00:35:37 +03:00
|
|
|
|
|
|
|
while (nxt == &ptype_base[hash]) {
|
2007-11-26 15:12:58 +03:00
|
|
|
if (++hash >= PTYPE_HASH_SIZE)
|
2007-03-13 00:35:37 +03:00
|
|
|
return NULL;
|
|
|
|
nxt = ptype_base[hash].next;
|
|
|
|
}
|
|
|
|
found:
|
|
|
|
return list_entry(nxt, struct packet_type, list);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ptype_seq_stop(struct seq_file *seq, void *v)
|
2008-01-21 13:27:29 +03:00
|
|
|
__releases(RCU)
|
2007-03-13 00:35:37 +03:00
|
|
|
{
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ptype_seq_show(struct seq_file *seq, void *v)
|
|
|
|
{
|
|
|
|
struct packet_type *pt = v;
|
|
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
seq_puts(seq, "Type Device Function\n");
|
2008-03-25 15:47:49 +03:00
|
|
|
else if (pt->dev == NULL || dev_net(pt->dev) == seq_file_net(seq)) {
|
2007-03-13 00:35:37 +03:00
|
|
|
if (pt->type == htons(ETH_P_ALL))
|
|
|
|
seq_puts(seq, "ALL ");
|
|
|
|
else
|
|
|
|
seq_printf(seq, "%04x", ntohs(pt->type));
|
|
|
|
|
2008-11-17 06:50:35 +03:00
|
|
|
seq_printf(seq, " %-8s %pF\n",
|
|
|
|
pt->dev ? pt->dev->name : "", pt->func);
|
2007-03-13 00:35:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct seq_operations ptype_seq_ops = {
|
|
|
|
.start = ptype_seq_start,
|
|
|
|
.next = ptype_seq_next,
|
|
|
|
.stop = ptype_seq_stop,
|
|
|
|
.show = ptype_seq_show,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int ptype_seq_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
2008-03-25 00:57:45 +03:00
|
|
|
return seq_open_net(inode, file, &ptype_seq_ops,
|
|
|
|
sizeof(struct seq_net_private));
|
2007-03-13 00:35:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations ptype_seq_fops = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = ptype_seq_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
2008-03-25 00:57:45 +03:00
|
|
|
.release = seq_release_net,
|
2007-03-13 00:35:37 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2007-10-09 07:38:39 +04:00
|
|
|
static int __net_init dev_proc_net_init(struct net *net)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int rc = -ENOMEM;
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
2007-09-17 22:56:21 +04:00
|
|
|
if (!proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out_dev;
|
2007-09-17 22:56:21 +04:00
|
|
|
if (!proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops))
|
2007-09-12 14:01:34 +04:00
|
|
|
goto out_softnet;
|
2007-03-13 00:35:37 +03:00
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
if (wext_proc_init(net))
|
2007-09-12 14:01:34 +04:00
|
|
|
goto out_ptype;
|
2005-04-17 02:20:36 +04:00
|
|
|
rc = 0;
|
|
|
|
out:
|
|
|
|
return rc;
|
2007-09-12 14:01:34 +04:00
|
|
|
out_ptype:
|
2007-09-17 22:56:21 +04:00
|
|
|
proc_net_remove(net, "ptype");
|
2005-04-17 02:20:36 +04:00
|
|
|
out_softnet:
|
2007-09-17 22:56:21 +04:00
|
|
|
proc_net_remove(net, "softnet_stat");
|
2005-04-17 02:20:36 +04:00
|
|
|
out_dev:
|
2007-09-17 22:56:21 +04:00
|
|
|
proc_net_remove(net, "dev");
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
}
|
2007-09-17 22:56:21 +04:00
|
|
|
|
2007-10-09 07:38:39 +04:00
|
|
|
static void __net_exit dev_proc_net_exit(struct net *net)
|
2007-09-17 22:56:21 +04:00
|
|
|
{
|
|
|
|
wext_proc_exit(net);
|
|
|
|
|
|
|
|
proc_net_remove(net, "ptype");
|
|
|
|
proc_net_remove(net, "softnet_stat");
|
|
|
|
proc_net_remove(net, "dev");
|
|
|
|
}
|
|
|
|
|
2007-11-13 14:23:50 +03:00
|
|
|
static struct pernet_operations __net_initdata dev_proc_ops = {
|
2007-09-17 22:56:21 +04:00
|
|
|
.init = dev_proc_net_init,
|
|
|
|
.exit = dev_proc_net_exit,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init dev_proc_init(void)
|
|
|
|
{
|
|
|
|
return register_pernet_subsys(&dev_proc_ops);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
#else
|
|
|
|
#define dev_proc_init() 0
|
|
|
|
#endif /* CONFIG_PROC_FS */
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_set_master - set up master/slave pair
|
|
|
|
* @slave: slave device
|
|
|
|
* @master: new master device
|
|
|
|
*
|
|
|
|
* Changes the master device of the slave. Pass %NULL to break the
|
|
|
|
* bonding. The caller must hold the RTNL semaphore. On a failure
|
|
|
|
* a negative errno code is returned. On success the reference counts
|
|
|
|
* are adjusted, %RTM_NEWLINK is sent to the routing socket and the
|
|
|
|
* function returns zero.
|
|
|
|
*/
|
|
|
|
int netdev_set_master(struct net_device *slave, struct net_device *master)
|
|
|
|
{
|
|
|
|
struct net_device *old = slave->master;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
if (master) {
|
|
|
|
if (old)
|
|
|
|
return -EBUSY;
|
|
|
|
dev_hold(master);
|
|
|
|
}
|
|
|
|
|
|
|
|
slave->master = master;
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2010-03-18 16:37:40 +03:00
|
|
|
if (old) {
|
|
|
|
synchronize_net();
|
2005-04-17 02:20:36 +04:00
|
|
|
dev_put(old);
|
2010-03-18 16:37:40 +03:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
if (master)
|
|
|
|
slave->flags |= IFF_SLAVE;
|
|
|
|
else
|
|
|
|
slave->flags &= ~IFF_SLAVE;
|
|
|
|
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, slave, IFF_SLAVE);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(netdev_set_master);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-10-08 02:26:48 +04:00
|
|
|
static void dev_change_rx_flags(struct net_device *dev, int flags)
|
|
|
|
{
|
2008-11-20 08:32:24 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
|
|
|
|
|
|
|
if ((dev->flags & IFF_UP) && ops->ndo_change_rx_flags)
|
|
|
|
ops->ndo_change_rx_flags(dev, flags);
|
2008-10-08 02:26:48 +04:00
|
|
|
}
|
|
|
|
|
2008-06-18 12:48:28 +04:00
|
|
|
static int __dev_set_promiscuity(struct net_device *dev, int inc)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
unsigned short old_flags = dev->flags;
|
2008-11-14 02:39:10 +03:00
|
|
|
uid_t uid;
|
|
|
|
gid_t gid;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-07-15 05:51:31 +04:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2008-06-18 12:48:28 +04:00
|
|
|
dev->flags |= IFF_PROMISC;
|
|
|
|
dev->promiscuity += inc;
|
|
|
|
if (dev->promiscuity == 0) {
|
|
|
|
/*
|
|
|
|
* Avoid overflow.
|
|
|
|
* If inc causes overflow, untouch promisc and return error.
|
|
|
|
*/
|
|
|
|
if (inc < 0)
|
|
|
|
dev->flags &= ~IFF_PROMISC;
|
|
|
|
else {
|
|
|
|
dev->promiscuity -= inc;
|
|
|
|
printk(KERN_WARNING "%s: promiscuity touches roof, "
|
|
|
|
"set promiscuity failed, promiscuity feature "
|
|
|
|
"of device might be broken.\n", dev->name);
|
|
|
|
return -EOVERFLOW;
|
|
|
|
}
|
|
|
|
}
|
2005-07-06 02:11:06 +04:00
|
|
|
if (dev->flags != old_flags) {
|
2005-04-17 02:20:36 +04:00
|
|
|
printk(KERN_INFO "device %s %s promiscuous mode\n",
|
|
|
|
dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
|
2007-02-09 17:24:36 +03:00
|
|
|
"left");
|
2008-11-14 02:39:10 +03:00
|
|
|
if (audit_enabled) {
|
|
|
|
current_uid_gid(&uid, &gid);
|
2008-01-24 06:57:45 +03:00
|
|
|
audit_log(current->audit_context, GFP_ATOMIC,
|
|
|
|
AUDIT_ANOM_PROMISCUOUS,
|
|
|
|
"dev=%s prom=%d old_prom=%d auid=%u uid=%u gid=%u ses=%u",
|
|
|
|
dev->name, (dev->flags & IFF_PROMISC),
|
|
|
|
(old_flags & IFF_PROMISC),
|
|
|
|
audit_get_loginuid(current),
|
2008-11-14 02:39:10 +03:00
|
|
|
uid, gid,
|
2008-01-24 06:57:45 +03:00
|
|
|
audit_get_sessionid(current));
|
2008-11-14 02:39:10 +03:00
|
|
|
}
|
2007-07-15 05:51:31 +04:00
|
|
|
|
2008-10-08 02:26:48 +04:00
|
|
|
dev_change_rx_flags(dev, IFF_PROMISC);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-06-18 12:48:28 +04:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-06-27 12:28:10 +04:00
|
|
|
/**
|
|
|
|
* dev_set_promiscuity - update promiscuity count on a device
|
|
|
|
* @dev: device
|
|
|
|
* @inc: modifier
|
|
|
|
*
|
|
|
|
* Add or remove promiscuity from a device. While the count in the device
|
|
|
|
* remains above zero the interface remains promiscuous. Once it hits zero
|
|
|
|
* the device reverts back to normal filtering operation. A negative inc
|
|
|
|
* value is used to drop promiscuity on the device.
|
2008-06-18 12:48:28 +04:00
|
|
|
* Return 0 if successful or a negative errno code on error.
|
2007-06-27 12:28:10 +04:00
|
|
|
*/
|
2008-06-18 12:48:28 +04:00
|
|
|
int dev_set_promiscuity(struct net_device *dev, int inc)
|
2007-06-27 12:28:10 +04:00
|
|
|
{
|
|
|
|
unsigned short old_flags = dev->flags;
|
2008-06-18 12:48:28 +04:00
|
|
|
int err;
|
2007-06-27 12:28:10 +04:00
|
|
|
|
2008-06-18 12:48:28 +04:00
|
|
|
err = __dev_set_promiscuity(dev, inc);
|
2008-07-07 02:49:08 +04:00
|
|
|
if (err < 0)
|
2008-06-18 12:48:28 +04:00
|
|
|
return err;
|
2007-06-27 12:28:10 +04:00
|
|
|
if (dev->flags != old_flags)
|
|
|
|
dev_set_rx_mode(dev);
|
2008-06-18 12:48:28 +04:00
|
|
|
return err;
|
2007-06-27 12:28:10 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_set_promiscuity);
|
2007-06-27 12:28:10 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* dev_set_allmulti - update allmulti count on a device
|
|
|
|
* @dev: device
|
|
|
|
* @inc: modifier
|
|
|
|
*
|
|
|
|
* Add or remove reception of all multicast frames to a device. While the
|
|
|
|
* count in the device remains above zero the interface remains listening
|
|
|
|
* to all interfaces. Once it hits zero the device reverts back to normal
|
|
|
|
* filtering operation. A negative @inc value is used to drop the counter
|
|
|
|
* when releasing a resource needing all multicasts.
|
2008-06-18 12:48:28 +04:00
|
|
|
* Return 0 if successful or a negative errno code on error.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
2008-06-18 12:48:28 +04:00
|
|
|
int dev_set_allmulti(struct net_device *dev, int inc)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
unsigned short old_flags = dev->flags;
|
|
|
|
|
2007-07-15 05:51:31 +04:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->flags |= IFF_ALLMULTI;
|
2008-06-18 12:48:28 +04:00
|
|
|
dev->allmulti += inc;
|
|
|
|
if (dev->allmulti == 0) {
|
|
|
|
/*
|
|
|
|
* Avoid overflow.
|
|
|
|
* If inc causes overflow, untouch allmulti and return error.
|
|
|
|
*/
|
|
|
|
if (inc < 0)
|
|
|
|
dev->flags &= ~IFF_ALLMULTI;
|
|
|
|
else {
|
|
|
|
dev->allmulti -= inc;
|
|
|
|
printk(KERN_WARNING "%s: allmulti touches roof, "
|
|
|
|
"set allmulti failed, allmulti feature of "
|
|
|
|
"device might be broken.\n", dev->name);
|
|
|
|
return -EOVERFLOW;
|
|
|
|
}
|
|
|
|
}
|
2007-07-15 05:51:31 +04:00
|
|
|
if (dev->flags ^ old_flags) {
|
2008-10-08 02:26:48 +04:00
|
|
|
dev_change_rx_flags(dev, IFF_ALLMULTI);
|
2007-06-27 12:28:10 +04:00
|
|
|
dev_set_rx_mode(dev);
|
2007-07-15 05:51:31 +04:00
|
|
|
}
|
2008-06-18 12:48:28 +04:00
|
|
|
return 0;
|
2007-06-27 12:28:10 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_set_allmulti);
|
2007-06-27 12:28:10 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Upload unicast and multicast address lists to device and
|
|
|
|
* configure RX filtering. When the device doesn't support unicast
|
2007-12-21 01:02:06 +03:00
|
|
|
* filtering it is put in promiscuous mode while unicast addresses
|
2007-06-27 12:28:10 +04:00
|
|
|
* are present.
|
|
|
|
*/
|
|
|
|
void __dev_set_rx_mode(struct net_device *dev)
|
|
|
|
{
|
2008-11-20 08:32:24 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
|
|
|
|
2007-06-27 12:28:10 +04:00
|
|
|
/* dev_open will call this function so the list will stay sane. */
|
|
|
|
if (!(dev->flags&IFF_UP))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!netif_device_present(dev))
|
2007-07-19 05:43:23 +04:00
|
|
|
return;
|
2007-06-27 12:28:10 +04:00
|
|
|
|
2008-11-20 08:32:24 +03:00
|
|
|
if (ops->ndo_set_rx_mode)
|
|
|
|
ops->ndo_set_rx_mode(dev);
|
2007-06-27 12:28:10 +04:00
|
|
|
else {
|
|
|
|
/* Unicast addresses changes may only happen under the rtnl,
|
|
|
|
* therefore calling __dev_set_promiscuity here is safe.
|
|
|
|
*/
|
2010-01-26 00:36:10 +03:00
|
|
|
if (!netdev_uc_empty(dev) && !dev->uc_promisc) {
|
2007-06-27 12:28:10 +04:00
|
|
|
__dev_set_promiscuity(dev, 1);
|
|
|
|
dev->uc_promisc = 1;
|
2010-01-26 00:36:10 +03:00
|
|
|
} else if (netdev_uc_empty(dev) && dev->uc_promisc) {
|
2007-06-27 12:28:10 +04:00
|
|
|
__dev_set_promiscuity(dev, -1);
|
|
|
|
dev->uc_promisc = 0;
|
|
|
|
}
|
|
|
|
|
2008-11-20 08:32:24 +03:00
|
|
|
if (ops->ndo_set_multicast_list)
|
|
|
|
ops->ndo_set_multicast_list(dev);
|
2007-06-27 12:28:10 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void dev_set_rx_mode(struct net_device *dev)
|
|
|
|
{
|
2008-07-15 11:15:08 +04:00
|
|
|
netif_addr_lock_bh(dev);
|
2007-06-27 12:28:10 +04:00
|
|
|
__dev_set_rx_mode(dev);
|
2008-07-15 11:15:08 +04:00
|
|
|
netif_addr_unlock_bh(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2008-09-30 13:23:58 +04:00
|
|
|
/**
|
|
|
|
* dev_get_flags - get flags reported to userspace
|
|
|
|
* @dev: device
|
|
|
|
*
|
|
|
|
* Get the combination of flag bits exported through APIs to userspace.
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
unsigned dev_get_flags(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned flags;
|
|
|
|
|
|
|
|
flags = (dev->flags & ~(IFF_PROMISC |
|
|
|
|
IFF_ALLMULTI |
|
2006-03-21 04:09:11 +03:00
|
|
|
IFF_RUNNING |
|
|
|
|
IFF_LOWER_UP |
|
|
|
|
IFF_DORMANT)) |
|
2005-04-17 02:20:36 +04:00
|
|
|
(dev->gflags & (IFF_PROMISC |
|
|
|
|
IFF_ALLMULTI));
|
|
|
|
|
2006-03-21 04:09:11 +03:00
|
|
|
if (netif_running(dev)) {
|
|
|
|
if (netif_oper_up(dev))
|
|
|
|
flags |= IFF_RUNNING;
|
|
|
|
if (netif_carrier_ok(dev))
|
|
|
|
flags |= IFF_LOWER_UP;
|
|
|
|
if (netif_dormant(dev))
|
|
|
|
flags |= IFF_DORMANT;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
return flags;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_get_flags);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-26 09:34:53 +03:00
|
|
|
int __dev_change_flags(struct net_device *dev, unsigned int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int old_flags = dev->flags;
|
2010-02-26 09:34:53 +03:00
|
|
|
int ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-07-15 05:51:31 +04:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Set the flags on our device.
|
|
|
|
*/
|
|
|
|
|
|
|
|
dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP |
|
|
|
|
IFF_DYNAMIC | IFF_MULTICAST | IFF_PORTSEL |
|
|
|
|
IFF_AUTOMEDIA)) |
|
|
|
|
(dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC |
|
|
|
|
IFF_ALLMULTI));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Load in the correct multicast list now the flags have changed.
|
|
|
|
*/
|
|
|
|
|
2008-10-08 02:26:48 +04:00
|
|
|
if ((old_flags ^ flags) & IFF_MULTICAST)
|
|
|
|
dev_change_rx_flags(dev, IFF_MULTICAST);
|
2007-07-15 05:51:31 +04:00
|
|
|
|
2007-06-27 12:28:10 +04:00
|
|
|
dev_set_rx_mode(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Have we downed the interface. We handle IFF_UP ourselves
|
|
|
|
* according to user attempts to set it, rather than blindly
|
|
|
|
* setting it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
if ((old_flags ^ flags) & IFF_UP) { /* Bit is different ? */
|
2010-02-26 09:34:53 +03:00
|
|
|
ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (!ret)
|
2007-06-27 12:28:10 +04:00
|
|
|
dev_set_rx_mode(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((flags ^ dev->gflags) & IFF_PROMISC) {
|
2009-09-03 12:29:39 +04:00
|
|
|
int inc = (flags & IFF_PROMISC) ? 1 : -1;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->gflags ^= IFF_PROMISC;
|
|
|
|
dev_set_promiscuity(dev, inc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE: order of synchronization of IFF_PROMISC and IFF_ALLMULTI
|
|
|
|
is important. Some (broken) drivers set IFF_PROMISC, when
|
|
|
|
IFF_ALLMULTI is requested not asking us and not reporting.
|
|
|
|
*/
|
|
|
|
if ((flags ^ dev->gflags) & IFF_ALLMULTI) {
|
2009-09-03 12:29:39 +04:00
|
|
|
int inc = (flags & IFF_ALLMULTI) ? 1 : -1;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->gflags ^= IFF_ALLMULTI;
|
|
|
|
dev_set_allmulti(dev, inc);
|
|
|
|
}
|
|
|
|
|
2010-02-26 09:34:53 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __dev_notify_flags(struct net_device *dev, unsigned int old_flags)
|
|
|
|
{
|
|
|
|
unsigned int changes = dev->flags ^ old_flags;
|
|
|
|
|
|
|
|
if (changes & IFF_UP) {
|
|
|
|
if (dev->flags & IFF_UP)
|
|
|
|
call_netdevice_notifiers(NETDEV_UP, dev);
|
|
|
|
else
|
|
|
|
call_netdevice_notifiers(NETDEV_DOWN, dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dev->flags & IFF_UP &&
|
|
|
|
(changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE)))
|
|
|
|
call_netdevice_notifiers(NETDEV_CHANGE, dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_change_flags - change device settings
|
|
|
|
* @dev: device
|
|
|
|
* @flags: device state flags
|
|
|
|
*
|
|
|
|
* Change settings on device based state flags. The flags are
|
|
|
|
* in the userspace exported format.
|
|
|
|
*/
|
|
|
|
int dev_change_flags(struct net_device *dev, unsigned flags)
|
|
|
|
{
|
|
|
|
int ret, changes;
|
|
|
|
int old_flags = dev->flags;
|
|
|
|
|
|
|
|
ret = __dev_change_flags(dev, flags);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
changes = old_flags ^ dev->flags;
|
2007-06-06 03:03:03 +04:00
|
|
|
if (changes)
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, changes);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-26 09:34:53 +03:00
|
|
|
__dev_notify_flags(dev, old_flags);
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_change_flags);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-09-30 13:23:58 +04:00
|
|
|
/**
|
|
|
|
* dev_set_mtu - Change maximum transfer unit
|
|
|
|
* @dev: device
|
|
|
|
* @new_mtu: new transfer unit
|
|
|
|
*
|
|
|
|
* Change the maximum transfer size of the network device.
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
int dev_set_mtu(struct net_device *dev, int new_mtu)
|
|
|
|
{
|
2008-11-20 08:32:24 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
|
|
|
if (new_mtu == dev->mtu)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* MTU must be positive. */
|
|
|
|
if (new_mtu < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
err = 0;
|
2008-11-20 08:32:24 +03:00
|
|
|
if (ops->ndo_change_mtu)
|
|
|
|
err = ops->ndo_change_mtu(dev, new_mtu);
|
2005-04-17 02:20:36 +04:00
|
|
|
else
|
|
|
|
dev->mtu = new_mtu;
|
2008-11-20 08:32:24 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!err && dev->flags & IFF_UP)
|
2007-09-17 02:42:43 +04:00
|
|
|
call_netdevice_notifiers(NETDEV_CHANGEMTU, dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
return err;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_set_mtu);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-01-14 02:38:30 +03:00
|
|
|
/**
|
|
|
|
* dev_set_group - Change group this device belongs to
|
|
|
|
* @dev: device
|
|
|
|
* @new_group: group this device should belong to
|
|
|
|
*/
|
|
|
|
void dev_set_group(struct net_device *dev, int new_group)
|
|
|
|
{
|
|
|
|
dev->group = new_group;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(dev_set_group);
|
|
|
|
|
2008-09-30 13:23:58 +04:00
|
|
|
/**
|
|
|
|
* dev_set_mac_address - Change Media Access Control Address
|
|
|
|
* @dev: device
|
|
|
|
* @sa: new address
|
|
|
|
*
|
|
|
|
* Change the hardware (MAC) address of the device
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa)
|
|
|
|
{
|
2008-11-20 08:32:24 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
2008-11-20 08:32:24 +03:00
|
|
|
if (!ops->ndo_set_mac_address)
|
2005-04-17 02:20:36 +04:00
|
|
|
return -EOPNOTSUPP;
|
|
|
|
if (sa->sa_family != dev->type)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
2008-11-20 08:32:24 +03:00
|
|
|
err = ops->ndo_set_mac_address(dev, sa);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!err)
|
2007-09-17 02:42:43 +04:00
|
|
|
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
return err;
|
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(dev_set_mac_address);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
2009-11-01 22:42:09 +03:00
|
|
|
* Perform the SIOCxIFxxx calls, inside rcu_read_lock()
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2007-10-08 11:06:32 +04:00
|
|
|
static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cmd)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int err;
|
2009-11-01 22:42:09 +03:00
|
|
|
struct net_device *dev = dev_get_by_name_rcu(net, ifr->ifr_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (!dev)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
switch (cmd) {
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFFLAGS: /* Get interface flags */
|
|
|
|
ifr->ifr_flags = (short) dev_get_flags(dev);
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFMETRIC: /* Get the metric on the interface
|
|
|
|
(currently unused) */
|
|
|
|
ifr->ifr_metric = 0;
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFMTU: /* Get the MTU of a device */
|
|
|
|
ifr->ifr_mtu = dev->mtu;
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFHWADDR:
|
|
|
|
if (!dev->addr_len)
|
|
|
|
memset(ifr->ifr_hwaddr.sa_data, 0, sizeof ifr->ifr_hwaddr.sa_data);
|
|
|
|
else
|
|
|
|
memcpy(ifr->ifr_hwaddr.sa_data, dev->dev_addr,
|
|
|
|
min(sizeof ifr->ifr_hwaddr.sa_data, (size_t) dev->addr_len));
|
|
|
|
ifr->ifr_hwaddr.sa_family = dev->type;
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFSLAVE:
|
|
|
|
err = -EINVAL;
|
|
|
|
break;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFMAP:
|
|
|
|
ifr->ifr_map.mem_start = dev->mem_start;
|
|
|
|
ifr->ifr_map.mem_end = dev->mem_end;
|
|
|
|
ifr->ifr_map.base_addr = dev->base_addr;
|
|
|
|
ifr->ifr_map.irq = dev->irq;
|
|
|
|
ifr->ifr_map.dma = dev->dma;
|
|
|
|
ifr->ifr_map.port = dev->if_port;
|
|
|
|
return 0;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFINDEX:
|
|
|
|
ifr->ifr_ifindex = dev->ifindex;
|
|
|
|
return 0;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCGIFTXQLEN:
|
|
|
|
ifr->ifr_qlen = dev->tx_queue_len;
|
|
|
|
return 0;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
default:
|
|
|
|
/* dev_ioctl() should ensure this case
|
|
|
|
* is never reached
|
|
|
|
*/
|
|
|
|
WARN_ON(1);
|
|
|
|
err = -EINVAL;
|
|
|
|
break;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform the SIOCxIFxxx calls, inside rtnl_lock()
|
|
|
|
*/
|
|
|
|
static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct net_device *dev = __dev_get_by_name(net, ifr->ifr_name);
|
2008-12-23 06:35:28 +03:00
|
|
|
const struct net_device_ops *ops;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
|
|
|
if (!dev)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2008-12-23 06:35:28 +03:00
|
|
|
ops = dev->netdev_ops;
|
|
|
|
|
2007-10-08 11:06:32 +04:00
|
|
|
switch (cmd) {
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFFLAGS: /* Set interface flags */
|
|
|
|
return dev_change_flags(dev, ifr->ifr_flags);
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFMETRIC: /* Set the metric on the interface
|
|
|
|
(currently unused) */
|
|
|
|
return -EOPNOTSUPP;
|
2007-10-08 11:06:32 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFMTU: /* Set the MTU of a device */
|
|
|
|
return dev_set_mtu(dev, ifr->ifr_mtu);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFHWADDR:
|
|
|
|
return dev_set_mac_address(dev, &ifr->ifr_hwaddr);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFHWBROADCAST:
|
|
|
|
if (ifr->ifr_hwaddr.sa_family != dev->type)
|
|
|
|
return -EINVAL;
|
|
|
|
memcpy(dev->broadcast, ifr->ifr_hwaddr.sa_data,
|
|
|
|
min(sizeof ifr->ifr_hwaddr.sa_data, (size_t) dev->addr_len));
|
|
|
|
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFMAP:
|
|
|
|
if (ops->ndo_set_config) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
2009-09-03 12:29:39 +04:00
|
|
|
return ops->ndo_set_config(dev, &ifr->ifr_map);
|
|
|
|
}
|
|
|
|
return -EOPNOTSUPP;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCADDMULTI:
|
|
|
|
if ((!ops->ndo_set_multicast_list && !ops->ndo_set_rx_mode) ||
|
|
|
|
ifr->ifr_hwaddr.sa_family != AF_UNSPEC)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
2010-04-02 01:22:57 +04:00
|
|
|
return dev_mc_add_global(dev, ifr->ifr_hwaddr.sa_data);
|
2009-09-03 12:29:39 +04:00
|
|
|
|
|
|
|
case SIOCDELMULTI:
|
|
|
|
if ((!ops->ndo_set_multicast_list && !ops->ndo_set_rx_mode) ||
|
|
|
|
ifr->ifr_hwaddr.sa_family != AF_UNSPEC)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!netif_device_present(dev))
|
|
|
|
return -ENODEV;
|
2010-04-02 01:22:57 +04:00
|
|
|
return dev_mc_del_global(dev, ifr->ifr_hwaddr.sa_data);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFTXQLEN:
|
|
|
|
if (ifr->ifr_qlen < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
dev->tx_queue_len = ifr->ifr_qlen;
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCSIFNAME:
|
|
|
|
ifr->ifr_newname[IFNAMSIZ-1] = '\0';
|
|
|
|
return dev_change_name(dev, ifr->ifr_newname);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
/*
|
|
|
|
* Unknown or private ioctl
|
|
|
|
*/
|
|
|
|
default:
|
|
|
|
if ((cmd >= SIOCDEVPRIVATE &&
|
|
|
|
cmd <= SIOCDEVPRIVATE + 15) ||
|
|
|
|
cmd == SIOCBONDENSLAVE ||
|
|
|
|
cmd == SIOCBONDRELEASE ||
|
|
|
|
cmd == SIOCBONDSETHWADDR ||
|
|
|
|
cmd == SIOCBONDSLAVEINFOQUERY ||
|
|
|
|
cmd == SIOCBONDINFOQUERY ||
|
|
|
|
cmd == SIOCBONDCHANGEACTIVE ||
|
|
|
|
cmd == SIOCGMIIPHY ||
|
|
|
|
cmd == SIOCGMIIREG ||
|
|
|
|
cmd == SIOCSMIIREG ||
|
|
|
|
cmd == SIOCBRADDIF ||
|
|
|
|
cmd == SIOCBRDELIF ||
|
|
|
|
cmd == SIOCSHWTSTAMP ||
|
|
|
|
cmd == SIOCWANDEV) {
|
|
|
|
err = -EOPNOTSUPP;
|
|
|
|
if (ops->ndo_do_ioctl) {
|
|
|
|
if (netif_device_present(dev))
|
|
|
|
err = ops->ndo_do_ioctl(dev, ifr, cmd);
|
|
|
|
else
|
|
|
|
err = -ENODEV;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
err = -EINVAL;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function handles all "interface"-type I/O control requests. The actual
|
|
|
|
* 'doing' part of this is dev_ifsioc above.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_ioctl - network device ioctl
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
* @cmd: command to issue
|
|
|
|
* @arg: pointer to a struct ifreq in user space
|
|
|
|
*
|
|
|
|
* Issue ioctl functions to devices. This is normally called by the
|
|
|
|
* user space syscall interfaces but can sometimes be useful for
|
|
|
|
* other purposes. The return value is the return from the syscall if
|
|
|
|
* positive or a negative errno code on error.
|
|
|
|
*/
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct ifreq ifr;
|
|
|
|
int ret;
|
|
|
|
char *colon;
|
|
|
|
|
|
|
|
/* One special case: SIOCGIFCONF takes ifconf argument
|
|
|
|
and requires shared lock, because it sleeps writing
|
|
|
|
to user space.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (cmd == SIOCGIFCONF) {
|
2006-03-21 09:23:58 +03:00
|
|
|
rtnl_lock();
|
2007-09-17 22:56:21 +04:00
|
|
|
ret = dev_ifconf(net, (char __user *) arg);
|
2006-03-21 09:23:58 +03:00
|
|
|
rtnl_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (cmd == SIOCGIFNAME)
|
2007-09-17 22:56:21 +04:00
|
|
|
return dev_ifname(net, (struct ifreq __user *)arg);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
ifr.ifr_name[IFNAMSIZ-1] = 0;
|
|
|
|
|
|
|
|
colon = strchr(ifr.ifr_name, ':');
|
|
|
|
if (colon)
|
|
|
|
*colon = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See which interface the caller is talking about.
|
|
|
|
*/
|
|
|
|
|
|
|
|
switch (cmd) {
|
2009-09-03 12:29:39 +04:00
|
|
|
/*
|
|
|
|
* These ioctl calls:
|
|
|
|
* - can be done by all.
|
|
|
|
* - atomic and do not require locking.
|
|
|
|
* - return a value
|
|
|
|
*/
|
|
|
|
case SIOCGIFFLAGS:
|
|
|
|
case SIOCGIFMETRIC:
|
|
|
|
case SIOCGIFMTU:
|
|
|
|
case SIOCGIFHWADDR:
|
|
|
|
case SIOCGIFSLAVE:
|
|
|
|
case SIOCGIFMAP:
|
|
|
|
case SIOCGIFINDEX:
|
|
|
|
case SIOCGIFTXQLEN:
|
|
|
|
dev_load(net, ifr.ifr_name);
|
2009-11-01 22:42:09 +03:00
|
|
|
rcu_read_lock();
|
2009-09-03 12:29:39 +04:00
|
|
|
ret = dev_ifsioc_locked(net, &ifr, cmd);
|
2009-11-01 22:42:09 +03:00
|
|
|
rcu_read_unlock();
|
2009-09-03 12:29:39 +04:00
|
|
|
if (!ret) {
|
|
|
|
if (colon)
|
|
|
|
*colon = ':';
|
|
|
|
if (copy_to_user(arg, &ifr,
|
|
|
|
sizeof(struct ifreq)))
|
|
|
|
ret = -EFAULT;
|
|
|
|
}
|
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
case SIOCETHTOOL:
|
|
|
|
dev_load(net, ifr.ifr_name);
|
|
|
|
rtnl_lock();
|
|
|
|
ret = dev_ethtool(net, &ifr);
|
|
|
|
rtnl_unlock();
|
|
|
|
if (!ret) {
|
|
|
|
if (colon)
|
|
|
|
*colon = ':';
|
|
|
|
if (copy_to_user(arg, &ifr,
|
|
|
|
sizeof(struct ifreq)))
|
|
|
|
ret = -EFAULT;
|
|
|
|
}
|
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
/*
|
|
|
|
* These ioctl calls:
|
|
|
|
* - require superuser power.
|
|
|
|
* - require strict serialization.
|
|
|
|
* - return a value
|
|
|
|
*/
|
|
|
|
case SIOCGMIIPHY:
|
|
|
|
case SIOCGMIIREG:
|
|
|
|
case SIOCSIFNAME:
|
|
|
|
if (!capable(CAP_NET_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
dev_load(net, ifr.ifr_name);
|
|
|
|
rtnl_lock();
|
|
|
|
ret = dev_ifsioc(net, &ifr, cmd);
|
|
|
|
rtnl_unlock();
|
|
|
|
if (!ret) {
|
|
|
|
if (colon)
|
|
|
|
*colon = ':';
|
|
|
|
if (copy_to_user(arg, &ifr,
|
|
|
|
sizeof(struct ifreq)))
|
|
|
|
ret = -EFAULT;
|
|
|
|
}
|
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-09-03 12:29:39 +04:00
|
|
|
/*
|
|
|
|
* These ioctl calls:
|
|
|
|
* - require superuser power.
|
|
|
|
* - require strict serialization.
|
|
|
|
* - do not return a value
|
|
|
|
*/
|
|
|
|
case SIOCSIFFLAGS:
|
|
|
|
case SIOCSIFMETRIC:
|
|
|
|
case SIOCSIFMTU:
|
|
|
|
case SIOCSIFMAP:
|
|
|
|
case SIOCSIFHWADDR:
|
|
|
|
case SIOCSIFSLAVE:
|
|
|
|
case SIOCADDMULTI:
|
|
|
|
case SIOCDELMULTI:
|
|
|
|
case SIOCSIFHWBROADCAST:
|
|
|
|
case SIOCSIFTXQLEN:
|
|
|
|
case SIOCSMIIREG:
|
|
|
|
case SIOCBONDENSLAVE:
|
|
|
|
case SIOCBONDRELEASE:
|
|
|
|
case SIOCBONDSETHWADDR:
|
|
|
|
case SIOCBONDCHANGEACTIVE:
|
|
|
|
case SIOCBRADDIF:
|
|
|
|
case SIOCBRDELIF:
|
|
|
|
case SIOCSHWTSTAMP:
|
|
|
|
if (!capable(CAP_NET_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
/* fall through */
|
|
|
|
case SIOCBONDSLAVEINFOQUERY:
|
|
|
|
case SIOCBONDINFOQUERY:
|
|
|
|
dev_load(net, ifr.ifr_name);
|
|
|
|
rtnl_lock();
|
|
|
|
ret = dev_ifsioc(net, &ifr, cmd);
|
|
|
|
rtnl_unlock();
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
case SIOCGIFMEM:
|
|
|
|
/* Get the per device memory space. We can add this but
|
|
|
|
* currently do not support it */
|
|
|
|
case SIOCSIFMEM:
|
|
|
|
/* Set the per device memory buffer space.
|
|
|
|
* Not applicable in our case */
|
|
|
|
case SIOCSIFLINK:
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unknown or private ioctl.
|
|
|
|
*/
|
|
|
|
default:
|
|
|
|
if (cmd == SIOCWANDEV ||
|
|
|
|
(cmd >= SIOCDEVPRIVATE &&
|
|
|
|
cmd <= SIOCDEVPRIVATE + 15)) {
|
2007-09-17 22:56:21 +04:00
|
|
|
dev_load(net, ifr.ifr_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
rtnl_lock();
|
2007-09-17 22:56:21 +04:00
|
|
|
ret = dev_ifsioc(net, &ifr, cmd);
|
2005-04-17 02:20:36 +04:00
|
|
|
rtnl_unlock();
|
2009-09-03 12:29:39 +04:00
|
|
|
if (!ret && copy_to_user(arg, &ifr,
|
|
|
|
sizeof(struct ifreq)))
|
|
|
|
ret = -EFAULT;
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
2009-09-03 12:29:39 +04:00
|
|
|
}
|
|
|
|
/* Take care of Wireless Extensions */
|
|
|
|
if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST)
|
|
|
|
return wext_handle_ioctl(net, &ifr, cmd, arg);
|
|
|
|
return -EINVAL;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* dev_new_index - allocate an ifindex
|
2007-10-13 08:17:49 +04:00
|
|
|
* @net: the applicable net namespace
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Returns a suitable unique value for a new device interface
|
|
|
|
* number. The caller must hold the rtnl semaphore or the
|
|
|
|
* dev_base_lock to be sure it remains unique.
|
|
|
|
*/
|
2007-09-17 22:56:21 +04:00
|
|
|
static int dev_new_index(struct net *net)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
static int ifindex;
|
|
|
|
for (;;) {
|
|
|
|
if (++ifindex <= 0)
|
|
|
|
ifindex = 1;
|
2007-09-17 22:56:21 +04:00
|
|
|
if (!__dev_get_by_index(net, ifindex))
|
2005-04-17 02:20:36 +04:00
|
|
|
return ifindex;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Delayed registration/unregisteration */
|
2007-12-07 11:49:17 +03:00
|
|
|
static LIST_HEAD(net_todo_list);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-03-09 07:46:03 +03:00
|
|
|
static void net_set_todo(struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
list_add_tail(&dev->todo_list, &net_todo_list);
|
|
|
|
}
|
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
static void rollback_registered_many(struct list_head *head)
|
2007-10-31 01:38:18 +03:00
|
|
|
{
|
net: Handle NETREG_UNINITIALIZED devices correctly
Fix two problems:
1. If unregister_netdevice_many() is called with both registered
and unregistered devices, rollback_registered_many() bails out
when it reaches the first unregistered device. The processing
of the prior registered devices is unfinished, and the
remaining devices are skipped, and possible registered netdev's
are leaked/unregistered.
2. System hangs or panics depending on how the devices are passed,
since when netdev_run_todo() runs, some devices were not fully
processed.
Tested by passing intermingled unregistered and registered vlan
devices to unregister_netdevice_many() as follows:
1. dev, fake_dev1, fake_dev2: hangs in run_todo
("unregister_netdevice: waiting for eth1.100 to become
free. Usage count = 1")
2. fake_dev1, dev, fake_dev2: failure during de-registration
and next registration, followed by a vlan driver Oops
during subsequent registration.
Confirmed that the patch fixes both cases.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-09 01:26:02 +03:00
|
|
|
struct net_device *dev, *tmp;
|
2009-10-27 10:04:19 +03:00
|
|
|
|
2007-10-31 01:38:18 +03:00
|
|
|
BUG_ON(dev_boot_phase);
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
net: Handle NETREG_UNINITIALIZED devices correctly
Fix two problems:
1. If unregister_netdevice_many() is called with both registered
and unregistered devices, rollback_registered_many() bails out
when it reaches the first unregistered device. The processing
of the prior registered devices is unfinished, and the
remaining devices are skipped, and possible registered netdev's
are leaked/unregistered.
2. System hangs or panics depending on how the devices are passed,
since when netdev_run_todo() runs, some devices were not fully
processed.
Tested by passing intermingled unregistered and registered vlan
devices to unregister_netdevice_many() as follows:
1. dev, fake_dev1, fake_dev2: hangs in run_todo
("unregister_netdevice: waiting for eth1.100 to become
free. Usage count = 1")
2. fake_dev1, dev, fake_dev2: failure during de-registration
and next registration, followed by a vlan driver Oops
during subsequent registration.
Confirmed that the patch fixes both cases.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-09 01:26:02 +03:00
|
|
|
list_for_each_entry_safe(dev, tmp, head, unreg_list) {
|
2009-10-27 10:04:19 +03:00
|
|
|
/* Some devices call without registering
|
net: Handle NETREG_UNINITIALIZED devices correctly
Fix two problems:
1. If unregister_netdevice_many() is called with both registered
and unregistered devices, rollback_registered_many() bails out
when it reaches the first unregistered device. The processing
of the prior registered devices is unfinished, and the
remaining devices are skipped, and possible registered netdev's
are leaked/unregistered.
2. System hangs or panics depending on how the devices are passed,
since when netdev_run_todo() runs, some devices were not fully
processed.
Tested by passing intermingled unregistered and registered vlan
devices to unregister_netdevice_many() as follows:
1. dev, fake_dev1, fake_dev2: hangs in run_todo
("unregister_netdevice: waiting for eth1.100 to become
free. Usage count = 1")
2. fake_dev1, dev, fake_dev2: failure during de-registration
and next registration, followed by a vlan driver Oops
during subsequent registration.
Confirmed that the patch fixes both cases.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-09 01:26:02 +03:00
|
|
|
* for initialization unwind. Remove those
|
|
|
|
* devices and proceed with the remaining.
|
2009-10-27 10:04:19 +03:00
|
|
|
*/
|
|
|
|
if (dev->reg_state == NETREG_UNINITIALIZED) {
|
|
|
|
pr_debug("unregister_netdevice: device %s/%p never "
|
|
|
|
"was registered\n", dev->name, dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
WARN_ON(1);
|
net: Handle NETREG_UNINITIALIZED devices correctly
Fix two problems:
1. If unregister_netdevice_many() is called with both registered
and unregistered devices, rollback_registered_many() bails out
when it reaches the first unregistered device. The processing
of the prior registered devices is unfinished, and the
remaining devices are skipped, and possible registered netdev's
are leaked/unregistered.
2. System hangs or panics depending on how the devices are passed,
since when netdev_run_todo() runs, some devices were not fully
processed.
Tested by passing intermingled unregistered and registered vlan
devices to unregister_netdevice_many() as follows:
1. dev, fake_dev1, fake_dev2: hangs in run_todo
("unregister_netdevice: waiting for eth1.100 to become
free. Usage count = 1")
2. fake_dev1, dev, fake_dev2: failure during de-registration
and next registration, followed by a vlan driver Oops
during subsequent registration.
Confirmed that the patch fixes both cases.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-09 01:26:02 +03:00
|
|
|
list_del(&dev->unreg_list);
|
|
|
|
continue;
|
2009-10-27 10:04:19 +03:00
|
|
|
}
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
BUG_ON(dev->reg_state != NETREG_REGISTERED);
|
2010-12-13 15:44:07 +03:00
|
|
|
}
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
/* If device is running, close it first. */
|
|
|
|
dev_close_many(head);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2010-12-13 15:44:07 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list) {
|
2009-10-27 10:04:19 +03:00
|
|
|
/* And unlink it from device chain. */
|
|
|
|
unlist_netdevice(dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
dev->reg_state = NETREG_UNREGISTERING;
|
|
|
|
}
|
2007-10-31 01:38:18 +03:00
|
|
|
|
|
|
|
synchronize_net();
|
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list) {
|
|
|
|
/* Shutdown queueing discipline. */
|
|
|
|
dev_shutdown(dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
/* Notify protocols, that we are about to destroy
|
|
|
|
this device. They should clean all the things.
|
|
|
|
*/
|
|
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2010-02-26 09:34:51 +03:00
|
|
|
if (!dev->rtnl_link_ops ||
|
|
|
|
dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
|
|
|
|
rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
|
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
/*
|
|
|
|
* Flush the unicast and multicast chains
|
|
|
|
*/
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_flush(dev);
|
2010-04-02 01:22:57 +04:00
|
|
|
dev_mc_flush(dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
if (dev->netdev_ops->ndo_uninit)
|
|
|
|
dev->netdev_ops->ndo_uninit(dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
/* Notifier chain MUST detach us from master device. */
|
|
|
|
WARN_ON(dev->master);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
/* Remove entries from kobject tree */
|
|
|
|
netdev_unregister_kobject(dev);
|
|
|
|
}
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2009-11-29 18:45:58 +03:00
|
|
|
/* Process any work delayed until the end of the batch */
|
2010-02-24 17:01:38 +03:00
|
|
|
dev = list_first_entry(head, struct net_device, unreg_list);
|
2009-11-29 18:45:58 +03:00
|
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);
|
2007-10-31 01:38:18 +03:00
|
|
|
|
2010-09-13 16:24:54 +04:00
|
|
|
rcu_barrier();
|
2009-11-16 16:49:35 +03:00
|
|
|
|
2009-11-29 18:45:58 +03:00
|
|
|
list_for_each_entry(dev, head, unreg_list)
|
2009-10-27 10:04:19 +03:00
|
|
|
dev_put(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rollback_registered(struct net_device *dev)
|
|
|
|
{
|
|
|
|
LIST_HEAD(single);
|
|
|
|
|
|
|
|
list_add(&dev->unreg_list, &single);
|
|
|
|
rollback_registered_many(&single);
|
2007-10-31 01:38:18 +03:00
|
|
|
}
|
|
|
|
|
2008-10-23 12:11:29 +04:00
|
|
|
unsigned long netdev_fix_features(unsigned long features, const char *name)
|
|
|
|
{
|
|
|
|
/* Fix illegal SG+CSUM combinations. */
|
|
|
|
if ((features & NETIF_F_SG) &&
|
|
|
|
!(features & NETIF_F_ALL_CSUM)) {
|
|
|
|
if (name)
|
|
|
|
printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no "
|
|
|
|
"checksum feature.\n", name);
|
|
|
|
features &= ~NETIF_F_SG;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TSO requires that SG is present as well. */
|
|
|
|
if ((features & NETIF_F_TSO) && !(features & NETIF_F_SG)) {
|
|
|
|
if (name)
|
|
|
|
printk(KERN_NOTICE "%s: Dropping NETIF_F_TSO since no "
|
|
|
|
"SG feature.\n", name);
|
|
|
|
features &= ~NETIF_F_TSO;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (features & NETIF_F_UFO) {
|
2010-11-30 09:38:00 +03:00
|
|
|
/* maybe split UFO into V4 and V6? */
|
|
|
|
if (!((features & NETIF_F_GEN_CSUM) ||
|
|
|
|
(features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))
|
|
|
|
== (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
|
2008-10-23 12:11:29 +04:00
|
|
|
if (name)
|
|
|
|
printk(KERN_ERR "%s: Dropping NETIF_F_UFO "
|
2010-11-30 09:38:00 +03:00
|
|
|
"since no checksum offload features.\n",
|
2008-10-23 12:11:29 +04:00
|
|
|
name);
|
|
|
|
features &= ~NETIF_F_UFO;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(features & NETIF_F_SG)) {
|
|
|
|
if (name)
|
|
|
|
printk(KERN_ERR "%s: Dropping NETIF_F_UFO "
|
|
|
|
"since no NETIF_F_SG feature.\n", name);
|
|
|
|
features &= ~NETIF_F_UFO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return features;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_fix_features);
|
|
|
|
|
2009-12-04 02:59:22 +03:00
|
|
|
/**
|
|
|
|
* netif_stacked_transfer_operstate - transfer operstate
|
|
|
|
* @rootdev: the root or lower level device to transfer state from
|
|
|
|
* @dev: the device to transfer operstate to
|
|
|
|
*
|
|
|
|
* Transfer operational state from root to device. This is normally
|
|
|
|
* called when a stacking relationship exists between the root
|
|
|
|
* device and the device(a leaf device).
|
|
|
|
*/
|
|
|
|
void netif_stacked_transfer_operstate(const struct net_device *rootdev,
|
|
|
|
struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (rootdev->operstate == IF_OPER_DORMANT)
|
|
|
|
netif_dormant_on(dev);
|
|
|
|
else
|
|
|
|
netif_dormant_off(dev);
|
|
|
|
|
|
|
|
if (netif_carrier_ok(rootdev)) {
|
|
|
|
if (!netif_carrier_ok(dev))
|
|
|
|
netif_carrier_on(dev);
|
|
|
|
} else {
|
|
|
|
if (netif_carrier_ok(dev))
|
|
|
|
netif_carrier_off(dev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netif_stacked_transfer_operstate);
|
|
|
|
|
2010-11-26 11:36:09 +03:00
|
|
|
#ifdef CONFIG_RPS
|
2010-09-23 21:26:35 +04:00
|
|
|
static int netif_alloc_rx_queues(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int i, count = dev->num_rx_queues;
|
2010-10-18 22:00:16 +04:00
|
|
|
struct netdev_rx_queue *rx;
|
2010-09-23 21:26:35 +04:00
|
|
|
|
2010-10-18 22:00:16 +04:00
|
|
|
BUG_ON(count < 1);
|
2010-09-23 21:26:35 +04:00
|
|
|
|
2010-10-18 22:00:16 +04:00
|
|
|
rx = kcalloc(count, sizeof(struct netdev_rx_queue), GFP_KERNEL);
|
|
|
|
if (!rx) {
|
|
|
|
pr_err("netdev: Unable to allocate %u rx queues.\n", count);
|
|
|
|
return -ENOMEM;
|
2010-09-23 21:26:35 +04:00
|
|
|
}
|
2010-10-18 22:00:16 +04:00
|
|
|
dev->_rx = rx;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
2010-11-09 13:47:38 +03:00
|
|
|
rx[i].dev = dev;
|
2010-09-23 21:26:35 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2010-11-26 11:36:09 +03:00
|
|
|
#endif
|
2010-09-23 21:26:35 +04:00
|
|
|
|
2010-12-04 05:31:41 +03:00
|
|
|
static void netdev_init_one_queue(struct net_device *dev,
|
|
|
|
struct netdev_queue *queue, void *_unused)
|
|
|
|
{
|
|
|
|
/* Initialize queue lock */
|
|
|
|
spin_lock_init(&queue->_xmit_lock);
|
|
|
|
netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
|
|
|
|
queue->xmit_lock_owner = -1;
|
2010-12-14 06:09:15 +03:00
|
|
|
netdev_queue_numa_node_write(queue, NUMA_NO_NODE);
|
2010-12-04 05:31:41 +03:00
|
|
|
queue->dev = dev;
|
|
|
|
}
|
|
|
|
|
2010-10-18 22:04:39 +04:00
|
|
|
static int netif_alloc_netdev_queues(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int count = dev->num_tx_queues;
|
|
|
|
struct netdev_queue *tx;
|
|
|
|
|
|
|
|
BUG_ON(count < 1);
|
|
|
|
|
|
|
|
tx = kcalloc(count, sizeof(struct netdev_queue), GFP_KERNEL);
|
|
|
|
if (!tx) {
|
|
|
|
pr_err("netdev: Unable to allocate %u tx queues.\n",
|
|
|
|
count);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
dev->_tx = tx;
|
2010-11-21 16:17:27 +03:00
|
|
|
|
2010-10-18 22:04:39 +04:00
|
|
|
netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);
|
|
|
|
spin_lock_init(&dev->tx_global_lock);
|
2010-12-04 05:31:41 +03:00
|
|
|
|
|
|
|
return 0;
|
2010-10-18 22:04:39 +04:00
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* register_netdevice - register a network device
|
|
|
|
* @dev: device to register
|
|
|
|
*
|
|
|
|
* Take a completed network device structure and add it to the kernel
|
|
|
|
* interfaces. A %NETDEV_REGISTER message is sent to the netdev notifier
|
|
|
|
* chain. 0 is returned on success. A negative errno code is returned
|
|
|
|
* on a failure to set up the device, or if the name is a duplicate.
|
|
|
|
*
|
|
|
|
* Callers must hold the rtnl semaphore. You may want
|
|
|
|
* register_netdev() instead of this.
|
|
|
|
*
|
|
|
|
* BUGS:
|
|
|
|
* The locking appears insufficient to guarantee two parallel registers
|
|
|
|
* will not get the same name.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int register_netdevice(struct net_device *dev)
|
|
|
|
{
|
|
|
|
int ret;
|
2008-11-20 08:32:24 +03:00
|
|
|
struct net *net = dev_net(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
BUG_ON(dev_boot_phase);
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
might_sleep();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* When net_device's are persistent, this will be fatal. */
|
|
|
|
BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
|
2008-11-20 08:32:24 +03:00
|
|
|
BUG_ON(!net);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-15 11:08:33 +04:00
|
|
|
spin_lock_init(&dev->addr_list_lock);
|
2008-07-23 01:16:42 +04:00
|
|
|
netdev_set_addr_lockdep_class(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
dev->iflink = -1;
|
|
|
|
|
|
|
|
/* Init, if this function is available */
|
2008-11-20 08:32:24 +03:00
|
|
|
if (dev->netdev_ops->ndo_init) {
|
|
|
|
ret = dev->netdev_ops->ndo_init(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (ret) {
|
|
|
|
if (ret > 0)
|
|
|
|
ret = -EIO;
|
2006-11-14 03:02:22 +03:00
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2010-05-19 14:12:19 +04:00
|
|
|
ret = dev_get_valid_name(dev, dev->name, 0);
|
2009-11-18 05:36:59 +03:00
|
|
|
if (ret)
|
2007-07-31 03:29:40 +04:00
|
|
|
goto err_uninit;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
dev->ifindex = dev_new_index(net);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev->iflink == -1)
|
|
|
|
dev->iflink = dev->ifindex;
|
|
|
|
|
2007-06-27 11:47:37 +04:00
|
|
|
/* Fix illegal checksum combinations */
|
|
|
|
if ((dev->features & NETIF_F_HW_CSUM) &&
|
|
|
|
(dev->features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
|
|
|
|
printk(KERN_NOTICE "%s: mixed HW and IP checksum settings.\n",
|
|
|
|
dev->name);
|
|
|
|
dev->features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((dev->features & NETIF_F_NO_CSUM) &&
|
|
|
|
(dev->features & (NETIF_F_HW_CSUM|NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
|
|
|
|
printk(KERN_NOTICE "%s: mixed no checksumming and other settings.\n",
|
|
|
|
dev->name);
|
|
|
|
dev->features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM|NETIF_F_HW_CSUM);
|
|
|
|
}
|
|
|
|
|
2008-10-23 12:11:29 +04:00
|
|
|
dev->features = netdev_fix_features(dev->features, dev->name);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-08-03 12:23:10 +04:00
|
|
|
/* Enable software GSO if SG is supported. */
|
|
|
|
if (dev->features & NETIF_F_SG)
|
|
|
|
dev->features |= NETIF_F_GSO;
|
|
|
|
|
2010-09-23 04:46:11 +04:00
|
|
|
/* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
|
|
|
|
* vlan_dev_init() will do the dev->features check, so these features
|
|
|
|
* are enabled only if supported by underlying device.
|
2010-09-15 13:24:24 +04:00
|
|
|
*/
|
2010-09-23 04:46:11 +04:00
|
|
|
dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA);
|
2010-09-15 13:24:24 +04:00
|
|
|
|
2009-10-02 09:15:27 +04:00
|
|
|
ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
|
|
|
|
ret = notifier_to_errno(ret);
|
|
|
|
if (ret)
|
|
|
|
goto err_uninit;
|
|
|
|
|
2007-09-27 09:02:53 +04:00
|
|
|
ret = netdev_register_kobject(dev);
|
2006-05-11 00:21:17 +04:00
|
|
|
if (ret)
|
2007-07-31 03:29:40 +04:00
|
|
|
goto err_uninit;
|
2006-05-11 00:21:17 +04:00
|
|
|
dev->reg_state = NETREG_REGISTERED;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Default initial state at registry is that the
|
|
|
|
* device is present.
|
|
|
|
*/
|
|
|
|
|
|
|
|
set_bit(__LINK_STATE_PRESENT, &dev->state);
|
|
|
|
|
|
|
|
dev_init_scheduler(dev);
|
|
|
|
dev_hold(dev);
|
2007-09-12 15:53:49 +04:00
|
|
|
list_netdevice(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Notify protocols, that a new device appeared. */
|
2007-09-17 02:42:43 +04:00
|
|
|
ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);
|
2007-07-31 04:03:38 +04:00
|
|
|
ret = notifier_to_errno(ret);
|
2007-10-31 01:38:18 +03:00
|
|
|
if (ret) {
|
|
|
|
rollback_registered(dev);
|
|
|
|
dev->reg_state = NETREG_UNREGISTERED;
|
|
|
|
}
|
2009-12-13 01:11:15 +03:00
|
|
|
/*
|
|
|
|
* Prevent userspace races by waiting until the network
|
|
|
|
* device is fully setup before sending notifications.
|
|
|
|
*/
|
2010-02-26 09:34:51 +03:00
|
|
|
if (!dev->rtnl_link_ops ||
|
|
|
|
dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
2007-07-31 03:29:40 +04:00
|
|
|
|
|
|
|
err_uninit:
|
2008-11-20 08:32:24 +03:00
|
|
|
if (dev->netdev_ops->ndo_uninit)
|
|
|
|
dev->netdev_ops->ndo_uninit(dev);
|
2007-07-31 03:29:40 +04:00
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(register_netdevice);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-01-15 08:05:05 +03:00
|
|
|
/**
|
|
|
|
* init_dummy_netdev - init a dummy network device for NAPI
|
|
|
|
* @dev: device to init
|
|
|
|
*
|
|
|
|
* This takes a network device structure and initialize the minimum
|
|
|
|
* amount of fields so it can be used to schedule NAPI polls without
|
|
|
|
* registering a full blown interface. This is to be used by drivers
|
|
|
|
* that need to tie several hardware interfaces to a single NAPI
|
|
|
|
* poll scheduler due to HW limitations.
|
|
|
|
*/
|
|
|
|
int init_dummy_netdev(struct net_device *dev)
|
|
|
|
{
|
|
|
|
/* Clear everything. Note we don't initialize spinlocks
|
|
|
|
* are they aren't supposed to be taken by any of the
|
|
|
|
* NAPI code and this dummy netdev is supposed to be
|
|
|
|
* only ever used for NAPI polls
|
|
|
|
*/
|
|
|
|
memset(dev, 0, sizeof(struct net_device));
|
|
|
|
|
|
|
|
/* make sure we BUG if trying to hit standard
|
|
|
|
* register/unregister code path
|
|
|
|
*/
|
|
|
|
dev->reg_state = NETREG_DUMMY;
|
|
|
|
|
|
|
|
/* NAPI wants this */
|
|
|
|
INIT_LIST_HEAD(&dev->napi_list);
|
|
|
|
|
|
|
|
/* a dummy interface is started by default */
|
|
|
|
set_bit(__LINK_STATE_PRESENT, &dev->state);
|
|
|
|
set_bit(__LINK_STATE_START, &dev->state);
|
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
/* Note : We dont allocate pcpu_refcnt for dummy devices,
|
|
|
|
* because users of this 'device' dont need to change
|
|
|
|
* its refcount.
|
|
|
|
*/
|
|
|
|
|
2009-01-15 08:05:05 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(init_dummy_netdev);
|
|
|
|
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* register_netdev - register a network device
|
|
|
|
* @dev: device to register
|
|
|
|
*
|
|
|
|
* Take a completed network device structure and add it to the kernel
|
|
|
|
* interfaces. A %NETDEV_REGISTER message is sent to the netdev notifier
|
|
|
|
* chain. 0 is returned on success. A negative errno code is returned
|
|
|
|
* on a failure to set up the device, or if the name is a duplicate.
|
|
|
|
*
|
2007-04-21 09:14:10 +04:00
|
|
|
* This is a wrapper around register_netdevice that takes the rtnl semaphore
|
2005-04-17 02:20:36 +04:00
|
|
|
* and expands the device name if you passed a format string to
|
|
|
|
* alloc_netdev.
|
|
|
|
*/
|
|
|
|
int register_netdev(struct net_device *dev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
rtnl_lock();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the name is a format string the caller wants us to do a
|
|
|
|
* name allocation.
|
|
|
|
*/
|
|
|
|
if (strchr(dev->name, '%')) {
|
|
|
|
err = dev_alloc_name(dev, dev->name);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
err = register_netdevice(dev);
|
|
|
|
out:
|
|
|
|
rtnl_unlock();
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(register_netdev);
|
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
int netdev_refcnt_read(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
int i, refcnt = 0;
|
|
|
|
|
|
|
|
for_each_possible_cpu(i)
|
|
|
|
refcnt += *per_cpu_ptr(dev->pcpu_refcnt, i);
|
|
|
|
return refcnt;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_refcnt_read);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* netdev_wait_allrefs - wait until all references are gone.
|
|
|
|
*
|
|
|
|
* This is called when unregistering network devices.
|
|
|
|
*
|
|
|
|
* Any protocol or device that holds a reference should register
|
|
|
|
* for netdevice notification, and cleanup and put back the
|
|
|
|
* reference if they receive an UNREGISTER event.
|
|
|
|
* We can get stuck here if buggy protocols don't correctly
|
2007-02-09 17:24:36 +03:00
|
|
|
* call dev_put.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
static void netdev_wait_allrefs(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned long rebroadcast_time, warning_time;
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
int refcnt;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
linkwatch: linkwatch_forget_dev() to speedup device dismantle
Herbert Xu a écrit :
> On Tue, Nov 17, 2009 at 04:26:04AM -0800, David Miller wrote:
>> Really, the link watch stuff is just due for a redesign. I don't
>> think a simple hack is going to cut it this time, sorry Eric :-)
>
> I have no objections against any redesigns, but since the only
> caller of linkwatch_forget_dev runs in process context with the
> RTNL, it could also legally emit those events.
Thanks guys, here an updated version then, before linkwatch surgery ?
In this version, I force the event to be sent synchronously.
[PATCH net-next-2.6] linkwatch: linkwatch_forget_dev() to speedup device dismantle
time ip link del eth3.103 ; time ip link del eth3.104 ; time ip link del eth3.105
real 0m0.266s
user 0m0.000s
sys 0m0.001s
real 0m0.770s
user 0m0.000s
sys 0m0.000s
real 0m1.022s
user 0m0.000s
sys 0m0.000s
One problem of current schem in vlan dismantle phase is the
holding of device done by following chain :
vlan_dev_stop() ->
netif_carrier_off(dev) ->
linkwatch_fire_event(dev) ->
dev_hold() ...
And __linkwatch_run_queue() runs up to one second later...
A generic fix to this problem is to add a linkwatch_forget_dev() method
to unlink the device from the list of watched devices.
dev->link_watch_next becomes dev->link_watch_list (and use a bit more memory),
to be able to unlink device in O(1).
After patch :
time ip link del eth3.103 ; time ip link del eth3.104 ; time ip link del eth3.105
real 0m0.024s
user 0m0.000s
sys 0m0.000s
real 0m0.032s
user 0m0.000s
sys 0m0.001s
real 0m0.033s
user 0m0.000s
sys 0m0.000s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-11-17 08:59:21 +03:00
|
|
|
linkwatch_forget_dev(dev);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
rebroadcast_time = warning_time = jiffies;
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
refcnt = netdev_refcnt_read(dev);
|
|
|
|
|
|
|
|
while (refcnt != 0) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (time_after(jiffies, rebroadcast_time + 1 * HZ)) {
|
2006-03-21 09:23:58 +03:00
|
|
|
rtnl_lock();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Rebroadcast unregister notification */
|
2007-09-17 02:42:43 +04:00
|
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
|
2009-11-29 18:45:58 +03:00
|
|
|
/* don't resend NETDEV_UNREGISTER_BATCH, _BATCH users
|
2009-11-16 16:49:35 +03:00
|
|
|
* should have already handle it the first time */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (test_bit(__LINK_STATE_LINKWATCH_PENDING,
|
|
|
|
&dev->state)) {
|
|
|
|
/* We must not have linkwatch events
|
|
|
|
* pending on unregister. If this
|
|
|
|
* happens, we simply run the queue
|
|
|
|
* unscheduled, resulting in a noop
|
|
|
|
* for this device.
|
|
|
|
*/
|
|
|
|
linkwatch_run_queue();
|
|
|
|
}
|
|
|
|
|
2006-03-21 09:23:58 +03:00
|
|
|
__rtnl_unlock();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
rebroadcast_time = jiffies;
|
|
|
|
}
|
|
|
|
|
|
|
|
msleep(250);
|
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
refcnt = netdev_refcnt_read(dev);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (time_after(jiffies, warning_time + 10 * HZ)) {
|
|
|
|
printk(KERN_EMERG "unregister_netdevice: "
|
|
|
|
"waiting for %s to become free. Usage "
|
|
|
|
"count = %d\n",
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
dev->name, refcnt);
|
2005-04-17 02:20:36 +04:00
|
|
|
warning_time = jiffies;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The sequence is:
|
|
|
|
*
|
|
|
|
* rtnl_lock();
|
|
|
|
* ...
|
|
|
|
* register_netdevice(x1);
|
|
|
|
* register_netdevice(x2);
|
|
|
|
* ...
|
|
|
|
* unregister_netdevice(y1);
|
|
|
|
* unregister_netdevice(y2);
|
|
|
|
* ...
|
|
|
|
* rtnl_unlock();
|
|
|
|
* free_netdev(y1);
|
|
|
|
* free_netdev(y2);
|
|
|
|
*
|
2008-10-08 02:50:03 +04:00
|
|
|
* We are invoked by rtnl_unlock().
|
2005-04-17 02:20:36 +04:00
|
|
|
* This allows us to deal with problems:
|
2006-05-11 00:21:17 +04:00
|
|
|
* 1) We can delete sysfs objects which invoke hotplug
|
2005-04-17 02:20:36 +04:00
|
|
|
* without deadlocking with linkwatch via keventd.
|
|
|
|
* 2) Since we run with the RTNL semaphore not held, we can sleep
|
|
|
|
* safely in order to wait for the netdev refcnt to drop to zero.
|
2008-10-08 02:50:03 +04:00
|
|
|
*
|
|
|
|
* We must not return until all unregister events added during
|
|
|
|
* the interval the lock was held have been completed.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
void netdev_run_todo(void)
|
|
|
|
{
|
2006-06-23 13:05:55 +04:00
|
|
|
struct list_head list;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Snapshot list, allow later requests */
|
2006-06-23 13:05:55 +04:00
|
|
|
list_replace_init(&net_todo_list, &list);
|
2008-10-08 02:50:03 +04:00
|
|
|
|
|
|
|
__rtnl_unlock();
|
2006-06-23 13:05:55 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
while (!list_empty(&list)) {
|
|
|
|
struct net_device *dev
|
2010-02-24 17:01:38 +03:00
|
|
|
= list_first_entry(&list, struct net_device, todo_list);
|
2005-04-17 02:20:36 +04:00
|
|
|
list_del(&dev->todo_list);
|
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
|
|
|
|
printk(KERN_ERR "network todo '%s' but state %d\n",
|
|
|
|
dev->name, dev->reg_state);
|
|
|
|
dump_stack();
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
dev->reg_state = NETREG_UNREGISTERED;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-03-31 00:16:22 +04:00
|
|
|
on_each_cpu(flush_backlog, dev, 1);
|
2008-08-04 08:29:57 +04:00
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
netdev_wait_allrefs(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
/* paranoia */
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
BUG_ON(netdev_refcnt_read(dev));
|
2010-09-15 08:04:31 +04:00
|
|
|
WARN_ON(rcu_dereference_raw(dev->ip_ptr));
|
2010-10-25 01:32:05 +04:00
|
|
|
WARN_ON(rcu_dereference_raw(dev->ip6_ptr));
|
2008-07-26 08:43:18 +04:00
|
|
|
WARN_ON(dev->dn_ptr);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-05-11 00:21:17 +04:00
|
|
|
if (dev->destructor)
|
|
|
|
dev->destructor(dev);
|
2007-05-20 02:39:25 +04:00
|
|
|
|
|
|
|
/* Free network device */
|
|
|
|
kobject_put(&dev->dev.kobj);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-09 13:11:52 +04:00
|
|
|
/* Convert net_device_stats to rtnl_link_stats64. They have the same
|
|
|
|
* fields in the same order, with only the type differing.
|
|
|
|
*/
|
|
|
|
static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
|
|
|
|
const struct net_device_stats *netdev_stats)
|
|
|
|
{
|
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
BUILD_BUG_ON(sizeof(*stats64) != sizeof(*netdev_stats));
|
|
|
|
memcpy(stats64, netdev_stats, sizeof(*stats64));
|
|
|
|
#else
|
|
|
|
size_t i, n = sizeof(*stats64) / sizeof(u64);
|
|
|
|
const unsigned long *src = (const unsigned long *)netdev_stats;
|
|
|
|
u64 *dst = (u64 *)stats64;
|
|
|
|
|
|
|
|
BUILD_BUG_ON(sizeof(*netdev_stats) / sizeof(unsigned long) !=
|
|
|
|
sizeof(*stats64) / sizeof(u64));
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
dst[i] = src[i];
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-11-20 08:40:23 +03:00
|
|
|
/**
|
|
|
|
* dev_get_stats - get network device statistics
|
|
|
|
* @dev: device to get statistics from
|
2010-07-08 01:58:56 +04:00
|
|
|
* @storage: place to store stats
|
2008-11-20 08:40:23 +03:00
|
|
|
*
|
2010-07-09 13:12:41 +04:00
|
|
|
* Get network statistics from device. Return @storage.
|
|
|
|
* The device driver may provide its own method by setting
|
|
|
|
* dev->netdev_ops->get_stats64 or dev->netdev_ops->get_stats;
|
|
|
|
* otherwise the internal statistics structure is used.
|
2008-11-20 08:40:23 +03:00
|
|
|
*/
|
2010-07-09 13:12:41 +04:00
|
|
|
struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
|
|
|
|
struct rtnl_link_stats64 *storage)
|
2009-05-18 04:34:33 +04:00
|
|
|
{
|
2008-11-20 08:40:23 +03:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
|
|
|
|
2010-07-08 01:58:56 +04:00
|
|
|
if (ops->ndo_get_stats64) {
|
|
|
|
memset(storage, 0, sizeof(*storage));
|
2010-10-01 01:06:55 +04:00
|
|
|
ops->ndo_get_stats64(dev, storage);
|
|
|
|
} else if (ops->ndo_get_stats) {
|
2010-07-09 13:11:52 +04:00
|
|
|
netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev));
|
2010-10-01 01:06:55 +04:00
|
|
|
} else {
|
|
|
|
netdev_stats_to_stats64(storage, &dev->stats);
|
2010-07-08 01:58:56 +04:00
|
|
|
}
|
2010-10-01 01:06:55 +04:00
|
|
|
storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
|
2010-07-08 01:58:56 +04:00
|
|
|
return storage;
|
2007-03-29 01:29:08 +04:00
|
|
|
}
|
2008-11-20 08:40:23 +03:00
|
|
|
EXPORT_SYMBOL(dev_get_stats);
|
2007-03-29 01:29:08 +04:00
|
|
|
|
2010-10-02 10:11:55 +04:00
|
|
|
struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
|
2008-07-09 04:18:23 +04:00
|
|
|
{
|
2010-10-02 10:11:55 +04:00
|
|
|
struct netdev_queue *queue = dev_ingress_queue(dev);
|
2008-07-09 04:18:23 +04:00
|
|
|
|
2010-10-02 10:11:55 +04:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
if (queue)
|
|
|
|
return queue;
|
|
|
|
queue = kzalloc(sizeof(*queue), GFP_KERNEL);
|
|
|
|
if (!queue)
|
|
|
|
return NULL;
|
|
|
|
netdev_init_one_queue(dev, queue, NULL);
|
|
|
|
queue->qdisc = &noop_qdisc;
|
|
|
|
queue->qdisc_sleeping = &noop_qdisc;
|
|
|
|
rcu_assign_pointer(dev->ingress_queue, queue);
|
|
|
|
#endif
|
|
|
|
return queue;
|
2008-07-09 03:55:56 +04:00
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
2011-01-09 22:36:31 +03:00
|
|
|
* alloc_netdev_mqs - allocate network device
|
2005-04-17 02:20:36 +04:00
|
|
|
* @sizeof_priv: size of private data to allocate space for
|
|
|
|
* @name: device name format string
|
|
|
|
* @setup: callback to initialize device
|
2011-01-09 22:36:31 +03:00
|
|
|
* @txqs: the number of TX subqueues to allocate
|
|
|
|
* @rxqs: the number of RX subqueues to allocate
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Allocates a struct net_device with private data area for driver use
|
2007-07-07 00:36:20 +04:00
|
|
|
* and performs basic initialization. Also allocates subquue structs
|
2011-01-09 22:36:31 +03:00
|
|
|
* for each queue on the device.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2011-01-09 22:36:31 +03:00
|
|
|
struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
|
|
|
|
void (*setup)(struct net_device *),
|
|
|
|
unsigned int txqs, unsigned int rxqs)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
2008-07-22 00:28:44 +04:00
|
|
|
size_t alloc_size;
|
2009-05-27 08:42:37 +04:00
|
|
|
struct net_device *p;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-08-30 04:06:13 +04:00
|
|
|
BUG_ON(strlen(name) >= sizeof(dev->name));
|
|
|
|
|
2011-01-09 22:36:31 +03:00
|
|
|
if (txqs < 1) {
|
2010-10-18 21:55:58 +04:00
|
|
|
pr_err("alloc_netdev: Unable to allocate device "
|
|
|
|
"with zero queues.\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-01-09 22:36:31 +03:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
if (rxqs < 1) {
|
|
|
|
pr_err("alloc_netdev: Unable to allocate device "
|
|
|
|
"with zero RX queues.\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-17 12:56:23 +04:00
|
|
|
alloc_size = sizeof(struct net_device);
|
2008-04-19 02:43:32 +04:00
|
|
|
if (sizeof_priv) {
|
|
|
|
/* ensure 32-byte alignment of private area */
|
2009-05-27 08:42:37 +04:00
|
|
|
alloc_size = ALIGN(alloc_size, NETDEV_ALIGN);
|
2008-04-19 02:43:32 +04:00
|
|
|
alloc_size += sizeof_priv;
|
|
|
|
}
|
|
|
|
/* ensure 32-byte alignment of whole construct */
|
2009-05-27 08:42:37 +04:00
|
|
|
alloc_size += NETDEV_ALIGN - 1;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-04-07 09:38:28 +04:00
|
|
|
p = kzalloc(alloc_size, GFP_KERNEL);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!p) {
|
2006-08-30 04:06:13 +04:00
|
|
|
printk(KERN_ERR "alloc_netdev: Unable to allocate device.\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-05-27 08:42:37 +04:00
|
|
|
dev = PTR_ALIGN(p, NETDEV_ALIGN);
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->padded = (char *)dev - (char *)p;
|
2009-05-08 17:30:17 +04:00
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
dev->pcpu_refcnt = alloc_percpu(int);
|
|
|
|
if (!dev->pcpu_refcnt)
|
2010-10-18 22:04:39 +04:00
|
|
|
goto free_p;
|
2009-05-08 17:30:17 +04:00
|
|
|
|
|
|
|
if (dev_addr_init(dev))
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
goto free_pcpu;
|
2009-05-08 17:30:17 +04:00
|
|
|
|
2010-04-02 01:22:57 +04:00
|
|
|
dev_mc_init(dev);
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_init(dev);
|
2009-05-23 03:22:17 +04:00
|
|
|
|
2008-03-25 15:47:49 +03:00
|
|
|
dev_net_set(dev, &init_net);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-01-09 22:36:31 +03:00
|
|
|
dev->num_tx_queues = txqs;
|
|
|
|
dev->real_num_tx_queues = txqs;
|
2010-11-09 13:47:30 +03:00
|
|
|
if (netif_alloc_netdev_queues(dev))
|
|
|
|
goto free_pcpu;
|
2008-07-17 11:34:19 +04:00
|
|
|
|
2010-03-24 22:13:54 +03:00
|
|
|
#ifdef CONFIG_RPS
|
2011-01-09 22:36:31 +03:00
|
|
|
dev->num_rx_queues = rxqs;
|
|
|
|
dev->real_num_rx_queues = rxqs;
|
2010-11-09 13:47:38 +03:00
|
|
|
if (netif_alloc_rx_queues(dev))
|
|
|
|
goto free_pcpu;
|
2010-03-24 22:13:54 +03:00
|
|
|
#endif
|
2010-03-16 11:03:29 +03:00
|
|
|
|
[NET]: Add per-connection option to set max TSO frame size
Update: My mailer ate one of Jarek's feedback mails... Fixed the
parameter in netif_set_gso_max_size() to be u32, not u16. Fixed the
whitespace issue due to a patch import botch. Changed the types from
u32 to unsigned int to be more consistent with other variables in the
area. Also brought the patch up to the latest net-2.6.26 tree.
Update: Made gso_max_size container 32 bits, not 16. Moved the
location of gso_max_size within netdev to be less hotpath. Made more
consistent names between the sock and netdev layers, and added a
define for the max GSO size.
Update: Respun for net-2.6.26 tree.
Update: changed max_gso_frame_size and sk_gso_max_size from signed to
unsigned - thanks Stephen!
This patch adds the ability for device drivers to control the size of
the TSO frames being sent to them, per TCP connection. By setting the
netdevice's gso_max_size value, the socket layer will set the GSO
frame size based on that value. This will propogate into the TCP
layer, and send TSO's of that size to the hardware.
This can be desirable to help tune the bursty nature of TSO on a
per-adapter basis, where one may have 1 GbE and 10 GbE devices
coexisting in a system, one running multiqueue and the other not, etc.
This can also be desirable for devices that cannot support full 64 KB
TSO's, but still want to benefit from some level of segmentation
offloading.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-21 13:43:19 +03:00
|
|
|
dev->gso_max_size = GSO_MAX_SIZE;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-11 07:03:05 +03:00
|
|
|
INIT_LIST_HEAD(&dev->ethtool_ntuple_list.list);
|
|
|
|
dev->ethtool_ntuple_list.count = 0;
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
INIT_LIST_HEAD(&dev->napi_list);
|
2009-10-30 17:51:13 +03:00
|
|
|
INIT_LIST_HEAD(&dev->unreg_list);
|
linkwatch: linkwatch_forget_dev() to speedup device dismantle
Herbert Xu a écrit :
> On Tue, Nov 17, 2009 at 04:26:04AM -0800, David Miller wrote:
>> Really, the link watch stuff is just due for a redesign. I don't
>> think a simple hack is going to cut it this time, sorry Eric :-)
>
> I have no objections against any redesigns, but since the only
> caller of linkwatch_forget_dev runs in process context with the
> RTNL, it could also legally emit those events.
Thanks guys, here an updated version then, before linkwatch surgery ?
In this version, I force the event to be sent synchronously.
[PATCH net-next-2.6] linkwatch: linkwatch_forget_dev() to speedup device dismantle
time ip link del eth3.103 ; time ip link del eth3.104 ; time ip link del eth3.105
real 0m0.266s
user 0m0.000s
sys 0m0.001s
real 0m0.770s
user 0m0.000s
sys 0m0.000s
real 0m1.022s
user 0m0.000s
sys 0m0.000s
One problem of current schem in vlan dismantle phase is the
holding of device done by following chain :
vlan_dev_stop() ->
netif_carrier_off(dev) ->
linkwatch_fire_event(dev) ->
dev_hold() ...
And __linkwatch_run_queue() runs up to one second later...
A generic fix to this problem is to add a linkwatch_forget_dev() method
to unlink the device from the list of watched devices.
dev->link_watch_next becomes dev->link_watch_list (and use a bit more memory),
to be able to unlink device in O(1).
After patch :
time ip link del eth3.103 ; time ip link del eth3.104 ; time ip link del eth3.105
real 0m0.024s
user 0m0.000s
sys 0m0.000s
real 0m0.032s
user 0m0.000s
sys 0m0.001s
real 0m0.033s
user 0m0.000s
sys 0m0.000s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-11-17 08:59:21 +03:00
|
|
|
INIT_LIST_HEAD(&dev->link_watch_list);
|
net: release dst entry in dev_hard_start_xmit()
One point of contention in high network loads is the dst_release() performed
when a transmited skb is freed. This is because NIC tx completion calls
dev_kree_skb() long after original call to dev_queue_xmit(skb).
CPU cache is cold and the atomic op in dst_release() stalls. On SMP, this is
quite visible if one CPU is 100% handling softirqs for a network device,
since dst_clone() is done by other cpus, involving cache line ping pongs.
It seems right place to release dst is in dev_hard_start_xmit(), for most
devices but ones that are virtual, and some exceptions.
David Miller suggested to define a new device flag, set in alloc_netdev_mq()
(so that most devices set it at init time), and carefuly unset in devices
which dont want a NULL skb->dst in their ndo_start_xmit().
List of devices that must clear this flag is :
- loopback device, because it calls netif_rx() and quoting Patrick :
"ip_route_input() doesn't accept loopback addresses, so loopback packets
already need to have a dst_entry attached."
- appletalk/ipddp.c : needs skb->dst in its xmit function
- And all devices that call again dev_queue_xmit() from their xmit function
(as some classifiers need skb->dst) : bonding, vlan, macvlan, eql, ifb, hdlc_fr
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-05-19 09:19:19 +04:00
|
|
|
dev->priv_flags = IFF_XMIT_DST_RELEASE;
|
2005-04-17 02:20:36 +04:00
|
|
|
setup(dev);
|
|
|
|
strcpy(dev->name, name);
|
2011-01-14 02:38:30 +03:00
|
|
|
dev->group = INIT_NETDEV_GROUP;
|
2005-04-17 02:20:36 +04:00
|
|
|
return dev;
|
2009-05-08 17:30:17 +04:00
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
free_pcpu:
|
|
|
|
free_percpu(dev->pcpu_refcnt);
|
2010-11-09 13:47:30 +03:00
|
|
|
kfree(dev->_tx);
|
2010-11-09 13:47:38 +03:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
kfree(dev->_rx);
|
|
|
|
#endif
|
|
|
|
|
2009-05-08 17:30:17 +04:00
|
|
|
free_p:
|
|
|
|
kfree(p);
|
|
|
|
return NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2011-01-09 22:36:31 +03:00
|
|
|
EXPORT_SYMBOL(alloc_netdev_mqs);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* free_netdev - free network device
|
|
|
|
* @dev: device
|
|
|
|
*
|
2007-02-09 17:24:36 +03:00
|
|
|
* This function does the last stage of destroying an allocated device
|
|
|
|
* interface. The reference to the device object is released.
|
2005-04-17 02:20:36 +04:00
|
|
|
* If this is the last reference then it will be freed.
|
|
|
|
*/
|
|
|
|
void free_netdev(struct net_device *dev)
|
|
|
|
{
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
struct napi_struct *p, *n;
|
|
|
|
|
2008-04-16 13:02:18 +04:00
|
|
|
release_net(dev_net(dev));
|
|
|
|
|
2008-07-17 11:34:19 +04:00
|
|
|
kfree(dev->_tx);
|
2010-11-09 13:47:38 +03:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
kfree(dev->_rx);
|
|
|
|
#endif
|
2008-07-17 11:34:19 +04:00
|
|
|
|
2010-10-02 10:11:55 +04:00
|
|
|
kfree(rcu_dereference_raw(dev->ingress_queue));
|
|
|
|
|
2009-05-05 06:48:28 +04:00
|
|
|
/* Flush device addresses */
|
|
|
|
dev_addr_flush(dev);
|
|
|
|
|
2010-02-11 07:03:05 +03:00
|
|
|
/* Clear ethtool n-tuple list */
|
|
|
|
ethtool_ntuple_flush(dev);
|
|
|
|
|
net: Add Generic Receive Offload infrastructure
This patch adds the top-level GRO (Generic Receive Offload) infrastructure.
This is pretty similar to LRO except that this is protocol-independent.
Instead of holding packets in an lro_mgr structure, they're now held in
napi_struct.
For drivers that intend to use this, they can set the NETIF_F_GRO bit and
call napi_gro_receive instead of netif_receive_skb or just call netif_rx.
The latter will call napi_receive_skb automatically. When napi_gro_receive
is used, the driver must either call napi_complete/napi_rx_complete, or
call napi_gro_flush in softirq context if the driver uses the primitives
__napi_complete/__napi_rx_complete.
Protocols will set the gro_receive and gro_complete function pointers in
order to participate in this scheme.
In addition to the packet, gro_receive will get a list of currently held
packets. Each packet in the list has a same_flow field which is non-zero
if it is a potential match for the new packet. For each packet that may
match, they also have a flush field which is non-zero if the held packet
must not be merged with the new packet.
Once gro_receive has determined that the new skb matches a held packet,
the held packet may be processed immediately if the new skb cannot be
merged with it. In this case gro_receive should return the pointer to
the existing skb in gro_list. Otherwise the new skb should be merged into
the existing packet and NULL should be returned, unless the new skb makes
it impossible for any further merges to be made (e.g., FIN packet) where
the merged skb should be returned.
Whenever the skb is merged into an existing entry, the gro_receive
function should set NAPI_GRO_CB(skb)->same_flow. Note that if an skb
merely matches an existing entry but can't be merged with it, then
this shouldn't be set.
If gro_receive finds it pointless to hold the new skb for future merging,
it should set NAPI_GRO_CB(skb)->flush.
Held packets will be flushed by napi_gro_flush which is called by
napi_complete and napi_rx_complete.
Currently held packets are stored in a singly liked list just like LRO.
The list is limited to a maximum of 8 entries. In future, this may be
expanded to use a hash table to allow more flows to be held for merging.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-16 10:38:52 +03:00
|
|
|
list_for_each_entry_safe(p, n, &dev->napi_list, dev_list)
|
|
|
|
netif_napi_del(p);
|
|
|
|
|
net: percpu net_device refcount
We tried very hard to remove all possible dev_hold()/dev_put() pairs in
network stack, using RCU conversions.
There is still an unavoidable device refcount change for every dst we
create/destroy, and this can slow down some workloads (routers or some
app servers, mmap af_packet)
We can switch to a percpu refcount implementation, now dynamic per_cpu
infrastructure is mature. On a 64 cpus machine, this consumes 256 bytes
per device.
On x86, dev_hold(dev) code :
before
lock incl 0x280(%ebx)
after:
movl 0x260(%ebx),%eax
incl fs:(%eax)
Stress bench :
(Sending 160.000.000 UDP frames,
IP route cache disabled, dual E5540 @2.53GHz,
32bit kernel, FIB_TRIE)
Before:
real 1m1.662s
user 0m14.373s
sys 12m55.960s
After:
real 0m51.179s
user 0m15.329s
sys 10m15.942s
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-11 14:22:12 +04:00
|
|
|
free_percpu(dev->pcpu_refcnt);
|
|
|
|
dev->pcpu_refcnt = NULL;
|
|
|
|
|
2006-05-27 00:25:24 +04:00
|
|
|
/* Compatibility with error handling in drivers */
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dev->reg_state == NETREG_UNINITIALIZED) {
|
|
|
|
kfree((char *)dev - dev->padded);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
BUG_ON(dev->reg_state != NETREG_UNREGISTERED);
|
|
|
|
dev->reg_state = NETREG_RELEASED;
|
|
|
|
|
2002-04-09 23:14:34 +04:00
|
|
|
/* will free via device release */
|
|
|
|
put_device(&dev->dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(free_netdev);
|
2007-02-09 17:24:36 +03:00
|
|
|
|
2008-09-30 13:23:58 +04:00
|
|
|
/**
|
|
|
|
* synchronize_net - Synchronize with packet receive processing
|
|
|
|
*
|
|
|
|
* Wait for packets currently being received to be done.
|
|
|
|
* Does not block later packets from starting.
|
|
|
|
*/
|
2007-02-09 17:24:36 +03:00
|
|
|
void synchronize_net(void)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
might_sleep();
|
2005-05-01 19:59:04 +04:00
|
|
|
synchronize_rcu();
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-09-03 12:29:39 +04:00
|
|
|
EXPORT_SYMBOL(synchronize_net);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/**
|
2009-10-27 10:03:04 +03:00
|
|
|
* unregister_netdevice_queue - remove device from the kernel
|
2005-04-17 02:20:36 +04:00
|
|
|
* @dev: device
|
2009-10-27 10:03:04 +03:00
|
|
|
* @head: list
|
2009-11-23 07:43:13 +03:00
|
|
|
*
|
2005-04-17 02:20:36 +04:00
|
|
|
* This function shuts down a device interface and removes it
|
2007-12-11 13:28:03 +03:00
|
|
|
* from the kernel tables.
|
2009-10-27 10:03:04 +03:00
|
|
|
* If head not NULL, device is queued to be unregistered later.
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* Callers must hold the rtnl semaphore. You may want
|
|
|
|
* unregister_netdev() instead of this.
|
|
|
|
*/
|
|
|
|
|
2009-10-27 10:03:04 +03:00
|
|
|
void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-12-13 06:21:56 +03:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2009-10-27 10:03:04 +03:00
|
|
|
if (head) {
|
2009-10-30 17:51:13 +03:00
|
|
|
list_move_tail(&dev->unreg_list, head);
|
2009-10-27 10:03:04 +03:00
|
|
|
} else {
|
|
|
|
rollback_registered(dev);
|
|
|
|
/* Finish processing unregister after unlock */
|
|
|
|
net_set_todo(dev);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-10-27 10:03:04 +03:00
|
|
|
EXPORT_SYMBOL(unregister_netdevice_queue);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-27 10:04:19 +03:00
|
|
|
/**
|
|
|
|
* unregister_netdevice_many - unregister many devices
|
|
|
|
* @head: list of devices
|
|
|
|
*/
|
|
|
|
void unregister_netdevice_many(struct list_head *head)
|
|
|
|
{
|
|
|
|
struct net_device *dev;
|
|
|
|
|
|
|
|
if (!list_empty(head)) {
|
|
|
|
rollback_registered_many(head);
|
|
|
|
list_for_each_entry(dev, head, unreg_list)
|
|
|
|
net_set_todo(dev);
|
|
|
|
}
|
|
|
|
}
|
2009-10-27 10:06:49 +03:00
|
|
|
EXPORT_SYMBOL(unregister_netdevice_many);
|
2009-10-27 10:04:19 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/**
|
|
|
|
* unregister_netdev - remove device from the kernel
|
|
|
|
* @dev: device
|
|
|
|
*
|
|
|
|
* This function shuts down a device interface and removes it
|
2007-12-11 13:28:03 +03:00
|
|
|
* from the kernel tables.
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* This is just a wrapper for unregister_netdevice that takes
|
|
|
|
* the rtnl semaphore. In general you want to use this and not
|
|
|
|
* unregister_netdevice.
|
|
|
|
*/
|
|
|
|
void unregister_netdev(struct net_device *dev)
|
|
|
|
{
|
|
|
|
rtnl_lock();
|
|
|
|
unregister_netdevice(dev);
|
|
|
|
rtnl_unlock();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(unregister_netdev);
|
|
|
|
|
2007-09-12 15:53:49 +04:00
|
|
|
/**
|
|
|
|
* dev_change_net_namespace - move device to different nethost namespace
|
|
|
|
* @dev: device
|
|
|
|
* @net: network namespace
|
|
|
|
* @pat: If not NULL name pattern to try if the current device name
|
|
|
|
* is already taken in the destination network namespace.
|
|
|
|
*
|
|
|
|
* This function shuts down a device interface and moves it
|
|
|
|
* to a new network namespace. On success 0 is returned, on
|
|
|
|
* a failure a netagive errno code is returned.
|
|
|
|
*
|
|
|
|
* Callers must hold the rtnl semaphore.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int dev_change_net_namespace(struct net_device *dev, struct net *net, const char *pat)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
/* Don't allow namespace local devices to be moved. */
|
|
|
|
err = -EINVAL;
|
|
|
|
if (dev->features & NETIF_F_NETNS_LOCAL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Ensure the device has been registrered */
|
|
|
|
err = -EINVAL;
|
|
|
|
if (dev->reg_state != NETREG_REGISTERED)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Get out if there is nothing todo */
|
|
|
|
err = 0;
|
2008-03-25 21:57:35 +03:00
|
|
|
if (net_eq(dev_net(dev), net))
|
2007-09-12 15:53:49 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Pick the destination device name, and ensure
|
|
|
|
* we can use it in the destination network namespace.
|
|
|
|
*/
|
|
|
|
err = -EEXIST;
|
2009-11-18 05:36:59 +03:00
|
|
|
if (__dev_get_by_name(net, dev->name)) {
|
2007-09-12 15:53:49 +04:00
|
|
|
/* We get here if we can't use the current device name */
|
|
|
|
if (!pat)
|
|
|
|
goto out;
|
2010-05-19 14:12:19 +04:00
|
|
|
if (dev_get_valid_name(dev, pat, 1))
|
2007-09-12 15:53:49 +04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* And now a mini version of register_netdevice unregister_netdevice.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* If device is running close it first. */
|
2007-10-10 13:49:09 +04:00
|
|
|
dev_close(dev);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/* And unlink it from device chain */
|
|
|
|
err = -ENODEV;
|
|
|
|
unlist_netdevice(dev);
|
|
|
|
|
|
|
|
synchronize_net();
|
|
|
|
|
|
|
|
/* Shutdown queueing discipline. */
|
|
|
|
dev_shutdown(dev);
|
|
|
|
|
|
|
|
/* Notify protocols, that we are about to destroy
|
|
|
|
this device. They should clean all the things.
|
2010-09-17 07:22:19 +04:00
|
|
|
|
|
|
|
Note that dev->reg_state stays at NETREG_REGISTERED.
|
|
|
|
This is wanted because this way 8021q and macvlan know
|
|
|
|
the device is just moving and can keep their slaves up.
|
2007-09-12 15:53:49 +04:00
|
|
|
*/
|
|
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
|
2009-11-29 18:45:58 +03:00
|
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Flush the unicast and multicast chains
|
|
|
|
*/
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_flush(dev);
|
2010-04-02 01:22:57 +04:00
|
|
|
dev_mc_flush(dev);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/* Actually switch the network namespace */
|
2008-03-25 15:47:49 +03:00
|
|
|
dev_net_set(dev, net);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/* If there is an ifindex conflict assign a new one */
|
|
|
|
if (__dev_get_by_index(net, dev->ifindex)) {
|
|
|
|
int iflink = (dev->iflink == dev->ifindex);
|
|
|
|
dev->ifindex = dev_new_index(net);
|
|
|
|
if (iflink)
|
|
|
|
dev->iflink = dev->ifindex;
|
|
|
|
}
|
|
|
|
|
2007-09-27 09:02:53 +04:00
|
|
|
/* Fixup kobjects */
|
2010-05-05 04:36:49 +04:00
|
|
|
err = device_rename(&dev->dev, dev->name);
|
2007-09-27 09:02:53 +04:00
|
|
|
WARN_ON(err);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/* Add the device back in the hashes */
|
|
|
|
list_netdevice(dev);
|
|
|
|
|
|
|
|
/* Notify protocols, that a new device appeared. */
|
|
|
|
call_netdevice_notifiers(NETDEV_REGISTER, dev);
|
|
|
|
|
2009-12-13 01:11:15 +03:00
|
|
|
/*
|
|
|
|
* Prevent userspace races by waiting until the network
|
|
|
|
* device is fully setup before sending notifications.
|
|
|
|
*/
|
|
|
|
rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
|
|
|
|
|
2007-09-12 15:53:49 +04:00
|
|
|
synchronize_net();
|
|
|
|
err = 0;
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
2009-07-14 02:33:35 +04:00
|
|
|
EXPORT_SYMBOL_GPL(dev_change_net_namespace);
|
2007-09-12 15:53:49 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static int dev_cpu_callback(struct notifier_block *nfb,
|
|
|
|
unsigned long action,
|
|
|
|
void *ocpu)
|
|
|
|
{
|
|
|
|
struct sk_buff **list_skb;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
unsigned int cpu, oldcpu = (unsigned long)ocpu;
|
|
|
|
struct softnet_data *sd, *oldsd;
|
|
|
|
|
2007-05-09 13:35:10 +04:00
|
|
|
if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
|
2005-04-17 02:20:36 +04:00
|
|
|
return NOTIFY_OK;
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
cpu = smp_processor_id();
|
|
|
|
sd = &per_cpu(softnet_data, cpu);
|
|
|
|
oldsd = &per_cpu(softnet_data, oldcpu);
|
|
|
|
|
|
|
|
/* Find end of our completion_queue. */
|
|
|
|
list_skb = &sd->completion_queue;
|
|
|
|
while (*list_skb)
|
|
|
|
list_skb = &(*list_skb)->next;
|
|
|
|
/* Append completion queue from offline CPU. */
|
|
|
|
*list_skb = oldsd->completion_queue;
|
|
|
|
oldsd->completion_queue = NULL;
|
|
|
|
|
|
|
|
/* Append output queue from offline CPU. */
|
2010-04-27 03:06:24 +04:00
|
|
|
if (oldsd->output_queue) {
|
|
|
|
*sd->output_queue_tailp = oldsd->output_queue;
|
|
|
|
sd->output_queue_tailp = oldsd->output_queue_tailp;
|
|
|
|
oldsd->output_queue = NULL;
|
|
|
|
oldsd->output_queue_tailp = &oldsd->output_queue;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
raise_softirq_irqoff(NET_TX_SOFTIRQ);
|
|
|
|
local_irq_enable();
|
|
|
|
|
|
|
|
/* Process offline CPU's input_pkt_queue */
|
2010-05-20 22:37:59 +04:00
|
|
|
while ((skb = __skb_dequeue(&oldsd->process_queue))) {
|
2005-04-17 02:20:36 +04:00
|
|
|
netif_rx(skb);
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_head_incr(oldsd);
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
}
|
2010-05-20 22:37:59 +04:00
|
|
|
while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
|
2010-04-28 02:07:33 +04:00
|
|
|
netif_rx(skb);
|
2010-05-20 22:37:59 +04:00
|
|
|
input_queue_head_incr(oldsd);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-11 02:47:58 +04:00
|
|
|
/**
|
2008-10-23 12:11:29 +04:00
|
|
|
* netdev_increment_features - increment feature set by one
|
|
|
|
* @all: current feature set
|
|
|
|
* @one: new feature set
|
|
|
|
* @mask: mask feature set
|
2007-08-11 02:47:58 +04:00
|
|
|
*
|
|
|
|
* Computes a new feature set after adding a device with feature set
|
2008-10-23 12:11:29 +04:00
|
|
|
* @one to the master device with current feature set @all. Will not
|
|
|
|
* enable anything that is off in @mask. Returns the new feature set.
|
2007-08-11 02:47:58 +04:00
|
|
|
*/
|
2008-10-23 12:11:29 +04:00
|
|
|
unsigned long netdev_increment_features(unsigned long all, unsigned long one,
|
|
|
|
unsigned long mask)
|
|
|
|
{
|
|
|
|
/* If device needs checksumming, downgrade to it. */
|
2009-09-03 12:29:39 +04:00
|
|
|
if (all & NETIF_F_NO_CSUM && !(one & NETIF_F_NO_CSUM))
|
2008-10-23 12:11:29 +04:00
|
|
|
all ^= NETIF_F_NO_CSUM | (one & NETIF_F_ALL_CSUM);
|
|
|
|
else if (mask & NETIF_F_ALL_CSUM) {
|
|
|
|
/* If one device supports v4/v6 checksumming, set for all. */
|
|
|
|
if (one & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM) &&
|
|
|
|
!(all & NETIF_F_GEN_CSUM)) {
|
|
|
|
all &= ~NETIF_F_ALL_CSUM;
|
|
|
|
all |= one & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
|
|
|
|
}
|
2008-09-09 03:10:02 +04:00
|
|
|
|
2008-10-23 12:11:29 +04:00
|
|
|
/* If one device supports hw checksumming, set for all. */
|
|
|
|
if (one & NETIF_F_GEN_CSUM && !(all & NETIF_F_GEN_CSUM)) {
|
|
|
|
all &= ~NETIF_F_ALL_CSUM;
|
|
|
|
all |= NETIF_F_HW_CSUM;
|
|
|
|
}
|
|
|
|
}
|
2007-08-11 02:47:58 +04:00
|
|
|
|
2008-10-23 12:11:29 +04:00
|
|
|
one |= NETIF_F_ALL_CSUM;
|
2007-08-11 02:47:58 +04:00
|
|
|
|
2008-10-23 12:11:29 +04:00
|
|
|
one |= all & NETIF_F_ONE_FOR_ALL;
|
2009-10-07 16:24:25 +04:00
|
|
|
all &= one | NETIF_F_LLTX | NETIF_F_GSO | NETIF_F_UFO;
|
2008-10-23 12:11:29 +04:00
|
|
|
all |= one & mask & NETIF_F_ONE_FOR_ALL;
|
2007-08-11 02:47:58 +04:00
|
|
|
|
|
|
|
return all;
|
|
|
|
}
|
2008-10-23 12:11:29 +04:00
|
|
|
EXPORT_SYMBOL(netdev_increment_features);
|
2007-08-11 02:47:58 +04:00
|
|
|
|
2007-09-17 02:40:33 +04:00
|
|
|
static struct hlist_head *netdev_create_hash(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct hlist_head *hash;
|
|
|
|
|
|
|
|
hash = kmalloc(sizeof(*hash) * NETDEV_HASHENTRIES, GFP_KERNEL);
|
|
|
|
if (hash != NULL)
|
|
|
|
for (i = 0; i < NETDEV_HASHENTRIES; i++)
|
|
|
|
INIT_HLIST_HEAD(&hash[i]);
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
/* Initialize per network namespace state */
|
2007-10-09 07:38:39 +04:00
|
|
|
static int __net_init netdev_init(struct net *net)
|
2007-09-17 22:56:21 +04:00
|
|
|
{
|
|
|
|
INIT_LIST_HEAD(&net->dev_base_head);
|
|
|
|
|
2007-09-17 02:40:33 +04:00
|
|
|
net->dev_name_head = netdev_create_hash();
|
|
|
|
if (net->dev_name_head == NULL)
|
|
|
|
goto err_name;
|
2007-09-17 22:56:21 +04:00
|
|
|
|
2007-09-17 02:40:33 +04:00
|
|
|
net->dev_index_head = netdev_create_hash();
|
|
|
|
if (net->dev_index_head == NULL)
|
|
|
|
goto err_idx;
|
2007-09-17 22:56:21 +04:00
|
|
|
|
|
|
|
return 0;
|
2007-09-17 02:40:33 +04:00
|
|
|
|
|
|
|
err_idx:
|
|
|
|
kfree(net->dev_name_head);
|
|
|
|
err_name:
|
|
|
|
return -ENOMEM;
|
2007-09-17 22:56:21 +04:00
|
|
|
}
|
|
|
|
|
2008-09-30 13:23:58 +04:00
|
|
|
/**
|
|
|
|
* netdev_drivername - network driver for the device
|
|
|
|
* @dev: network device
|
|
|
|
* @buffer: buffer for resulting name
|
|
|
|
* @len: size of buffer
|
|
|
|
*
|
|
|
|
* Determine network driver for device.
|
|
|
|
*/
|
2008-09-30 13:22:14 +04:00
|
|
|
char *netdev_drivername(const struct net_device *dev, char *buffer, int len)
|
2008-07-22 00:31:48 +04:00
|
|
|
{
|
2008-09-30 13:22:14 +04:00
|
|
|
const struct device_driver *driver;
|
|
|
|
const struct device *parent;
|
2008-07-22 00:31:48 +04:00
|
|
|
|
|
|
|
if (len <= 0 || !buffer)
|
|
|
|
return buffer;
|
|
|
|
buffer[0] = 0;
|
|
|
|
|
|
|
|
parent = dev->dev.parent;
|
|
|
|
|
|
|
|
if (!parent)
|
|
|
|
return buffer;
|
|
|
|
|
|
|
|
driver = parent->driver;
|
|
|
|
if (driver && driver->name)
|
|
|
|
strlcpy(buffer, driver->name, len);
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2010-06-27 05:02:35 +04:00
|
|
|
static int __netdev_printk(const char *level, const struct net_device *dev,
|
|
|
|
struct va_format *vaf)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
if (dev && dev->dev.parent)
|
|
|
|
r = dev_printk(level, dev->dev.parent, "%s: %pV",
|
|
|
|
netdev_name(dev), vaf);
|
|
|
|
else if (dev)
|
|
|
|
r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
|
|
|
|
else
|
|
|
|
r = printk("%s(NULL net_device): %pV", level, vaf);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int netdev_printk(const char *level, const struct net_device *dev,
|
|
|
|
const char *format, ...)
|
|
|
|
{
|
|
|
|
struct va_format vaf;
|
|
|
|
va_list args;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
va_start(args, format);
|
|
|
|
|
|
|
|
vaf.fmt = format;
|
|
|
|
vaf.va = &args;
|
|
|
|
|
|
|
|
r = __netdev_printk(level, dev, &vaf);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netdev_printk);
|
|
|
|
|
|
|
|
#define define_netdev_printk_level(func, level) \
|
|
|
|
int func(const struct net_device *dev, const char *fmt, ...) \
|
|
|
|
{ \
|
|
|
|
int r; \
|
|
|
|
struct va_format vaf; \
|
|
|
|
va_list args; \
|
|
|
|
\
|
|
|
|
va_start(args, fmt); \
|
|
|
|
\
|
|
|
|
vaf.fmt = fmt; \
|
|
|
|
vaf.va = &args; \
|
|
|
|
\
|
|
|
|
r = __netdev_printk(level, dev, &vaf); \
|
|
|
|
va_end(args); \
|
|
|
|
\
|
|
|
|
return r; \
|
|
|
|
} \
|
|
|
|
EXPORT_SYMBOL(func);
|
|
|
|
|
|
|
|
define_netdev_printk_level(netdev_emerg, KERN_EMERG);
|
|
|
|
define_netdev_printk_level(netdev_alert, KERN_ALERT);
|
|
|
|
define_netdev_printk_level(netdev_crit, KERN_CRIT);
|
|
|
|
define_netdev_printk_level(netdev_err, KERN_ERR);
|
|
|
|
define_netdev_printk_level(netdev_warn, KERN_WARNING);
|
|
|
|
define_netdev_printk_level(netdev_notice, KERN_NOTICE);
|
|
|
|
define_netdev_printk_level(netdev_info, KERN_INFO);
|
|
|
|
|
2007-10-09 07:38:39 +04:00
|
|
|
static void __net_exit netdev_exit(struct net *net)
|
2007-09-17 22:56:21 +04:00
|
|
|
{
|
|
|
|
kfree(net->dev_name_head);
|
|
|
|
kfree(net->dev_index_head);
|
|
|
|
}
|
|
|
|
|
2007-11-13 14:23:50 +03:00
|
|
|
static struct pernet_operations __net_initdata netdev_net_ops = {
|
2007-09-17 22:56:21 +04:00
|
|
|
.init = netdev_init,
|
|
|
|
.exit = netdev_exit,
|
|
|
|
};
|
|
|
|
|
2007-10-09 07:38:39 +04:00
|
|
|
static void __net_exit default_device_exit(struct net *net)
|
2007-09-12 15:53:49 +04:00
|
|
|
{
|
2009-11-30 01:25:30 +03:00
|
|
|
struct net_device *dev, *aux;
|
2007-09-12 15:53:49 +04:00
|
|
|
/*
|
2009-11-30 01:25:30 +03:00
|
|
|
* Push all migratable network devices back to the
|
2007-09-12 15:53:49 +04:00
|
|
|
* initial network namespace
|
|
|
|
*/
|
|
|
|
rtnl_lock();
|
2009-11-30 01:25:30 +03:00
|
|
|
for_each_netdev_safe(net, dev, aux) {
|
2007-09-12 15:53:49 +04:00
|
|
|
int err;
|
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
When a net namespace is destroyed, some devices (those, not killed
on ns stop explicitly) are moved back to init_net.
The problem, is that this net_ns change has one point of failure -
the __dev_alloc_name() may be called if a name collision occurs (and
this is easy to trigger). This allocator performs a likely-to-fail
GFP_ATOMIC allocation to find a suitable number. Other possible
conditions that may cause error (for device being ns local or not
registered) are always false in this case.
So, when this call fails, the device is unregistered. But this is
*not* the right thing to do, since after this the device may be
released (and kfree-ed) improperly. E. g. bridges require more
actions (sysfs update, timer disarming, etc.), some other devices
want to remove their private areas from lists, etc.
I. e. arbitrary use-after-free cases may occur.
The proposed fix is the following: since the only reason for the
dev_change_net_namespace to fail is the name generation, we may
give it a unique fall-back name w/o %d-s in it - the dev<ifindex>
one, since ifindexes are still unique.
So make this change, raise the failure-case printk loglevel to
EMERG and replace the unregister_netdevice call with BUG().
[ Use snprintf() -DaveM ]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-05-08 12:24:25 +04:00
|
|
|
char fb_name[IFNAMSIZ];
|
2007-09-12 15:53:49 +04:00
|
|
|
|
|
|
|
/* Ignore unmoveable devices (i.e. loopback) */
|
|
|
|
if (dev->features & NETIF_F_NETNS_LOCAL)
|
|
|
|
continue;
|
|
|
|
|
2009-11-30 01:25:30 +03:00
|
|
|
/* Leave virtual devices for the generic cleanup */
|
|
|
|
if (dev->rtnl_link_ops)
|
|
|
|
continue;
|
2008-11-06 02:59:38 +03:00
|
|
|
|
2007-09-12 15:53:49 +04:00
|
|
|
/* Push remaing network devices to init_net */
|
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
When a net namespace is destroyed, some devices (those, not killed
on ns stop explicitly) are moved back to init_net.
The problem, is that this net_ns change has one point of failure -
the __dev_alloc_name() may be called if a name collision occurs (and
this is easy to trigger). This allocator performs a likely-to-fail
GFP_ATOMIC allocation to find a suitable number. Other possible
conditions that may cause error (for device being ns local or not
registered) are always false in this case.
So, when this call fails, the device is unregistered. But this is
*not* the right thing to do, since after this the device may be
released (and kfree-ed) improperly. E. g. bridges require more
actions (sysfs update, timer disarming, etc.), some other devices
want to remove their private areas from lists, etc.
I. e. arbitrary use-after-free cases may occur.
The proposed fix is the following: since the only reason for the
dev_change_net_namespace to fail is the name generation, we may
give it a unique fall-back name w/o %d-s in it - the dev<ifindex>
one, since ifindexes are still unique.
So make this change, raise the failure-case printk loglevel to
EMERG and replace the unregister_netdevice call with BUG().
[ Use snprintf() -DaveM ]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-05-08 12:24:25 +04:00
|
|
|
snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
|
|
|
|
err = dev_change_net_namespace(dev, &init_net, fb_name);
|
2007-09-12 15:53:49 +04:00
|
|
|
if (err) {
|
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
When a net namespace is destroyed, some devices (those, not killed
on ns stop explicitly) are moved back to init_net.
The problem, is that this net_ns change has one point of failure -
the __dev_alloc_name() may be called if a name collision occurs (and
this is easy to trigger). This allocator performs a likely-to-fail
GFP_ATOMIC allocation to find a suitable number. Other possible
conditions that may cause error (for device being ns local or not
registered) are always false in this case.
So, when this call fails, the device is unregistered. But this is
*not* the right thing to do, since after this the device may be
released (and kfree-ed) improperly. E. g. bridges require more
actions (sysfs update, timer disarming, etc.), some other devices
want to remove their private areas from lists, etc.
I. e. arbitrary use-after-free cases may occur.
The proposed fix is the following: since the only reason for the
dev_change_net_namespace to fail is the name generation, we may
give it a unique fall-back name w/o %d-s in it - the dev<ifindex>
one, since ifindexes are still unique.
So make this change, raise the failure-case printk loglevel to
EMERG and replace the unregister_netdevice call with BUG().
[ Use snprintf() -DaveM ]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-05-08 12:24:25 +04:00
|
|
|
printk(KERN_EMERG "%s: failed to move %s to init_net: %d\n",
|
2007-09-12 15:53:49 +04:00
|
|
|
__func__, dev->name, err);
|
netns: Fix arbitrary net_device-s corruptions on net_ns stop.
When a net namespace is destroyed, some devices (those, not killed
on ns stop explicitly) are moved back to init_net.
The problem, is that this net_ns change has one point of failure -
the __dev_alloc_name() may be called if a name collision occurs (and
this is easy to trigger). This allocator performs a likely-to-fail
GFP_ATOMIC allocation to find a suitable number. Other possible
conditions that may cause error (for device being ns local or not
registered) are always false in this case.
So, when this call fails, the device is unregistered. But this is
*not* the right thing to do, since after this the device may be
released (and kfree-ed) improperly. E. g. bridges require more
actions (sysfs update, timer disarming, etc.), some other devices
want to remove their private areas from lists, etc.
I. e. arbitrary use-after-free cases may occur.
The proposed fix is the following: since the only reason for the
dev_change_net_namespace to fail is the name generation, we may
give it a unique fall-back name w/o %d-s in it - the dev<ifindex>
one, since ifindexes are still unique.
So make this change, raise the failure-case printk loglevel to
EMERG and replace the unregister_netdevice call with BUG().
[ Use snprintf() -DaveM ]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-05-08 12:24:25 +04:00
|
|
|
BUG();
|
2007-09-12 15:53:49 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
rtnl_unlock();
|
|
|
|
}
|
|
|
|
|
2009-12-03 05:29:04 +03:00
|
|
|
static void __net_exit default_device_exit_batch(struct list_head *net_list)
|
|
|
|
{
|
|
|
|
/* At exit all network devices most be removed from a network
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-01 22:38:34 +03:00
|
|
|
* namespace. Do this in the reverse order of registration.
|
2009-12-03 05:29:04 +03:00
|
|
|
* Do this across as many network namespaces as possible to
|
|
|
|
* improve batching efficiency.
|
|
|
|
*/
|
|
|
|
struct net_device *dev;
|
|
|
|
struct net *net;
|
|
|
|
LIST_HEAD(dev_kill_list);
|
|
|
|
|
|
|
|
rtnl_lock();
|
|
|
|
list_for_each_entry(net, net_list, exit_list) {
|
|
|
|
for_each_netdev_reverse(net, dev) {
|
|
|
|
if (dev->rtnl_link_ops)
|
|
|
|
dev->rtnl_link_ops->dellink(dev, &dev_kill_list);
|
|
|
|
else
|
|
|
|
unregister_netdevice_queue(dev, &dev_kill_list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unregister_netdevice_many(&dev_kill_list);
|
|
|
|
rtnl_unlock();
|
|
|
|
}
|
|
|
|
|
2007-11-13 14:23:50 +03:00
|
|
|
static struct pernet_operations __net_initdata default_device_ops = {
|
2007-09-12 15:53:49 +04:00
|
|
|
.exit = default_device_exit,
|
2009-12-03 05:29:04 +03:00
|
|
|
.exit_batch = default_device_exit_batch,
|
2007-09-12 15:53:49 +04:00
|
|
|
};
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Initialize the DEV module. At boot time this walks the device list and
|
|
|
|
* unhooks any devices that fail to initialise (normally hardware not
|
|
|
|
* present) and leaves us with a valid list of present and active devices.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is called single threaded during boot, so no need
|
|
|
|
* to take the rtnl semaphore.
|
|
|
|
*/
|
|
|
|
static int __init net_dev_init(void)
|
|
|
|
{
|
|
|
|
int i, rc = -ENOMEM;
|
|
|
|
|
|
|
|
BUG_ON(!dev_boot_phase);
|
|
|
|
|
|
|
|
if (dev_proc_init())
|
|
|
|
goto out;
|
|
|
|
|
2007-09-27 09:02:53 +04:00
|
|
|
if (netdev_kobject_init())
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&ptype_all);
|
2007-11-26 15:12:58 +03:00
|
|
|
for (i = 0; i < PTYPE_HASH_SIZE; i++)
|
2005-04-17 02:20:36 +04:00
|
|
|
INIT_LIST_HEAD(&ptype_base[i]);
|
|
|
|
|
2007-09-17 22:56:21 +04:00
|
|
|
if (register_pernet_subsys(&netdev_net_ops))
|
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialise the packet receive queues.
|
|
|
|
*/
|
|
|
|
|
2006-04-11 09:52:50 +04:00
|
|
|
for_each_possible_cpu(i) {
|
2010-04-20 01:17:14 +04:00
|
|
|
struct softnet_data *sd = &per_cpu(softnet_data, i);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-05-02 09:42:16 +04:00
|
|
|
memset(sd, 0, sizeof(*sd));
|
2010-04-20 01:17:14 +04:00
|
|
|
skb_queue_head_init(&sd->input_pkt_queue);
|
2010-04-28 02:07:33 +04:00
|
|
|
skb_queue_head_init(&sd->process_queue);
|
2010-04-20 01:17:14 +04:00
|
|
|
sd->completion_queue = NULL;
|
|
|
|
INIT_LIST_HEAD(&sd->poll_list);
|
2010-04-27 03:06:24 +04:00
|
|
|
sd->output_queue = NULL;
|
|
|
|
sd->output_queue_tailp = &sd->output_queue;
|
2010-03-24 22:13:54 +03:00
|
|
|
#ifdef CONFIG_RPS
|
2010-04-20 01:17:14 +04:00
|
|
|
sd->csd.func = rps_trigger_softirq;
|
|
|
|
sd->csd.info = sd;
|
|
|
|
sd->csd.flags = 0;
|
|
|
|
sd->cpu = i;
|
2010-03-19 03:45:44 +03:00
|
|
|
#endif
|
2010-03-16 11:03:29 +03:00
|
|
|
|
2010-04-20 01:17:14 +04:00
|
|
|
sd->backlog.poll = process_backlog;
|
|
|
|
sd->backlog.weight = weight_p;
|
|
|
|
sd->backlog.gro_list = NULL;
|
|
|
|
sd->backlog.gro_count = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
dev_boot_phase = 0;
|
|
|
|
|
2008-11-08 09:54:20 +03:00
|
|
|
/* The loopback device is special if any other network devices
|
|
|
|
* is present in a network namespace the loopback device must
|
|
|
|
* be present. Since we now dynamically allocate and free the
|
|
|
|
* loopback device ensure this invariant is maintained by
|
|
|
|
* keeping the loopback device as the first device on the
|
|
|
|
* list of network devices. Ensuring the loopback devices
|
|
|
|
* is the first device that appears and the last network device
|
|
|
|
* that disappears.
|
|
|
|
*/
|
|
|
|
if (register_pernet_device(&loopback_net_ops))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (register_pernet_device(&default_device_ops))
|
|
|
|
goto out;
|
|
|
|
|
Remove argument from open_softirq which is always NULL
As git-grep shows, open_softirq() is always called with the last argument
being NULL
block/blk-core.c: open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
kernel/hrtimer.c: open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq, NULL);
kernel/rcuclassic.c: open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL);
kernel/rcupreempt.c: open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL);
kernel/sched.c: open_softirq(SCHED_SOFTIRQ, run_rebalance_domains, NULL);
kernel/softirq.c: open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL);
kernel/softirq.c: open_softirq(HI_SOFTIRQ, tasklet_hi_action, NULL);
kernel/timer.c: open_softirq(TIMER_SOFTIRQ, run_timer_softirq, NULL);
net/core/dev.c: open_softirq(NET_TX_SOFTIRQ, net_tx_action, NULL);
net/core/dev.c: open_softirq(NET_RX_SOFTIRQ, net_rx_action, NULL);
This observation has already been made by Matthew Wilcox in June 2002
(http://www.cs.helsinki.fi/linux/linux-kernel/2002-25/0687.html)
"I notice that none of the current softirq routines use the data element
passed to them."
and the situation hasn't changed since them. So it appears we can safely
remove that extra argument to save 128 (54) bytes of kernel data (text).
Signed-off-by: Carlos R. Mafra <crmafra@ift.unesp.br>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-15 18:15:37 +04:00
|
|
|
open_softirq(NET_TX_SOFTIRQ, net_tx_action);
|
|
|
|
open_softirq(NET_RX_SOFTIRQ, net_rx_action);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
hotcpu_notifier(dev_cpu_callback, 0);
|
|
|
|
dst_init();
|
|
|
|
dev_mcast_init();
|
|
|
|
rc = 0;
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
subsys_initcall(net_dev_init);
|
|
|
|
|
2009-02-19 04:55:02 +03:00
|
|
|
static int __init initialize_hashrnd(void)
|
|
|
|
{
|
2010-03-16 11:03:29 +03:00
|
|
|
get_random_bytes(&hashrnd, sizeof(hashrnd));
|
2009-02-19 04:55:02 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
late_initcall_sync(initialize_hashrnd);
|
|
|
|
|