2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
|
|
* operating system. INET is implemented using the BSD Socket
|
|
|
|
* interface as the means of communication with the user level.
|
|
|
|
*
|
|
|
|
* Definitions for the Interfaces handler.
|
|
|
|
*
|
|
|
|
* Version: @(#)dev.h 1.0.10 08/12/93
|
|
|
|
*
|
2005-05-05 17:16:16 -06:00
|
|
|
* Authors: Ross Biro
|
2005-04-16 16:20:36 -06:00
|
|
|
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
|
|
* Corey Minyard <wf-rch!minyard@relay.EU.net>
|
|
|
|
* Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
|
2008-10-13 20:01:08 -06:00
|
|
|
* Alan Cox, <alan@lxorguk.ukuu.org.uk>
|
2005-04-16 16:20:36 -06:00
|
|
|
* Bjorn Ekwall. <bj0rn@blox.se>
|
|
|
|
* Pekka Riikonen <priikone@poseidon.pspt.fi>
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* Moved to /usr/include/linux for NET3
|
|
|
|
*/
|
|
|
|
#ifndef _LINUX_NETDEVICE_H
|
|
|
|
#define _LINUX_NETDEVICE_H
|
|
|
|
|
|
|
|
#include <linux/if.h>
|
|
|
|
#include <linux/if_ether.h>
|
|
|
|
#include <linux/if_packet.h>
|
2010-02-09 18:43:46 -07:00
|
|
|
#include <linux/if_link.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#ifdef __KERNEL__
|
2010-05-05 17:59:26 -06:00
|
|
|
#include <linux/pm_qos_params.h>
|
2006-12-03 21:15:30 -07:00
|
|
|
#include <linux/timer.h>
|
[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-03 17:41:36 -06:00
|
|
|
#include <linux/delay.h>
|
2009-03-27 16:55:36 -06:00
|
|
|
#include <linux/mm.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <asm/atomic.h>
|
|
|
|
#include <asm/cache.h>
|
|
|
|
#include <asm/byteorder.h>
|
|
|
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/percpu.h>
|
2009-05-06 17:52:51 -06:00
|
|
|
#include <linux/rculist.h>
|
2006-06-17 22:24:58 -06:00
|
|
|
#include <linux/dmaengine.h>
|
[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-03 17:41:36 -06:00
|
|
|
#include <linux/workqueue.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-04-19 22:49:28 -06:00
|
|
|
#include <linux/ethtool.h>
|
2007-09-12 06:57:09 -06:00
|
|
|
#include <net/net_namespace.h>
|
2008-10-07 07:45:02 -06:00
|
|
|
#include <net/dsa.h>
|
2008-11-25 02:02:08 -07:00
|
|
|
#ifdef CONFIG_DCB
|
2008-11-20 21:52:10 -07:00
|
|
|
#include <net/dcbnl.h>
|
|
|
|
#endif
|
2007-09-12 06:57:09 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct vlan_group;
|
2005-06-22 23:05:31 -06:00
|
|
|
struct netpoll_info;
|
2010-07-17 02:49:36 -06:00
|
|
|
struct phy_device;
|
2007-04-23 13:20:05 -06:00
|
|
|
/* 802.11 specific */
|
|
|
|
struct wireless_dev;
|
2005-04-16 16:20:36 -06:00
|
|
|
/* source back-compat hooks */
|
|
|
|
#define SET_ETHTOOL_OPS(netdev,ops) \
|
|
|
|
( (netdev)->ethtool_ops = (ops) )
|
|
|
|
|
|
|
|
#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
|
|
|
|
functions are available. */
|
|
|
|
#define HAVE_FREE_NETDEV /* free_netdev() */
|
|
|
|
#define HAVE_NETDEV_PRIV /* netdev_priv() */
|
|
|
|
|
2010-07-21 20:50:21 -06:00
|
|
|
/* hardware address assignment types */
|
|
|
|
#define NET_ADDR_PERM 0 /* address is permanent (default) */
|
|
|
|
#define NET_ADDR_RANDOM 1 /* address is generated randomly */
|
|
|
|
#define NET_ADDR_STOLEN 2 /* address is stolen from other device */
|
|
|
|
|
2009-11-15 00:20:12 -07:00
|
|
|
/* Backlog congestion levels */
|
|
|
|
#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
|
|
|
|
#define NET_RX_DROP 1 /* packet dropped */
|
|
|
|
|
2009-11-09 23:14:14 -07:00
|
|
|
/*
|
|
|
|
* Transmit return codes: transmit return codes originate from three different
|
|
|
|
* namespaces:
|
|
|
|
*
|
|
|
|
* - qdisc return codes
|
|
|
|
* - driver transmit return codes
|
|
|
|
* - errno values
|
|
|
|
*
|
|
|
|
* Drivers are allowed to return any one of those in their hard_start_xmit()
|
|
|
|
* function. Real network devices commonly used with qdiscs should only return
|
|
|
|
* the driver transmit return codes though - when qdiscs are used, the actual
|
|
|
|
* transmission happens asynchronously, so the value is not propagated to
|
|
|
|
* higher layers. Virtual network devices transmit synchronously, in this case
|
|
|
|
* the driver transmit return codes are consumed by dev_queue_xmit(), all
|
|
|
|
* others are propagated to higher layers.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* qdisc ->enqueue() return codes. */
|
|
|
|
#define NET_XMIT_SUCCESS 0x00
|
2009-11-15 00:20:12 -07:00
|
|
|
#define NET_XMIT_DROP 0x01 /* skb dropped */
|
|
|
|
#define NET_XMIT_CN 0x02 /* congestion notification */
|
|
|
|
#define NET_XMIT_POLICED 0x03 /* skb is shot by police */
|
|
|
|
#define NET_XMIT_MASK 0x0f /* qdisc flags in net/sch_generic.h */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-11-14 06:21:36 -07:00
|
|
|
/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
|
|
|
|
* indicates that the device will soon be dropping packets, or already drops
|
|
|
|
* some packets of the same priority; prompting us to send less aggressively. */
|
2009-11-09 23:14:14 -07:00
|
|
|
#define net_xmit_eval(e) ((e) == NET_XMIT_CN ? 0 : (e))
|
2005-04-16 16:20:36 -06:00
|
|
|
#define net_xmit_errno(e) ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
|
|
|
|
|
2009-08-31 13:50:40 -06:00
|
|
|
/* Driver transmit return codes */
|
2009-11-15 00:20:12 -07:00
|
|
|
#define NETDEV_TX_MASK 0xf0
|
2009-11-09 23:14:14 -07:00
|
|
|
|
2009-08-31 13:50:40 -06:00
|
|
|
enum netdev_tx {
|
2009-11-09 23:14:14 -07:00
|
|
|
__NETDEV_TX_MIN = INT_MIN, /* make sure enum is signed */
|
2009-11-15 00:20:12 -07:00
|
|
|
NETDEV_TX_OK = 0x00, /* driver took care of packet */
|
|
|
|
NETDEV_TX_BUSY = 0x10, /* driver tx path was busy*/
|
|
|
|
NETDEV_TX_LOCKED = 0x20, /* driver tx lock was already taken */
|
2009-08-31 13:50:40 -06:00
|
|
|
};
|
|
|
|
typedef enum netdev_tx netdev_tx_t;
|
|
|
|
|
2009-11-15 00:20:12 -07:00
|
|
|
/*
|
|
|
|
* Current order: NETDEV_TX_MASK > NET_XMIT_MASK >= 0 is significant;
|
|
|
|
* hard_start_xmit() return < NET_XMIT_MASK means skb was consumed.
|
|
|
|
*/
|
|
|
|
static inline bool dev_xmit_complete(int rc)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Positive cases with an skb consumed by a driver:
|
|
|
|
* - successful transmission (rc == NETDEV_TX_OK)
|
|
|
|
* - error while transmitting (rc < 0)
|
|
|
|
* - error while queueing to a different device (rc & NET_XMIT_MASK)
|
|
|
|
*/
|
|
|
|
if (likely(rc < NET_XMIT_MASK))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#define MAX_ADDR_LEN 32 /* Largest hardware address length */
|
|
|
|
|
2008-06-27 20:54:54 -06:00
|
|
|
#ifdef __KERNEL__
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Compute the worst case header length according to the protocols
|
|
|
|
* used.
|
|
|
|
*/
|
2009-02-05 22:26:19 -07:00
|
|
|
|
2010-02-25 10:02:45 -07:00
|
|
|
#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
2008-05-12 21:17:33 -06:00
|
|
|
# if defined(CONFIG_MAC80211_MESH)
|
|
|
|
# define LL_MAX_HEADER 128
|
|
|
|
# else
|
|
|
|
# define LL_MAX_HEADER 96
|
|
|
|
# endif
|
2009-04-27 03:36:20 -06:00
|
|
|
#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
|
2008-05-12 21:17:33 -06:00
|
|
|
# define LL_MAX_HEADER 48
|
2005-04-16 16:20:36 -06:00
|
|
|
#else
|
2008-05-12 21:17:33 -06:00
|
|
|
# define LL_MAX_HEADER 32
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
|
|
|
|
2006-11-28 21:53:39 -07:00
|
|
|
#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \
|
|
|
|
!defined(CONFIG_NET_IPGRE) && !defined(CONFIG_NET_IPGRE_MODULE) && \
|
|
|
|
!defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \
|
|
|
|
!defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)
|
2005-04-16 16:20:36 -06:00
|
|
|
#define MAX_HEADER LL_MAX_HEADER
|
|
|
|
#else
|
|
|
|
#define MAX_HEADER (LL_MAX_HEADER + 48)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
2010-06-08 01:19:54 -06:00
|
|
|
* Old network device statistics. Fields are native words
|
|
|
|
* (unsigned long) so they can be read and written atomically.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2009-02-05 22:26:19 -07:00
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
struct net_device_stats {
|
2010-07-09 03:11:52 -06:00
|
|
|
unsigned long rx_packets;
|
|
|
|
unsigned long tx_packets;
|
|
|
|
unsigned long rx_bytes;
|
|
|
|
unsigned long tx_bytes;
|
|
|
|
unsigned long rx_errors;
|
|
|
|
unsigned long tx_errors;
|
|
|
|
unsigned long rx_dropped;
|
|
|
|
unsigned long tx_dropped;
|
|
|
|
unsigned long multicast;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long collisions;
|
|
|
|
unsigned long rx_length_errors;
|
2010-07-09 03:11:52 -06:00
|
|
|
unsigned long rx_over_errors;
|
|
|
|
unsigned long rx_crc_errors;
|
|
|
|
unsigned long rx_frame_errors;
|
|
|
|
unsigned long rx_fifo_errors;
|
|
|
|
unsigned long rx_missed_errors;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long tx_aborted_errors;
|
|
|
|
unsigned long tx_carrier_errors;
|
|
|
|
unsigned long tx_fifo_errors;
|
|
|
|
unsigned long tx_heartbeat_errors;
|
|
|
|
unsigned long tx_window_errors;
|
|
|
|
unsigned long rx_compressed;
|
|
|
|
unsigned long tx_compressed;
|
|
|
|
};
|
|
|
|
|
2010-06-08 01:19:54 -06:00
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Media selection options. */
|
|
|
|
enum {
|
|
|
|
IF_PORT_UNKNOWN = 0,
|
|
|
|
IF_PORT_10BASE2,
|
|
|
|
IF_PORT_10BASET,
|
|
|
|
IF_PORT_AUI,
|
|
|
|
IF_PORT_100BASET,
|
|
|
|
IF_PORT_100BASETX,
|
|
|
|
IF_PORT_100BASEFX
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
|
|
|
|
#include <linux/cache.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
|
|
|
|
struct neighbour;
|
|
|
|
struct neigh_parms;
|
|
|
|
struct sk_buff;
|
|
|
|
|
2009-05-04 20:48:28 -06:00
|
|
|
struct netdev_hw_addr {
|
|
|
|
struct list_head list;
|
|
|
|
unsigned char addr[MAX_ADDR_LEN];
|
|
|
|
unsigned char type;
|
2009-05-22 17:22:17 -06:00
|
|
|
#define NETDEV_HW_ADDR_T_LAN 1
|
|
|
|
#define NETDEV_HW_ADDR_T_SAN 2
|
|
|
|
#define NETDEV_HW_ADDR_T_SLAVE 3
|
|
|
|
#define NETDEV_HW_ADDR_T_UNICAST 4
|
2010-04-01 15:22:57 -06:00
|
|
|
#define NETDEV_HW_ADDR_T_MULTICAST 5
|
2009-05-22 17:22:17 -06:00
|
|
|
bool synced;
|
2010-04-01 15:22:57 -06:00
|
|
|
bool global_use;
|
2010-09-19 12:24:02 -06:00
|
|
|
int refcount;
|
2009-05-04 20:48:28 -06:00
|
|
|
struct rcu_head rcu_head;
|
|
|
|
};
|
|
|
|
|
2009-06-16 19:12:19 -06:00
|
|
|
struct netdev_hw_addr_list {
|
|
|
|
struct list_head list;
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
2010-04-01 15:22:57 -06:00
|
|
|
#define netdev_hw_addr_list_count(l) ((l)->count)
|
|
|
|
#define netdev_hw_addr_list_empty(l) (netdev_hw_addr_list_count(l) == 0)
|
|
|
|
#define netdev_hw_addr_list_for_each(ha, l) \
|
|
|
|
list_for_each_entry(ha, &(l)->list, list)
|
2010-01-25 14:36:10 -07:00
|
|
|
|
2010-04-01 15:22:57 -06:00
|
|
|
#define netdev_uc_count(dev) netdev_hw_addr_list_count(&(dev)->uc)
|
|
|
|
#define netdev_uc_empty(dev) netdev_hw_addr_list_empty(&(dev)->uc)
|
|
|
|
#define netdev_for_each_uc_addr(ha, dev) \
|
|
|
|
netdev_hw_addr_list_for_each(ha, &(dev)->uc)
|
2010-02-04 11:22:25 -07:00
|
|
|
|
2010-04-01 15:22:57 -06:00
|
|
|
#define netdev_mc_count(dev) netdev_hw_addr_list_count(&(dev)->mc)
|
|
|
|
#define netdev_mc_empty(dev) netdev_hw_addr_list_empty(&(dev)->mc)
|
2010-04-07 17:40:09 -06:00
|
|
|
#define netdev_for_each_mc_addr(ha, dev) \
|
2010-04-01 15:22:57 -06:00
|
|
|
netdev_hw_addr_list_for_each(ha, &(dev)->mc)
|
2010-02-04 11:22:25 -07:00
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
struct hh_cache {
|
2005-04-16 16:20:36 -06:00
|
|
|
struct hh_cache *hh_next; /* Next entry */
|
|
|
|
atomic_t hh_refcnt; /* number of users */
|
2006-12-08 01:08:43 -07:00
|
|
|
/*
|
|
|
|
* We want hh_output, hh_len, hh_lock and hh_data be a in a separate
|
|
|
|
* cache line on SMP.
|
|
|
|
* They are mostly read, but hh_refcnt may be changed quite frequently,
|
|
|
|
* incurring cache line ping pongs.
|
|
|
|
*/
|
|
|
|
__be16 hh_type ____cacheline_aligned_in_smp;
|
|
|
|
/* protocol identifier, f.e ETH_P_IP
|
2005-04-16 16:20:36 -06:00
|
|
|
* NOTE: For VLANs, this will be the
|
|
|
|
* encapuslated type. --BLG
|
|
|
|
*/
|
2006-11-27 12:58:02 -07:00
|
|
|
u16 hh_len; /* length of header */
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*hh_output)(struct sk_buff *skb);
|
2006-12-07 16:08:17 -07:00
|
|
|
seqlock_t hh_lock;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* cached hardware header; allow for machine alignment needs. */
|
|
|
|
#define HH_DATA_MOD 16
|
|
|
|
#define HH_DATA_OFF(__len) \
|
2005-06-02 17:48:05 -06:00
|
|
|
(HH_DATA_MOD - (((__len - 1) & (HH_DATA_MOD - 1)) + 1))
|
2005-04-16 16:20:36 -06:00
|
|
|
#define HH_DATA_ALIGN(__len) \
|
|
|
|
(((__len)+(HH_DATA_MOD-1))&~(HH_DATA_MOD - 1))
|
|
|
|
unsigned long hh_data[HH_DATA_ALIGN(LL_MAX_HEADER) / sizeof(long)];
|
|
|
|
};
|
|
|
|
|
2010-10-11 10:16:57 -06:00
|
|
|
static inline void hh_cache_put(struct hh_cache *hh)
|
|
|
|
{
|
|
|
|
if (atomic_dec_and_test(&hh->hh_refcnt))
|
|
|
|
kfree(hh);
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Reserve HH_DATA_MOD byte aligned hard_header_len, but at least that much.
|
|
|
|
* Alternative is:
|
|
|
|
* dev->hard_header_len ? (dev->hard_header_len +
|
|
|
|
* (HH_DATA_MOD - 1)) & ~(HH_DATA_MOD - 1) : 0
|
|
|
|
*
|
|
|
|
* We could use other alignment values, but we must maintain the
|
|
|
|
* relationship HH alignment <= LL alignment.
|
2008-05-12 21:48:31 -06:00
|
|
|
*
|
|
|
|
* LL_ALLOCATED_SPACE also takes into account the tailroom the device
|
|
|
|
* may need.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
#define LL_RESERVED_SPACE(dev) \
|
2008-05-12 21:48:31 -06:00
|
|
|
((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
|
2005-04-16 16:20:36 -06:00
|
|
|
#define LL_RESERVED_SPACE_EXTRA(dev,extra) \
|
2008-05-12 21:48:31 -06:00
|
|
|
((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
|
|
|
|
#define LL_ALLOCATED_SPACE(dev) \
|
|
|
|
((((dev)->hard_header_len+(dev)->needed_headroom+(dev)->needed_tailroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-10-09 02:40:57 -06:00
|
|
|
struct header_ops {
|
|
|
|
int (*create) (struct sk_buff *skb, struct net_device *dev,
|
|
|
|
unsigned short type, const void *daddr,
|
|
|
|
const void *saddr, unsigned len);
|
|
|
|
int (*parse)(const struct sk_buff *skb, unsigned char *haddr);
|
|
|
|
int (*rebuild)(struct sk_buff *skb);
|
|
|
|
#define HAVE_HEADER_CACHE
|
|
|
|
int (*cache)(const struct neighbour *neigh, struct hh_cache *hh);
|
|
|
|
void (*cache_update)(struct hh_cache *hh,
|
|
|
|
const struct net_device *dev,
|
|
|
|
const unsigned char *haddr);
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* These flag bits are private to the generic network queueing
|
|
|
|
* layer, they may not be explicitly referenced by any other
|
|
|
|
* code.
|
|
|
|
*/
|
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
enum netdev_state_t {
|
2005-04-16 16:20:36 -06:00
|
|
|
__LINK_STATE_START,
|
|
|
|
__LINK_STATE_PRESENT,
|
|
|
|
__LINK_STATE_NOCARRIER,
|
2006-03-20 18:09:11 -07:00
|
|
|
__LINK_STATE_LINKWATCH_PENDING,
|
|
|
|
__LINK_STATE_DORMANT,
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This structure holds at boot time configured netdevice settings. They
|
2009-02-05 22:26:19 -07:00
|
|
|
* are then used in the device probing.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
struct netdev_boot_setup {
|
|
|
|
char name[IFNAMSIZ];
|
|
|
|
struct ifmap map;
|
|
|
|
};
|
|
|
|
#define NETDEV_BOOT_SETUP_MAX 8
|
|
|
|
|
2005-08-15 23:18:02 -06:00
|
|
|
extern int __init netdev_boot_setup(char *str);
|
2005-04-16 16:20:36 -06: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-03 17:41:36 -06:00
|
|
|
/*
|
|
|
|
* Structure for NAPI scheduling similar to tasklet but with weighting
|
|
|
|
*/
|
|
|
|
struct napi_struct {
|
|
|
|
/* The poll_list must only be managed by the entity which
|
|
|
|
* changes the state of the NAPI_STATE_SCHED bit. This means
|
|
|
|
* whoever atomically sets that bit can add this napi_struct
|
|
|
|
* to the per-cpu poll_list, and whoever clears that bit
|
|
|
|
* can remove from the list right before clearing the bit.
|
|
|
|
*/
|
|
|
|
struct list_head poll_list;
|
|
|
|
|
|
|
|
unsigned long state;
|
|
|
|
int weight;
|
|
|
|
int (*poll)(struct napi_struct *, int);
|
|
|
|
#ifdef CONFIG_NETPOLL
|
|
|
|
spinlock_t poll_lock;
|
|
|
|
int poll_owner;
|
|
|
|
#endif
|
2009-02-08 11:00:36 -07:00
|
|
|
|
|
|
|
unsigned int gro_count;
|
|
|
|
|
2009-01-04 17:13:40 -07:00
|
|
|
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 00:38:52 -07:00
|
|
|
struct list_head dev_list;
|
|
|
|
struct sk_buff *gro_list;
|
2009-01-04 17:13:40 -07:00
|
|
|
struct sk_buff *skb;
|
[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-03 17:41:36 -06:00
|
|
|
};
|
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
enum {
|
[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-03 17:41:36 -06:00
|
|
|
NAPI_STATE_SCHED, /* Poll is scheduled */
|
2008-01-07 21:35:07 -07:00
|
|
|
NAPI_STATE_DISABLE, /* Disable pending */
|
netpoll: fix race on poll_list resulting in garbage entry
A few months back a race was discused between the netpoll napi service
path, and the fast path through net_rx_action:
http://kerneltrap.org/mailarchive/linux-netdev/2007/10/16/345470
A patch was submitted for that bug, but I think we missed a case.
Consider the following scenario:
INITIAL STATE
CPU0 has one napi_struct A on its poll_list
CPU1 is calling netpoll_send_skb and needs to call poll_napi on the same
napi_struct A that CPU0 has on its list
CPU0 CPU1
net_rx_action poll_napi
!list_empty (returns true) locks poll_lock for A
poll_one_napi
napi->poll
netif_rx_complete
__napi_complete
(removes A from poll_list)
list_entry(list->next)
In the above scenario, net_rx_action assumes that the per-cpu poll_list is
exclusive to that cpu. netpoll of course violates that, and because the netpoll
path can dequeue from the poll list, its possible for CPU0 to detect a non-empty
list at the top of the while loop in net_rx_action, but have it become empty by
the time it calls list_entry. Since the poll_list isn't surrounded by any other
structure, the returned data from that list_entry call in this situation is
garbage, and any number of crashes can result based on what exactly that garbage
is.
Given that its not fasible for performance reasons to place exclusive locks
arround each cpus poll list to provide that mutal exclusion, I think the best
solution is modify the netpoll path in such a way that we continue to guarantee
that the poll_list for a cpu is in fact exclusive to that cpu. To do this I've
implemented the patch below. It adds an additional bit to the state field in
the napi_struct. When executing napi->poll from the netpoll_path, this bit will
be set. When a driver calls netif_rx_complete, if that bit is set, it will not
remove the napi_struct from the poll_list. That work will be saved for the next
iteration of net_rx_action.
I've tested this and it seems to work well. About the biggest drawback I can
see to it is the fact that it might result in an extra loop through
net_rx_action in the event that the device is actually contended for (i.e. the
netpoll path actually preforms all the needed work no the device, and the call
to net_rx_action winds up doing nothing, except removing the napi_struct from
the poll_list. However I think this is probably a small price to pay, given
that the alternative is a crash.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-12-10 00:22:26 -07:00
|
|
|
NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from 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-03 17:41:36 -06:00
|
|
|
};
|
|
|
|
|
2009-10-29 01:17:09 -06:00
|
|
|
enum gro_result {
|
2009-03-16 11:50:02 -06:00
|
|
|
GRO_MERGED,
|
|
|
|
GRO_MERGED_FREE,
|
|
|
|
GRO_HELD,
|
|
|
|
GRO_NORMAL,
|
|
|
|
GRO_DROP,
|
|
|
|
};
|
2009-10-29 01:17:09 -06:00
|
|
|
typedef enum gro_result gro_result_t;
|
2009-03-16 11:50:02 -06:00
|
|
|
|
2010-06-01 15:52:08 -06:00
|
|
|
typedef struct sk_buff *rx_handler_func_t(struct sk_buff *skb);
|
|
|
|
|
2008-02-13 16:03:15 -07:00
|
|
|
extern 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-03 17:41:36 -06:00
|
|
|
|
2008-01-07 21:35:07 -07:00
|
|
|
static inline int napi_disable_pending(struct napi_struct *n)
|
|
|
|
{
|
|
|
|
return test_bit(NAPI_STATE_DISABLE, &n->state);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* napi_schedule_prep - check if napi can be scheduled
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Test if NAPI routine is already running, and if not mark
|
|
|
|
* it as running. This is used as a condition variable
|
2008-01-07 21:35:07 -07:00
|
|
|
* insure only one NAPI poll instance runs. We also make
|
|
|
|
* sure there is no pending NAPI disable.
|
[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-03 17:41:36 -06:00
|
|
|
*/
|
|
|
|
static inline int napi_schedule_prep(struct napi_struct *n)
|
|
|
|
{
|
2008-01-07 21:35:07 -07:00
|
|
|
return !napi_disable_pending(n) &&
|
|
|
|
!test_and_set_bit(NAPI_STATE_SCHED, &n->state);
|
[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-03 17:41:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* napi_schedule - schedule NAPI poll
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Schedule NAPI poll routine to be called if it is not already
|
|
|
|
* running.
|
|
|
|
*/
|
|
|
|
static inline void napi_schedule(struct napi_struct *n)
|
|
|
|
{
|
|
|
|
if (napi_schedule_prep(n))
|
|
|
|
__napi_schedule(n);
|
|
|
|
}
|
|
|
|
|
2007-10-09 16:47:37 -06:00
|
|
|
/* Try to reschedule poll. Called by dev->poll() after napi_complete(). */
|
|
|
|
static inline int napi_reschedule(struct napi_struct *napi)
|
|
|
|
{
|
|
|
|
if (napi_schedule_prep(napi)) {
|
|
|
|
__napi_schedule(napi);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* napi_complete - NAPI processing complete
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Mark NAPI processing as complete.
|
|
|
|
*/
|
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 00:38:52 -07:00
|
|
|
extern void __napi_complete(struct napi_struct *n);
|
|
|
|
extern void napi_complete(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-03 17:41:36 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* napi_disable - prevent NAPI from scheduling
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Stop NAPI from being scheduled on this context.
|
|
|
|
* Waits till any outstanding processing completes.
|
|
|
|
*/
|
|
|
|
static inline void napi_disable(struct napi_struct *n)
|
|
|
|
{
|
2008-01-07 21:35:07 -07:00
|
|
|
set_bit(NAPI_STATE_DISABLE, &n->state);
|
[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-03 17:41:36 -06:00
|
|
|
while (test_and_set_bit(NAPI_STATE_SCHED, &n->state))
|
2007-10-26 05:23:22 -06:00
|
|
|
msleep(1);
|
2008-01-07 21:35:07 -07:00
|
|
|
clear_bit(NAPI_STATE_DISABLE, &n->state);
|
[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-03 17:41:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* napi_enable - enable NAPI scheduling
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Resume NAPI from being scheduled on this context.
|
|
|
|
* Must be paired with napi_disable.
|
|
|
|
*/
|
|
|
|
static inline void napi_enable(struct napi_struct *n)
|
|
|
|
{
|
|
|
|
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
|
|
|
|
smp_mb__before_clear_bit();
|
|
|
|
clear_bit(NAPI_STATE_SCHED, &n->state);
|
|
|
|
}
|
|
|
|
|
2007-10-17 14:26:41 -06:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
/**
|
|
|
|
* napi_synchronize - wait until NAPI is not running
|
|
|
|
* @n: napi context
|
|
|
|
*
|
|
|
|
* Wait until NAPI is done being scheduled on this context.
|
|
|
|
* Waits till any outstanding processing completes but
|
|
|
|
* does not disable future activations.
|
|
|
|
*/
|
|
|
|
static inline void napi_synchronize(const struct napi_struct *n)
|
|
|
|
{
|
|
|
|
while (test_bit(NAPI_STATE_SCHED, &n->state))
|
|
|
|
msleep(1);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
# define napi_synchronize(n) barrier()
|
|
|
|
#endif
|
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
enum netdev_queue_state_t {
|
2008-07-09 00:14:46 -06:00
|
|
|
__QUEUE_STATE_XOFF,
|
2008-07-31 17:58:50 -06:00
|
|
|
__QUEUE_STATE_FROZEN,
|
2010-11-23 03:42:02 -07:00
|
|
|
#define QUEUE_STATE_XOFF_OR_FROZEN ((1 << __QUEUE_STATE_XOFF) | \
|
|
|
|
(1 << __QUEUE_STATE_FROZEN))
|
2008-07-09 00:14:46 -06:00
|
|
|
};
|
|
|
|
|
2008-07-08 17:55:56 -06:00
|
|
|
struct netdev_queue {
|
2009-04-28 05:43:42 -06:00
|
|
|
/*
|
|
|
|
* read mostly part
|
|
|
|
*/
|
2008-07-08 17:55:56 -06:00
|
|
|
struct net_device *dev;
|
2008-07-08 18:42:10 -06:00
|
|
|
struct Qdisc *qdisc;
|
2008-07-09 00:14:46 -06:00
|
|
|
unsigned long state;
|
2008-07-08 18:42:10 -06:00
|
|
|
struct Qdisc *qdisc_sleeping;
|
2010-11-21 06:17:27 -07:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
struct kobject kobj;
|
|
|
|
#endif
|
2010-11-29 01:14:37 -07:00
|
|
|
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
|
|
|
|
int numa_node;
|
|
|
|
#endif
|
2009-04-28 05:43:42 -06:00
|
|
|
/*
|
|
|
|
* write mostly part
|
|
|
|
*/
|
|
|
|
spinlock_t _xmit_lock ____cacheline_aligned_in_smp;
|
|
|
|
int xmit_lock_owner;
|
2009-05-17 21:55:16 -06:00
|
|
|
/*
|
|
|
|
* please use this field instead of dev->trans_start
|
|
|
|
*/
|
|
|
|
unsigned long trans_start;
|
2008-07-17 01:34:19 -06:00
|
|
|
} ____cacheline_aligned_in_smp;
|
2008-07-08 17:55:56 -06:00
|
|
|
|
2010-11-29 01:14:37 -07:00
|
|
|
static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
|
|
|
|
{
|
|
|
|
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
|
|
|
|
return q->numa_node;
|
|
|
|
#else
|
2010-12-13 20:09:15 -07:00
|
|
|
return NUMA_NO_NODE;
|
2010-11-29 01:14:37 -07:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netdev_queue_numa_node_write(struct netdev_queue *q, int node)
|
|
|
|
{
|
|
|
|
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
|
|
|
|
q->numa_node = node;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2010-03-24 13:13:54 -06:00
|
|
|
#ifdef CONFIG_RPS
|
2010-03-16 02:03:29 -06:00
|
|
|
/*
|
|
|
|
* This structure holds an RPS map which can be of variable length. The
|
|
|
|
* map is an array of CPUs.
|
|
|
|
*/
|
|
|
|
struct rps_map {
|
|
|
|
unsigned int len;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
u16 cpus[0];
|
|
|
|
};
|
|
|
|
#define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + (_num * sizeof(u16)))
|
|
|
|
|
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-16 17:01:27 -06:00
|
|
|
/*
|
|
|
|
* The rps_dev_flow structure contains the mapping of a flow to a CPU and the
|
|
|
|
* tail pointer for that CPU's input queue at the time of last enqueue.
|
|
|
|
*/
|
|
|
|
struct rps_dev_flow {
|
|
|
|
u16 cpu;
|
|
|
|
u16 fill;
|
|
|
|
unsigned int last_qtail;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The rps_dev_flow_table structure contains a table of flow mappings.
|
|
|
|
*/
|
|
|
|
struct rps_dev_flow_table {
|
|
|
|
unsigned int mask;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
struct work_struct free_work;
|
|
|
|
struct rps_dev_flow flows[0];
|
|
|
|
};
|
|
|
|
#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \
|
|
|
|
(_num * sizeof(struct rps_dev_flow)))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The rps_sock_flow_table contains mappings of flows to the last CPU
|
|
|
|
* on which they were processed by the application (set in recvmsg).
|
|
|
|
*/
|
|
|
|
struct rps_sock_flow_table {
|
|
|
|
unsigned int mask;
|
|
|
|
u16 ents[0];
|
|
|
|
};
|
|
|
|
#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_sock_flow_table) + \
|
|
|
|
(_num * sizeof(u16)))
|
|
|
|
|
|
|
|
#define RPS_NO_CPU 0xffff
|
|
|
|
|
|
|
|
static inline void rps_record_sock_flow(struct rps_sock_flow_table *table,
|
|
|
|
u32 hash)
|
|
|
|
{
|
|
|
|
if (table && hash) {
|
|
|
|
unsigned int cpu, index = hash & table->mask;
|
|
|
|
|
|
|
|
/* We only give a hint, preemption can change cpu under us */
|
|
|
|
cpu = raw_smp_processor_id();
|
|
|
|
|
|
|
|
if (table->ents[index] != cpu)
|
|
|
|
table->ents[index] = cpu;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void rps_reset_sock_flow(struct rps_sock_flow_table *table,
|
|
|
|
u32 hash)
|
|
|
|
{
|
|
|
|
if (table && hash)
|
|
|
|
table->ents[hash & table->mask] = RPS_NO_CPU;
|
|
|
|
}
|
|
|
|
|
2010-10-24 21:02:02 -06:00
|
|
|
extern struct rps_sock_flow_table __rcu *rps_sock_flow_table;
|
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-16 17:01:27 -06:00
|
|
|
|
2010-03-16 02:03:29 -06:00
|
|
|
/* This structure contains an instance of an RX queue. */
|
|
|
|
struct netdev_rx_queue {
|
2010-10-24 21:02:02 -06:00
|
|
|
struct rps_map __rcu *rps_map;
|
|
|
|
struct rps_dev_flow_table __rcu *rps_flow_table;
|
|
|
|
struct kobject kobj;
|
2010-11-09 03:47:38 -07:00
|
|
|
struct net_device *dev;
|
2010-03-16 02:03:29 -06:00
|
|
|
} ____cacheline_aligned_in_smp;
|
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-16 17:01:27 -06:00
|
|
|
#endif /* CONFIG_RPS */
|
2008-11-19 22:32:24 -07:00
|
|
|
|
2010-11-26 01:36:09 -07:00
|
|
|
#ifdef CONFIG_XPS
|
|
|
|
/*
|
|
|
|
* This structure holds an XPS map which can be of variable length. The
|
|
|
|
* map is an array of queues.
|
|
|
|
*/
|
|
|
|
struct xps_map {
|
|
|
|
unsigned int len;
|
|
|
|
unsigned int alloc_len;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
u16 queues[0];
|
|
|
|
};
|
|
|
|
#define XPS_MAP_SIZE(_num) (sizeof(struct xps_map) + (_num * sizeof(u16)))
|
|
|
|
#define XPS_MIN_MAP_ALLOC ((L1_CACHE_BYTES - sizeof(struct xps_map)) \
|
|
|
|
/ sizeof(u16))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This structure holds all XPS maps for device. Maps are indexed by CPU.
|
|
|
|
*/
|
|
|
|
struct xps_dev_maps {
|
|
|
|
struct rcu_head rcu;
|
2010-11-28 14:43:02 -07:00
|
|
|
struct xps_map __rcu *cpu_map[0];
|
2010-11-26 01:36:09 -07:00
|
|
|
};
|
|
|
|
#define XPS_DEV_MAPS_SIZE (sizeof(struct xps_dev_maps) + \
|
|
|
|
(nr_cpu_ids * sizeof(struct xps_map *)))
|
|
|
|
#endif /* CONFIG_XPS */
|
|
|
|
|
2008-11-19 22:32:24 -07:00
|
|
|
/*
|
|
|
|
* This structure defines the management hooks for network devices.
|
2008-11-20 21:14:53 -07:00
|
|
|
* The following hooks can be defined; unless noted otherwise, they are
|
|
|
|
* optional and can be filled with a null pointer.
|
2008-11-19 22:32:24 -07:00
|
|
|
*
|
|
|
|
* int (*ndo_init)(struct net_device *dev);
|
|
|
|
* This function is called once when network device is registered.
|
|
|
|
* The network device can use this to any late stage initializaton
|
|
|
|
* or semantic validattion. It can fail with an error code which will
|
|
|
|
* be propogated back to register_netdev
|
|
|
|
*
|
|
|
|
* void (*ndo_uninit)(struct net_device *dev);
|
|
|
|
* This function is called when device is unregistered or when registration
|
|
|
|
* fails. It is not called if init fails.
|
|
|
|
*
|
|
|
|
* int (*ndo_open)(struct net_device *dev);
|
|
|
|
* This function is called when network device transistions to the up
|
|
|
|
* state.
|
|
|
|
*
|
|
|
|
* int (*ndo_stop)(struct net_device *dev);
|
|
|
|
* This function is called when network device transistions to the down
|
|
|
|
* state.
|
|
|
|
*
|
2009-08-31 13:50:40 -06:00
|
|
|
* netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
|
|
|
|
* struct net_device *dev);
|
2008-11-20 21:14:53 -07:00
|
|
|
* Called when a packet needs to be transmitted.
|
2009-08-31 13:50:40 -06:00
|
|
|
* Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
|
|
|
|
* (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
|
2008-11-20 21:14:53 -07:00
|
|
|
* Required can not be NULL.
|
|
|
|
*
|
|
|
|
* u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb);
|
|
|
|
* Called to decide which queue to when device supports multiple
|
|
|
|
* transmit queues.
|
|
|
|
*
|
2008-11-19 22:32:24 -07:00
|
|
|
* void (*ndo_change_rx_flags)(struct net_device *dev, int flags);
|
|
|
|
* This function is called to allow device receiver to make
|
|
|
|
* changes to configuration when multicast or promiscious is enabled.
|
|
|
|
*
|
|
|
|
* void (*ndo_set_rx_mode)(struct net_device *dev);
|
|
|
|
* This function is called device changes address list filtering.
|
|
|
|
*
|
|
|
|
* void (*ndo_set_multicast_list)(struct net_device *dev);
|
|
|
|
* This function is called when the multicast address list changes.
|
|
|
|
*
|
|
|
|
* int (*ndo_set_mac_address)(struct net_device *dev, void *addr);
|
|
|
|
* This function is called when the Media Access Control address
|
2009-04-27 06:45:54 -06:00
|
|
|
* needs to be changed. If this interface is not defined, the
|
2008-11-19 22:32:24 -07:00
|
|
|
* mac address can not be changed.
|
|
|
|
*
|
|
|
|
* int (*ndo_validate_addr)(struct net_device *dev);
|
|
|
|
* Test if Media Access Control address is valid for the device.
|
|
|
|
*
|
|
|
|
* int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
|
|
|
|
* Called when a user request an ioctl which can't be handled by
|
|
|
|
* the generic interface code. If not defined ioctl's return
|
|
|
|
* not supported error code.
|
|
|
|
*
|
|
|
|
* int (*ndo_set_config)(struct net_device *dev, struct ifmap *map);
|
|
|
|
* Used to set network devices bus interface parameters. This interface
|
|
|
|
* is retained for legacy reason, new devices should use the bus
|
|
|
|
* interface (PCI) for low level management.
|
|
|
|
*
|
|
|
|
* int (*ndo_change_mtu)(struct net_device *dev, int new_mtu);
|
|
|
|
* Called when a user wants to change the Maximum Transfer Unit
|
|
|
|
* of a device. If not defined, any request to change MTU will
|
|
|
|
* will return an error.
|
|
|
|
*
|
2008-11-20 21:14:53 -07:00
|
|
|
* void (*ndo_tx_timeout)(struct net_device *dev);
|
2008-11-19 22:32:24 -07:00
|
|
|
* Callback uses when the transmitter has not made any progress
|
|
|
|
* for dev->watchdog ticks.
|
|
|
|
*
|
2010-07-09 03:11:52 -06:00
|
|
|
* struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev,
|
2010-07-07 15:58:56 -06:00
|
|
|
* struct rtnl_link_stats64 *storage);
|
2009-10-07 14:53:11 -06:00
|
|
|
* struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
|
2008-11-19 22:32:24 -07:00
|
|
|
* Called when a user wants to get the network device usage
|
2010-06-08 01:19:54 -06:00
|
|
|
* statistics. Drivers must do one of the following:
|
2010-07-09 03:11:52 -06:00
|
|
|
* 1. Define @ndo_get_stats64 to fill in a zero-initialised
|
|
|
|
* rtnl_link_stats64 structure passed by the caller.
|
2010-06-15 16:08:48 -06:00
|
|
|
* 2. Define @ndo_get_stats to update a net_device_stats structure
|
2010-06-08 01:19:54 -06:00
|
|
|
* (which should normally be dev->stats) and return a pointer to
|
|
|
|
* it. The structure may be changed asynchronously only if each
|
|
|
|
* field is written atomically.
|
|
|
|
* 3. Update dev->stats asynchronously and atomically, and define
|
|
|
|
* neither operation.
|
2008-11-19 22:32:24 -07:00
|
|
|
*
|
|
|
|
* void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);
|
2011-01-02 15:54:09 -07:00
|
|
|
* If device support VLAN receive acceleration
|
2008-11-19 22:32:24 -07:00
|
|
|
* (ie. dev->features & NETIF_F_HW_VLAN_RX), then this function is called
|
|
|
|
* when vlan groups for the device changes. Note: grp is NULL
|
|
|
|
* if no vlan's groups are being used.
|
|
|
|
*
|
|
|
|
* void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);
|
|
|
|
* If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
|
|
|
|
* this function is called when a VLAN id is registered.
|
|
|
|
*
|
|
|
|
* void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
|
|
|
|
* If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
|
|
|
|
* this function is called when a VLAN id is unregistered.
|
|
|
|
*
|
|
|
|
* void (*ndo_poll_controller)(struct net_device *dev);
|
2010-02-09 18:43:46 -07:00
|
|
|
*
|
|
|
|
* SR-IOV management functions.
|
|
|
|
* int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
|
|
|
|
* int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
|
|
|
|
* int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate);
|
|
|
|
* int (*ndo_get_vf_config)(struct net_device *dev,
|
|
|
|
* int vf, struct ifla_vf_info *ivf);
|
net: Add netlink support for virtual port management (was iovnl)
Add new netdev ops ndo_{set|get}_vf_port to allow setting of
port-profile on a netdev interface. Extends netlink socket RTM_SETLINK/
RTM_GETLINK with two new sub msgs called IFLA_VF_PORTS and IFLA_PORT_SELF
(added to end of IFLA_cmd list). These are both nested atrtibutes
using this layout:
[IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT]
[IFLA_PORT_*], ...
[IFLA_VF_PORT]
[IFLA_PORT_*], ...
...
[IFLA_PORT_SELF]
[IFLA_PORT_*], ...
These attributes are design to be set and get symmetrically. VF_PORTS
is a list of VF_PORTs, one for each VF, when dealing with an SR-IOV
device. PORT_SELF is for the PF of the SR-IOV device, in case it wants
to also have a port-profile, or for the case where the VF==PF, like in
enic patch 2/2 of this patch set.
A port-profile is used to configure/enable the external switch virtual port
backing the netdev interface, not to configure the host-facing side of the
netdev. A port-profile is an identifier known to the switch. How port-
profiles are installed on the switch or how available port-profiles are
made know to the host is outside the scope of this patch.
There are two types of port-profiles specs in the netlink msg. The first spec
is for 802.1Qbg (pre-)standard, VDP protocol. The second spec is for devices
that run a similar protocol as VDP but in firmware, thus hiding the protocol
details. In either case, the specs have much in common and makes sense to
define the netlink msg as the union of the two specs. For example, both specs
have a notition of associating/deassociating a port-profile. And both specs
require some information from the hypervisor manager, such as client port
instance ID.
The general flow is the port-profile is applied to a host netdev interface
using RTM_SETLINK, the receiver of the RTM_SETLINK msg communicates with the
switch, and the switch virtual port backing the host netdev interface is
configured/enabled based on the settings defined by the port-profile. What
those settings comprise, and how those settings are managed is again
outside the scope of this patch, since this patch only deals with the
first step in the flow.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-17 23:49:55 -06:00
|
|
|
* int (*ndo_set_vf_port)(struct net_device *dev, int vf,
|
|
|
|
* struct nlattr *port[]);
|
|
|
|
* int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
|
2008-11-19 22:32:24 -07:00
|
|
|
*/
|
2008-11-25 01:20:43 -07:00
|
|
|
#define HAVE_NET_DEVICE_OPS
|
2008-11-19 22:32:24 -07:00
|
|
|
struct net_device_ops {
|
|
|
|
int (*ndo_init)(struct net_device *dev);
|
|
|
|
void (*ndo_uninit)(struct net_device *dev);
|
|
|
|
int (*ndo_open)(struct net_device *dev);
|
|
|
|
int (*ndo_stop)(struct net_device *dev);
|
2009-08-31 13:50:40 -06:00
|
|
|
netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb,
|
2008-11-20 21:14:53 -07:00
|
|
|
struct net_device *dev);
|
|
|
|
u16 (*ndo_select_queue)(struct net_device *dev,
|
|
|
|
struct sk_buff *skb);
|
2008-11-19 22:32:24 -07:00
|
|
|
void (*ndo_change_rx_flags)(struct net_device *dev,
|
|
|
|
int flags);
|
|
|
|
void (*ndo_set_rx_mode)(struct net_device *dev);
|
|
|
|
void (*ndo_set_multicast_list)(struct net_device *dev);
|
|
|
|
int (*ndo_set_mac_address)(struct net_device *dev,
|
|
|
|
void *addr);
|
|
|
|
int (*ndo_validate_addr)(struct net_device *dev);
|
|
|
|
int (*ndo_do_ioctl)(struct net_device *dev,
|
|
|
|
struct ifreq *ifr, int cmd);
|
|
|
|
int (*ndo_set_config)(struct net_device *dev,
|
|
|
|
struct ifmap *map);
|
2008-11-20 21:14:53 -07:00
|
|
|
int (*ndo_change_mtu)(struct net_device *dev,
|
|
|
|
int new_mtu);
|
|
|
|
int (*ndo_neigh_setup)(struct net_device *dev,
|
|
|
|
struct neigh_parms *);
|
2008-11-19 22:32:24 -07:00
|
|
|
void (*ndo_tx_timeout) (struct net_device *dev);
|
|
|
|
|
2010-07-07 15:58:56 -06:00
|
|
|
struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev,
|
|
|
|
struct rtnl_link_stats64 *storage);
|
2008-11-19 22:32:24 -07:00
|
|
|
struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
|
|
|
|
|
|
|
|
void (*ndo_vlan_rx_register)(struct net_device *dev,
|
|
|
|
struct vlan_group *grp);
|
|
|
|
void (*ndo_vlan_rx_add_vid)(struct net_device *dev,
|
|
|
|
unsigned short vid);
|
|
|
|
void (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
|
|
|
|
unsigned short vid);
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
void (*ndo_poll_controller)(struct net_device *dev);
|
2010-06-10 10:12:47 -06:00
|
|
|
int (*ndo_netpoll_setup)(struct net_device *dev,
|
|
|
|
struct netpoll_info *info);
|
2010-05-06 01:47:21 -06:00
|
|
|
void (*ndo_netpoll_cleanup)(struct net_device *dev);
|
2008-11-19 22:32:24 -07:00
|
|
|
#endif
|
2010-02-09 18:43:46 -07:00
|
|
|
int (*ndo_set_vf_mac)(struct net_device *dev,
|
|
|
|
int queue, u8 *mac);
|
|
|
|
int (*ndo_set_vf_vlan)(struct net_device *dev,
|
|
|
|
int queue, u16 vlan, u8 qos);
|
|
|
|
int (*ndo_set_vf_tx_rate)(struct net_device *dev,
|
|
|
|
int vf, int rate);
|
|
|
|
int (*ndo_get_vf_config)(struct net_device *dev,
|
|
|
|
int vf,
|
|
|
|
struct ifla_vf_info *ivf);
|
net: Add netlink support for virtual port management (was iovnl)
Add new netdev ops ndo_{set|get}_vf_port to allow setting of
port-profile on a netdev interface. Extends netlink socket RTM_SETLINK/
RTM_GETLINK with two new sub msgs called IFLA_VF_PORTS and IFLA_PORT_SELF
(added to end of IFLA_cmd list). These are both nested atrtibutes
using this layout:
[IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT]
[IFLA_PORT_*], ...
[IFLA_VF_PORT]
[IFLA_PORT_*], ...
...
[IFLA_PORT_SELF]
[IFLA_PORT_*], ...
These attributes are design to be set and get symmetrically. VF_PORTS
is a list of VF_PORTs, one for each VF, when dealing with an SR-IOV
device. PORT_SELF is for the PF of the SR-IOV device, in case it wants
to also have a port-profile, or for the case where the VF==PF, like in
enic patch 2/2 of this patch set.
A port-profile is used to configure/enable the external switch virtual port
backing the netdev interface, not to configure the host-facing side of the
netdev. A port-profile is an identifier known to the switch. How port-
profiles are installed on the switch or how available port-profiles are
made know to the host is outside the scope of this patch.
There are two types of port-profiles specs in the netlink msg. The first spec
is for 802.1Qbg (pre-)standard, VDP protocol. The second spec is for devices
that run a similar protocol as VDP but in firmware, thus hiding the protocol
details. In either case, the specs have much in common and makes sense to
define the netlink msg as the union of the two specs. For example, both specs
have a notition of associating/deassociating a port-profile. And both specs
require some information from the hypervisor manager, such as client port
instance ID.
The general flow is the port-profile is applied to a host netdev interface
using RTM_SETLINK, the receiver of the RTM_SETLINK msg communicates with the
switch, and the switch virtual port backing the host netdev interface is
configured/enabled based on the settings defined by the port-profile. What
those settings comprise, and how those settings are managed is again
outside the scope of this patch, since this patch only deals with the
first step in the flow.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-17 23:49:55 -06:00
|
|
|
int (*ndo_set_vf_port)(struct net_device *dev,
|
|
|
|
int vf,
|
|
|
|
struct nlattr *port[]);
|
|
|
|
int (*ndo_get_vf_port)(struct net_device *dev,
|
|
|
|
int vf, struct sk_buff *skb);
|
2009-02-27 15:06:59 -07:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
2009-08-31 06:31:36 -06:00
|
|
|
int (*ndo_fcoe_enable)(struct net_device *dev);
|
|
|
|
int (*ndo_fcoe_disable)(struct net_device *dev);
|
2009-02-27 15:06:59 -07:00
|
|
|
int (*ndo_fcoe_ddp_setup)(struct net_device *dev,
|
|
|
|
u16 xid,
|
|
|
|
struct scatterlist *sgl,
|
|
|
|
unsigned int sgc);
|
|
|
|
int (*ndo_fcoe_ddp_done)(struct net_device *dev,
|
|
|
|
u16 xid);
|
2009-10-28 12:24:35 -06:00
|
|
|
#define NETDEV_FCOE_WWNN 0
|
|
|
|
#define NETDEV_FCOE_WWPN 1
|
|
|
|
int (*ndo_fcoe_get_wwn)(struct net_device *dev,
|
|
|
|
u64 *wwn, int type);
|
2009-02-27 15:06:59 -07:00
|
|
|
#endif
|
2008-11-19 22:32:24 -07:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* The DEVICE structure.
|
|
|
|
* Actually, this whole structure is a big mistake. It mixes I/O
|
|
|
|
* data with strictly "high-level" data, and it has to know about
|
|
|
|
* almost every data structure used in the INET module.
|
|
|
|
*
|
|
|
|
* FIXME: cleanup struct net_device such that network protocol info
|
|
|
|
* moves out.
|
|
|
|
*/
|
|
|
|
|
2009-11-04 10:50:58 -07:00
|
|
|
struct net_device {
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the first field of the "visible" part of this structure
|
|
|
|
* (i.e. as seen by users in the "Space.c" file). It is the name
|
2010-05-26 10:22:40 -06:00
|
|
|
* of the interface.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
char name[IFNAMSIZ];
|
2010-05-05 17:59:26 -06:00
|
|
|
|
2010-07-05 14:53:06 -06:00
|
|
|
struct pm_qos_request_list pm_qos_req;
|
2010-05-05 17:59:26 -06:00
|
|
|
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
/* device name hash chain */
|
|
|
|
struct hlist_node name_hlist;
|
2008-09-22 22:28:11 -06:00
|
|
|
/* snmp alias */
|
|
|
|
char *ifalias;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* I/O specific fields
|
|
|
|
* FIXME: Merge these and struct ifmap into one
|
|
|
|
*/
|
|
|
|
unsigned long mem_end; /* shared mem end */
|
|
|
|
unsigned long mem_start; /* shared mem start */
|
|
|
|
unsigned long base_addr; /* device I/O address */
|
|
|
|
unsigned int irq; /* device IRQ number */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some hardware also needs these fields, but they are not
|
|
|
|
* part of the usual set specified in Space.c.
|
|
|
|
*/
|
|
|
|
|
|
|
|
unsigned char if_port; /* Selectable AUI, TP,..*/
|
|
|
|
unsigned char dma; /* DMA channel */
|
|
|
|
|
|
|
|
unsigned long state;
|
|
|
|
|
2007-05-03 16:13:45 -06:00
|
|
|
struct list_head dev_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-03 17:41:36 -06:00
|
|
|
struct list_head napi_list;
|
2009-10-27 01:03:04 -06:00
|
|
|
struct list_head unreg_list;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
/* Net device features */
|
|
|
|
unsigned long features;
|
|
|
|
#define NETIF_F_SG 1 /* Scatter/gather IO. */
|
2007-06-27 01:47:37 -06:00
|
|
|
#define NETIF_F_IP_CSUM 2 /* Can checksum TCP/UDP over IPv4. */
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
#define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */
|
|
|
|
#define NETIF_F_HW_CSUM 8 /* Can checksum all the packets. */
|
2007-06-27 01:47:37 -06:00
|
|
|
#define NETIF_F_IPV6_CSUM 16 /* Can checksum TCP/UDP over IPV6 */
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
#define NETIF_F_HIGHDMA 32 /* Can DMA to high memory. */
|
|
|
|
#define NETIF_F_FRAGLIST 64 /* Scatter/gather IO. */
|
|
|
|
#define NETIF_F_HW_VLAN_TX 128 /* Transmit VLAN hw acceleration */
|
|
|
|
#define NETIF_F_HW_VLAN_RX 256 /* Receive VLAN hw acceleration */
|
|
|
|
#define NETIF_F_HW_VLAN_FILTER 512 /* Receive filtering on VLAN */
|
|
|
|
#define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */
|
2006-06-22 04:07:29 -06:00
|
|
|
#define NETIF_F_GSO 2048 /* Enable software GSO. */
|
2007-09-25 20:42:02 -06:00
|
|
|
#define NETIF_F_LLTX 4096 /* LockLess TX - deprecated. Please */
|
|
|
|
/* do not use LLTX in new drivers */
|
2007-09-12 05:53:49 -06:00
|
|
|
#define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */
|
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 00:38:52 -07:00
|
|
|
#define NETIF_F_GRO 16384 /* Generic receive offload */
|
2007-08-15 17:00:51 -06:00
|
|
|
#define NETIF_F_LRO 32768 /* large receive offload */
|
2006-06-22 03:40:14 -06:00
|
|
|
|
2009-04-27 16:35:52 -06:00
|
|
|
/* the GSO_MASK reserves bits 16 through 23 */
|
2009-02-27 15:06:49 -07:00
|
|
|
#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */
|
2009-04-27 16:35:52 -06:00
|
|
|
#define NETIF_F_SCTP_CSUM (1 << 25) /* SCTP checksum offload */
|
2009-08-14 06:41:57 -06:00
|
|
|
#define NETIF_F_FCOE_MTU (1 << 26) /* Supports max FCoE MTU, 2158 bytes*/
|
2010-02-10 21:03:05 -07:00
|
|
|
#define NETIF_F_NTUPLE (1 << 27) /* N-tuple filters supported */
|
2010-03-29 08:47:27 -06:00
|
|
|
#define NETIF_F_RXHASH (1 << 28) /* Receive hashing offload */
|
2009-02-27 15:06:49 -07:00
|
|
|
|
2006-06-22 03:40:14 -06:00
|
|
|
/* Segmentation offload features */
|
2008-05-23 01:22:04 -06:00
|
|
|
#define NETIF_F_GSO_SHIFT 16
|
2009-02-27 15:06:43 -07:00
|
|
|
#define NETIF_F_GSO_MASK 0x00ff0000
|
2006-06-22 03:40:14 -06:00
|
|
|
#define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
|
2006-06-30 14:37:03 -06:00
|
|
|
#define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
|
2006-06-27 14:22:38 -06:00
|
|
|
#define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
|
2006-06-30 14:37:03 -06:00
|
|
|
#define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT)
|
|
|
|
#define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT)
|
2009-02-27 15:06:49 -07:00
|
|
|
#define NETIF_F_FSO (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
|
2006-08-17 19:22:32 -06:00
|
|
|
/* List of features with software fallbacks. */
|
2010-06-14 14:21:04 -06:00
|
|
|
#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | \
|
|
|
|
NETIF_F_TSO6 | NETIF_F_UFO)
|
2006-08-17 19:22:32 -06:00
|
|
|
|
2007-06-27 01:47:37 -06:00
|
|
|
|
2006-06-17 23:06:05 -06:00
|
|
|
#define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
|
2007-06-27 01:47:37 -06:00
|
|
|
#define NETIF_F_V4_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IP_CSUM)
|
|
|
|
#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
|
|
|
|
#define NETIF_F_ALL_CSUM (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)
|
2006-06-17 23:06:05 -06:00
|
|
|
|
2008-10-23 02:11:29 -06:00
|
|
|
/*
|
|
|
|
* If one device supports one of these features, then enable them
|
|
|
|
* for all in netdev_increment_features.
|
|
|
|
*/
|
|
|
|
#define NETIF_F_ONE_FOR_ALL (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \
|
2008-11-19 22:32:24 -07:00
|
|
|
NETIF_F_SG | NETIF_F_HIGHDMA | \
|
2008-10-23 02:11:29 -06:00
|
|
|
NETIF_F_FRAGLIST)
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Interface index. Unique device identifier */
|
|
|
|
int ifindex;
|
|
|
|
int iflink;
|
|
|
|
|
2007-03-28 15:29:08 -06:00
|
|
|
struct net_device_stats stats;
|
2010-09-30 15:06:55 -06:00
|
|
|
atomic_long_t rx_dropped; /* dropped packets by core network
|
|
|
|
* Do not use this in drivers.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-04-26 21:48:23 -06:00
|
|
|
#ifdef CONFIG_WIRELESS_EXT
|
2005-04-16 16:20:36 -06:00
|
|
|
/* List of functions to handle Wireless Extensions (instead of ioctl).
|
|
|
|
* See <net/iw_handler.h> for details. Jean II */
|
|
|
|
const struct iw_handler_def * wireless_handlers;
|
|
|
|
/* Instance data managed by the core of Wireless Extensions. */
|
|
|
|
struct iw_public_data * wireless_data;
|
2007-04-26 21:48:23 -06:00
|
|
|
#endif
|
2008-11-19 22:32:24 -07:00
|
|
|
/* Management operations */
|
|
|
|
const struct net_device_ops *netdev_ops;
|
2006-09-08 12:16:13 -06:00
|
|
|
const struct ethtool_ops *ethtool_ops;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-10-09 02:40:57 -06:00
|
|
|
/* Hardware header description */
|
|
|
|
const struct header_ops *header_ops;
|
|
|
|
|
2006-03-20 18:09:11 -07:00
|
|
|
unsigned int flags; /* interface flags (a la BSD) */
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned short gflags;
|
2010-08-23 10:26:41 -06:00
|
|
|
unsigned int priv_flags; /* Like 'flags' but invisible to userspace. */
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned short padded; /* How much padding added by alloc_netdev() */
|
|
|
|
|
2006-03-20 18:09:11 -07:00
|
|
|
unsigned char operstate; /* RFC2863 operstate */
|
|
|
|
unsigned char link_mode; /* mapping policy to operstate */
|
|
|
|
|
2010-05-02 23:27:59 -06:00
|
|
|
unsigned int mtu; /* interface MTU value */
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned short type; /* interface hardware type */
|
|
|
|
unsigned short hard_header_len; /* hardware hdr length */
|
|
|
|
|
2008-05-12 21:48:31 -06:00
|
|
|
/* extra head- and tailroom the hardware may need, but not in all cases
|
|
|
|
* can this be guaranteed, especially tailroom. Some cases also use
|
|
|
|
* LL_MAX_HEADER instead to allocate the skb.
|
|
|
|
*/
|
|
|
|
unsigned short needed_headroom;
|
|
|
|
unsigned short needed_tailroom;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Interface address info. */
|
2005-08-20 18:15:54 -06:00
|
|
|
unsigned char perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
|
2010-07-21 20:50:21 -06:00
|
|
|
unsigned char addr_assign_type; /* hw address assignment type */
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned char addr_len; /* hardware address length */
|
|
|
|
unsigned short dev_id; /* for shared network cards */
|
|
|
|
|
2009-05-22 17:22:17 -06:00
|
|
|
spinlock_t addr_list_lock;
|
2010-04-01 15:22:57 -06:00
|
|
|
struct netdev_hw_addr_list uc; /* Unicast mac addresses */
|
|
|
|
struct netdev_hw_addr_list mc; /* Multicast mac addresses */
|
|
|
|
int uc_promisc;
|
2008-06-17 22:12:48 -06:00
|
|
|
unsigned int promiscuity;
|
|
|
|
unsigned int allmulti;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
|
|
|
|
/* Protocol specific pointers */
|
2010-10-20 07:56:05 -06:00
|
|
|
|
|
|
|
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
|
2010-10-24 15:31:58 -06:00
|
|
|
struct vlan_group __rcu *vlgrp; /* VLAN group */
|
2010-10-20 07:56:05 -06:00
|
|
|
#endif
|
net: Distributed Switch Architecture protocol support
Distributed Switch Architecture is a protocol for managing hardware
switch chips. It consists of a set of MII management registers and
commands to configure the switch, and an ethernet header format to
signal which of the ports of the switch a packet was received from
or is intended to be sent to.
The switches that this driver supports are typically embedded in
access points and routers, and a typical setup with a DSA switch
looks something like this:
+-----------+ +-----------+
| | RGMII | |
| +-------+ +------ 1000baseT MDI ("WAN")
| | | 6-port +------ 1000baseT MDI ("LAN1")
| CPU | | ethernet +------ 1000baseT MDI ("LAN2")
| |MIImgmt| switch +------ 1000baseT MDI ("LAN3")
| +-------+ w/5 PHYs +------ 1000baseT MDI ("LAN4")
| | | |
+-----------+ +-----------+
The switch driver presents each port on the switch as a separate
network interface to Linux, polls the switch to maintain software
link state of those ports, forwards MII management interface
accesses to those network interfaces (e.g. as done by ethtool) to
the switch, and exposes the switch's hardware statistics counters
via the appropriate Linux kernel interfaces.
This initial patch supports the MII management interface register
layout of the Marvell 88E6123, 88E6161 and 88E6165 switch chips, and
supports the "Ethertype DSA" packet tagging format.
(There is no officially registered ethertype for the Ethertype DSA
packet format, so we just grab a random one. The ethertype to use
is programmed into the switch, and the switch driver uses the value
of ETH_P_EDSA for this, so this define can be changed at any time in
the future if the one we chose is allocated to another protocol or
if Ethertype DSA gets its own officially registered ethertype, and
everything will continue to work.)
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Tested-by: Nicolas Pitre <nico@marvell.com>
Tested-by: Byron Bradley <byron.bbradley@gmail.com>
Tested-by: Tim Ellis <tim.ellis@mac.com>
Tested-by: Peter van Valderen <linux@ddcrew.com>
Tested-by: Dirk Teurlings <dirk@upexia.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-10-07 07:44:02 -06:00
|
|
|
#ifdef CONFIG_NET_DSA
|
|
|
|
void *dsa_ptr; /* dsa specific data */
|
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
void *atalk_ptr; /* AppleTalk link */
|
2010-09-14 22:04:31 -06:00
|
|
|
struct in_device __rcu *ip_ptr; /* IPv4 specific data */
|
2010-10-28 21:09:24 -06:00
|
|
|
struct dn_dev __rcu *dn_ptr; /* DECnet specific data */
|
2010-10-24 15:32:05 -06:00
|
|
|
struct inet6_dev __rcu *ip6_ptr; /* IPv6 specific data */
|
2005-04-16 16:20:36 -06:00
|
|
|
void *ec_ptr; /* Econet specific data */
|
|
|
|
void *ax25_ptr; /* AX.25 specific data */
|
2007-04-23 13:20:05 -06:00
|
|
|
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
|
|
|
|
assign before registering */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
/*
|
2010-09-15 20:58:13 -06:00
|
|
|
* Cache lines mostly used on receive path (including eth_type_trans())
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
*/
|
2010-08-31 01:40:16 -06:00
|
|
|
unsigned long last_rx; /* Time of last Rx
|
|
|
|
* This should not be set in
|
|
|
|
* drivers, unless really needed,
|
|
|
|
* because network stack (bonding)
|
|
|
|
* use it if/when necessary, to
|
|
|
|
* avoid dirtying this cache line.
|
|
|
|
*/
|
|
|
|
|
2010-09-15 20:58:13 -06:00
|
|
|
struct net_device *master; /* Pointer to master device of a group,
|
|
|
|
* which this device is member of.
|
|
|
|
*/
|
|
|
|
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
/* Interface address info used in eth_type_trans() */
|
2009-05-04 20:48:28 -06:00
|
|
|
unsigned char *dev_addr; /* hw address, (before bcast
|
|
|
|
because most packets are
|
|
|
|
unicast) */
|
|
|
|
|
2009-06-16 19:12:19 -06:00
|
|
|
struct netdev_hw_addr_list dev_addrs; /* list of device
|
|
|
|
hw addresses */
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
|
|
|
|
unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-03-24 13:13:54 -06:00
|
|
|
#ifdef CONFIG_RPS
|
2010-03-16 02:03:29 -06:00
|
|
|
struct kset *queues_kset;
|
|
|
|
|
|
|
|
struct netdev_rx_queue *_rx;
|
|
|
|
|
2010-09-27 02:24:33 -06:00
|
|
|
/* Number of RX queues allocated at register_netdev() time */
|
2010-03-16 02:03:29 -06:00
|
|
|
unsigned int num_rx_queues;
|
2010-09-27 02:24:33 -06:00
|
|
|
|
|
|
|
/* Number of RX queues currently active in device */
|
|
|
|
unsigned int real_num_rx_queues;
|
2010-03-24 13:13:54 -06:00
|
|
|
#endif
|
2010-03-16 02:03:29 -06:00
|
|
|
|
2010-11-14 23:38:12 -07:00
|
|
|
rx_handler_func_t __rcu *rx_handler;
|
|
|
|
void __rcu *rx_handler_data;
|
2008-07-17 01:34:19 -06:00
|
|
|
|
2010-10-02 00:11:55 -06:00
|
|
|
struct netdev_queue __rcu *ingress_queue;
|
2010-09-15 20:58:13 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Cache lines mostly used on transmit path
|
|
|
|
*/
|
2008-07-17 01:34:19 -06:00
|
|
|
struct netdev_queue *_tx ____cacheline_aligned_in_smp;
|
2008-07-17 02:56:23 -06:00
|
|
|
|
|
|
|
/* Number of TX queues allocated at alloc_netdev_mq() time */
|
2008-07-17 01:34:19 -06:00
|
|
|
unsigned int num_tx_queues;
|
2008-07-17 02:56:23 -06:00
|
|
|
|
|
|
|
/* Number of TX queues currently active in device */
|
|
|
|
unsigned int real_num_tx_queues;
|
|
|
|
|
2009-09-04 00:41:18 -06:00
|
|
|
/* root qdisc from userspace point of view */
|
|
|
|
struct Qdisc *qdisc;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long tx_queue_len; /* Max frames per queue allowed */
|
2008-07-31 17:58:50 -06:00
|
|
|
spinlock_t tx_global_lock;
|
2010-09-15 20:58:13 -06:00
|
|
|
|
2010-11-26 01:36:09 -07:00
|
|
|
#ifdef CONFIG_XPS
|
2010-11-28 14:43:02 -07:00
|
|
|
struct xps_dev_maps __rcu *xps_maps;
|
2010-11-26 01:36:09 -07:00
|
|
|
#endif
|
2010-11-21 06:17:27 -07:00
|
|
|
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
/* These may be needed for future network-power-down code. */
|
2009-05-17 21:55:16 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* trans_start here is expensive for high speed devices on SMP,
|
|
|
|
* please use netdev_queue->trans_start instead.
|
|
|
|
*/
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
unsigned long trans_start; /* Time (in jiffies) of last Tx */
|
|
|
|
|
|
|
|
int watchdog_timeo; /* used by dev_watchdog() */
|
|
|
|
struct timer_list watchdog_timer;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Number of references to this device */
|
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 04:22:12 -06:00
|
|
|
int __percpu *pcpu_refcnt;
|
[NET]: Reorder some hot fields of struct net_device
Place them on separate cache lines in SMP to lower memory bouncing
between multiple CPU accessing the device.
- One part is mostly used on receive path (including
eth_type_trans()) (poll_list, poll, quota, weight, last_rx,
dev_addr, broadcast)
- One part is mostly used on queue transmit path (qdisc)
(queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)
- One part is mostly used on xmit path (device)
(xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)
'features' is placed outside of these hot points, in a location that
may be shared by all cpus (because mostly read)
name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-27 16:23:16 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* delayed register/unregister */
|
|
|
|
struct list_head todo_list;
|
|
|
|
/* device index hash chain */
|
|
|
|
struct hlist_node index_hlist;
|
|
|
|
|
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-16 22:59:21 -07:00
|
|
|
struct list_head link_watch_list;
|
2007-05-08 19:34:17 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* register/unregister state machine */
|
|
|
|
enum { NETREG_UNINITIALIZED=0,
|
2006-05-10 14:21:17 -06:00
|
|
|
NETREG_REGISTERED, /* completed register_netdevice */
|
2005-04-16 16:20:36 -06:00
|
|
|
NETREG_UNREGISTERING, /* called unregister_netdevice */
|
|
|
|
NETREG_UNREGISTERED, /* completed unregister todo */
|
|
|
|
NETREG_RELEASED, /* called free_netdev */
|
2009-01-14 22:05:05 -07:00
|
|
|
NETREG_DUMMY, /* dummy device for NAPI poll */
|
2010-02-25 23:34:51 -07:00
|
|
|
} reg_state:16;
|
|
|
|
|
|
|
|
enum {
|
|
|
|
RTNL_LINK_INITIALIZED,
|
|
|
|
RTNL_LINK_INITIALIZING,
|
|
|
|
} rtnl_link_state:16;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-11-19 22:32:24 -07:00
|
|
|
/* Called from unregister, can be used to call free_netdev */
|
|
|
|
void (*destructor)(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_NETPOLL
|
2005-06-22 23:05:31 -06:00
|
|
|
struct netpoll_info *npinfo;
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
2008-07-15 04:03:33 -06:00
|
|
|
|
2008-03-25 06:47:49 -06:00
|
|
|
#ifdef CONFIG_NET_NS
|
2007-09-12 03:56:32 -06:00
|
|
|
/* Network namespace this network device is inside */
|
|
|
|
struct net *nd_net;
|
2008-03-25 06:47:49 -06:00
|
|
|
#endif
|
2007-09-12 03:56:32 -06:00
|
|
|
|
2008-05-12 04:29:11 -06:00
|
|
|
/* mid-layer private */
|
2010-09-23 17:51:51 -06:00
|
|
|
union {
|
|
|
|
void *ml_priv;
|
|
|
|
struct pcpu_lstats __percpu *lstats; /* loopback stats */
|
2010-09-26 18:33:35 -06:00
|
|
|
struct pcpu_tstats __percpu *tstats; /* tunnel stats */
|
2010-09-27 14:50:33 -06:00
|
|
|
struct pcpu_dstats __percpu *dstats; /* dummy stats */
|
2010-09-23 17:51:51 -06:00
|
|
|
};
|
2008-07-05 22:26:13 -06:00
|
|
|
/* GARP */
|
2010-10-24 15:32:36 -06:00
|
|
|
struct garp_port __rcu *garp_port;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* class/net/name entry */
|
2002-04-09 13:14:34 -06:00
|
|
|
struct device dev;
|
2009-10-29 08:18:21 -06:00
|
|
|
/* space for optional device, statistics, and wireless sysfs groups */
|
|
|
|
const struct attribute_group *sysfs_groups[4];
|
2007-06-13 13:03:51 -06:00
|
|
|
|
|
|
|
/* rtnetlink link ops */
|
|
|
|
const struct rtnl_link_ops *rtnl_link_ops;
|
2007-07-06 14:36:20 -06:00
|
|
|
|
2008-05-23 01:22:04 -06:00
|
|
|
/* VLAN feature mask */
|
|
|
|
unsigned long vlan_features;
|
|
|
|
|
[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 04:43:19 -06:00
|
|
|
/* for setting kernel sock attribute on TCP connection setup */
|
|
|
|
#define GSO_MAX_SIZE 65536
|
|
|
|
unsigned int gso_max_size;
|
2008-11-19 22:32:24 -07:00
|
|
|
|
2008-11-25 02:02:08 -07:00
|
|
|
#ifdef CONFIG_DCB
|
2008-11-20 21:52:10 -07:00
|
|
|
/* Data Center Bridging netlink ops */
|
2009-10-05 00:01:03 -06:00
|
|
|
const struct dcbnl_rtnl_ops *dcbnl_ops;
|
2008-11-20 21:52:10 -07:00
|
|
|
#endif
|
|
|
|
|
2009-02-27 15:06:59 -07:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
/* max exchange id for FCoE LRO by ddp */
|
|
|
|
unsigned int fcoe_ddp_xid;
|
|
|
|
#endif
|
2010-02-10 21:03:05 -07:00
|
|
|
/* n-tuple filter list attached to this device */
|
|
|
|
struct ethtool_rx_ntuple_list ethtool_ntuple_list;
|
2010-07-17 02:49:36 -06:00
|
|
|
|
|
|
|
/* phy device may attach itself for hardware timestamping */
|
|
|
|
struct phy_device *phydev;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
2002-04-09 13:14:34 -06:00
|
|
|
#define to_net_dev(d) container_of(d, struct net_device, dev)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#define NETDEV_ALIGN 32
|
|
|
|
|
2008-07-17 01:34:19 -06:00
|
|
|
static inline
|
|
|
|
struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
|
|
|
|
unsigned int index)
|
|
|
|
{
|
|
|
|
return &dev->_tx[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netdev_for_each_tx_queue(struct net_device *dev,
|
|
|
|
void (*f)(struct net_device *,
|
|
|
|
struct netdev_queue *,
|
|
|
|
void *),
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++)
|
|
|
|
f(dev, &dev->_tx[i], arg);
|
|
|
|
}
|
|
|
|
|
2008-03-25 06:47:49 -06:00
|
|
|
/*
|
|
|
|
* Net namespace inlines
|
|
|
|
*/
|
|
|
|
static inline
|
|
|
|
struct net *dev_net(const struct net_device *dev)
|
|
|
|
{
|
2010-06-01 00:51:19 -06:00
|
|
|
return read_pnet(&dev->nd_net);
|
2008-03-25 06:47:49 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
2008-03-26 01:48:17 -06:00
|
|
|
void dev_net_set(struct net_device *dev, struct net *net)
|
2008-03-25 06:47:49 -06:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_NET_NS
|
2008-04-16 03:02:18 -06:00
|
|
|
release_net(dev->nd_net);
|
|
|
|
dev->nd_net = hold_net(net);
|
2008-03-25 06:47:49 -06:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-10-07 07:45:02 -06:00
|
|
|
static inline bool netdev_uses_dsa_tags(struct net_device *dev)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_NET_DSA_TAG_DSA
|
|
|
|
if (dev->dsa_ptr != NULL)
|
|
|
|
return dsa_uses_dsa_tags(dev->dsa_ptr);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-01-30 05:23:03 -07:00
|
|
|
#ifndef CONFIG_NET_NS
|
|
|
|
static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
{
|
|
|
|
skb->dev = dev;
|
|
|
|
}
|
|
|
|
#else /* CONFIG_NET_NS */
|
|
|
|
void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
|
|
|
|
#endif
|
|
|
|
|
2008-10-07 07:46:07 -06:00
|
|
|
static inline bool netdev_uses_trailer_tags(struct net_device *dev)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_NET_DSA_TAG_TRAILER
|
|
|
|
if (dev->dsa_ptr != NULL)
|
|
|
|
return dsa_uses_trailer_tags(dev->dsa_ptr);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netdev_priv - access network device private data
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Get network device private data
|
|
|
|
*/
|
2007-06-13 13:03:21 -06:00
|
|
|
static inline void *netdev_priv(const struct net_device *dev)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2009-05-26 22:42:37 -06:00
|
|
|
return (char *)dev + ALIGN(sizeof(struct net_device), NETDEV_ALIGN);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the sysfs physical device reference for the network logical device
|
|
|
|
* if set prior to registration will cause a symlink during initialization.
|
|
|
|
*/
|
2002-04-09 13:14:34 -06:00
|
|
|
#define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev))
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-08-31 15:08:19 -06:00
|
|
|
/* Set the sysfs device type for the network logical device to allow
|
|
|
|
* fin grained indentification of different network device types. For
|
|
|
|
* example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc.
|
|
|
|
*/
|
|
|
|
#define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype))
|
|
|
|
|
2007-11-01 03:21:47 -06:00
|
|
|
/**
|
|
|
|
* netif_napi_add - initialize a napi context
|
|
|
|
* @dev: network device
|
|
|
|
* @napi: napi context
|
|
|
|
* @poll: polling function
|
|
|
|
* @weight: default weight
|
|
|
|
*
|
|
|
|
* netif_napi_add() must be used to initialize a napi context prior to calling
|
|
|
|
* *any* of the other napi related functions.
|
|
|
|
*/
|
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 00:38:52 -07:00
|
|
|
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
|
|
|
|
int (*poll)(struct napi_struct *, int), int weight);
|
[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-03 17:41:36 -06:00
|
|
|
|
2008-07-08 16:13:05 -06:00
|
|
|
/**
|
|
|
|
* netif_napi_del - remove a napi context
|
|
|
|
* @napi: napi context
|
|
|
|
*
|
|
|
|
* netif_napi_del() removes a napi context from the network device napi list
|
|
|
|
*/
|
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 00:38:52 -07:00
|
|
|
void netif_napi_del(struct napi_struct *napi);
|
|
|
|
|
|
|
|
struct napi_gro_cb {
|
2009-05-26 12:50:21 -06:00
|
|
|
/* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
|
|
|
|
void *frag0;
|
|
|
|
|
2009-05-26 12:50:27 -06:00
|
|
|
/* Length of frag0. */
|
|
|
|
unsigned int frag0_len;
|
|
|
|
|
2009-01-29 07:19:50 -07:00
|
|
|
/* This indicates where we are processing relative to skb->data. */
|
|
|
|
int data_offset;
|
|
|
|
|
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 00:38:52 -07:00
|
|
|
/* This is non-zero if the packet may be of the same flow. */
|
|
|
|
int same_flow;
|
|
|
|
|
|
|
|
/* This is non-zero if the packet cannot be merged with the new skb. */
|
|
|
|
int flush;
|
|
|
|
|
|
|
|
/* Number of segments aggregated. */
|
|
|
|
int count;
|
2009-01-04 17:13:40 -07:00
|
|
|
|
|
|
|
/* Free the skb? */
|
|
|
|
int free;
|
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 00:38:52 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
|
2008-07-08 16:13:05 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct packet_type {
|
2005-08-09 20:34:12 -06:00
|
|
|
__be16 type; /* This is really htons(ether_type). */
|
|
|
|
struct net_device *dev; /* NULL is wildcarded here */
|
|
|
|
int (*func) (struct sk_buff *,
|
|
|
|
struct net_device *,
|
|
|
|
struct packet_type *,
|
|
|
|
struct net_device *);
|
2006-06-27 14:22:38 -06:00
|
|
|
struct sk_buff *(*gso_segment)(struct sk_buff *skb,
|
|
|
|
int features);
|
2006-07-08 14:34:56 -06:00
|
|
|
int (*gso_send_check)(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 00:38:52 -07:00
|
|
|
struct sk_buff **(*gro_receive)(struct sk_buff **head,
|
|
|
|
struct sk_buff *skb);
|
|
|
|
int (*gro_complete)(struct sk_buff *skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
void *af_packet_priv;
|
|
|
|
struct list_head list;
|
|
|
|
};
|
|
|
|
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/notifier.h>
|
|
|
|
|
|
|
|
extern rwlock_t dev_base_lock; /* Device list lock */
|
|
|
|
|
2007-05-03 16:13:45 -06:00
|
|
|
|
2007-09-17 12:56:21 -06:00
|
|
|
#define for_each_netdev(net, d) \
|
|
|
|
list_for_each_entry(d, &(net)->dev_base_head, dev_list)
|
2009-11-29 15:25:26 -07:00
|
|
|
#define for_each_netdev_reverse(net, d) \
|
|
|
|
list_for_each_entry_reverse(d, &(net)->dev_base_head, dev_list)
|
2009-11-04 06:43:23 -07:00
|
|
|
#define for_each_netdev_rcu(net, d) \
|
|
|
|
list_for_each_entry_rcu(d, &(net)->dev_base_head, dev_list)
|
2007-09-17 12:56:21 -06:00
|
|
|
#define for_each_netdev_safe(net, d, n) \
|
|
|
|
list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
|
|
|
|
#define for_each_netdev_continue(net, d) \
|
|
|
|
list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
|
2009-11-10 00:54:47 -07:00
|
|
|
#define for_each_netdev_continue_rcu(net, d) \
|
|
|
|
list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
|
2007-09-17 12:56:21 -06:00
|
|
|
#define net_device_entry(lh) list_entry(lh, struct net_device, dev_list)
|
2007-05-03 16:13:45 -06:00
|
|
|
|
2007-09-12 06:57:09 -06:00
|
|
|
static inline struct net_device *next_net_device(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct list_head *lh;
|
|
|
|
struct net *net;
|
|
|
|
|
2008-03-25 06:47:49 -06:00
|
|
|
net = dev_net(dev);
|
2007-09-12 06:57:09 -06:00
|
|
|
lh = dev->dev_list.next;
|
|
|
|
return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
|
|
|
|
}
|
|
|
|
|
2009-11-11 10:34:30 -07:00
|
|
|
static inline struct net_device *next_net_device_rcu(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct list_head *lh;
|
|
|
|
struct net *net;
|
|
|
|
|
|
|
|
net = dev_net(dev);
|
|
|
|
lh = rcu_dereference(dev->dev_list.next);
|
|
|
|
return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
|
|
|
|
}
|
|
|
|
|
2007-09-12 06:57:09 -06:00
|
|
|
static inline struct net_device *first_net_device(struct net *net)
|
|
|
|
{
|
|
|
|
return list_empty(&net->dev_base_head) ? NULL :
|
|
|
|
net_device_entry(net->dev_base_head.next);
|
|
|
|
}
|
2007-05-03 16:13:45 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int netdev_boot_setup_check(struct net_device *dev);
|
|
|
|
extern unsigned long netdev_boot_base(const char *prefix, int unit);
|
2010-12-04 18:23:53 -07:00
|
|
|
extern struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,
|
|
|
|
const char *hwaddr);
|
2007-09-17 12:56:21 -06:00
|
|
|
extern struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type);
|
|
|
|
extern struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern void dev_add_pack(struct packet_type *pt);
|
|
|
|
extern void dev_remove_pack(struct packet_type *pt);
|
|
|
|
extern void __dev_remove_pack(struct packet_type *pt);
|
|
|
|
|
2010-06-07 05:42:13 -06:00
|
|
|
extern struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short flags,
|
|
|
|
unsigned short mask);
|
2007-09-17 12:56:21 -06:00
|
|
|
extern struct net_device *dev_get_by_name(struct net *net, const char *name);
|
2009-10-30 01:11:27 -06:00
|
|
|
extern struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
|
2007-09-17 12:56:21 -06:00
|
|
|
extern struct net_device *__dev_get_by_name(struct net *net, const char *name);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int dev_alloc_name(struct net_device *dev, const char *name);
|
|
|
|
extern int dev_open(struct net_device *dev);
|
|
|
|
extern int dev_close(struct net_device *dev);
|
2008-06-19 17:15:47 -06:00
|
|
|
extern void dev_disable_lro(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int dev_queue_xmit(struct sk_buff *skb);
|
|
|
|
extern int register_netdevice(struct net_device *dev);
|
2009-10-27 01:03:04 -06:00
|
|
|
extern void unregister_netdevice_queue(struct net_device *dev,
|
|
|
|
struct list_head *head);
|
2009-10-27 01:04:19 -06:00
|
|
|
extern void unregister_netdevice_many(struct list_head *head);
|
2009-10-27 01:03:04 -06:00
|
|
|
static inline void unregister_netdevice(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unregister_netdevice_queue(dev, NULL);
|
|
|
|
}
|
|
|
|
|
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 04:22:12 -06:00
|
|
|
extern int netdev_refcnt_read(const struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern void free_netdev(struct net_device *dev);
|
|
|
|
extern void synchronize_net(void);
|
|
|
|
extern int register_netdevice_notifier(struct notifier_block *nb);
|
|
|
|
extern int unregister_netdevice_notifier(struct notifier_block *nb);
|
2009-01-14 22:05:05 -07:00
|
|
|
extern int init_dummy_netdev(struct net_device *dev);
|
2009-03-05 00:46:25 -07:00
|
|
|
extern void netdev_resync_ops(struct net_device *dev);
|
2009-01-14 22:05:05 -07:00
|
|
|
|
2007-09-16 16:33:32 -06:00
|
|
|
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
|
2007-09-17 12:56:21 -06:00
|
|
|
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
|
|
|
|
extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
|
2009-10-19 13:18:49 -06:00
|
|
|
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int dev_restart(struct net_device *dev);
|
|
|
|
#ifdef CONFIG_NETPOLL_TRAP
|
|
|
|
extern int netpoll_trap(void);
|
|
|
|
#endif
|
2009-01-29 07:19:50 -07:00
|
|
|
extern int skb_gro_receive(struct sk_buff **head,
|
|
|
|
struct sk_buff *skb);
|
2009-05-26 12:50:21 -06:00
|
|
|
extern void skb_gro_reset_offset(struct sk_buff *skb);
|
2009-01-29 07:19:50 -07:00
|
|
|
|
|
|
|
static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return NAPI_GRO_CB(skb)->data_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned int skb_gro_len(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->len - NAPI_GRO_CB(skb)->data_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
NAPI_GRO_CB(skb)->data_offset += len;
|
|
|
|
}
|
|
|
|
|
2009-05-26 12:50:28 -06:00
|
|
|
static inline void *skb_gro_header_fast(struct sk_buff *skb,
|
|
|
|
unsigned int offset)
|
2009-01-29 07:19:50 -07:00
|
|
|
{
|
2009-05-26 12:50:28 -06:00
|
|
|
return NAPI_GRO_CB(skb)->frag0 + offset;
|
|
|
|
}
|
2009-05-26 12:50:21 -06:00
|
|
|
|
2009-05-26 12:50:28 -06:00
|
|
|
static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
|
|
|
|
{
|
|
|
|
return NAPI_GRO_CB(skb)->frag0_len < hlen;
|
|
|
|
}
|
2009-05-26 12:50:21 -06:00
|
|
|
|
2009-05-26 12:50:28 -06:00
|
|
|
static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
|
|
|
|
unsigned int offset)
|
|
|
|
{
|
|
|
|
NAPI_GRO_CB(skb)->frag0 = NULL;
|
|
|
|
NAPI_GRO_CB(skb)->frag0_len = 0;
|
|
|
|
return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
|
2009-01-29 07:19:50 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-02-08 11:00:37 -07:00
|
|
|
static inline void *skb_gro_mac_header(struct sk_buff *skb)
|
|
|
|
{
|
2009-05-26 12:50:23 -06:00
|
|
|
return NAPI_GRO_CB(skb)->frag0 ?: skb_mac_header(skb);
|
2009-02-08 11:00:37 -07:00
|
|
|
}
|
|
|
|
|
2009-04-27 06:44:45 -06:00
|
|
|
static inline void *skb_gro_network_header(struct sk_buff *skb)
|
|
|
|
{
|
2009-05-26 12:50:23 -06:00
|
|
|
return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
|
|
|
|
skb_network_offset(skb);
|
2009-04-27 06:44:45 -06:00
|
|
|
}
|
|
|
|
|
2007-10-09 02:36:32 -06:00
|
|
|
static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
unsigned short type,
|
2007-10-09 02:40:57 -06:00
|
|
|
const void *daddr, const void *saddr,
|
|
|
|
unsigned len)
|
2007-10-09 02:36:32 -06:00
|
|
|
{
|
2007-10-22 08:16:14 -06:00
|
|
|
if (!dev->header_ops || !dev->header_ops->create)
|
2007-10-09 02:36:32 -06:00
|
|
|
return 0;
|
2007-10-09 02:40:57 -06:00
|
|
|
|
|
|
|
return dev->header_ops->create(skb, dev, type, daddr, saddr, len);
|
2007-10-09 02:36:32 -06:00
|
|
|
}
|
|
|
|
|
2007-09-26 23:13:38 -06:00
|
|
|
static inline int dev_parse_header(const struct sk_buff *skb,
|
|
|
|
unsigned char *haddr)
|
|
|
|
{
|
|
|
|
const struct net_device *dev = skb->dev;
|
|
|
|
|
2007-10-18 06:09:28 -06:00
|
|
|
if (!dev->header_ops || !dev->header_ops->parse)
|
2007-09-26 23:13:38 -06:00
|
|
|
return 0;
|
2007-10-09 02:40:57 -06:00
|
|
|
return dev->header_ops->parse(skb, haddr);
|
2007-09-26 23:13:38 -06:00
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
|
|
|
|
extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf);
|
|
|
|
static inline int unregister_gifconf(unsigned int family)
|
|
|
|
{
|
|
|
|
return register_gifconf(family, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-04-18 23:07:33 -06:00
|
|
|
* Incoming packets are placed on per-cpu queues
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2009-11-04 10:50:58 -07:00
|
|
|
struct softnet_data {
|
2008-07-16 03:15:04 -06:00
|
|
|
struct Qdisc *output_queue;
|
2010-04-26 17:06:24 -06:00
|
|
|
struct Qdisc **output_queue_tailp;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct list_head poll_list;
|
|
|
|
struct sk_buff *completion_queue;
|
2010-04-27 16:07:33 -06:00
|
|
|
struct sk_buff_head process_queue;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-05-01 23:42:16 -06:00
|
|
|
/* stats */
|
2010-05-02 23:27:59 -06:00
|
|
|
unsigned int processed;
|
|
|
|
unsigned int time_squeeze;
|
|
|
|
unsigned int cpu_collision;
|
|
|
|
unsigned int received_rps;
|
2010-05-01 23:42:16 -06:00
|
|
|
|
2010-04-15 01:16:59 -06:00
|
|
|
#ifdef CONFIG_RPS
|
2010-04-18 23:07:33 -06:00
|
|
|
struct softnet_data *rps_ipi_list;
|
|
|
|
|
|
|
|
/* Elements below can be accessed between CPUs for RPS */
|
2010-03-16 02:03:29 -06:00
|
|
|
struct call_single_data csd ____cacheline_aligned_in_smp;
|
2010-04-18 23:07:33 -06:00
|
|
|
struct softnet_data *rps_ipi_next;
|
|
|
|
unsigned int cpu;
|
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-16 17:01:27 -06:00
|
|
|
unsigned int input_queue_head;
|
2010-05-20 12:37:59 -06:00
|
|
|
unsigned int input_queue_tail;
|
2010-03-18 18:45:44 -06:00
|
|
|
#endif
|
2010-05-01 23:42:16 -06:00
|
|
|
unsigned dropped;
|
2010-03-16 02:03:29 -06:00
|
|
|
struct sk_buff_head input_pkt_queue;
|
[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-03 17:41:36 -06:00
|
|
|
struct napi_struct backlog;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2010-05-20 12:37:59 -06:00
|
|
|
static inline void input_queue_head_incr(struct softnet_data *sd)
|
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-16 17:01:27 -06:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
2010-05-20 12:37:59 -06:00
|
|
|
sd->input_queue_head++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void input_queue_tail_incr_save(struct softnet_data *sd,
|
|
|
|
unsigned int *qtail)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
*qtail = ++sd->input_queue_tail;
|
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-16 17:01:27 -06:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2010-03-16 02:03:29 -06:00
|
|
|
DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#define HAVE_NETIF_QUEUE
|
|
|
|
|
2008-07-16 03:15:04 -06:00
|
|
|
extern void __netif_schedule(struct Qdisc *q);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-07-09 00:11:25 -06:00
|
|
|
static inline void netif_schedule_queue(struct netdev_queue *txq)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2008-07-09 00:14:46 -06:00
|
|
|
if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
|
2008-07-16 03:15:04 -06:00
|
|
|
__netif_schedule(txq->qdisc);
|
2008-07-09 00:11:25 -06:00
|
|
|
}
|
|
|
|
|
2008-07-17 02:56:23 -06:00
|
|
|
static inline void netif_tx_schedule_all(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++)
|
|
|
|
netif_schedule_queue(netdev_get_tx_queue(dev, i));
|
|
|
|
}
|
|
|
|
|
2008-07-22 15:09:06 -06:00
|
|
|
static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
|
|
|
|
{
|
|
|
|
clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_start_queue - allow transmit
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Allow upper layers to call the device hard_start_xmit routine.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline void netif_start_queue(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
netif_tx_start_queue(netdev_get_tx_queue(dev, 0));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-07-17 02:56:23 -06:00
|
|
|
static inline void netif_tx_start_all_queues(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
|
|
netif_tx_start_queue(txq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-09 00:14:46 -06:00
|
|
|
static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_NETPOLL_TRAP
|
2007-04-28 21:57:37 -06:00
|
|
|
if (netpoll_trap()) {
|
2009-08-29 14:21:21 -06:00
|
|
|
netif_tx_start_queue(dev_queue);
|
2005-04-16 16:20:36 -06:00
|
|
|
return;
|
2007-04-28 21:57:37 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
2008-07-09 00:14:46 -06:00
|
|
|
if (test_and_clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state))
|
2008-07-16 03:15:04 -06:00
|
|
|
__netif_schedule(dev_queue->qdisc);
|
2008-07-09 00:14:46 -06:00
|
|
|
}
|
|
|
|
|
2008-07-22 15:09:06 -06:00
|
|
|
/**
|
|
|
|
* netif_wake_queue - restart transmit
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Allow upper layers to call the device hard_start_xmit routine.
|
|
|
|
* Used for flow control when transmit resources are available.
|
|
|
|
*/
|
2008-07-09 00:14:46 -06:00
|
|
|
static inline void netif_wake_queue(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
netif_tx_wake_queue(netdev_get_tx_queue(dev, 0));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-07-17 02:56:23 -06:00
|
|
|
static inline void netif_tx_wake_all_queues(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
|
|
netif_tx_wake_queue(txq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-22 15:09:06 -06:00
|
|
|
static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
|
|
|
|
{
|
2010-11-06 00:39:32 -06:00
|
|
|
if (WARN_ON(!dev_queue)) {
|
|
|
|
printk(KERN_INFO "netif_stop_queue() cannot be called before "
|
|
|
|
"register_netdev()");
|
|
|
|
return;
|
|
|
|
}
|
2008-07-22 15:09:06 -06:00
|
|
|
set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_stop_queue - stop transmitted packets
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Stop upper layers calling the device hard_start_xmit routine.
|
|
|
|
* Used for flow control when transmit resources are unavailable.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline void netif_stop_queue(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
netif_tx_stop_queue(netdev_get_tx_queue(dev, 0));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-07-17 02:56:23 -06:00
|
|
|
static inline void netif_tx_stop_all_queues(struct net_device *dev)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
|
|
netif_tx_stop_queue(txq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-22 15:09:06 -06:00
|
|
|
static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
|
|
|
|
{
|
|
|
|
return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_queue_stopped - test if transmit queue is flowblocked
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Test if transmit queue on device is currently unable to send.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline int netif_queue_stopped(const struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2010-11-23 03:42:02 -07:00
|
|
|
static inline int netif_tx_queue_frozen_or_stopped(const struct netdev_queue *dev_queue)
|
2008-07-31 17:58:50 -06:00
|
|
|
{
|
2010-11-23 03:42:02 -07:00
|
|
|
return dev_queue->state & QUEUE_STATE_XOFF_OR_FROZEN;
|
2008-07-31 17:58:50 -06: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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_running - test if up
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Test if the device has been brought up.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline int netif_running(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return test_bit(__LINK_STATE_START, &dev->state);
|
|
|
|
}
|
|
|
|
|
2007-07-06 14:36:20 -06:00
|
|
|
/*
|
|
|
|
* Routines to manage the subqueues on a device. We only need start
|
|
|
|
* stop, and a check if it's stopped. All other device management is
|
|
|
|
* done at the overall netdevice level.
|
|
|
|
* Also test the device if we're multiqueue.
|
|
|
|
*/
|
[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-03 17:41:36 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* netif_start_subqueue - allow sending packets on subqueue
|
|
|
|
* @dev: network device
|
|
|
|
* @queue_index: sub queue index
|
|
|
|
*
|
|
|
|
* Start individual transmit queue of a device with multiple transmit queues.
|
|
|
|
*/
|
2007-07-06 14:36:20 -06:00
|
|
|
static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
|
|
|
|
{
|
2008-07-17 02:56:23 -06:00
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
|
2009-08-29 14:21:21 -06:00
|
|
|
|
|
|
|
netif_tx_start_queue(txq);
|
2007-07-06 14:36:20 -06: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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_stop_subqueue - stop sending packets on subqueue
|
|
|
|
* @dev: network device
|
|
|
|
* @queue_index: sub queue index
|
|
|
|
*
|
|
|
|
* Stop individual transmit queue of a device with multiple transmit queues.
|
|
|
|
*/
|
2007-07-06 14:36:20 -06:00
|
|
|
static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
|
|
|
|
{
|
2008-07-17 02:56:23 -06:00
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
|
2007-07-06 14:36:20 -06:00
|
|
|
#ifdef CONFIG_NETPOLL_TRAP
|
|
|
|
if (netpoll_trap())
|
|
|
|
return;
|
|
|
|
#endif
|
2009-08-29 14:21:21 -06:00
|
|
|
netif_tx_stop_queue(txq);
|
2007-07-06 14:36:20 -06: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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_subqueue_stopped - test status of subqueue
|
|
|
|
* @dev: network device
|
|
|
|
* @queue_index: sub queue index
|
|
|
|
*
|
|
|
|
* Check individual transmit queue of a device with multiple transmit queues.
|
|
|
|
*/
|
2007-10-21 18:01:56 -06:00
|
|
|
static inline int __netif_subqueue_stopped(const struct net_device *dev,
|
2007-07-06 14:36:20 -06:00
|
|
|
u16 queue_index)
|
|
|
|
{
|
2008-07-17 02:56:23 -06:00
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
|
2009-08-29 14:21:21 -06:00
|
|
|
|
|
|
|
return netif_tx_queue_stopped(txq);
|
2007-07-06 14:36:20 -06:00
|
|
|
}
|
|
|
|
|
2007-10-21 18:01:56 -06:00
|
|
|
static inline int netif_subqueue_stopped(const struct net_device *dev,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return __netif_subqueue_stopped(dev, skb_get_queue_mapping(skb));
|
|
|
|
}
|
[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-03 17:41:36 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* netif_wake_subqueue - allow sending packets on subqueue
|
|
|
|
* @dev: network device
|
|
|
|
* @queue_index: sub queue index
|
|
|
|
*
|
|
|
|
* Resume individual transmit queue of a device with multiple transmit queues.
|
|
|
|
*/
|
2007-07-06 14:36:20 -06:00
|
|
|
static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
|
|
|
|
{
|
2008-07-17 02:56:23 -06:00
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
|
2007-07-06 14:36:20 -06:00
|
|
|
#ifdef CONFIG_NETPOLL_TRAP
|
|
|
|
if (netpoll_trap())
|
|
|
|
return;
|
|
|
|
#endif
|
2008-07-17 02:56:23 -06:00
|
|
|
if (test_and_clear_bit(__QUEUE_STATE_XOFF, &txq->state))
|
2008-07-16 03:15:04 -06:00
|
|
|
__netif_schedule(txq->qdisc);
|
2007-07-06 14:36:20 -06:00
|
|
|
}
|
|
|
|
|
2010-12-12 23:27:10 -07:00
|
|
|
/*
|
|
|
|
* Returns a Tx hash for the given packet when dev->real_num_tx_queues is used
|
|
|
|
* as a distribution range limit for the returned value.
|
|
|
|
*/
|
|
|
|
static inline u16 skb_tx_hash(const struct net_device *dev,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return __skb_tx_hash(dev, skb, dev->real_num_tx_queues);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_is_multiqueue - test if device has multiple transmit queues
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Check if device has multiple transmit queues
|
|
|
|
*/
|
2007-07-06 14:36:20 -06:00
|
|
|
static inline int netif_is_multiqueue(const struct net_device *dev)
|
|
|
|
{
|
2010-09-22 14:43:57 -06:00
|
|
|
return dev->num_tx_queues > 1;
|
2007-07-06 14:36:20 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-10-18 12:04:39 -06:00
|
|
|
extern int netif_set_real_num_tx_queues(struct net_device *dev,
|
|
|
|
unsigned int txq);
|
2010-07-01 07:21:57 -06:00
|
|
|
|
2010-09-27 02:24:33 -06:00
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
extern int netif_set_real_num_rx_queues(struct net_device *dev,
|
|
|
|
unsigned int rxq);
|
|
|
|
#else
|
|
|
|
static inline int netif_set_real_num_rx_queues(struct net_device *dev,
|
|
|
|
unsigned int rxq)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-09-27 02:24:49 -06:00
|
|
|
static inline int netif_copy_real_num_queues(struct net_device *to_dev,
|
|
|
|
const struct net_device *from_dev)
|
|
|
|
{
|
|
|
|
netif_set_real_num_tx_queues(to_dev, from_dev->real_num_tx_queues);
|
|
|
|
#ifdef CONFIG_RPS
|
|
|
|
return netif_set_real_num_rx_queues(to_dev,
|
|
|
|
from_dev->real_num_rx_queues);
|
|
|
|
#else
|
|
|
|
return 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Use this variant when it is known for sure that it
|
2008-03-28 17:33:00 -06:00
|
|
|
* is executing from hardware interrupt context or with hardware interrupts
|
|
|
|
* disabled.
|
2005-04-16 16:20:36 -06: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-03 17:41:36 -06:00
|
|
|
extern void dev_kfree_skb_irq(struct sk_buff *skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Use this variant in places where it could be invoked
|
2008-03-28 17:33:00 -06:00
|
|
|
* from either hardware interrupt or other context, with hardware interrupts
|
|
|
|
* either disabled or enabled.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2006-03-29 16:57:29 -07:00
|
|
|
extern void dev_kfree_skb_any(struct sk_buff *skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#define HAVE_NETIF_RX 1
|
|
|
|
extern int netif_rx(struct sk_buff *skb);
|
|
|
|
extern int netif_rx_ni(struct sk_buff *skb);
|
|
|
|
#define HAVE_NETIF_RECEIVE_SKB 1
|
|
|
|
extern int netif_receive_skb(struct sk_buff *skb);
|
2009-10-29 01:17:09 -06:00
|
|
|
extern gro_result_t dev_gro_receive(struct napi_struct *napi,
|
2009-01-06 11:49:34 -07:00
|
|
|
struct sk_buff *skb);
|
2009-10-29 22:36:53 -06:00
|
|
|
extern gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
|
|
|
|
extern gro_result_t napi_gro_receive(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 00:38:52 -07:00
|
|
|
struct sk_buff *skb);
|
2010-08-31 12:25:32 -06:00
|
|
|
extern void napi_gro_flush(struct napi_struct *napi);
|
2009-04-16 03:02:07 -06:00
|
|
|
extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
|
2009-10-29 22:36:53 -06:00
|
|
|
extern gro_result_t napi_frags_finish(struct napi_struct *napi,
|
2009-10-29 01:17:09 -06:00
|
|
|
struct sk_buff *skb,
|
|
|
|
gro_result_t ret);
|
2009-04-16 03:02:07 -06:00
|
|
|
extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
|
2009-10-29 22:36:53 -06:00
|
|
|
extern gro_result_t napi_gro_frags(struct napi_struct *napi);
|
2009-04-16 03:02:07 -06:00
|
|
|
|
|
|
|
static inline void napi_free_frags(struct napi_struct *napi)
|
|
|
|
{
|
|
|
|
kfree_skb(napi->skb);
|
|
|
|
napi->skb = NULL;
|
|
|
|
}
|
|
|
|
|
2010-06-01 15:52:08 -06:00
|
|
|
extern int netdev_rx_handler_register(struct net_device *dev,
|
2010-06-09 21:34:59 -06:00
|
|
|
rx_handler_func_t *rx_handler,
|
|
|
|
void *rx_handler_data);
|
2010-06-01 15:52:08 -06:00
|
|
|
extern void netdev_rx_handler_unregister(struct net_device *dev);
|
|
|
|
|
2005-11-09 11:34:45 -07:00
|
|
|
extern int dev_valid_name(const char *name);
|
2007-09-17 12:56:21 -06:00
|
|
|
extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
|
|
|
|
extern int dev_ethtool(struct net *net, struct ifreq *);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern unsigned dev_get_flags(const struct net_device *);
|
2010-02-25 23:34:53 -07:00
|
|
|
extern int __dev_change_flags(struct net_device *, unsigned int flags);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int dev_change_flags(struct net_device *, unsigned);
|
2010-02-25 23:34:53 -07:00
|
|
|
extern void __dev_notify_flags(struct net_device *, unsigned int old_flags);
|
2008-09-30 03:22:14 -06:00
|
|
|
extern int dev_change_name(struct net_device *, const char *);
|
2008-09-22 22:28:11 -06:00
|
|
|
extern int dev_set_alias(struct net_device *, const char *, size_t);
|
2007-09-12 05:53:49 -06:00
|
|
|
extern int dev_change_net_namespace(struct net_device *,
|
|
|
|
struct net *, const char *);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int dev_set_mtu(struct net_device *, int);
|
|
|
|
extern int dev_set_mac_address(struct net_device *,
|
|
|
|
struct sockaddr *);
|
2006-06-22 03:57:17 -06:00
|
|
|
extern int dev_hard_start_xmit(struct sk_buff *skb,
|
2008-07-17 02:56:23 -06:00
|
|
|
struct net_device *dev,
|
|
|
|
struct netdev_queue *txq);
|
2009-11-25 23:07:08 -07:00
|
|
|
extern int dev_forward_skb(struct net_device *dev,
|
|
|
|
struct sk_buff *skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-08-15 23:18:02 -06:00
|
|
|
extern int netdev_budget;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Called by rtnetlink.c:rtnl_unlock() */
|
|
|
|
extern void netdev_run_todo(void);
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* dev_put - release reference to device
|
|
|
|
* @dev: network device
|
|
|
|
*
|
2007-10-10 22:18:17 -06:00
|
|
|
* Release reference to device to allow it to be freed.
|
[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-03 17:41:36 -06:00
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline void dev_put(struct net_device *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 04:22:12 -06:00
|
|
|
irqsafe_cpu_dec(*dev->pcpu_refcnt);
|
2005-04-16 16:20:36 -06: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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* dev_hold - get reference to device
|
|
|
|
* @dev: network device
|
|
|
|
*
|
2007-10-10 22:18:17 -06:00
|
|
|
* Hold reference to device to keep it from being freed.
|
[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-03 17:41:36 -06:00
|
|
|
*/
|
2006-03-20 23:32:28 -07:00
|
|
|
static inline void dev_hold(struct net_device *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 04:22:12 -06:00
|
|
|
irqsafe_cpu_inc(*dev->pcpu_refcnt);
|
2006-03-20 23:32:28 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Carrier loss detection, dial on demand. The functions netif_carrier_on
|
|
|
|
* and _off may be called from IRQ context, but it is caller
|
|
|
|
* who is responsible for serialization of these calls.
|
2006-03-20 18:09:11 -07:00
|
|
|
*
|
|
|
|
* The name carrier is inappropriate, these functions should really be
|
|
|
|
* called netif_lowerlayer_*() because they represent the state of any
|
|
|
|
* kind of lower layer not just hardware media.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
|
|
|
|
extern void linkwatch_fire_event(struct net_device *dev);
|
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-16 22:59:21 -07:00
|
|
|
extern void linkwatch_forget_dev(struct net_device *dev);
|
2005-04-16 16:20:36 -06: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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_carrier_ok - test if carrier present
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Check if carrier is present on device
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline int netif_carrier_ok(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return !test_bit(__LINK_STATE_NOCARRIER, &dev->state);
|
|
|
|
}
|
|
|
|
|
2009-05-17 21:55:16 -06:00
|
|
|
extern unsigned long dev_trans_start(struct net_device *dev);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
extern void __netdev_watchdog_up(struct net_device *dev);
|
|
|
|
|
2005-08-11 16:32:53 -06:00
|
|
|
extern void netif_carrier_on(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-08-11 16:32:53 -06:00
|
|
|
extern void netif_carrier_off(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-05-25 18:09:42 -06:00
|
|
|
extern void netif_notify_peers(struct net_device *dev);
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_dormant_on - mark device as dormant.
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Mark device as dormant (as per RFC2863).
|
|
|
|
*
|
|
|
|
* The dormant state indicates that the relevant interface is not
|
|
|
|
* actually in a condition to pass packets (i.e., it is not 'up') but is
|
|
|
|
* in a "pending" state, waiting for some external event. For "on-
|
|
|
|
* demand" interfaces, this new state identifies the situation where the
|
|
|
|
* interface is waiting for events to place it in the up state.
|
|
|
|
*
|
|
|
|
*/
|
2006-03-20 18:09:11 -07:00
|
|
|
static inline void netif_dormant_on(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (!test_and_set_bit(__LINK_STATE_DORMANT, &dev->state))
|
|
|
|
linkwatch_fire_event(dev);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_dormant_off - set device as not dormant.
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Device is not in dormant state.
|
|
|
|
*/
|
2006-03-20 18:09:11 -07:00
|
|
|
static inline void netif_dormant_off(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (test_and_clear_bit(__LINK_STATE_DORMANT, &dev->state))
|
|
|
|
linkwatch_fire_event(dev);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_dormant - test if carrier present
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Check if carrier is present on device
|
|
|
|
*/
|
2006-03-20 18:09:11 -07:00
|
|
|
static inline int netif_dormant(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return test_bit(__LINK_STATE_DORMANT, &dev->state);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_oper_up - test if device is operational
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Check if carrier is operational
|
|
|
|
*/
|
2009-11-04 10:50:58 -07:00
|
|
|
static inline int netif_oper_up(const struct net_device *dev)
|
|
|
|
{
|
2006-03-20 18:09:11 -07:00
|
|
|
return (dev->operstate == IF_OPER_UP ||
|
|
|
|
dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
|
|
|
|
}
|
|
|
|
|
[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-03 17:41:36 -06:00
|
|
|
/**
|
|
|
|
* netif_device_present - is device available or removed
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Check if device has not been removed from system.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline int netif_device_present(struct net_device *dev)
|
|
|
|
{
|
|
|
|
return test_bit(__LINK_STATE_PRESENT, &dev->state);
|
|
|
|
}
|
|
|
|
|
2006-03-29 16:57:29 -07:00
|
|
|
extern void netif_device_detach(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-03-29 16:57:29 -07:00
|
|
|
extern void netif_device_attach(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Network interface message level settings
|
|
|
|
*/
|
|
|
|
#define HAVE_NETIF_MSG 1
|
|
|
|
|
|
|
|
enum {
|
|
|
|
NETIF_MSG_DRV = 0x0001,
|
|
|
|
NETIF_MSG_PROBE = 0x0002,
|
|
|
|
NETIF_MSG_LINK = 0x0004,
|
|
|
|
NETIF_MSG_TIMER = 0x0008,
|
|
|
|
NETIF_MSG_IFDOWN = 0x0010,
|
|
|
|
NETIF_MSG_IFUP = 0x0020,
|
|
|
|
NETIF_MSG_RX_ERR = 0x0040,
|
|
|
|
NETIF_MSG_TX_ERR = 0x0080,
|
|
|
|
NETIF_MSG_TX_QUEUED = 0x0100,
|
|
|
|
NETIF_MSG_INTR = 0x0200,
|
|
|
|
NETIF_MSG_TX_DONE = 0x0400,
|
|
|
|
NETIF_MSG_RX_STATUS = 0x0800,
|
|
|
|
NETIF_MSG_PKTDATA = 0x1000,
|
|
|
|
NETIF_MSG_HW = 0x2000,
|
|
|
|
NETIF_MSG_WOL = 0x4000,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define netif_msg_drv(p) ((p)->msg_enable & NETIF_MSG_DRV)
|
|
|
|
#define netif_msg_probe(p) ((p)->msg_enable & NETIF_MSG_PROBE)
|
|
|
|
#define netif_msg_link(p) ((p)->msg_enable & NETIF_MSG_LINK)
|
|
|
|
#define netif_msg_timer(p) ((p)->msg_enable & NETIF_MSG_TIMER)
|
|
|
|
#define netif_msg_ifdown(p) ((p)->msg_enable & NETIF_MSG_IFDOWN)
|
|
|
|
#define netif_msg_ifup(p) ((p)->msg_enable & NETIF_MSG_IFUP)
|
|
|
|
#define netif_msg_rx_err(p) ((p)->msg_enable & NETIF_MSG_RX_ERR)
|
|
|
|
#define netif_msg_tx_err(p) ((p)->msg_enable & NETIF_MSG_TX_ERR)
|
|
|
|
#define netif_msg_tx_queued(p) ((p)->msg_enable & NETIF_MSG_TX_QUEUED)
|
|
|
|
#define netif_msg_intr(p) ((p)->msg_enable & NETIF_MSG_INTR)
|
|
|
|
#define netif_msg_tx_done(p) ((p)->msg_enable & NETIF_MSG_TX_DONE)
|
|
|
|
#define netif_msg_rx_status(p) ((p)->msg_enable & NETIF_MSG_RX_STATUS)
|
|
|
|
#define netif_msg_pktdata(p) ((p)->msg_enable & NETIF_MSG_PKTDATA)
|
|
|
|
#define netif_msg_hw(p) ((p)->msg_enable & NETIF_MSG_HW)
|
|
|
|
#define netif_msg_wol(p) ((p)->msg_enable & NETIF_MSG_WOL)
|
|
|
|
|
|
|
|
static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
|
|
|
|
{
|
|
|
|
/* use default */
|
|
|
|
if (debug_value < 0 || debug_value >= (sizeof(u32) * 8))
|
|
|
|
return default_msg_enable_bits;
|
|
|
|
if (debug_value == 0) /* no output */
|
|
|
|
return 0;
|
|
|
|
/* set low N bits */
|
|
|
|
return (1 << debug_value) - 1;
|
|
|
|
}
|
|
|
|
|
2008-07-09 00:13:53 -06:00
|
|
|
static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
|
2006-06-09 13:20:56 -06:00
|
|
|
{
|
2008-07-09 00:13:53 -06:00
|
|
|
spin_lock(&txq->_xmit_lock);
|
|
|
|
txq->xmit_lock_owner = cpu;
|
2007-09-16 15:40:49 -06:00
|
|
|
}
|
|
|
|
|
2008-07-17 02:56:23 -06:00
|
|
|
static inline void __netif_tx_lock_bh(struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&txq->_xmit_lock);
|
|
|
|
txq->xmit_lock_owner = smp_processor_id();
|
|
|
|
}
|
|
|
|
|
2008-07-31 17:58:50 -06:00
|
|
|
static inline int __netif_tx_trylock(struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
int ok = spin_trylock(&txq->_xmit_lock);
|
|
|
|
if (likely(ok))
|
|
|
|
txq->xmit_lock_owner = smp_processor_id();
|
|
|
|
return ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __netif_tx_unlock(struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
txq->xmit_lock_owner = -1;
|
|
|
|
spin_unlock(&txq->_xmit_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
txq->xmit_lock_owner = -1;
|
|
|
|
spin_unlock_bh(&txq->_xmit_lock);
|
|
|
|
}
|
|
|
|
|
2009-05-25 23:58:01 -06:00
|
|
|
static inline void txq_trans_update(struct netdev_queue *txq)
|
|
|
|
{
|
|
|
|
if (txq->xmit_lock_owner != -1)
|
|
|
|
txq->trans_start = jiffies;
|
|
|
|
}
|
|
|
|
|
2008-07-22 15:09:06 -06:00
|
|
|
/**
|
|
|
|
* netif_tx_lock - grab network device transmit lock
|
|
|
|
* @dev: network device
|
|
|
|
*
|
|
|
|
* Get network device transmit lock
|
|
|
|
*/
|
2007-09-16 15:40:49 -06:00
|
|
|
static inline void netif_tx_lock(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
unsigned int i;
|
2008-07-31 17:58:50 -06:00
|
|
|
int cpu;
|
2008-07-09 00:13:53 -06:00
|
|
|
|
2008-07-31 17:58:50 -06:00
|
|
|
spin_lock(&dev->tx_global_lock);
|
|
|
|
cpu = smp_processor_id();
|
2008-07-17 01:34:19 -06:00
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
2008-07-31 17:58:50 -06:00
|
|
|
|
|
|
|
/* We are the only thread of execution doing a
|
|
|
|
* freeze, but we have to grab the _xmit_lock in
|
|
|
|
* order to synchronize with threads which are in
|
|
|
|
* the ->hard_start_xmit() handler and already
|
|
|
|
* checked the frozen bit.
|
|
|
|
*/
|
2008-07-17 01:34:19 -06:00
|
|
|
__netif_tx_lock(txq, cpu);
|
2008-07-31 17:58:50 -06:00
|
|
|
set_bit(__QUEUE_STATE_FROZEN, &txq->state);
|
|
|
|
__netif_tx_unlock(txq);
|
2008-07-17 01:34:19 -06:00
|
|
|
}
|
2006-06-09 13:20:56 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_tx_lock_bh(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
local_bh_disable();
|
|
|
|
netif_tx_lock(dev);
|
2006-06-09 13:20:56 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_tx_unlock(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
2008-07-09 00:13:53 -06:00
|
|
|
|
2008-07-31 17:58:50 -06:00
|
|
|
/* No need to grab the _xmit_lock here. If the
|
|
|
|
* queue is not stopped for another reason, we
|
|
|
|
* force a schedule.
|
|
|
|
*/
|
|
|
|
clear_bit(__QUEUE_STATE_FROZEN, &txq->state);
|
2009-08-29 14:21:21 -06:00
|
|
|
netif_schedule_queue(txq);
|
2008-07-31 17:58:50 -06:00
|
|
|
}
|
|
|
|
spin_unlock(&dev->tx_global_lock);
|
2006-06-09 13:20:56 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_tx_unlock_bh(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 01:34:19 -06:00
|
|
|
netif_tx_unlock(dev);
|
|
|
|
local_bh_enable();
|
2006-06-09 13:20:56 -06:00
|
|
|
}
|
|
|
|
|
2008-07-09 00:13:53 -06:00
|
|
|
#define HARD_TX_LOCK(dev, txq, cpu) { \
|
2007-09-16 15:40:49 -06:00
|
|
|
if ((dev->features & NETIF_F_LLTX) == 0) { \
|
2008-07-09 00:13:53 -06:00
|
|
|
__netif_tx_lock(txq, cpu); \
|
2007-09-16 15:40:49 -06:00
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
2008-07-09 00:13:53 -06:00
|
|
|
#define HARD_TX_UNLOCK(dev, txq) { \
|
2007-09-16 15:40:49 -06:00
|
|
|
if ((dev->features & NETIF_F_LLTX) == 0) { \
|
2008-07-09 00:13:53 -06:00
|
|
|
__netif_tx_unlock(txq); \
|
2007-09-16 15:40:49 -06:00
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline void netif_tx_disable(struct net_device *dev)
|
|
|
|
{
|
2008-07-17 02:56:23 -06:00
|
|
|
unsigned int i;
|
2008-07-31 17:58:50 -06:00
|
|
|
int cpu;
|
2008-07-17 02:56:23 -06:00
|
|
|
|
2008-07-31 17:58:50 -06:00
|
|
|
local_bh_disable();
|
|
|
|
cpu = smp_processor_id();
|
2008-07-17 02:56:23 -06:00
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
2008-07-31 17:58:50 -06:00
|
|
|
|
|
|
|
__netif_tx_lock(txq, cpu);
|
2008-07-17 02:56:23 -06:00
|
|
|
netif_tx_stop_queue(txq);
|
2008-07-31 17:58:50 -06:00
|
|
|
__netif_tx_unlock(txq);
|
2008-07-17 02:56:23 -06:00
|
|
|
}
|
2008-07-31 17:58:50 -06:00
|
|
|
local_bh_enable();
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-07-15 01:13:44 -06:00
|
|
|
static inline void netif_addr_lock(struct net_device *dev)
|
|
|
|
{
|
|
|
|
spin_lock(&dev->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_addr_lock_bh(struct net_device *dev)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&dev->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_addr_unlock(struct net_device *dev)
|
|
|
|
{
|
|
|
|
spin_unlock(&dev->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netif_addr_unlock_bh(struct net_device *dev)
|
|
|
|
{
|
|
|
|
spin_unlock_bh(&dev->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
2009-05-04 20:48:28 -06:00
|
|
|
/*
|
2009-06-16 19:12:19 -06:00
|
|
|
* dev_addrs walker. Should be used only for read access. Call with
|
2009-05-04 20:48:28 -06:00
|
|
|
* rcu_read_lock held.
|
|
|
|
*/
|
|
|
|
#define for_each_dev_addr(dev, ha) \
|
2009-06-16 19:12:19 -06:00
|
|
|
list_for_each_entry_rcu(ha, &dev->dev_addrs.list, list)
|
2009-05-04 20:48:28 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* These functions live elsewhere (drivers/net/net_init.c, but related) */
|
|
|
|
|
|
|
|
extern void ether_setup(struct net_device *dev);
|
|
|
|
|
|
|
|
/* Support for loadable net-drivers */
|
2011-01-09 12:36:31 -07:00
|
|
|
extern struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
|
2007-07-06 14:36:20 -06:00
|
|
|
void (*setup)(struct net_device *),
|
2011-01-09 12:36:31 -07:00
|
|
|
unsigned int txqs, unsigned int rxqs);
|
2007-07-06 14:36:20 -06:00
|
|
|
#define alloc_netdev(sizeof_priv, name, setup) \
|
2011-01-09 12:36:31 -07:00
|
|
|
alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
|
|
|
|
|
|
|
|
#define alloc_netdev_mq(sizeof_priv, name, setup, count) \
|
|
|
|
alloc_netdev_mqs(sizeof_priv, name, setup, count, count)
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int register_netdev(struct net_device *dev);
|
|
|
|
extern void unregister_netdev(struct net_device *dev);
|
2009-05-04 20:48:28 -06:00
|
|
|
|
2010-04-01 15:22:57 -06:00
|
|
|
/* General hardware address lists handling functions */
|
|
|
|
extern int __hw_addr_add_multiple(struct netdev_hw_addr_list *to_list,
|
|
|
|
struct netdev_hw_addr_list *from_list,
|
|
|
|
int addr_len, unsigned char addr_type);
|
|
|
|
extern void __hw_addr_del_multiple(struct netdev_hw_addr_list *to_list,
|
|
|
|
struct netdev_hw_addr_list *from_list,
|
|
|
|
int addr_len, unsigned char addr_type);
|
|
|
|
extern int __hw_addr_sync(struct netdev_hw_addr_list *to_list,
|
|
|
|
struct netdev_hw_addr_list *from_list,
|
|
|
|
int addr_len);
|
|
|
|
extern void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,
|
|
|
|
struct netdev_hw_addr_list *from_list,
|
|
|
|
int addr_len);
|
|
|
|
extern void __hw_addr_flush(struct netdev_hw_addr_list *list);
|
|
|
|
extern void __hw_addr_init(struct netdev_hw_addr_list *list);
|
|
|
|
|
2009-05-04 20:48:28 -06:00
|
|
|
/* Functions used for device addresses handling */
|
|
|
|
extern int dev_addr_add(struct net_device *dev, unsigned char *addr,
|
|
|
|
unsigned char addr_type);
|
|
|
|
extern int dev_addr_del(struct net_device *dev, unsigned char *addr,
|
|
|
|
unsigned char addr_type);
|
|
|
|
extern int dev_addr_add_multiple(struct net_device *to_dev,
|
|
|
|
struct net_device *from_dev,
|
|
|
|
unsigned char addr_type);
|
|
|
|
extern int dev_addr_del_multiple(struct net_device *to_dev,
|
|
|
|
struct net_device *from_dev,
|
|
|
|
unsigned char addr_type);
|
2010-04-01 15:22:09 -06:00
|
|
|
extern void dev_addr_flush(struct net_device *dev);
|
|
|
|
extern int dev_addr_init(struct net_device *dev);
|
|
|
|
|
|
|
|
/* Functions used for unicast addresses handling */
|
|
|
|
extern int dev_uc_add(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_uc_del(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_uc_sync(struct net_device *to, struct net_device *from);
|
|
|
|
extern void dev_uc_unsync(struct net_device *to, struct net_device *from);
|
|
|
|
extern void dev_uc_flush(struct net_device *dev);
|
|
|
|
extern void dev_uc_init(struct net_device *dev);
|
2009-05-04 20:48:28 -06:00
|
|
|
|
2010-04-01 15:22:57 -06:00
|
|
|
/* Functions used for multicast addresses handling */
|
|
|
|
extern int dev_mc_add(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_mc_add_global(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_mc_del(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_mc_del_global(struct net_device *dev, unsigned char *addr);
|
|
|
|
extern int dev_mc_sync(struct net_device *to, struct net_device *from);
|
|
|
|
extern void dev_mc_unsync(struct net_device *to, struct net_device *from);
|
|
|
|
extern void dev_mc_flush(struct net_device *dev);
|
|
|
|
extern void dev_mc_init(struct net_device *dev);
|
2009-05-04 20:48:28 -06:00
|
|
|
|
2007-06-27 02:28:10 -06:00
|
|
|
/* Functions used for secondary unicast and multicast support */
|
|
|
|
extern void dev_set_rx_mode(struct net_device *dev);
|
|
|
|
extern void __dev_set_rx_mode(struct net_device *dev);
|
2008-06-18 02:48:28 -06:00
|
|
|
extern int dev_set_promiscuity(struct net_device *dev, int inc);
|
|
|
|
extern int dev_set_allmulti(struct net_device *dev, int inc);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern void netdev_state_change(struct net_device *dev);
|
2010-03-10 03:29:35 -07:00
|
|
|
extern int netdev_bonding_change(struct net_device *dev,
|
2009-09-15 03:37:40 -06:00
|
|
|
unsigned long event);
|
2005-05-29 15:13:47 -06:00
|
|
|
extern void netdev_features_change(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Load a device via the kmod */
|
2007-09-17 12:56:21 -06:00
|
|
|
extern void dev_load(struct net *net, const char *name);
|
2005-04-16 16:20:36 -06:00
|
|
|
extern void dev_mcast_init(void);
|
2010-07-09 03:12:41 -06:00
|
|
|
extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
|
|
|
|
struct rtnl_link_stats64 *storage);
|
2008-11-19 22:40:23 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int netdev_max_backlog;
|
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 00:57:10 -06:00
|
|
|
extern int netdev_tstamp_prequeue;
|
2005-04-16 16:20:36 -06:00
|
|
|
extern int weight_p;
|
|
|
|
extern int netdev_set_master(struct net_device *dev, struct net_device *master);
|
2006-08-29 17:44:56 -06:00
|
|
|
extern int skb_checksum_help(struct sk_buff *skb);
|
2006-06-27 14:22:38 -06:00
|
|
|
extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
|
2005-11-10 14:01:24 -07:00
|
|
|
#ifdef CONFIG_BUG
|
|
|
|
extern void netdev_rx_csum_fault(struct net_device *dev);
|
|
|
|
#else
|
|
|
|
static inline void netdev_rx_csum_fault(struct net_device *dev)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
/* rx skb timestamps */
|
|
|
|
extern void net_enable_timestamp(void);
|
|
|
|
extern void net_disable_timestamp(void);
|
|
|
|
|
2005-08-15 23:18:02 -06:00
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
|
|
|
|
extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
|
|
|
|
extern void dev_seq_stop(struct seq_file *seq, void *v);
|
|
|
|
#endif
|
|
|
|
|
2008-06-13 19:12:04 -06:00
|
|
|
extern int netdev_class_create_file(struct class_attribute *class_attr);
|
|
|
|
extern void netdev_class_remove_file(struct class_attribute *class_attr);
|
|
|
|
|
2010-08-05 09:45:15 -06:00
|
|
|
extern struct kobj_ns_type_operations net_ns_type_operations;
|
|
|
|
|
2008-09-30 03:22:14 -06:00
|
|
|
extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);
|
2008-07-21 14:31:48 -06:00
|
|
|
|
2005-08-15 23:18:02 -06:00
|
|
|
extern void linkwatch_run_queue(void);
|
|
|
|
|
2008-10-23 02:11:29 -06:00
|
|
|
unsigned long netdev_increment_features(unsigned long all, unsigned long one,
|
|
|
|
unsigned long mask);
|
|
|
|
unsigned long netdev_fix_features(unsigned long features, const char *name);
|
2007-08-10 16:47:58 -06:00
|
|
|
|
2009-12-03 16:59:22 -07:00
|
|
|
void netif_stacked_transfer_operstate(const struct net_device *rootdev,
|
|
|
|
struct net_device *dev);
|
|
|
|
|
2011-01-08 23:23:31 -07:00
|
|
|
int netif_skb_features(struct sk_buff *skb);
|
2010-10-29 06:14:55 -06:00
|
|
|
|
2006-06-30 14:36:35 -06:00
|
|
|
static inline int net_gso_ok(int features, int gso_type)
|
2006-06-27 14:22:38 -06:00
|
|
|
{
|
2006-06-30 14:36:35 -06:00
|
|
|
int feature = gso_type << NETIF_F_GSO_SHIFT;
|
2006-06-29 13:25:53 -06:00
|
|
|
return (features & feature) == feature;
|
2006-06-27 14:22:38 -06:00
|
|
|
}
|
|
|
|
|
2006-06-30 14:36:35 -06:00
|
|
|
static inline int skb_gso_ok(struct sk_buff *skb, int features)
|
|
|
|
{
|
2009-06-03 22:20:51 -06:00
|
|
|
return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
|
2010-08-23 01:13:46 -06:00
|
|
|
(!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST));
|
2006-06-30 14:36:35 -06:00
|
|
|
}
|
|
|
|
|
2011-01-08 23:23:32 -07:00
|
|
|
static inline int netif_needs_gso(struct sk_buff *skb, int features)
|
2006-06-22 03:40:14 -06:00
|
|
|
{
|
2011-01-08 23:23:32 -07:00
|
|
|
return skb_is_gso(skb) && (!skb_gso_ok(skb, features) ||
|
|
|
|
unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
|
2006-06-22 03:40:14 -06: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 04:43:19 -06:00
|
|
|
static inline void netif_set_gso_max_size(struct net_device *dev,
|
|
|
|
unsigned int size)
|
|
|
|
{
|
|
|
|
dev->gso_max_size = size;
|
|
|
|
}
|
|
|
|
|
2010-04-11 00:56:11 -06:00
|
|
|
extern int __skb_bond_should_drop(struct sk_buff *skb,
|
|
|
|
struct net_device *master);
|
2009-05-27 19:05:00 -06:00
|
|
|
|
2010-03-18 22:16:45 -06:00
|
|
|
static inline int skb_bond_should_drop(struct sk_buff *skb,
|
|
|
|
struct net_device *master)
|
2006-08-14 18:08:36 -06:00
|
|
|
{
|
2010-04-11 00:56:11 -06:00
|
|
|
if (master)
|
|
|
|
return __skb_bond_should_drop(skb, master);
|
2006-08-14 18:08:36 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-11-07 23:54:20 -07:00
|
|
|
extern struct pernet_operations __net_initdata loopback_net_ops;
|
2009-04-19 22:49:28 -06:00
|
|
|
|
|
|
|
static inline int dev_ethtool_get_settings(struct net_device *dev,
|
|
|
|
struct ethtool_cmd *cmd)
|
|
|
|
{
|
|
|
|
if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
return dev->ethtool_ops->get_settings(dev, cmd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum)
|
|
|
|
return 0;
|
|
|
|
return dev->ethtool_ops->get_rx_csum(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 dev_ethtool_get_flags(struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (!dev->ethtool_ops || !dev->ethtool_ops->get_flags)
|
|
|
|
return 0;
|
|
|
|
return dev->ethtool_ops->get_flags(dev);
|
|
|
|
}
|
2010-02-09 04:49:47 -07:00
|
|
|
|
|
|
|
/* Logging, debugging and troubleshooting/diagnostic helpers. */
|
|
|
|
|
|
|
|
/* netdev_printk helpers, similar to dev_printk */
|
|
|
|
|
|
|
|
static inline const char *netdev_name(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
if (dev->reg_state != NETREG_REGISTERED)
|
|
|
|
return "(unregistered net_device)";
|
|
|
|
return dev->name;
|
|
|
|
}
|
|
|
|
|
2010-06-26 19:02:35 -06:00
|
|
|
extern int netdev_printk(const char *level, const struct net_device *dev,
|
|
|
|
const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 3, 4)));
|
|
|
|
extern int netdev_emerg(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_alert(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_crit(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_err(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_warn(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_notice(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int netdev_info(const struct net_device *dev, const char *format, ...)
|
|
|
|
__attribute__ ((format (printf, 2, 3)));
|
2010-02-09 04:49:47 -07:00
|
|
|
|
|
|
|
#if defined(DEBUG)
|
|
|
|
#define netdev_dbg(__dev, format, args...) \
|
|
|
|
netdev_printk(KERN_DEBUG, __dev, format, ##args)
|
|
|
|
#elif defined(CONFIG_DYNAMIC_DEBUG)
|
|
|
|
#define netdev_dbg(__dev, format, args...) \
|
|
|
|
do { \
|
|
|
|
dynamic_dev_dbg((__dev)->dev.parent, "%s: " format, \
|
|
|
|
netdev_name(__dev), ##args); \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define netdev_dbg(__dev, format, args...) \
|
|
|
|
({ \
|
|
|
|
if (0) \
|
|
|
|
netdev_printk(KERN_DEBUG, __dev, format, ##args); \
|
|
|
|
0; \
|
|
|
|
})
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(VERBOSE_DEBUG)
|
|
|
|
#define netdev_vdbg netdev_dbg
|
|
|
|
#else
|
|
|
|
|
|
|
|
#define netdev_vdbg(dev, format, args...) \
|
|
|
|
({ \
|
|
|
|
if (0) \
|
|
|
|
netdev_printk(KERN_DEBUG, dev, format, ##args); \
|
|
|
|
0; \
|
|
|
|
})
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* netdev_WARN() acts like dev_printk(), but with the key difference
|
|
|
|
* of using a WARN/WARN_ON to get the message out, including the
|
|
|
|
* file/line information and a backtrace.
|
|
|
|
*/
|
|
|
|
#define netdev_WARN(dev, format, args...) \
|
|
|
|
WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args);
|
|
|
|
|
2010-02-09 04:49:49 -07:00
|
|
|
/* netif printk helpers, similar to netdev_printk */
|
|
|
|
|
|
|
|
#define netif_printk(priv, type, level, dev, fmt, args...) \
|
|
|
|
do { \
|
|
|
|
if (netif_msg_##type(priv)) \
|
|
|
|
netdev_printk(level, (dev), fmt, ##args); \
|
|
|
|
} while (0)
|
|
|
|
|
2010-06-26 19:02:36 -06:00
|
|
|
#define netif_level(level, priv, type, dev, fmt, args...) \
|
|
|
|
do { \
|
|
|
|
if (netif_msg_##type(priv)) \
|
|
|
|
netdev_##level(dev, fmt, ##args); \
|
|
|
|
} while (0)
|
|
|
|
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_emerg(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(emerg, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_alert(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(alert, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_crit(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(crit, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_err(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(err, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_warn(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(warn, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_notice(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(notice, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
#define netif_info(priv, type, dev, fmt, args...) \
|
2010-06-26 19:02:36 -06:00
|
|
|
netif_level(info, priv, type, dev, fmt, ##args)
|
2010-02-09 04:49:49 -07:00
|
|
|
|
|
|
|
#if defined(DEBUG)
|
|
|
|
#define netif_dbg(priv, type, dev, format, args...) \
|
|
|
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
|
|
|
|
#elif defined(CONFIG_DYNAMIC_DEBUG)
|
|
|
|
#define netif_dbg(priv, type, netdev, format, args...) \
|
|
|
|
do { \
|
|
|
|
if (netif_msg_##type(priv)) \
|
|
|
|
dynamic_dev_dbg((netdev)->dev.parent, \
|
|
|
|
"%s: " format, \
|
|
|
|
netdev_name(netdev), ##args); \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define netif_dbg(priv, type, dev, format, args...) \
|
|
|
|
({ \
|
|
|
|
if (0) \
|
|
|
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
|
|
|
0; \
|
|
|
|
})
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(VERBOSE_DEBUG)
|
2010-07-02 01:08:44 -06:00
|
|
|
#define netif_vdbg netif_dbg
|
2010-02-09 04:49:49 -07:00
|
|
|
#else
|
|
|
|
#define netif_vdbg(priv, type, dev, format, args...) \
|
|
|
|
({ \
|
|
|
|
if (0) \
|
2010-05-18 00:56:32 -06:00
|
|
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
2010-02-09 04:49:49 -07:00
|
|
|
0; \
|
|
|
|
})
|
|
|
|
#endif
|
2010-02-09 04:49:47 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
|
2009-05-27 16:48:07 -06:00
|
|
|
#endif /* _LINUX_NETDEVICE_H */
|