Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits) tcp: MD5: Fix IPv6 signatures skbuff: add missing kernel-doc for do_not_encrypt net/ipv4/route.c: fix build error tcp: MD5: Fix MD5 signatures on certain ACK packets ipv6: Fix ip6_xmit to send fragments if ipfragok is true ipvs: Move userspace definitions to include/linux/ip_vs.h netdev: Fix lockdep warnings in multiqueue configurations. netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations netfilter: nf_conntrack_tcp: decrease timeouts while data in unacknowledged irda: replace __FUNCTION__ with __func__ nsc-ircc: default to dongle type 9 on IBM hardware bluetooth: add quirks for a few hci_usb devices hysdn: remove the packed attribute from PofTimStamp_tag isdn: use the common ascii hex helpers tg3: adapt tg3 to use reworked PCI PM code atm: fix direct casts of pointers to u32 in the InterPhase driver atm: fix const assignment/discard warnings in the ATM networking driver net: use the common ascii hex helpers random32: seeding improvement ...
This commit is contained in:
Linus Torvalds
@@ -97,6 +97,7 @@ header-y += ioctl.h
|
||||
header-y += ip6_tunnel.h
|
||||
header-y += ipmi_msgdefs.h
|
||||
header-y += ipsec.h
|
||||
header-y += ip_vs.h
|
||||
header-y += ipx.h
|
||||
header-y += irda.h
|
||||
header-y += iso_fs.h
|
||||
|
||||
245
include/linux/ip_vs.h
Normal file
245
include/linux/ip_vs.h
Normal file
@@ -0,0 +1,245 @@
|
||||
/*
|
||||
* IP Virtual Server
|
||||
* data structure and functionality definitions
|
||||
*/
|
||||
|
||||
#ifndef _IP_VS_H
|
||||
#define _IP_VS_H
|
||||
|
||||
#include <linux/types.h> /* For __beXX types in userland */
|
||||
|
||||
#define IP_VS_VERSION_CODE 0x010201
|
||||
#define NVERSION(version) \
|
||||
(version >> 16) & 0xFF, \
|
||||
(version >> 8) & 0xFF, \
|
||||
version & 0xFF
|
||||
|
||||
/*
|
||||
* Virtual Service Flags
|
||||
*/
|
||||
#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
|
||||
#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
|
||||
|
||||
/*
|
||||
* Destination Server Flags
|
||||
*/
|
||||
#define IP_VS_DEST_F_AVAILABLE 0x0001 /* server is available */
|
||||
#define IP_VS_DEST_F_OVERLOAD 0x0002 /* server is overloaded */
|
||||
|
||||
/*
|
||||
* IPVS sync daemon states
|
||||
*/
|
||||
#define IP_VS_STATE_NONE 0x0000 /* daemon is stopped */
|
||||
#define IP_VS_STATE_MASTER 0x0001 /* started as master */
|
||||
#define IP_VS_STATE_BACKUP 0x0002 /* started as backup */
|
||||
|
||||
/*
|
||||
* IPVS socket options
|
||||
*/
|
||||
#define IP_VS_BASE_CTL (64+1024+64) /* base */
|
||||
|
||||
#define IP_VS_SO_SET_NONE IP_VS_BASE_CTL /* just peek */
|
||||
#define IP_VS_SO_SET_INSERT (IP_VS_BASE_CTL+1)
|
||||
#define IP_VS_SO_SET_ADD (IP_VS_BASE_CTL+2)
|
||||
#define IP_VS_SO_SET_EDIT (IP_VS_BASE_CTL+3)
|
||||
#define IP_VS_SO_SET_DEL (IP_VS_BASE_CTL+4)
|
||||
#define IP_VS_SO_SET_FLUSH (IP_VS_BASE_CTL+5)
|
||||
#define IP_VS_SO_SET_LIST (IP_VS_BASE_CTL+6)
|
||||
#define IP_VS_SO_SET_ADDDEST (IP_VS_BASE_CTL+7)
|
||||
#define IP_VS_SO_SET_DELDEST (IP_VS_BASE_CTL+8)
|
||||
#define IP_VS_SO_SET_EDITDEST (IP_VS_BASE_CTL+9)
|
||||
#define IP_VS_SO_SET_TIMEOUT (IP_VS_BASE_CTL+10)
|
||||
#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
|
||||
#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
|
||||
#define IP_VS_SO_SET_RESTORE (IP_VS_BASE_CTL+13)
|
||||
#define IP_VS_SO_SET_SAVE (IP_VS_BASE_CTL+14)
|
||||
#define IP_VS_SO_SET_ZERO (IP_VS_BASE_CTL+15)
|
||||
#define IP_VS_SO_SET_MAX IP_VS_SO_SET_ZERO
|
||||
|
||||
#define IP_VS_SO_GET_VERSION IP_VS_BASE_CTL
|
||||
#define IP_VS_SO_GET_INFO (IP_VS_BASE_CTL+1)
|
||||
#define IP_VS_SO_GET_SERVICES (IP_VS_BASE_CTL+2)
|
||||
#define IP_VS_SO_GET_SERVICE (IP_VS_BASE_CTL+3)
|
||||
#define IP_VS_SO_GET_DESTS (IP_VS_BASE_CTL+4)
|
||||
#define IP_VS_SO_GET_DEST (IP_VS_BASE_CTL+5) /* not used now */
|
||||
#define IP_VS_SO_GET_TIMEOUT (IP_VS_BASE_CTL+6)
|
||||
#define IP_VS_SO_GET_DAEMON (IP_VS_BASE_CTL+7)
|
||||
#define IP_VS_SO_GET_MAX IP_VS_SO_GET_DAEMON
|
||||
|
||||
|
||||
/*
|
||||
* IPVS Connection Flags
|
||||
*/
|
||||
#define IP_VS_CONN_F_FWD_MASK 0x0007 /* mask for the fwd methods */
|
||||
#define IP_VS_CONN_F_MASQ 0x0000 /* masquerading/NAT */
|
||||
#define IP_VS_CONN_F_LOCALNODE 0x0001 /* local node */
|
||||
#define IP_VS_CONN_F_TUNNEL 0x0002 /* tunneling */
|
||||
#define IP_VS_CONN_F_DROUTE 0x0003 /* direct routing */
|
||||
#define IP_VS_CONN_F_BYPASS 0x0004 /* cache bypass */
|
||||
#define IP_VS_CONN_F_SYNC 0x0020 /* entry created by sync */
|
||||
#define IP_VS_CONN_F_HASHED 0x0040 /* hashed entry */
|
||||
#define IP_VS_CONN_F_NOOUTPUT 0x0080 /* no output packets */
|
||||
#define IP_VS_CONN_F_INACTIVE 0x0100 /* not established */
|
||||
#define IP_VS_CONN_F_OUT_SEQ 0x0200 /* must do output seq adjust */
|
||||
#define IP_VS_CONN_F_IN_SEQ 0x0400 /* must do input seq adjust */
|
||||
#define IP_VS_CONN_F_SEQ_MASK 0x0600 /* in/out sequence mask */
|
||||
#define IP_VS_CONN_F_NO_CPORT 0x0800 /* no client port set yet */
|
||||
#define IP_VS_CONN_F_TEMPLATE 0x1000 /* template, not connection */
|
||||
|
||||
#define IP_VS_SCHEDNAME_MAXLEN 16
|
||||
#define IP_VS_IFNAME_MAXLEN 16
|
||||
|
||||
|
||||
/*
|
||||
* The struct ip_vs_service_user and struct ip_vs_dest_user are
|
||||
* used to set IPVS rules through setsockopt.
|
||||
*/
|
||||
struct ip_vs_service_user {
|
||||
/* virtual service addresses */
|
||||
u_int16_t protocol;
|
||||
__be32 addr; /* virtual ip address */
|
||||
__be16 port;
|
||||
u_int32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* virtual service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout in sec */
|
||||
__be32 netmask; /* persistent netmask */
|
||||
};
|
||||
|
||||
|
||||
struct ip_vs_dest_user {
|
||||
/* destination server address */
|
||||
__be32 addr;
|
||||
__be16 port;
|
||||
|
||||
/* real server options */
|
||||
unsigned conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
/* thresholds for active connections */
|
||||
u_int32_t u_threshold; /* upper threshold */
|
||||
u_int32_t l_threshold; /* lower threshold */
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* IPVS statistics object (for user space)
|
||||
*/
|
||||
struct ip_vs_stats_user
|
||||
{
|
||||
__u32 conns; /* connections scheduled */
|
||||
__u32 inpkts; /* incoming packets */
|
||||
__u32 outpkts; /* outgoing packets */
|
||||
__u64 inbytes; /* incoming bytes */
|
||||
__u64 outbytes; /* outgoing bytes */
|
||||
|
||||
__u32 cps; /* current connection rate */
|
||||
__u32 inpps; /* current in packet rate */
|
||||
__u32 outpps; /* current out packet rate */
|
||||
__u32 inbps; /* current in byte rate */
|
||||
__u32 outbps; /* current out byte rate */
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_INFO */
|
||||
struct ip_vs_getinfo {
|
||||
/* version number */
|
||||
unsigned int version;
|
||||
|
||||
/* size of connection hash table */
|
||||
unsigned int size;
|
||||
|
||||
/* number of virtual services */
|
||||
unsigned int num_services;
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_SERVICE */
|
||||
struct ip_vs_service_entry {
|
||||
/* which service: user fills in these */
|
||||
u_int16_t protocol;
|
||||
__be32 addr; /* virtual address */
|
||||
__be16 port;
|
||||
u_int32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout */
|
||||
__be32 netmask; /* persistent netmask */
|
||||
|
||||
/* number of real servers */
|
||||
unsigned int num_dests;
|
||||
|
||||
/* statistics */
|
||||
struct ip_vs_stats_user stats;
|
||||
};
|
||||
|
||||
|
||||
struct ip_vs_dest_entry {
|
||||
__be32 addr; /* destination address */
|
||||
__be16 port;
|
||||
unsigned conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
u_int32_t u_threshold; /* upper threshold */
|
||||
u_int32_t l_threshold; /* lower threshold */
|
||||
|
||||
u_int32_t activeconns; /* active connections */
|
||||
u_int32_t inactconns; /* inactive connections */
|
||||
u_int32_t persistconns; /* persistent connections */
|
||||
|
||||
/* statistics */
|
||||
struct ip_vs_stats_user stats;
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_DESTS */
|
||||
struct ip_vs_get_dests {
|
||||
/* which service: user fills in these */
|
||||
u_int16_t protocol;
|
||||
__be32 addr; /* virtual address */
|
||||
__be16 port;
|
||||
u_int32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* number of real servers */
|
||||
unsigned int num_dests;
|
||||
|
||||
/* the real servers */
|
||||
struct ip_vs_dest_entry entrytable[0];
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_SERVICES */
|
||||
struct ip_vs_get_services {
|
||||
/* number of virtual services */
|
||||
unsigned int num_services;
|
||||
|
||||
/* service table */
|
||||
struct ip_vs_service_entry entrytable[0];
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_TIMEOUT */
|
||||
struct ip_vs_timeout_user {
|
||||
int tcp_timeout;
|
||||
int tcp_fin_timeout;
|
||||
int udp_timeout;
|
||||
};
|
||||
|
||||
|
||||
/* The argument to IP_VS_SO_GET_DAEMON */
|
||||
struct ip_vs_daemon_user {
|
||||
/* sync daemon state (master/backup) */
|
||||
int state;
|
||||
|
||||
/* multicast interface name */
|
||||
char mcast_ifn[IP_VS_IFNAME_MAXLEN];
|
||||
|
||||
/* SyncID we belong to */
|
||||
int syncid;
|
||||
};
|
||||
|
||||
#endif /* _IP_VS_H */
|
||||
@@ -440,6 +440,7 @@ static inline void napi_synchronize(const struct napi_struct *n)
|
||||
enum netdev_queue_state_t
|
||||
{
|
||||
__QUEUE_STATE_XOFF,
|
||||
__QUEUE_STATE_FROZEN,
|
||||
};
|
||||
|
||||
struct netdev_queue {
|
||||
@@ -636,7 +637,7 @@ struct net_device
|
||||
unsigned int real_num_tx_queues;
|
||||
|
||||
unsigned long tx_queue_len; /* Max frames per queue allowed */
|
||||
|
||||
spinlock_t tx_global_lock;
|
||||
/*
|
||||
* One part is mostly used on xmit path (device)
|
||||
*/
|
||||
@@ -1099,6 +1100,11 @@ static inline int netif_queue_stopped(const struct net_device *dev)
|
||||
return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
|
||||
}
|
||||
|
||||
static inline int netif_tx_queue_frozen(const struct netdev_queue *dev_queue)
|
||||
{
|
||||
return test_bit(__QUEUE_STATE_FROZEN, &dev_queue->state);
|
||||
}
|
||||
|
||||
/**
|
||||
* netif_running - test if up
|
||||
* @dev: network device
|
||||
@@ -1475,30 +1481,6 @@ static inline void __netif_tx_lock_bh(struct netdev_queue *txq)
|
||||
txq->xmit_lock_owner = smp_processor_id();
|
||||
}
|
||||
|
||||
/**
|
||||
* netif_tx_lock - grab network device transmit lock
|
||||
* @dev: network device
|
||||
* @cpu: cpu number of lock owner
|
||||
*
|
||||
* Get network device transmit lock
|
||||
*/
|
||||
static inline void netif_tx_lock(struct net_device *dev)
|
||||
{
|
||||
int cpu = smp_processor_id();
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < dev->num_tx_queues; i++) {
|
||||
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
||||
__netif_tx_lock(txq, cpu);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void netif_tx_lock_bh(struct net_device *dev)
|
||||
{
|
||||
local_bh_disable();
|
||||
netif_tx_lock(dev);
|
||||
}
|
||||
|
||||
static inline int __netif_tx_trylock(struct netdev_queue *txq)
|
||||
{
|
||||
int ok = spin_trylock(&txq->_xmit_lock);
|
||||
@@ -1507,11 +1489,6 @@ static inline int __netif_tx_trylock(struct netdev_queue *txq)
|
||||
return ok;
|
||||
}
|
||||
|
||||
static inline int netif_tx_trylock(struct net_device *dev)
|
||||
{
|
||||
return __netif_tx_trylock(netdev_get_tx_queue(dev, 0));
|
||||
}
|
||||
|
||||
static inline void __netif_tx_unlock(struct netdev_queue *txq)
|
||||
{
|
||||
txq->xmit_lock_owner = -1;
|
||||
@@ -1524,15 +1501,57 @@ static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
|
||||
spin_unlock_bh(&txq->_xmit_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* netif_tx_lock - grab network device transmit lock
|
||||
* @dev: network device
|
||||
* @cpu: cpu number of lock owner
|
||||
*
|
||||
* Get network device transmit lock
|
||||
*/
|
||||
static inline void netif_tx_lock(struct net_device *dev)
|
||||
{
|
||||
unsigned int i;
|
||||
int cpu;
|
||||
|
||||
spin_lock(&dev->tx_global_lock);
|
||||
cpu = smp_processor_id();
|
||||
for (i = 0; i < dev->num_tx_queues; i++) {
|
||||
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
||||
|
||||
/* 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.
|
||||
*/
|
||||
__netif_tx_lock(txq, cpu);
|
||||
set_bit(__QUEUE_STATE_FROZEN, &txq->state);
|
||||
__netif_tx_unlock(txq);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void netif_tx_lock_bh(struct net_device *dev)
|
||||
{
|
||||
local_bh_disable();
|
||||
netif_tx_lock(dev);
|
||||
}
|
||||
|
||||
static inline void netif_tx_unlock(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_unlock(txq);
|
||||
}
|
||||
|
||||
/* 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);
|
||||
if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
|
||||
__netif_schedule(txq->qdisc);
|
||||
}
|
||||
spin_unlock(&dev->tx_global_lock);
|
||||
}
|
||||
|
||||
static inline void netif_tx_unlock_bh(struct net_device *dev)
|
||||
@@ -1556,13 +1575,18 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
|
||||
static inline void netif_tx_disable(struct net_device *dev)
|
||||
{
|
||||
unsigned int i;
|
||||
int cpu;
|
||||
|
||||
netif_tx_lock_bh(dev);
|
||||
local_bh_disable();
|
||||
cpu = smp_processor_id();
|
||||
for (i = 0; i < dev->num_tx_queues; i++) {
|
||||
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
||||
|
||||
__netif_tx_lock(txq, cpu);
|
||||
netif_tx_stop_queue(txq);
|
||||
__netif_tx_unlock(txq);
|
||||
}
|
||||
netif_tx_unlock_bh(dev);
|
||||
local_bh_enable();
|
||||
}
|
||||
|
||||
static inline void netif_addr_lock(struct net_device *dev)
|
||||
|
||||
@@ -30,6 +30,9 @@ enum tcp_conntrack {
|
||||
/* Be liberal in window checking */
|
||||
#define IP_CT_TCP_FLAG_BE_LIBERAL 0x08
|
||||
|
||||
/* Has unacknowledged data */
|
||||
#define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED 0x10
|
||||
|
||||
struct nf_ct_tcp_flags {
|
||||
u_int8_t flags;
|
||||
u_int8_t mask;
|
||||
|
||||
@@ -243,6 +243,7 @@ typedef unsigned char *sk_buff_data_t;
|
||||
* @tc_index: Traffic control index
|
||||
* @tc_verd: traffic control verdict
|
||||
* @ndisc_nodetype: router type (from link layer)
|
||||
* @do_not_encrypt: set to prevent encryption of this frame
|
||||
* @dma_cookie: a cookie to one of several possible DMA operations
|
||||
* done by skb DMA functions
|
||||
* @secmark: security marking
|
||||
|
||||
Reference in New Issue
Block a user