2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Definitions for the 'struct sk_buff' memory handlers.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Alan Cox, <gw4pts@gw4pts.ampr.org>
|
|
|
|
* Florian La Roche, <rzsfl@rz.uni-sb.de>
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _LINUX_SKBUFF_H
|
|
|
|
#define _LINUX_SKBUFF_H
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/compiler.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/cache.h>
|
|
|
|
|
|
|
|
#include <asm/atomic.h>
|
|
|
|
#include <asm/types.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/net.h>
|
2005-06-24 12:00:17 +08:00
|
|
|
#include <linux/textsearch.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <net/checksum.h>
|
2006-12-05 04:41:19 +08:00
|
|
|
#include <linux/rcupdate.h>
|
2006-05-24 08:55:33 +08:00
|
|
|
#include <linux/dmaengine.h>
|
2007-04-20 07:16:32 +08:00
|
|
|
#include <linux/hrtimer.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-04-10 02:59:39 +08:00
|
|
|
/* Don't change this without changing skb_csum_unnecessary! */
|
2005-04-17 06:20:36 +08:00
|
|
|
#define CHECKSUM_NONE 0
|
2007-04-10 02:59:39 +08:00
|
|
|
#define CHECKSUM_UNNECESSARY 1
|
|
|
|
#define CHECKSUM_COMPLETE 2
|
|
|
|
#define CHECKSUM_PARTIAL 3
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#define SKB_DATA_ALIGN(X) (((X) + (SMP_CACHE_BYTES - 1)) & \
|
|
|
|
~(SMP_CACHE_BYTES - 1))
|
2007-03-26 11:27:59 +08:00
|
|
|
#define SKB_WITH_OVERHEAD(X) \
|
2007-10-22 07:27:46 +08:00
|
|
|
((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
2007-03-26 11:27:59 +08:00
|
|
|
#define SKB_MAX_ORDER(X, ORDER) \
|
|
|
|
SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X))
|
2005-04-17 06:20:36 +08:00
|
|
|
#define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0))
|
|
|
|
#define SKB_MAX_ALLOC (SKB_MAX_ORDER(0, 2))
|
|
|
|
|
|
|
|
/* A. Checksumming of received packets by device.
|
|
|
|
*
|
|
|
|
* NONE: device failed to checksum this packet.
|
|
|
|
* skb->csum is undefined.
|
|
|
|
*
|
|
|
|
* UNNECESSARY: device parsed packet and wouldbe verified checksum.
|
|
|
|
* skb->csum is undefined.
|
|
|
|
* It is bad option, but, unfortunately, many of vendors do this.
|
|
|
|
* Apparently with secret goal to sell you new device, when you
|
|
|
|
* will add new protocol to your host. F.e. IPv6. 8)
|
|
|
|
*
|
2006-08-30 07:44:56 +08:00
|
|
|
* COMPLETE: the most generic way. Device supplied checksum of _all_
|
2005-04-17 06:20:36 +08:00
|
|
|
* the packet as seen by netif_rx in skb->csum.
|
|
|
|
* NOTE: Even if device supports only some protocols, but
|
2006-08-30 07:44:56 +08:00
|
|
|
* is able to produce some skb->csum, it MUST use COMPLETE,
|
2005-04-17 06:20:36 +08:00
|
|
|
* not UNNECESSARY.
|
|
|
|
*
|
2007-07-11 13:41:55 +08:00
|
|
|
* PARTIAL: identical to the case for output below. This may occur
|
|
|
|
* on a packet received directly from another Linux OS, e.g.,
|
|
|
|
* a virtualised Linux kernel on the same host. The packet can
|
|
|
|
* be treated in the same way as UNNECESSARY except that on
|
|
|
|
* output (i.e., forwarding) the checksum must be filled in
|
|
|
|
* by the OS or the hardware.
|
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* B. Checksumming on output.
|
|
|
|
*
|
|
|
|
* NONE: skb is checksummed by protocol or csum is not required.
|
|
|
|
*
|
2006-08-30 07:44:56 +08:00
|
|
|
* PARTIAL: device is required to csum packet as seen by hard_start_xmit
|
2007-07-11 13:41:55 +08:00
|
|
|
* from skb->csum_start to the end and to record the checksum
|
|
|
|
* at skb->csum_start + skb->csum_offset.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Device must show its capabilities in dev->features, set
|
|
|
|
* at device setup time.
|
|
|
|
* NETIF_F_HW_CSUM - it is clever device, it is able to checksum
|
|
|
|
* everything.
|
|
|
|
* NETIF_F_NO_CSUM - loopback or reliable single hop media.
|
|
|
|
* NETIF_F_IP_CSUM - device is dumb. It is able to csum only
|
|
|
|
* TCP/UDP over IPv4. Sigh. Vendors like this
|
|
|
|
* way by an unknown reason. Though, see comment above
|
|
|
|
* about CHECKSUM_UNNECESSARY. 8)
|
2007-07-11 13:41:55 +08:00
|
|
|
* NETIF_F_IPV6_CSUM about as dumb as the last one but does IPv6 instead.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Any questions? No questions, good. --ANK
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct net_device;
|
2007-04-03 11:19:53 +08:00
|
|
|
struct scatterlist;
|
2007-11-07 15:30:13 +08:00
|
|
|
struct pipe_inode_info;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-24 02:17:07 +08:00
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2005-04-17 06:20:36 +08:00
|
|
|
struct nf_conntrack {
|
|
|
|
atomic_t use;
|
|
|
|
};
|
2007-03-24 02:17:07 +08:00
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
struct nf_bridge_info {
|
|
|
|
atomic_t use;
|
|
|
|
struct net_device *physindev;
|
|
|
|
struct net_device *physoutdev;
|
|
|
|
unsigned int mask;
|
|
|
|
unsigned long data[32 / sizeof(unsigned long)];
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct sk_buff_head {
|
|
|
|
/* These two members must be first. */
|
|
|
|
struct sk_buff *next;
|
|
|
|
struct sk_buff *prev;
|
|
|
|
|
|
|
|
__u32 qlen;
|
|
|
|
spinlock_t lock;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct sk_buff;
|
|
|
|
|
|
|
|
/* To allow 64K frame to be packed as single skb without frag_list */
|
|
|
|
#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)
|
|
|
|
|
|
|
|
typedef struct skb_frag_struct skb_frag_t;
|
|
|
|
|
|
|
|
struct skb_frag_struct {
|
|
|
|
struct page *page;
|
2007-07-31 09:47:03 +08:00
|
|
|
__u32 page_offset;
|
|
|
|
__u32 size;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2009-02-12 13:03:37 +08:00
|
|
|
#define HAVE_HW_TIME_STAMP
|
|
|
|
|
|
|
|
/**
|
2009-03-02 19:15:58 +08:00
|
|
|
* struct skb_shared_hwtstamps - hardware time stamps
|
2009-02-12 13:03:37 +08:00
|
|
|
* @hwtstamp: hardware time stamp transformed into duration
|
|
|
|
* since arbitrary point in time
|
|
|
|
* @syststamp: hwtstamp transformed to system time base
|
|
|
|
*
|
|
|
|
* Software time stamps generated by ktime_get_real() are stored in
|
|
|
|
* skb->tstamp. The relation between the different kinds of time
|
|
|
|
* stamps is as follows:
|
|
|
|
*
|
|
|
|
* syststamp and tstamp can be compared against each other in
|
|
|
|
* arbitrary combinations. The accuracy of a
|
|
|
|
* syststamp/tstamp/"syststamp from other device" comparison is
|
|
|
|
* limited by the accuracy of the transformation into system time
|
|
|
|
* base. This depends on the device driver and its underlying
|
|
|
|
* hardware.
|
|
|
|
*
|
|
|
|
* hwtstamps can only be compared against other hwtstamps from
|
|
|
|
* the same device.
|
|
|
|
*
|
|
|
|
* This structure is attached to packets as part of the
|
|
|
|
* &skb_shared_info. Use skb_hwtstamps() to get a pointer.
|
|
|
|
*/
|
|
|
|
struct skb_shared_hwtstamps {
|
|
|
|
ktime_t hwtstamp;
|
|
|
|
ktime_t syststamp;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
2009-03-02 19:15:58 +08:00
|
|
|
* struct skb_shared_tx - instructions for time stamping of outgoing packets
|
2009-02-12 13:03:37 +08:00
|
|
|
* @hardware: generate hardware time stamp
|
|
|
|
* @software: generate software time stamp
|
|
|
|
* @in_progress: device driver is going to provide
|
|
|
|
* hardware time stamp
|
2009-03-29 14:38:40 +08:00
|
|
|
* @flags: all shared_tx flags
|
2009-02-12 13:03:37 +08:00
|
|
|
*
|
|
|
|
* These flags are attached to packets as part of the
|
|
|
|
* &skb_shared_info. Use skb_tx() to get a pointer.
|
|
|
|
*/
|
|
|
|
union skb_shared_tx {
|
|
|
|
struct {
|
|
|
|
__u8 hardware:1,
|
|
|
|
software:1,
|
|
|
|
in_progress:1;
|
|
|
|
};
|
|
|
|
__u8 flags;
|
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* This data is invariant across clones and lives at
|
|
|
|
* the end of the header data, ie. at skb->end.
|
|
|
|
*/
|
|
|
|
struct skb_shared_info {
|
|
|
|
atomic_t dataref;
|
2006-01-04 06:06:50 +08:00
|
|
|
unsigned short nr_frags;
|
2006-06-22 17:40:14 +08:00
|
|
|
unsigned short gso_size;
|
|
|
|
/* Warning: this field is not always filled in (UFO)! */
|
|
|
|
unsigned short gso_segs;
|
|
|
|
unsigned short gso_type;
|
2006-11-08 16:27:11 +08:00
|
|
|
__be32 ip6_frag_id;
|
2009-02-12 13:03:37 +08:00
|
|
|
union skb_shared_tx tx_flags;
|
2008-09-11 19:48:58 +08:00
|
|
|
#ifdef CONFIG_HAS_DMA
|
|
|
|
unsigned int num_dma_maps;
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
struct sk_buff *frag_list;
|
2009-02-12 13:03:37 +08:00
|
|
|
struct skb_shared_hwtstamps hwtstamps;
|
2005-04-17 06:20:36 +08:00
|
|
|
skb_frag_t frags[MAX_SKB_FRAGS];
|
2008-09-11 19:48:58 +08:00
|
|
|
#ifdef CONFIG_HAS_DMA
|
|
|
|
dma_addr_t dma_maps[MAX_SKB_FRAGS + 1];
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* We divide dataref into two halves. The higher 16 bits hold references
|
|
|
|
* to the payload part of skb->data. The lower 16 bits hold references to
|
[SKBUFF]: Keep track of writable header len of headerless clones
Currently NAT (and others) that want to modify cloned skbs copy them,
even if in the vast majority of cases its not necessary because the
skb is a clone made by TCP and the portion NAT wants to modify is
actually writable because TCP release the header reference before
cloning.
The problem is that there is no clean way for NAT to find out how
long the writable header area is, so this patch introduces skb->hdr_len
to hold this length. When a headerless skb is cloned skb->hdr_len
is set to the current headroom, for regular clones it is copied from
the original. A new function skb_clone_writable(skb, len) returns
whether the skb is writable up to len bytes from skb->data. To avoid
enlarging the skb the mac_len field is reduced to 16 bit and the
new hdr_len field is put in the remaining 16 bit.
I've done a few rough benchmarks of NAT (not with this exact patch,
but a very similar one). As expected it saves huge amounts of system
time in case of sendfile, bringing it down to basically the same
amount as without NAT, with sendmsg it only helps on loopback,
probably because of the large MTU.
Transmit a 1GB file using sendfile/sendmsg over eth0/lo with and
without NAT:
- sendfile eth0, no NAT: sys 0m0.388s
- sendfile eth0, NAT: sys 0m1.835s
- sendfile eth0: NAT + path: sys 0m0.370s (~ -80%)
- sendfile lo, no NAT: sys 0m0.258s
- sendfile lo, NAT: sys 0m2.609s
- sendfile lo, NAT + patch: sys 0m0.260s (~ -90%)
- sendmsg eth0, no NAT: sys 0m2.508s
- sendmsg eth0, NAT: sys 0m2.539s
- sendmsg eth0, NAT + patch: sys 0m2.445s (no change)
- sendmsg lo, no NAT: sys 0m2.151s
- sendmsg lo, NAT: sys 0m3.557s
- sendmsg lo, NAT + patch: sys 0m2.159s (~ -40%)
I expect other users can see a similar performance improvement,
packet mangling iptables targets, ipip and ip_gre come to mind ..
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-06-25 19:35:20 +08:00
|
|
|
* the entire skb->data. A clone of a headerless skb holds the length of
|
|
|
|
* the header in skb->hdr_len.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* All users must obey the rule that the skb->data reference count must be
|
|
|
|
* greater than or equal to the payload reference count.
|
|
|
|
*
|
|
|
|
* Holding a reference to the payload part means that the user does not
|
|
|
|
* care about modifications to the header part of skb->data.
|
|
|
|
*/
|
|
|
|
#define SKB_DATAREF_SHIFT 16
|
|
|
|
#define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
|
|
|
|
|
2005-08-18 05:57:30 +08:00
|
|
|
|
|
|
|
enum {
|
|
|
|
SKB_FCLONE_UNAVAILABLE,
|
|
|
|
SKB_FCLONE_ORIG,
|
|
|
|
SKB_FCLONE_CLONE,
|
|
|
|
};
|
|
|
|
|
2006-06-22 17:40:14 +08:00
|
|
|
enum {
|
|
|
|
SKB_GSO_TCPV4 = 1 << 0,
|
2006-07-01 04:37:03 +08:00
|
|
|
SKB_GSO_UDP = 1 << 1,
|
2006-06-28 04:22:38 +08:00
|
|
|
|
|
|
|
/* This indicates the skb is from an untrusted source. */
|
|
|
|
SKB_GSO_DODGY = 1 << 2,
|
2006-06-30 03:30:00 +08:00
|
|
|
|
|
|
|
/* This indicates the tcp segment has CWR set. */
|
2006-07-01 04:37:03 +08:00
|
|
|
SKB_GSO_TCP_ECN = 1 << 3,
|
|
|
|
|
|
|
|
SKB_GSO_TCPV6 = 1 << 4,
|
2009-02-28 06:06:49 +08:00
|
|
|
|
|
|
|
SKB_GSO_FCOE = 1 << 5,
|
2006-06-22 17:40:14 +08:00
|
|
|
};
|
|
|
|
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
#if BITS_PER_LONG > 32
|
|
|
|
#define NET_SKBUFF_DATA_USES_OFFSET 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef NET_SKBUFF_DATA_USES_OFFSET
|
|
|
|
typedef unsigned int sk_buff_data_t;
|
|
|
|
#else
|
|
|
|
typedef unsigned char *sk_buff_data_t;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* struct sk_buff - socket buffer
|
|
|
|
* @next: Next buffer in list
|
|
|
|
* @prev: Previous buffer in list
|
|
|
|
* @sk: Socket we are owned by
|
2005-10-04 04:57:23 +08:00
|
|
|
* @tstamp: Time we arrived
|
2005-04-17 06:20:36 +08:00
|
|
|
* @dev: Device we arrived on/are leaving by
|
2007-05-03 18:16:20 +08:00
|
|
|
* @transport_header: Transport layer header
|
2007-04-11 12:21:55 +08:00
|
|
|
* @network_header: Network layer header
|
|
|
|
* @mac_header: Link layer header
|
2005-05-01 23:59:26 +08:00
|
|
|
* @dst: destination entry
|
|
|
|
* @sp: the security path, used for xfrm
|
2005-04-17 06:20:36 +08:00
|
|
|
* @cb: Control buffer. Free for use by every layer. Put private vars here
|
|
|
|
* @len: Length of actual data
|
|
|
|
* @data_len: Data length
|
|
|
|
* @mac_len: Length of link layer header
|
[SKBUFF]: Keep track of writable header len of headerless clones
Currently NAT (and others) that want to modify cloned skbs copy them,
even if in the vast majority of cases its not necessary because the
skb is a clone made by TCP and the portion NAT wants to modify is
actually writable because TCP release the header reference before
cloning.
The problem is that there is no clean way for NAT to find out how
long the writable header area is, so this patch introduces skb->hdr_len
to hold this length. When a headerless skb is cloned skb->hdr_len
is set to the current headroom, for regular clones it is copied from
the original. A new function skb_clone_writable(skb, len) returns
whether the skb is writable up to len bytes from skb->data. To avoid
enlarging the skb the mac_len field is reduced to 16 bit and the
new hdr_len field is put in the remaining 16 bit.
I've done a few rough benchmarks of NAT (not with this exact patch,
but a very similar one). As expected it saves huge amounts of system
time in case of sendfile, bringing it down to basically the same
amount as without NAT, with sendmsg it only helps on loopback,
probably because of the large MTU.
Transmit a 1GB file using sendfile/sendmsg over eth0/lo with and
without NAT:
- sendfile eth0, no NAT: sys 0m0.388s
- sendfile eth0, NAT: sys 0m1.835s
- sendfile eth0: NAT + path: sys 0m0.370s (~ -80%)
- sendfile lo, no NAT: sys 0m0.258s
- sendfile lo, NAT: sys 0m2.609s
- sendfile lo, NAT + patch: sys 0m0.260s (~ -90%)
- sendmsg eth0, no NAT: sys 0m2.508s
- sendmsg eth0, NAT: sys 0m2.539s
- sendmsg eth0, NAT + patch: sys 0m2.445s (no change)
- sendmsg lo, no NAT: sys 0m2.151s
- sendmsg lo, NAT: sys 0m3.557s
- sendmsg lo, NAT + patch: sys 0m2.159s (~ -40%)
I expect other users can see a similar performance improvement,
packet mangling iptables targets, ipip and ip_gre come to mind ..
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-06-25 19:35:20 +08:00
|
|
|
* @hdr_len: writable header length of cloned skb
|
2007-04-10 02:59:07 +08:00
|
|
|
* @csum: Checksum (must include start/offset pair)
|
|
|
|
* @csum_start: Offset from skb->head where checksumming should start
|
|
|
|
* @csum_offset: Offset from csum_start where checksum should be stored
|
2005-05-01 23:59:26 +08:00
|
|
|
* @local_df: allow local fragmentation
|
2005-04-17 06:20:36 +08:00
|
|
|
* @cloned: Head may be cloned (check refcnt to be sure)
|
|
|
|
* @nohdr: Payload reference only, must not modify header
|
|
|
|
* @pkt_type: Packet class
|
2005-10-19 13:07:41 +08:00
|
|
|
* @fclone: skbuff clone status
|
2005-04-17 06:20:36 +08:00
|
|
|
* @ip_summed: Driver fed us an IP checksum
|
|
|
|
* @priority: Packet queueing priority
|
|
|
|
* @users: User count - see {datagram,tcp}.c
|
|
|
|
* @protocol: Packet protocol from driver
|
|
|
|
* @truesize: Buffer size
|
|
|
|
* @head: Head of buffer
|
|
|
|
* @data: Data head pointer
|
|
|
|
* @tail: Tail pointer
|
|
|
|
* @end: End pointer
|
|
|
|
* @destructor: Destruct function
|
2006-11-10 07:19:14 +08:00
|
|
|
* @mark: Generic packet mark
|
2005-04-17 06:20:36 +08:00
|
|
|
* @nfct: Associated connection, if any
|
2005-10-19 13:07:41 +08:00
|
|
|
* @ipvs_property: skbuff is owned by ipvs
|
2008-02-19 12:52:13 +08:00
|
|
|
* @peeked: this packet has been seen already, so stats have been
|
|
|
|
* done for it, don't do them again
|
2007-07-08 13:21:23 +08:00
|
|
|
* @nf_trace: netfilter packet trace flag
|
2005-04-17 06:20:36 +08:00
|
|
|
* @nfctinfo: Relationship of this skb to the connection
|
2005-11-21 13:25:15 +08:00
|
|
|
* @nfct_reasm: netfilter conntrack re-assembly pointer
|
2005-04-17 06:20:36 +08:00
|
|
|
* @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
|
2007-07-07 04:36:20 +08:00
|
|
|
* @iif: ifindex of device we arrived on
|
|
|
|
* @queue_mapping: Queue mapping for multiqueue devices
|
2005-04-17 06:20:36 +08:00
|
|
|
* @tc_index: Traffic control index
|
|
|
|
* @tc_verd: traffic control verdict
|
2008-04-21 01:51:01 +08:00
|
|
|
* @ndisc_nodetype: router type (from link layer)
|
2008-08-01 11:52:08 +08:00
|
|
|
* @do_not_encrypt: set to prevent encryption of this frame
|
2008-10-24 12:25:27 +08:00
|
|
|
* @requeue: set to indicate that the wireless core should attempt
|
|
|
|
* a software retry on this frame if we failed to
|
|
|
|
* receive an ACK for it
|
2006-06-23 07:00:11 +08:00
|
|
|
* @dma_cookie: a cookie to one of several possible DMA operations
|
|
|
|
* done by skb DMA functions
|
2006-06-09 15:29:17 +08:00
|
|
|
* @secmark: security marking
|
2008-07-15 13:49:06 +08:00
|
|
|
* @vlan_tci: vlan tag control information
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
struct sk_buff {
|
|
|
|
/* These two members must be first. */
|
|
|
|
struct sk_buff *next;
|
|
|
|
struct sk_buff *prev;
|
|
|
|
|
|
|
|
struct sock *sk;
|
2007-04-20 07:16:32 +08:00
|
|
|
ktime_t tstamp;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_device *dev;
|
|
|
|
|
2008-03-06 10:30:47 +08:00
|
|
|
union {
|
|
|
|
struct dst_entry *dst;
|
|
|
|
struct rtable *rtable;
|
|
|
|
};
|
2008-10-29 04:24:06 +08:00
|
|
|
#ifdef CONFIG_XFRM
|
2005-04-17 06:20:36 +08:00
|
|
|
struct sec_path *sp;
|
2008-10-29 04:24:06 +08:00
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* This is the control buffer. It is free to use for every
|
|
|
|
* layer. Please put your private variables there. If you
|
|
|
|
* want to keep them across layers you have to do a skb_clone()
|
|
|
|
* first. This is owned by whoever has the skb queued ATM.
|
|
|
|
*/
|
2006-01-07 15:04:54 +08:00
|
|
|
char cb[48];
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
unsigned int len,
|
[SKBUFF]: Keep track of writable header len of headerless clones
Currently NAT (and others) that want to modify cloned skbs copy them,
even if in the vast majority of cases its not necessary because the
skb is a clone made by TCP and the portion NAT wants to modify is
actually writable because TCP release the header reference before
cloning.
The problem is that there is no clean way for NAT to find out how
long the writable header area is, so this patch introduces skb->hdr_len
to hold this length. When a headerless skb is cloned skb->hdr_len
is set to the current headroom, for regular clones it is copied from
the original. A new function skb_clone_writable(skb, len) returns
whether the skb is writable up to len bytes from skb->data. To avoid
enlarging the skb the mac_len field is reduced to 16 bit and the
new hdr_len field is put in the remaining 16 bit.
I've done a few rough benchmarks of NAT (not with this exact patch,
but a very similar one). As expected it saves huge amounts of system
time in case of sendfile, bringing it down to basically the same
amount as without NAT, with sendmsg it only helps on loopback,
probably because of the large MTU.
Transmit a 1GB file using sendfile/sendmsg over eth0/lo with and
without NAT:
- sendfile eth0, no NAT: sys 0m0.388s
- sendfile eth0, NAT: sys 0m1.835s
- sendfile eth0: NAT + path: sys 0m0.370s (~ -80%)
- sendfile lo, no NAT: sys 0m0.258s
- sendfile lo, NAT: sys 0m2.609s
- sendfile lo, NAT + patch: sys 0m0.260s (~ -90%)
- sendmsg eth0, no NAT: sys 0m2.508s
- sendmsg eth0, NAT: sys 0m2.539s
- sendmsg eth0, NAT + patch: sys 0m2.445s (no change)
- sendmsg lo, no NAT: sys 0m2.151s
- sendmsg lo, NAT: sys 0m3.557s
- sendmsg lo, NAT + patch: sys 0m2.159s (~ -40%)
I expect other users can see a similar performance improvement,
packet mangling iptables targets, ipip and ip_gre come to mind ..
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-06-25 19:35:20 +08:00
|
|
|
data_len;
|
|
|
|
__u16 mac_len,
|
|
|
|
hdr_len;
|
2006-11-21 10:07:29 +08:00
|
|
|
union {
|
|
|
|
__wsum csum;
|
2007-04-10 02:59:07 +08:00
|
|
|
struct {
|
|
|
|
__u16 csum_start;
|
|
|
|
__u16 csum_offset;
|
|
|
|
};
|
2006-11-21 10:07:29 +08:00
|
|
|
};
|
2005-04-17 06:20:36 +08:00
|
|
|
__u32 priority;
|
2005-07-06 05:13:41 +08:00
|
|
|
__u8 local_df:1,
|
|
|
|
cloned:1,
|
|
|
|
ip_summed:2,
|
2005-08-10 10:24:19 +08:00
|
|
|
nohdr:1,
|
|
|
|
nfctinfo:3;
|
2005-08-18 05:57:30 +08:00
|
|
|
__u8 pkt_type:3,
|
2005-11-21 13:19:21 +08:00
|
|
|
fclone:2,
|
2007-07-08 13:21:23 +08:00
|
|
|
ipvs_property:1,
|
2007-12-05 17:53:40 +08:00
|
|
|
peeked:1,
|
2007-07-08 13:21:23 +08:00
|
|
|
nf_trace:1;
|
2005-08-12 07:05:50 +08:00
|
|
|
__be16 protocol;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
void (*destructor)(struct sk_buff *skb);
|
[NETFILTER]: Add nf_conntrack subsystem.
The existing connection tracking subsystem in netfilter can only
handle ipv4. There were basically two choices present to add
connection tracking support for ipv6. We could either duplicate all
of the ipv4 connection tracking code into an ipv6 counterpart, or (the
choice taken by these patches) we could design a generic layer that
could handle both ipv4 and ipv6 and thus requiring only one sub-protocol
(TCP, UDP, etc.) connection tracking helper module to be written.
In fact nf_conntrack is capable of working with any layer 3
protocol.
The existing ipv4 specific conntrack code could also not deal
with the pecularities of doing connection tracking on ipv6,
which is also cured here. For example, these issues include:
1) ICMPv6 handling, which is used for neighbour discovery in
ipv6 thus some messages such as these should not participate
in connection tracking since effectively they are like ARP
messages
2) fragmentation must be handled differently in ipv6, because
the simplistic "defrag, connection track and NAT, refrag"
(which the existing ipv4 connection tracking does) approach simply
isn't feasible in ipv6
3) ipv6 extension header parsing must occur at the correct spots
before and after connection tracking decisions, and there were
no provisions for this in the existing connection tracking
design
4) ipv6 has no need for stateful NAT
The ipv4 specific conntrack layer is kept around, until all of
the ipv4 specific conntrack helpers are ported over to nf_conntrack
and it is feature complete. Once that occurs, the old conntrack
stuff will get placed into the feature-removal-schedule and we will
fully kill it off 6 months later.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2005-11-10 08:38:16 +08:00
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2007-03-24 02:17:07 +08:00
|
|
|
struct nf_conntrack *nfct;
|
[NETFILTER]: Add nf_conntrack subsystem.
The existing connection tracking subsystem in netfilter can only
handle ipv4. There were basically two choices present to add
connection tracking support for ipv6. We could either duplicate all
of the ipv4 connection tracking code into an ipv6 counterpart, or (the
choice taken by these patches) we could design a generic layer that
could handle both ipv4 and ipv6 and thus requiring only one sub-protocol
(TCP, UDP, etc.) connection tracking helper module to be written.
In fact nf_conntrack is capable of working with any layer 3
protocol.
The existing ipv4 specific conntrack code could also not deal
with the pecularities of doing connection tracking on ipv6,
which is also cured here. For example, these issues include:
1) ICMPv6 handling, which is used for neighbour discovery in
ipv6 thus some messages such as these should not participate
in connection tracking since effectively they are like ARP
messages
2) fragmentation must be handled differently in ipv6, because
the simplistic "defrag, connection track and NAT, refrag"
(which the existing ipv4 connection tracking does) approach simply
isn't feasible in ipv6
3) ipv6 extension header parsing must occur at the correct spots
before and after connection tracking decisions, and there were
no provisions for this in the existing connection tracking
design
4) ipv6 has no need for stateful NAT
The ipv4 specific conntrack layer is kept around, until all of
the ipv4 specific conntrack helpers are ported over to nf_conntrack
and it is feature complete. Once that occurs, the old conntrack
stuff will get placed into the feature-removal-schedule and we will
fully kill it off 6 months later.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2005-11-10 08:38:16 +08:00
|
|
|
struct sk_buff *nfct_reasm;
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
struct nf_bridge_info *nf_bridge;
|
|
|
|
#endif
|
2007-07-07 04:36:20 +08:00
|
|
|
|
|
|
|
int iif;
|
|
|
|
__u16 queue_mapping;
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NET_SCHED
|
2005-08-10 10:33:51 +08:00
|
|
|
__u16 tc_index; /* traffic control index */
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
2005-08-10 10:33:51 +08:00
|
|
|
__u16 tc_verd; /* traffic control verdict */
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
#endif
|
2008-03-16 11:59:18 +08:00
|
|
|
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
2008-03-12 06:35:59 +08:00
|
|
|
__u8 ndisc_nodetype:2;
|
2008-03-16 11:59:18 +08:00
|
|
|
#endif
|
2008-07-29 17:32:07 +08:00
|
|
|
#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
|
|
|
|
__u8 do_not_encrypt:1;
|
2008-10-24 12:25:27 +08:00
|
|
|
__u8 requeue:1;
|
2008-07-29 17:32:07 +08:00
|
|
|
#endif
|
|
|
|
/* 0/13/14 bit hole */
|
2007-07-07 04:36:20 +08:00
|
|
|
|
2006-05-24 08:55:33 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
dma_cookie_t dma_cookie;
|
|
|
|
#endif
|
2006-06-09 15:29:17 +08:00
|
|
|
#ifdef CONFIG_NETWORK_SECMARK
|
|
|
|
__u32 secmark;
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-11-10 07:19:14 +08:00
|
|
|
__u32 mark;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-15 13:49:06 +08:00
|
|
|
__u16 vlan_tci;
|
|
|
|
|
2007-04-20 11:29:13 +08:00
|
|
|
sk_buff_data_t transport_header;
|
|
|
|
sk_buff_data_t network_header;
|
|
|
|
sk_buff_data_t mac_header;
|
2005-04-17 06:20:36 +08:00
|
|
|
/* These elements must be at the end, see alloc_skb() for details. */
|
2007-04-20 11:29:13 +08:00
|
|
|
sk_buff_data_t tail;
|
2007-04-20 11:43:29 +08:00
|
|
|
sk_buff_data_t end;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned char *head,
|
2007-04-20 11:43:29 +08:00
|
|
|
*data;
|
2007-04-20 11:29:13 +08:00
|
|
|
unsigned int truesize;
|
|
|
|
atomic_t users;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
|
|
* Handling routines are only of interest to the kernel
|
|
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
|
|
#include <asm/system.h>
|
|
|
|
|
2008-09-11 19:51:14 +08:00
|
|
|
#ifdef CONFIG_HAS_DMA
|
|
|
|
#include <linux/dma-mapping.h>
|
|
|
|
extern int skb_dma_map(struct device *dev, struct sk_buff *skb,
|
|
|
|
enum dma_data_direction dir);
|
|
|
|
extern void skb_dma_unmap(struct device *dev, struct sk_buff *skb,
|
|
|
|
enum dma_data_direction dir);
|
|
|
|
#endif
|
|
|
|
|
2006-03-21 13:28:35 +08:00
|
|
|
extern void kfree_skb(struct sk_buff *skb);
|
2009-03-11 17:49:55 +08:00
|
|
|
extern void consume_skb(struct sk_buff *skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern void __kfree_skb(struct sk_buff *skb);
|
2005-08-18 05:57:30 +08:00
|
|
|
extern struct sk_buff *__alloc_skb(unsigned int size,
|
2006-12-07 12:32:36 +08:00
|
|
|
gfp_t priority, int fclone, int node);
|
2005-08-18 05:57:30 +08:00
|
|
|
static inline struct sk_buff *alloc_skb(unsigned int size,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t priority)
|
2005-08-18 05:57:30 +08:00
|
|
|
{
|
2006-12-07 12:32:36 +08:00
|
|
|
return __alloc_skb(size, priority, 0, -1);
|
2005-08-18 05:57:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t priority)
|
2005-08-18 05:57:30 +08:00
|
|
|
{
|
2006-12-07 12:32:36 +08:00
|
|
|
return __alloc_skb(size, priority, 1, -1);
|
2005-08-18 05:57:30 +08:00
|
|
|
}
|
|
|
|
|
2008-10-01 17:33:12 +08:00
|
|
|
extern int skb_recycle_check(struct sk_buff *skb, int skb_size);
|
|
|
|
|
2007-10-14 15:37:52 +08:00
|
|
|
extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src);
|
2005-07-09 05:57:47 +08:00
|
|
|
extern struct sk_buff *skb_clone(struct sk_buff *skb,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t priority);
|
2005-07-09 05:57:47 +08:00
|
|
|
extern struct sk_buff *skb_copy(const struct sk_buff *skb,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t priority);
|
2005-07-09 05:57:47 +08:00
|
|
|
extern struct sk_buff *pskb_copy(struct sk_buff *skb,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t gfp_mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern int pskb_expand_head(struct sk_buff *skb,
|
2005-07-09 05:57:47 +08:00
|
|
|
int nhead, int ntail,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t gfp_mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern struct sk_buff *skb_realloc_headroom(struct sk_buff *skb,
|
|
|
|
unsigned int headroom);
|
|
|
|
extern struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
|
|
|
|
int newheadroom, int newtailroom,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t priority);
|
2007-04-03 11:19:53 +08:00
|
|
|
extern int skb_to_sgvec(struct sk_buff *skb,
|
|
|
|
struct scatterlist *sg, int offset,
|
|
|
|
int len);
|
|
|
|
extern int skb_cow_data(struct sk_buff *skb, int tailbits,
|
|
|
|
struct sk_buff **trailer);
|
2006-06-23 17:06:41 +08:00
|
|
|
extern int skb_pad(struct sk_buff *skb, int pad);
|
2009-03-11 17:49:55 +08:00
|
|
|
#define dev_kfree_skb(a) consume_skb(a)
|
|
|
|
#define dev_consume_skb(a) kfree_skb_clean(a)
|
2005-04-17 06:20:36 +08:00
|
|
|
extern void skb_over_panic(struct sk_buff *skb, int len,
|
|
|
|
void *here);
|
|
|
|
extern void skb_under_panic(struct sk_buff *skb, int len,
|
|
|
|
void *here);
|
|
|
|
|
2005-10-19 06:46:41 +08:00
|
|
|
extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
|
|
|
|
int getfrag(void *from, char *to, int offset,
|
|
|
|
int len,int odd, struct sk_buff *skb),
|
|
|
|
void *from, int length);
|
|
|
|
|
2005-06-24 11:59:51 +08:00
|
|
|
struct skb_seq_state
|
|
|
|
{
|
|
|
|
__u32 lower_offset;
|
|
|
|
__u32 upper_offset;
|
|
|
|
__u32 frag_idx;
|
|
|
|
__u32 stepped_offset;
|
|
|
|
struct sk_buff *root_skb;
|
|
|
|
struct sk_buff *cur_skb;
|
|
|
|
__u8 *frag_data;
|
|
|
|
};
|
|
|
|
|
|
|
|
extern void skb_prepare_seq_read(struct sk_buff *skb,
|
|
|
|
unsigned int from, unsigned int to,
|
|
|
|
struct skb_seq_state *st);
|
|
|
|
extern unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
|
|
|
|
struct skb_seq_state *st);
|
|
|
|
extern void skb_abort_seq_read(struct skb_seq_state *st);
|
|
|
|
|
2005-06-24 12:00:17 +08:00
|
|
|
extern unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
|
|
|
|
unsigned int to, struct ts_config *config,
|
|
|
|
struct ts_state *state);
|
|
|
|
|
2007-04-20 11:43:29 +08:00
|
|
|
#ifdef NET_SKBUFF_DATA_USES_OFFSET
|
|
|
|
static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->head + skb->end;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->end;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Internal */
|
2007-04-20 11:43:29 +08:00
|
|
|
#define skb_shinfo(SKB) ((struct skb_shared_info *)(skb_end_pointer(SKB)))
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-02-12 13:03:37 +08:00
|
|
|
static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return &skb_shinfo(skb)->hwtstamps;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline union skb_shared_tx *skb_tx(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return &skb_shinfo(skb)->tx_flags;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* skb_queue_empty - check if a queue is empty
|
|
|
|
* @list: queue head
|
|
|
|
*
|
|
|
|
* Returns true if the queue is empty, false otherwise.
|
|
|
|
*/
|
|
|
|
static inline int skb_queue_empty(const struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
return list->next == (struct sk_buff *)list;
|
|
|
|
}
|
|
|
|
|
2008-09-23 15:34:07 +08:00
|
|
|
/**
|
|
|
|
* skb_queue_is_last - check if skb is the last entry in the queue
|
|
|
|
* @list: queue head
|
|
|
|
* @skb: buffer
|
|
|
|
*
|
|
|
|
* Returns true if @skb is the last buffer on the list.
|
|
|
|
*/
|
|
|
|
static inline bool skb_queue_is_last(const struct sk_buff_head *list,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return (skb->next == (struct sk_buff *) list);
|
|
|
|
}
|
|
|
|
|
tcp: Try to restore large SKBs while SACK processing
During SACK processing, most of the benefits of TSO are eaten by
the SACK blocks that one-by-one fragment SKBs to MSS sized chunks.
Then we're in problems when cleanup work for them has to be done
when a large cumulative ACK comes. Try to return back to pre-split
state already while more and more SACK info gets discovered by
combining newly discovered SACK areas with the previous skb if
that's SACKed as well.
This approach has a number of benefits:
1) The processing overhead is spread more equally over the RTT
2) Write queue has less skbs to process (affect everything
which has to walk in the queue past the sacked areas)
3) Write queue is consistent whole the time, so no other parts
of TCP has to be aware of this (this was not the case with
some other approach that was, well, quite intrusive all
around).
4) Clean_rtx_queue can release most of the pages using single
put_page instead of previous PAGE_SIZE/mss+1 calls
In case a hole is fully filled by the new SACK block, we attempt
to combine the next skb too which allows construction of skbs
that are even larger than what tso split them to and it handles
hole per on every nth patterns that often occur during slow start
overshoot pretty nicely. Though this to be really useful also
a retransmission would have to get lost since cumulative ACKs
advance one hole at a time in the most typical case.
TODO: handle upwards only merging. That should be rather easy
when segment is fully sacked but I'm leaving that as future
work item (it won't make very large difference anyway since
this current approach already covers quite a lot of normal
cases).
I was earlier thinking of some sophisticated way of tracking
timestamps of the first and the last segment but later on
realized that it won't be that necessary at all to store the
timestamp of the last segment. The cases that can occur are
basically either:
1) ambiguous => no sensible measurement can be taken anyway
2) non-ambiguous is due to reordering => having the timestamp
of the last segment there is just skewing things more off
than does some good since the ack got triggered by one of
the holes (besides some substle issues that would make
determining right hole/skb even harder problem). Anyway,
it has nothing to do with this change then.
I choose to route some abnormal looking cases with goto noop,
some could be handled differently (eg., by stopping the
walking at that skb but again). In general, they either
shouldn't happen at all or are rare enough to make no difference
in practice.
In theory this change (as whole) could cause some macroscale
regression (global) because of cache misses that are taken over
the round-trip time but it gets very likely better because of much
less (local) cache misses per other write queue walkers and the
big recovery clearing cumulative ack.
Worth to note that these benefits would be very easy to get also
without TSO/GSO being on as long as the data is in pages so that
we can merge them. Currently I won't let that happen because
DSACK splitting at fragment that would mess up pcounts due to
sk_can_gso in tcp_set_skb_tso_segs. Once DSACKs fragments gets
avoided, we have some conditions that can be made less strict.
TODO: I will probably have to convert the excessive pointer
passing to struct sacktag_state... :-)
My testing revealed that considerable amount of skbs couldn't
be shifted because they were cloned (most likely still awaiting
tx reclaim)...
[The rest is considering future work instead since I got
repeatably EFAULT to tcpdump's recvfrom when I added
pskb_expand_head to deal with clones, so I separated that
into another, later patch]
...To counter that, I gave up on the fifth advantage:
5) When growing previous SACK block, less allocs for new skbs
are done, basically a new alloc is needed only when new hole
is detected and when the previous skb runs out of frags space
...which now only happens of if reclaim is fast enough to dispose
the clone before the SACK block comes in (the window is RTT long),
otherwise we'll have to alloc some.
With clones being handled I got these numbers (will be somewhat
worse without that), taken with fine-grained mibs:
TCPSackShifted 398
TCPSackMerged 877
TCPSackShiftFallback 320
TCPSACKCOLLAPSEFALLBACKGSO 0
TCPSACKCOLLAPSEFALLBACKSKBBITS 0
TCPSACKCOLLAPSEFALLBACKSKBDATA 0
TCPSACKCOLLAPSEFALLBACKBELOW 0
TCPSACKCOLLAPSEFALLBACKFIRST 1
TCPSACKCOLLAPSEFALLBACKPREVBITS 318
TCPSACKCOLLAPSEFALLBACKMSS 1
TCPSACKCOLLAPSEFALLBACKNOHEAD 0
TCPSACKCOLLAPSEFALLBACKSHIFT 0
TCPSACKCOLLAPSENOOPSEQ 0
TCPSACKCOLLAPSENOOPSMALLPCOUNT 0
TCPSACKCOLLAPSENOOPSMALLLEN 0
TCPSACKCOLLAPSEHOLE 12
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-11-25 13:20:15 +08:00
|
|
|
/**
|
|
|
|
* skb_queue_is_first - check if skb is the first entry in the queue
|
|
|
|
* @list: queue head
|
|
|
|
* @skb: buffer
|
|
|
|
*
|
|
|
|
* Returns true if @skb is the first buffer on the list.
|
|
|
|
*/
|
|
|
|
static inline bool skb_queue_is_first(const struct sk_buff_head *list,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return (skb->prev == (struct sk_buff *) list);
|
|
|
|
}
|
|
|
|
|
2008-09-23 15:44:42 +08:00
|
|
|
/**
|
|
|
|
* skb_queue_next - return the next packet in the queue
|
|
|
|
* @list: queue head
|
|
|
|
* @skb: current buffer
|
|
|
|
*
|
|
|
|
* Return the next packet in @list after @skb. It is only valid to
|
|
|
|
* call this if skb_queue_is_last() evaluates to false.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *skb_queue_next(const struct sk_buff_head *list,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/* This BUG_ON may seem severe, but if we just return then we
|
|
|
|
* are going to dereference garbage.
|
|
|
|
*/
|
|
|
|
BUG_ON(skb_queue_is_last(list, skb));
|
|
|
|
return skb->next;
|
|
|
|
}
|
|
|
|
|
tcp: Try to restore large SKBs while SACK processing
During SACK processing, most of the benefits of TSO are eaten by
the SACK blocks that one-by-one fragment SKBs to MSS sized chunks.
Then we're in problems when cleanup work for them has to be done
when a large cumulative ACK comes. Try to return back to pre-split
state already while more and more SACK info gets discovered by
combining newly discovered SACK areas with the previous skb if
that's SACKed as well.
This approach has a number of benefits:
1) The processing overhead is spread more equally over the RTT
2) Write queue has less skbs to process (affect everything
which has to walk in the queue past the sacked areas)
3) Write queue is consistent whole the time, so no other parts
of TCP has to be aware of this (this was not the case with
some other approach that was, well, quite intrusive all
around).
4) Clean_rtx_queue can release most of the pages using single
put_page instead of previous PAGE_SIZE/mss+1 calls
In case a hole is fully filled by the new SACK block, we attempt
to combine the next skb too which allows construction of skbs
that are even larger than what tso split them to and it handles
hole per on every nth patterns that often occur during slow start
overshoot pretty nicely. Though this to be really useful also
a retransmission would have to get lost since cumulative ACKs
advance one hole at a time in the most typical case.
TODO: handle upwards only merging. That should be rather easy
when segment is fully sacked but I'm leaving that as future
work item (it won't make very large difference anyway since
this current approach already covers quite a lot of normal
cases).
I was earlier thinking of some sophisticated way of tracking
timestamps of the first and the last segment but later on
realized that it won't be that necessary at all to store the
timestamp of the last segment. The cases that can occur are
basically either:
1) ambiguous => no sensible measurement can be taken anyway
2) non-ambiguous is due to reordering => having the timestamp
of the last segment there is just skewing things more off
than does some good since the ack got triggered by one of
the holes (besides some substle issues that would make
determining right hole/skb even harder problem). Anyway,
it has nothing to do with this change then.
I choose to route some abnormal looking cases with goto noop,
some could be handled differently (eg., by stopping the
walking at that skb but again). In general, they either
shouldn't happen at all or are rare enough to make no difference
in practice.
In theory this change (as whole) could cause some macroscale
regression (global) because of cache misses that are taken over
the round-trip time but it gets very likely better because of much
less (local) cache misses per other write queue walkers and the
big recovery clearing cumulative ack.
Worth to note that these benefits would be very easy to get also
without TSO/GSO being on as long as the data is in pages so that
we can merge them. Currently I won't let that happen because
DSACK splitting at fragment that would mess up pcounts due to
sk_can_gso in tcp_set_skb_tso_segs. Once DSACKs fragments gets
avoided, we have some conditions that can be made less strict.
TODO: I will probably have to convert the excessive pointer
passing to struct sacktag_state... :-)
My testing revealed that considerable amount of skbs couldn't
be shifted because they were cloned (most likely still awaiting
tx reclaim)...
[The rest is considering future work instead since I got
repeatably EFAULT to tcpdump's recvfrom when I added
pskb_expand_head to deal with clones, so I separated that
into another, later patch]
...To counter that, I gave up on the fifth advantage:
5) When growing previous SACK block, less allocs for new skbs
are done, basically a new alloc is needed only when new hole
is detected and when the previous skb runs out of frags space
...which now only happens of if reclaim is fast enough to dispose
the clone before the SACK block comes in (the window is RTT long),
otherwise we'll have to alloc some.
With clones being handled I got these numbers (will be somewhat
worse without that), taken with fine-grained mibs:
TCPSackShifted 398
TCPSackMerged 877
TCPSackShiftFallback 320
TCPSACKCOLLAPSEFALLBACKGSO 0
TCPSACKCOLLAPSEFALLBACKSKBBITS 0
TCPSACKCOLLAPSEFALLBACKSKBDATA 0
TCPSACKCOLLAPSEFALLBACKBELOW 0
TCPSACKCOLLAPSEFALLBACKFIRST 1
TCPSACKCOLLAPSEFALLBACKPREVBITS 318
TCPSACKCOLLAPSEFALLBACKMSS 1
TCPSACKCOLLAPSEFALLBACKNOHEAD 0
TCPSACKCOLLAPSEFALLBACKSHIFT 0
TCPSACKCOLLAPSENOOPSEQ 0
TCPSACKCOLLAPSENOOPSMALLPCOUNT 0
TCPSACKCOLLAPSENOOPSMALLLEN 0
TCPSACKCOLLAPSEHOLE 12
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-11-25 13:20:15 +08:00
|
|
|
/**
|
|
|
|
* skb_queue_prev - return the prev packet in the queue
|
|
|
|
* @list: queue head
|
|
|
|
* @skb: current buffer
|
|
|
|
*
|
|
|
|
* Return the prev packet in @list before @skb. It is only valid to
|
|
|
|
* call this if skb_queue_is_first() evaluates to false.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *skb_queue_prev(const struct sk_buff_head *list,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/* This BUG_ON may seem severe, but if we just return then we
|
|
|
|
* are going to dereference garbage.
|
|
|
|
*/
|
|
|
|
BUG_ON(skb_queue_is_first(list, skb));
|
|
|
|
return skb->prev;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* skb_get - reference buffer
|
|
|
|
* @skb: buffer to reference
|
|
|
|
*
|
|
|
|
* Makes another reference to a socket buffer and returns a pointer
|
|
|
|
* to the buffer.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *skb_get(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
atomic_inc(&skb->users);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If users == 1, we are the only owner and are can avoid redundant
|
|
|
|
* atomic change.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_cloned - is the buffer a clone
|
|
|
|
* @skb: buffer to check
|
|
|
|
*
|
|
|
|
* Returns true if the buffer was generated with skb_clone() and is
|
|
|
|
* one of multiple shared copies of the buffer. Cloned buffers are
|
|
|
|
* shared data so must not be written to under normal circumstances.
|
|
|
|
*/
|
|
|
|
static inline int skb_cloned(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->cloned &&
|
|
|
|
(atomic_read(&skb_shinfo(skb)->dataref) & SKB_DATAREF_MASK) != 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_header_cloned - is the header a clone
|
|
|
|
* @skb: buffer to check
|
|
|
|
*
|
|
|
|
* Returns true if modifying the header part of the buffer requires
|
|
|
|
* the data to be copied.
|
|
|
|
*/
|
|
|
|
static inline int skb_header_cloned(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
int dataref;
|
|
|
|
|
|
|
|
if (!skb->cloned)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dataref = atomic_read(&skb_shinfo(skb)->dataref);
|
|
|
|
dataref = (dataref & SKB_DATAREF_MASK) - (dataref >> SKB_DATAREF_SHIFT);
|
|
|
|
return dataref != 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_header_release - release reference to header
|
|
|
|
* @skb: buffer to operate on
|
|
|
|
*
|
|
|
|
* Drop a reference to the header part of the buffer. This is done
|
|
|
|
* by acquiring a payload reference. You must not read from the header
|
|
|
|
* part of skb->data after this.
|
|
|
|
*/
|
|
|
|
static inline void skb_header_release(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
BUG_ON(skb->nohdr);
|
|
|
|
skb->nohdr = 1;
|
|
|
|
atomic_add(1 << SKB_DATAREF_SHIFT, &skb_shinfo(skb)->dataref);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_shared - is the buffer shared
|
|
|
|
* @skb: buffer to check
|
|
|
|
*
|
|
|
|
* Returns true if more than one person has a reference to this
|
|
|
|
* buffer.
|
|
|
|
*/
|
|
|
|
static inline int skb_shared(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return atomic_read(&skb->users) != 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_share_check - check if buffer is shared and if so clone it
|
|
|
|
* @skb: buffer to check
|
|
|
|
* @pri: priority for memory allocation
|
|
|
|
*
|
|
|
|
* If the buffer is shared the buffer is cloned and the old copy
|
|
|
|
* drops a reference. A new clone with a single reference is returned.
|
|
|
|
* If the buffer is not shared the original buffer is returned. When
|
|
|
|
* being called from interrupt status or with spinlocks held pri must
|
|
|
|
* be GFP_ATOMIC.
|
|
|
|
*
|
|
|
|
* NULL is returned on a memory allocation failure.
|
|
|
|
*/
|
2005-07-09 05:57:47 +08:00
|
|
|
static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t pri)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
might_sleep_if(pri & __GFP_WAIT);
|
|
|
|
if (skb_shared(skb)) {
|
|
|
|
struct sk_buff *nskb = skb_clone(skb, pri);
|
|
|
|
kfree_skb(skb);
|
|
|
|
skb = nskb;
|
|
|
|
}
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy shared buffers into a new sk_buff. We effectively do COW on
|
|
|
|
* packets to handle cases where we have a local reader and forward
|
|
|
|
* and a couple of other messy ones. The normal one is tcpdumping
|
|
|
|
* a packet thats being forwarded.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_unshare - make a copy of a shared buffer
|
|
|
|
* @skb: buffer to check
|
|
|
|
* @pri: priority for memory allocation
|
|
|
|
*
|
|
|
|
* If the socket buffer is a clone then this function creates a new
|
|
|
|
* copy of the data, drops a reference count on the old copy and returns
|
|
|
|
* the new copy with the reference count at 1. If the buffer is not a clone
|
|
|
|
* the original buffer is returned. When called with a spinlock held or
|
|
|
|
* from interrupt state @pri must be %GFP_ATOMIC
|
|
|
|
*
|
|
|
|
* %NULL is returned on a memory allocation failure.
|
|
|
|
*/
|
2005-07-19 04:36:38 +08:00
|
|
|
static inline struct sk_buff *skb_unshare(struct sk_buff *skb,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t pri)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
might_sleep_if(pri & __GFP_WAIT);
|
|
|
|
if (skb_cloned(skb)) {
|
|
|
|
struct sk_buff *nskb = skb_copy(skb, pri);
|
|
|
|
kfree_skb(skb); /* Free our shared copy */
|
|
|
|
skb = nskb;
|
|
|
|
}
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_peek
|
|
|
|
* @list_: list to peek at
|
|
|
|
*
|
|
|
|
* Peek an &sk_buff. Unlike most other operations you _MUST_
|
|
|
|
* be careful with this one. A peek leaves the buffer on the
|
|
|
|
* list and someone else may run off with it. You must hold
|
|
|
|
* the appropriate locks or have a private queue to do this.
|
|
|
|
*
|
|
|
|
* Returns %NULL for an empty list or a pointer to the head element.
|
|
|
|
* The reference count is not incremented and the reference is therefore
|
|
|
|
* volatile. Use with caution.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *skb_peek(struct sk_buff_head *list_)
|
|
|
|
{
|
|
|
|
struct sk_buff *list = ((struct sk_buff *)list_)->next;
|
|
|
|
if (list == (struct sk_buff *)list_)
|
|
|
|
list = NULL;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_peek_tail
|
|
|
|
* @list_: list to peek at
|
|
|
|
*
|
|
|
|
* Peek an &sk_buff. Unlike most other operations you _MUST_
|
|
|
|
* be careful with this one. A peek leaves the buffer on the
|
|
|
|
* list and someone else may run off with it. You must hold
|
|
|
|
* the appropriate locks or have a private queue to do this.
|
|
|
|
*
|
|
|
|
* Returns %NULL for an empty list or a pointer to the tail element.
|
|
|
|
* The reference count is not incremented and the reference is therefore
|
|
|
|
* volatile. Use with caution.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *skb_peek_tail(struct sk_buff_head *list_)
|
|
|
|
{
|
|
|
|
struct sk_buff *list = ((struct sk_buff *)list_)->prev;
|
|
|
|
if (list == (struct sk_buff *)list_)
|
|
|
|
list = NULL;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_queue_len - get queue length
|
|
|
|
* @list_: list to measure
|
|
|
|
*
|
|
|
|
* Return the length of an &sk_buff queue.
|
|
|
|
*/
|
|
|
|
static inline __u32 skb_queue_len(const struct sk_buff_head *list_)
|
|
|
|
{
|
|
|
|
return list_->qlen;
|
|
|
|
}
|
|
|
|
|
2008-09-22 13:36:24 +08:00
|
|
|
/**
|
|
|
|
* __skb_queue_head_init - initialize non-spinlock portions of sk_buff_head
|
|
|
|
* @list: queue to initialize
|
|
|
|
*
|
|
|
|
* This initializes only the list and queue length aspects of
|
|
|
|
* an sk_buff_head object. This allows to initialize the list
|
|
|
|
* aspects of an sk_buff_head without reinitializing things like
|
|
|
|
* the spinlock. It can also be used for on-stack sk_buff_head
|
|
|
|
* objects where the spinlock is known to not be used.
|
|
|
|
*/
|
|
|
|
static inline void __skb_queue_head_init(struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
list->prev = list->next = (struct sk_buff *)list;
|
|
|
|
list->qlen = 0;
|
|
|
|
}
|
|
|
|
|
2006-08-03 05:06:55 +08:00
|
|
|
/*
|
|
|
|
* This function creates a split out lock class for each invocation;
|
|
|
|
* this is needed for now since a whole lot of users of the skb-queue
|
|
|
|
* infrastructure in drivers have different locking usage (in hardirq)
|
|
|
|
* than the networking core (in softirq only). In the long run either the
|
|
|
|
* network layer or drivers should need annotation to consolidate the
|
|
|
|
* main types of usage into 3 classes.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline void skb_queue_head_init(struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
spin_lock_init(&list->lock);
|
2008-09-22 13:36:24 +08:00
|
|
|
__skb_queue_head_init(list);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-04-18 03:45:31 +08:00
|
|
|
static inline void skb_queue_head_init_class(struct sk_buff_head *list,
|
|
|
|
struct lock_class_key *class)
|
|
|
|
{
|
|
|
|
skb_queue_head_init(list);
|
|
|
|
lockdep_set_class(&list->lock, class);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2008-04-14 15:04:51 +08:00
|
|
|
* Insert an sk_buff on a list.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* The "__skb_xxxx()" functions are the non-atomic ones that
|
|
|
|
* can only be called with interrupts disabled.
|
|
|
|
*/
|
2008-04-14 15:04:51 +08:00
|
|
|
extern void skb_insert(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list);
|
|
|
|
static inline void __skb_insert(struct sk_buff *newsk,
|
|
|
|
struct sk_buff *prev, struct sk_buff *next,
|
|
|
|
struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
newsk->next = next;
|
|
|
|
newsk->prev = prev;
|
|
|
|
next->prev = prev->next = newsk;
|
|
|
|
list->qlen++;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-09-22 13:36:24 +08:00
|
|
|
static inline void __skb_queue_splice(const struct sk_buff_head *list,
|
|
|
|
struct sk_buff *prev,
|
|
|
|
struct sk_buff *next)
|
|
|
|
{
|
|
|
|
struct sk_buff *first = list->next;
|
|
|
|
struct sk_buff *last = list->prev;
|
|
|
|
|
|
|
|
first->prev = prev;
|
|
|
|
prev->next = first;
|
|
|
|
|
|
|
|
last->next = next;
|
|
|
|
next->prev = last;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_queue_splice - join two skb lists, this is designed for stacks
|
|
|
|
* @list: the new list to add
|
|
|
|
* @head: the place to add it in the first list
|
|
|
|
*/
|
|
|
|
static inline void skb_queue_splice(const struct sk_buff_head *list,
|
|
|
|
struct sk_buff_head *head)
|
|
|
|
{
|
|
|
|
if (!skb_queue_empty(list)) {
|
|
|
|
__skb_queue_splice(list, (struct sk_buff *) head, head->next);
|
2008-09-23 12:57:21 +08:00
|
|
|
head->qlen += list->qlen;
|
2008-09-22 13:36:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_queue_splice - join two skb lists and reinitialise the emptied list
|
|
|
|
* @list: the new list to add
|
|
|
|
* @head: the place to add it in the first list
|
|
|
|
*
|
|
|
|
* The list at @list is reinitialised
|
|
|
|
*/
|
|
|
|
static inline void skb_queue_splice_init(struct sk_buff_head *list,
|
|
|
|
struct sk_buff_head *head)
|
|
|
|
{
|
|
|
|
if (!skb_queue_empty(list)) {
|
|
|
|
__skb_queue_splice(list, (struct sk_buff *) head, head->next);
|
2008-09-23 12:57:21 +08:00
|
|
|
head->qlen += list->qlen;
|
2008-09-22 13:36:24 +08:00
|
|
|
__skb_queue_head_init(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_queue_splice_tail - join two skb lists, each list being a queue
|
|
|
|
* @list: the new list to add
|
|
|
|
* @head: the place to add it in the first list
|
|
|
|
*/
|
|
|
|
static inline void skb_queue_splice_tail(const struct sk_buff_head *list,
|
|
|
|
struct sk_buff_head *head)
|
|
|
|
{
|
|
|
|
if (!skb_queue_empty(list)) {
|
|
|
|
__skb_queue_splice(list, head->prev, (struct sk_buff *) head);
|
2008-09-23 12:57:21 +08:00
|
|
|
head->qlen += list->qlen;
|
2008-09-22 13:36:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_queue_splice_tail - join two skb lists and reinitialise the emptied list
|
|
|
|
* @list: the new list to add
|
|
|
|
* @head: the place to add it in the first list
|
|
|
|
*
|
|
|
|
* Each of the lists is a queue.
|
|
|
|
* The list at @list is reinitialised
|
|
|
|
*/
|
|
|
|
static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,
|
|
|
|
struct sk_buff_head *head)
|
|
|
|
{
|
|
|
|
if (!skb_queue_empty(list)) {
|
|
|
|
__skb_queue_splice(list, head->prev, (struct sk_buff *) head);
|
2008-09-23 12:57:21 +08:00
|
|
|
head->qlen += list->qlen;
|
2008-09-22 13:36:24 +08:00
|
|
|
__skb_queue_head_init(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
2005-10-31 05:47:34 +08:00
|
|
|
* __skb_queue_after - queue a buffer at the list head
|
2005-04-17 06:20:36 +08:00
|
|
|
* @list: list to use
|
2005-10-31 05:47:34 +08:00
|
|
|
* @prev: place after this buffer
|
2005-04-17 06:20:36 +08:00
|
|
|
* @newsk: buffer to queue
|
|
|
|
*
|
2005-10-31 05:47:34 +08:00
|
|
|
* Queue a buffer int the middle of a list. This function takes no locks
|
2005-04-17 06:20:36 +08:00
|
|
|
* and you must therefore hold required locks before calling it.
|
|
|
|
*
|
|
|
|
* A buffer cannot be placed on two lists at the same time.
|
|
|
|
*/
|
2005-10-31 05:47:34 +08:00
|
|
|
static inline void __skb_queue_after(struct sk_buff_head *list,
|
|
|
|
struct sk_buff *prev,
|
|
|
|
struct sk_buff *newsk)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-04-14 15:04:51 +08:00
|
|
|
__skb_insert(newsk, prev, prev->next, list);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-04-14 15:05:09 +08:00
|
|
|
extern void skb_append(struct sk_buff *old, struct sk_buff *newsk,
|
|
|
|
struct sk_buff_head *list);
|
|
|
|
|
2008-04-14 15:05:28 +08:00
|
|
|
static inline void __skb_queue_before(struct sk_buff_head *list,
|
|
|
|
struct sk_buff *next,
|
|
|
|
struct sk_buff *newsk)
|
|
|
|
{
|
|
|
|
__skb_insert(newsk, next->prev, next, list);
|
|
|
|
}
|
|
|
|
|
2005-10-31 05:47:34 +08:00
|
|
|
/**
|
|
|
|
* __skb_queue_head - queue a buffer at the list head
|
|
|
|
* @list: list to use
|
|
|
|
* @newsk: buffer to queue
|
|
|
|
*
|
|
|
|
* Queue a buffer at the start of a list. This function takes no locks
|
|
|
|
* and you must therefore hold required locks before calling it.
|
|
|
|
*
|
|
|
|
* A buffer cannot be placed on two lists at the same time.
|
|
|
|
*/
|
|
|
|
extern void skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk);
|
|
|
|
static inline void __skb_queue_head(struct sk_buff_head *list,
|
|
|
|
struct sk_buff *newsk)
|
|
|
|
{
|
|
|
|
__skb_queue_after(list, (struct sk_buff *)list, newsk);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* __skb_queue_tail - queue a buffer at the list tail
|
|
|
|
* @list: list to use
|
|
|
|
* @newsk: buffer to queue
|
|
|
|
*
|
|
|
|
* Queue a buffer at the end of a list. This function takes no locks
|
|
|
|
* and you must therefore hold required locks before calling it.
|
|
|
|
*
|
|
|
|
* A buffer cannot be placed on two lists at the same time.
|
|
|
|
*/
|
|
|
|
extern void skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk);
|
|
|
|
static inline void __skb_queue_tail(struct sk_buff_head *list,
|
|
|
|
struct sk_buff *newsk)
|
|
|
|
{
|
2008-04-14 15:05:28 +08:00
|
|
|
__skb_queue_before(list, (struct sk_buff *)list, newsk);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* remove sk_buff from list. _Must_ be called atomically, and with
|
|
|
|
* the list known..
|
|
|
|
*/
|
2005-08-10 10:25:21 +08:00
|
|
|
extern void skb_unlink(struct sk_buff *skb, struct sk_buff_head *list);
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
struct sk_buff *next, *prev;
|
|
|
|
|
|
|
|
list->qlen--;
|
|
|
|
next = skb->next;
|
|
|
|
prev = skb->prev;
|
|
|
|
skb->next = skb->prev = NULL;
|
|
|
|
next->prev = prev;
|
|
|
|
prev->next = next;
|
|
|
|
}
|
|
|
|
|
2008-04-14 15:04:12 +08:00
|
|
|
/**
|
|
|
|
* __skb_dequeue - remove from the head of the queue
|
|
|
|
* @list: list to dequeue from
|
|
|
|
*
|
|
|
|
* Remove the head of the list. This function does not take any locks
|
|
|
|
* so must be used with appropriate locks held only. The head item is
|
|
|
|
* returned or %NULL if the list is empty.
|
|
|
|
*/
|
|
|
|
extern struct sk_buff *skb_dequeue(struct sk_buff_head *list);
|
|
|
|
static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb = skb_peek(list);
|
|
|
|
if (skb)
|
|
|
|
__skb_unlink(skb, list);
|
|
|
|
return skb;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* __skb_dequeue_tail - remove from the tail of the queue
|
|
|
|
* @list: list to dequeue from
|
|
|
|
*
|
|
|
|
* Remove the tail of the list. This function does not take any locks
|
|
|
|
* so must be used with appropriate locks held only. The tail item is
|
|
|
|
* returned or %NULL if the list is empty.
|
|
|
|
*/
|
|
|
|
extern struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list);
|
|
|
|
static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb = skb_peek_tail(list);
|
|
|
|
if (skb)
|
|
|
|
__skb_unlink(skb, list);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline int skb_is_nonlinear(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->data_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned int skb_headlen(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->len - skb->data_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int skb_pagelen(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
int i, len = 0;
|
|
|
|
|
|
|
|
for (i = (int)skb_shinfo(skb)->nr_frags - 1; i >= 0; i--)
|
|
|
|
len += skb_shinfo(skb)->frags[i].size;
|
|
|
|
return len + skb_headlen(skb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_fill_page_desc(struct sk_buff *skb, int i,
|
|
|
|
struct page *page, int off, int size)
|
|
|
|
{
|
|
|
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
|
|
|
|
|
|
|
frag->page = page;
|
|
|
|
frag->page_offset = off;
|
|
|
|
frag->size = size;
|
|
|
|
skb_shinfo(skb)->nr_frags = i + 1;
|
|
|
|
}
|
|
|
|
|
2008-10-08 05:22:33 +08:00
|
|
|
extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page,
|
|
|
|
int off, int size);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags)
|
|
|
|
#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_shinfo(skb)->frag_list)
|
|
|
|
#define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb))
|
|
|
|
|
2007-04-20 11:29:13 +08:00
|
|
|
#ifdef NET_SKBUFF_DATA_USES_OFFSET
|
|
|
|
static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->head + skb->tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_reset_tail_pointer(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->tail = skb->data - skb->head;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
|
|
|
skb_reset_tail_pointer(skb);
|
|
|
|
skb->tail += offset;
|
|
|
|
}
|
|
|
|
#else /* NET_SKBUFF_DATA_USES_OFFSET */
|
|
|
|
static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_reset_tail_pointer(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->tail = skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
|
|
|
skb->tail = skb->data + offset;
|
|
|
|
}
|
2007-04-20 11:43:29 +08:00
|
|
|
|
2007-04-20 11:29:13 +08:00
|
|
|
#endif /* NET_SKBUFF_DATA_USES_OFFSET */
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Add data to an sk_buff
|
|
|
|
*/
|
2008-03-28 08:43:41 +08:00
|
|
|
extern unsigned char *skb_put(struct sk_buff *skb, unsigned int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
2007-04-20 11:29:13 +08:00
|
|
|
unsigned char *tmp = skb_tail_pointer(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
SKB_LINEAR_ASSERT(skb);
|
|
|
|
skb->tail += len;
|
|
|
|
skb->len += len;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
2008-03-28 08:52:40 +08:00
|
|
|
extern unsigned char *skb_push(struct sk_buff *skb, unsigned int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
skb->data -= len;
|
|
|
|
skb->len += len;
|
|
|
|
return skb->data;
|
|
|
|
}
|
|
|
|
|
2008-03-28 08:47:24 +08:00
|
|
|
extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
skb->len -= len;
|
|
|
|
BUG_ON(skb->len < skb->data_len);
|
|
|
|
return skb->data += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
|
|
|
|
|
|
|
|
static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
if (len > skb_headlen(skb) &&
|
2008-08-12 09:17:17 +08:00
|
|
|
!__pskb_pull_tail(skb, len - skb_headlen(skb)))
|
2005-04-17 06:20:36 +08:00
|
|
|
return NULL;
|
|
|
|
skb->len -= len;
|
|
|
|
return skb->data += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned char *pskb_pull(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
return unlikely(len > skb->len) ? NULL : __pskb_pull(skb, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
if (likely(len <= skb_headlen(skb)))
|
|
|
|
return 1;
|
|
|
|
if (unlikely(len > skb->len))
|
|
|
|
return 0;
|
2008-08-12 09:17:17 +08:00
|
|
|
return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_headroom - bytes at buffer head
|
|
|
|
* @skb: buffer to check
|
|
|
|
*
|
|
|
|
* Return the number of bytes of free space at the head of an &sk_buff.
|
|
|
|
*/
|
2007-10-24 12:07:32 +08:00
|
|
|
static inline unsigned int skb_headroom(const struct sk_buff *skb)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
return skb->data - skb->head;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_tailroom - bytes at buffer end
|
|
|
|
* @skb: buffer to check
|
|
|
|
*
|
|
|
|
* Return the number of bytes of free space at the tail of an sk_buff
|
|
|
|
*/
|
|
|
|
static inline int skb_tailroom(const struct sk_buff *skb)
|
|
|
|
{
|
2007-04-20 11:43:29 +08:00
|
|
|
return skb_is_nonlinear(skb) ? 0 : skb->end - skb->tail;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_reserve - adjust headroom
|
|
|
|
* @skb: buffer to alter
|
|
|
|
* @len: bytes to move
|
|
|
|
*
|
|
|
|
* Increase the headroom of an empty &sk_buff by reducing the tail
|
|
|
|
* room. This is only allowed for an empty buffer.
|
|
|
|
*/
|
2006-01-17 18:54:21 +08:00
|
|
|
static inline void skb_reserve(struct sk_buff *skb, int len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
skb->data += len;
|
|
|
|
skb->tail += len;
|
|
|
|
}
|
|
|
|
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
#ifdef NET_SKBUFF_DATA_USES_OFFSET
|
2007-04-26 09:04:18 +08:00
|
|
|
static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
return skb->head + skb->transport_header;
|
2007-04-26 09:04:18 +08:00
|
|
|
}
|
|
|
|
|
2007-03-14 00:06:52 +08:00
|
|
|
static inline void skb_reset_transport_header(struct sk_buff *skb)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
skb->transport_header = skb->data - skb->head;
|
2007-03-14 00:06:52 +08:00
|
|
|
}
|
|
|
|
|
2007-03-14 00:51:52 +08:00
|
|
|
static inline void skb_set_transport_header(struct sk_buff *skb,
|
|
|
|
const int offset)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
skb_reset_transport_header(skb);
|
|
|
|
skb->transport_header += offset;
|
2007-04-26 08:55:53 +08:00
|
|
|
}
|
|
|
|
|
2007-04-11 11:50:43 +08:00
|
|
|
static inline unsigned char *skb_network_header(const struct sk_buff *skb)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
return skb->head + skb->network_header;
|
2007-04-11 11:50:43 +08:00
|
|
|
}
|
|
|
|
|
2007-04-11 11:45:18 +08:00
|
|
|
static inline void skb_reset_network_header(struct sk_buff *skb)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
skb->network_header = skb->data - skb->head;
|
2007-04-11 11:45:18 +08:00
|
|
|
}
|
|
|
|
|
2007-03-12 09:39:41 +08:00
|
|
|
static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
skb_reset_network_header(skb);
|
|
|
|
skb->network_header += offset;
|
2007-03-12 09:39:41 +08:00
|
|
|
}
|
|
|
|
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
|
2007-03-11 09:16:10 +08:00
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
return skb->head + skb->mac_header;
|
2007-03-11 09:16:10 +08:00
|
|
|
}
|
|
|
|
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
static inline int skb_mac_header_was_set(const struct sk_buff *skb)
|
2007-03-17 04:26:39 +08:00
|
|
|
{
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
return skb->mac_header != ~0U;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_reset_mac_header(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->mac_header = skb->data - skb->head;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
|
|
|
skb_reset_mac_header(skb);
|
|
|
|
skb->mac_header += offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* NET_SKBUFF_DATA_USES_OFFSET */
|
|
|
|
|
|
|
|
static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->transport_header;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_reset_transport_header(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->transport_header = skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_set_transport_header(struct sk_buff *skb,
|
|
|
|
const int offset)
|
|
|
|
{
|
|
|
|
skb->transport_header = skb->data + offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned char *skb_network_header(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->network_header;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_reset_network_header(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->network_header = skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
|
|
|
skb->network_header = skb->data + offset;
|
2007-03-17 04:26:39 +08:00
|
|
|
}
|
|
|
|
|
2007-03-20 06:33:04 +08:00
|
|
|
static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
|
|
|
|
{
|
2007-04-11 12:21:55 +08:00
|
|
|
return skb->mac_header;
|
2007-03-20 06:33:04 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int skb_mac_header_was_set(const struct sk_buff *skb)
|
|
|
|
{
|
2007-04-11 12:21:55 +08:00
|
|
|
return skb->mac_header != NULL;
|
2007-03-20 06:33:04 +08:00
|
|
|
}
|
|
|
|
|
2007-03-20 06:30:44 +08:00
|
|
|
static inline void skb_reset_mac_header(struct sk_buff *skb)
|
|
|
|
{
|
2007-04-11 12:21:55 +08:00
|
|
|
skb->mac_header = skb->data;
|
2007-03-20 06:30:44 +08:00
|
|
|
}
|
|
|
|
|
2007-03-10 23:30:58 +08:00
|
|
|
static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
|
|
|
|
{
|
2007-04-11 12:21:55 +08:00
|
|
|
skb->mac_header = skb->data + offset;
|
2007-03-10 23:30:58 +08:00
|
|
|
}
|
[SK_BUFF]: Use offsets for skb->{mac,network,transport}_header on 64bit architectures
With this we save 8 bytes per network packet, leaving a 4 bytes hole to be used
in further shrinking work, likely with the offsetization of other pointers,
such as ->{data,tail,end}, at the cost of adds, that were minimized by the
usual practice of setting skb->{mac,nh,n}.raw to a local variable that is then
accessed multiple times in each function, it also is not more expensive than
before with regards to most of the handling of such headers, like setting one
of these headers to another (transport to network, etc), or subtracting, adding
to/from it, comparing them, etc.
Now we have this layout for sk_buff on a x86_64 machine:
[acme@mica net-2.6.22]$ pahole vmlinux sk_buff
struct sk_buff {
struct sk_buff * next; /* 0 8 */
struct sk_buff * prev; /* 8 8 */
struct rb_node rb; /* 16 24 */
struct sock * sk; /* 40 8 */
ktime_t tstamp; /* 48 8 */
struct net_device * dev; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct net_device * input_dev; /* 64 8 */
sk_buff_data_t transport_header; /* 72 4 */
sk_buff_data_t network_header; /* 76 4 */
sk_buff_data_t mac_header; /* 80 4 */
/* XXX 4 bytes hole, try to pack */
struct dst_entry * dst; /* 88 8 */
struct sec_path * sp; /* 96 8 */
char cb[48]; /* 104 48 */
/* cacheline 2 boundary (128 bytes) was 24 bytes ago*/
unsigned int len; /* 152 4 */
unsigned int data_len; /* 156 4 */
unsigned int mac_len; /* 160 4 */
union {
__wsum csum; /* 4 */
__u32 csum_offset; /* 4 */
}; /* 164 4 */
__u32 priority; /* 168 4 */
__u8 local_df:1; /* 172 1 */
__u8 cloned:1; /* 172 1 */
__u8 ip_summed:2; /* 172 1 */
__u8 nohdr:1; /* 172 1 */
__u8 nfctinfo:3; /* 172 1 */
__u8 pkt_type:3; /* 173 1 */
__u8 fclone:2; /* 173 1 */
__u8 ipvs_property:1; /* 173 1 */
/* XXX 2 bits hole, try to pack */
__be16 protocol; /* 174 2 */
void (*destructor)(struct sk_buff *); /* 176 8 */
struct nf_conntrack * nfct; /* 184 8 */
/* --- cacheline 3 boundary (192 bytes) --- */
struct sk_buff * nfct_reasm; /* 192 8 */
struct nf_bridge_info *nf_bridge; /* 200 8 */
__u16 tc_index; /* 208 2 */
__u16 tc_verd; /* 210 2 */
dma_cookie_t dma_cookie; /* 212 4 */
__u32 secmark; /* 216 4 */
__u32 mark; /* 220 4 */
unsigned int truesize; /* 224 4 */
atomic_t users; /* 228 4 */
unsigned char * head; /* 232 8 */
unsigned char * data; /* 240 8 */
unsigned char * tail; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
unsigned char * end; /* 256 8 */
}; /* size: 264, cachelines: 5 */
/* sum members: 260, holes: 1, sum holes: 4 */
/* bit holes: 1, sum bit holes: 2 bits */
/* last cacheline: 8 bytes */
On 32 bits nothing changes, and pointers continue to be used with the compiler
turning all this abstraction layer into dust. But there are some sk_buff
validation tricks that are now possible, humm... :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-11 12:22:35 +08:00
|
|
|
#endif /* NET_SKBUFF_DATA_USES_OFFSET */
|
|
|
|
|
|
|
|
static inline int skb_transport_offset(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb_transport_header(skb) - skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 skb_network_header_len(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->transport_header - skb->network_header;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int skb_network_offset(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb_network_header(skb) - skb->data;
|
|
|
|
}
|
2007-03-10 23:30:58 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* CPUs often take a performance hit when accessing unaligned memory
|
|
|
|
* locations. The actual performance hit varies, it can be small if the
|
|
|
|
* hardware handles it or large if we have to take an exception and fix it
|
|
|
|
* in software.
|
|
|
|
*
|
|
|
|
* Since an ethernet header is 14 bytes network drivers often end up with
|
|
|
|
* the IP header at an unaligned offset. The IP header can be aligned by
|
|
|
|
* shifting the start of the packet by 2 bytes. Drivers should do this
|
|
|
|
* with:
|
|
|
|
*
|
|
|
|
* skb_reserve(NET_IP_ALIGN);
|
|
|
|
*
|
|
|
|
* The downside to this alignment of the IP header is that the DMA is now
|
|
|
|
* unaligned. On some architectures the cost of an unaligned DMA is high
|
|
|
|
* and this cost outweighs the gains made by aligning the IP header.
|
|
|
|
*
|
|
|
|
* Since this trade off varies between architectures, we allow NET_IP_ALIGN
|
|
|
|
* to be overridden.
|
|
|
|
*/
|
|
|
|
#ifndef NET_IP_ALIGN
|
|
|
|
#define NET_IP_ALIGN 2
|
|
|
|
#endif
|
|
|
|
|
2006-03-31 18:27:06 +08:00
|
|
|
/*
|
|
|
|
* The networking layer reserves some headroom in skb data (via
|
|
|
|
* dev_alloc_skb). This is used to avoid having to reallocate skb data when
|
|
|
|
* the header has to grow. In the default case, if the header has to grow
|
2009-02-09 11:24:13 +08:00
|
|
|
* 32 bytes or less we avoid the reallocation.
|
2006-03-31 18:27:06 +08:00
|
|
|
*
|
|
|
|
* Unfortunately this headroom changes the DMA alignment of the resulting
|
|
|
|
* network packet. As for NET_IP_ALIGN, this unaligned DMA is expensive
|
|
|
|
* on some architectures. An architecture can override this value,
|
|
|
|
* perhaps setting it to a cacheline in size (since that will maintain
|
|
|
|
* cacheline alignment of the DMA). It must be a power of 2.
|
|
|
|
*
|
2009-02-09 11:24:13 +08:00
|
|
|
* Various parts of the networking layer expect at least 32 bytes of
|
2006-03-31 18:27:06 +08:00
|
|
|
* headroom, you should not reduce this.
|
|
|
|
*/
|
|
|
|
#ifndef NET_SKB_PAD
|
2009-02-09 11:24:13 +08:00
|
|
|
#define NET_SKB_PAD 32
|
2006-03-31 18:27:06 +08:00
|
|
|
#endif
|
|
|
|
|
2006-06-10 07:13:38 +08:00
|
|
|
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
2006-06-10 07:13:38 +08:00
|
|
|
if (unlikely(skb->data_len)) {
|
|
|
|
WARN_ON(1);
|
|
|
|
return;
|
|
|
|
}
|
2007-04-20 11:29:13 +08:00
|
|
|
skb->len = len;
|
|
|
|
skb_set_tail_pointer(skb, len);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-03-28 08:54:01 +08:00
|
|
|
extern void skb_trim(struct sk_buff *skb, unsigned int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static inline int __pskb_trim(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
2006-06-10 07:13:38 +08:00
|
|
|
if (skb->data_len)
|
|
|
|
return ___pskb_trim(skb, len);
|
|
|
|
__skb_trim(skb, len);
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int pskb_trim(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
|
|
|
}
|
|
|
|
|
2006-08-14 11:12:58 +08:00
|
|
|
/**
|
|
|
|
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
|
|
|
* @skb: buffer to alter
|
|
|
|
* @len: new length
|
|
|
|
*
|
|
|
|
* This is identical to pskb_trim except that the caller knows that
|
|
|
|
* the skb is not cloned so we should never get an error due to out-
|
|
|
|
* of-memory.
|
|
|
|
*/
|
|
|
|
static inline void pskb_trim_unique(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
|
|
|
int err = pskb_trim(skb, len);
|
|
|
|
BUG_ON(err);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* skb_orphan - orphan a buffer
|
|
|
|
* @skb: buffer to orphan
|
|
|
|
*
|
|
|
|
* If a buffer currently has an owner then we call the owner's
|
|
|
|
* destructor function and make the @skb unowned. The buffer continues
|
|
|
|
* to exist but is no longer charged to its former owner.
|
|
|
|
*/
|
|
|
|
static inline void skb_orphan(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (skb->destructor)
|
|
|
|
skb->destructor(skb);
|
|
|
|
skb->destructor = NULL;
|
|
|
|
skb->sk = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* __skb_queue_purge - empty a list
|
|
|
|
* @list: list to empty
|
|
|
|
*
|
|
|
|
* Delete all buffers on an &sk_buff list. Each buffer is removed from
|
|
|
|
* the list and one reference dropped. This function does not take the
|
|
|
|
* list lock and the caller must hold the relevant locks to use it.
|
|
|
|
*/
|
|
|
|
extern void skb_queue_purge(struct sk_buff_head *list);
|
|
|
|
static inline void __skb_queue_purge(struct sk_buff_head *list)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
while ((skb = __skb_dequeue(list)) != NULL)
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-07-25 06:31:14 +08:00
|
|
|
* __dev_alloc_skb - allocate an skbuff for receiving
|
2005-04-17 06:20:36 +08:00
|
|
|
* @length: length to allocate
|
|
|
|
* @gfp_mask: get_free_pages mask, passed to alloc_skb
|
|
|
|
*
|
|
|
|
* Allocate a new &sk_buff and assign it a usage count of one. The
|
|
|
|
* buffer has unspecified headroom built in. Users should allocate
|
|
|
|
* the headroom they think they need without accounting for the
|
|
|
|
* built in space. The built in space is used for optimisations.
|
|
|
|
*
|
2006-08-08 06:49:53 +08:00
|
|
|
* %NULL is returned if there is no free memory.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
|
2005-10-07 14:46:04 +08:00
|
|
|
gfp_t gfp_mask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-03-31 18:27:06 +08:00
|
|
|
struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (likely(skb))
|
2006-03-31 18:27:06 +08:00
|
|
|
skb_reserve(skb, NET_SKB_PAD);
|
2005-04-17 06:20:36 +08:00
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2008-03-28 08:51:31 +08:00
|
|
|
extern struct sk_buff *dev_alloc_skb(unsigned int length);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-01 13:35:23 +08:00
|
|
|
extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
|
|
|
|
unsigned int length, gfp_t gfp_mask);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_alloc_skb - allocate an skbuff for rx on a specific device
|
|
|
|
* @dev: network device to receive on
|
|
|
|
* @length: length to allocate
|
|
|
|
*
|
|
|
|
* Allocate a new &sk_buff and assign it a usage count of one. The
|
|
|
|
* buffer has unspecified headroom built in. Users should allocate
|
|
|
|
* the headroom they think they need without accounting for the
|
|
|
|
* built in space. The built in space is used for optimisations.
|
|
|
|
*
|
|
|
|
* %NULL is returned if there is no free memory. Although this function
|
|
|
|
* allocates memory it can be called from an interrupt.
|
|
|
|
*/
|
|
|
|
static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev,
|
|
|
|
unsigned int length)
|
|
|
|
{
|
|
|
|
return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
|
|
|
|
}
|
|
|
|
|
2008-10-08 05:22:33 +08:00
|
|
|
extern struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netdev_alloc_page - allocate a page for ps-rx on a specific device
|
|
|
|
* @dev: network device to receive on
|
|
|
|
*
|
|
|
|
* Allocate a new page node local to the specified device.
|
|
|
|
*
|
|
|
|
* %NULL is returned if there is no free memory.
|
|
|
|
*/
|
|
|
|
static inline struct page *netdev_alloc_page(struct net_device *dev)
|
|
|
|
{
|
|
|
|
return __netdev_alloc_page(dev, GFP_ATOMIC);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void netdev_free_page(struct net_device *dev, struct page *page)
|
|
|
|
{
|
|
|
|
__free_page(page);
|
|
|
|
}
|
|
|
|
|
[SKBUFF]: Keep track of writable header len of headerless clones
Currently NAT (and others) that want to modify cloned skbs copy them,
even if in the vast majority of cases its not necessary because the
skb is a clone made by TCP and the portion NAT wants to modify is
actually writable because TCP release the header reference before
cloning.
The problem is that there is no clean way for NAT to find out how
long the writable header area is, so this patch introduces skb->hdr_len
to hold this length. When a headerless skb is cloned skb->hdr_len
is set to the current headroom, for regular clones it is copied from
the original. A new function skb_clone_writable(skb, len) returns
whether the skb is writable up to len bytes from skb->data. To avoid
enlarging the skb the mac_len field is reduced to 16 bit and the
new hdr_len field is put in the remaining 16 bit.
I've done a few rough benchmarks of NAT (not with this exact patch,
but a very similar one). As expected it saves huge amounts of system
time in case of sendfile, bringing it down to basically the same
amount as without NAT, with sendmsg it only helps on loopback,
probably because of the large MTU.
Transmit a 1GB file using sendfile/sendmsg over eth0/lo with and
without NAT:
- sendfile eth0, no NAT: sys 0m0.388s
- sendfile eth0, NAT: sys 0m1.835s
- sendfile eth0: NAT + path: sys 0m0.370s (~ -80%)
- sendfile lo, no NAT: sys 0m0.258s
- sendfile lo, NAT: sys 0m2.609s
- sendfile lo, NAT + patch: sys 0m0.260s (~ -90%)
- sendmsg eth0, no NAT: sys 0m2.508s
- sendmsg eth0, NAT: sys 0m2.539s
- sendmsg eth0, NAT + patch: sys 0m2.445s (no change)
- sendmsg lo, no NAT: sys 0m2.151s
- sendmsg lo, NAT: sys 0m3.557s
- sendmsg lo, NAT + patch: sys 0m2.159s (~ -40%)
I expect other users can see a similar performance improvement,
packet mangling iptables targets, ipip and ip_gre come to mind ..
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-06-25 19:35:20 +08:00
|
|
|
/**
|
|
|
|
* skb_clone_writable - is the header of a clone writable
|
|
|
|
* @skb: buffer to check
|
|
|
|
* @len: length up to which to write
|
|
|
|
*
|
|
|
|
* Returns true if modifying the header part of the cloned buffer
|
|
|
|
* does not requires the data to be copied.
|
|
|
|
*/
|
2007-10-24 12:07:32 +08:00
|
|
|
static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len)
|
[SKBUFF]: Keep track of writable header len of headerless clones
Currently NAT (and others) that want to modify cloned skbs copy them,
even if in the vast majority of cases its not necessary because the
skb is a clone made by TCP and the portion NAT wants to modify is
actually writable because TCP release the header reference before
cloning.
The problem is that there is no clean way for NAT to find out how
long the writable header area is, so this patch introduces skb->hdr_len
to hold this length. When a headerless skb is cloned skb->hdr_len
is set to the current headroom, for regular clones it is copied from
the original. A new function skb_clone_writable(skb, len) returns
whether the skb is writable up to len bytes from skb->data. To avoid
enlarging the skb the mac_len field is reduced to 16 bit and the
new hdr_len field is put in the remaining 16 bit.
I've done a few rough benchmarks of NAT (not with this exact patch,
but a very similar one). As expected it saves huge amounts of system
time in case of sendfile, bringing it down to basically the same
amount as without NAT, with sendmsg it only helps on loopback,
probably because of the large MTU.
Transmit a 1GB file using sendfile/sendmsg over eth0/lo with and
without NAT:
- sendfile eth0, no NAT: sys 0m0.388s
- sendfile eth0, NAT: sys 0m1.835s
- sendfile eth0: NAT + path: sys 0m0.370s (~ -80%)
- sendfile lo, no NAT: sys 0m0.258s
- sendfile lo, NAT: sys 0m2.609s
- sendfile lo, NAT + patch: sys 0m0.260s (~ -90%)
- sendmsg eth0, no NAT: sys 0m2.508s
- sendmsg eth0, NAT: sys 0m2.539s
- sendmsg eth0, NAT + patch: sys 0m2.445s (no change)
- sendmsg lo, no NAT: sys 0m2.151s
- sendmsg lo, NAT: sys 0m3.557s
- sendmsg lo, NAT + patch: sys 0m2.159s (~ -40%)
I expect other users can see a similar performance improvement,
packet mangling iptables targets, ipip and ip_gre come to mind ..
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-06-25 19:35:20 +08:00
|
|
|
{
|
|
|
|
return !skb_header_cloned(skb) &&
|
|
|
|
skb_headroom(skb) + len <= skb->hdr_len;
|
|
|
|
}
|
|
|
|
|
2007-09-17 07:21:16 +08:00
|
|
|
static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
|
|
|
|
int cloned)
|
|
|
|
{
|
|
|
|
int delta = 0;
|
|
|
|
|
|
|
|
if (headroom < NET_SKB_PAD)
|
|
|
|
headroom = NET_SKB_PAD;
|
|
|
|
if (headroom > skb_headroom(skb))
|
|
|
|
delta = headroom - skb_headroom(skb);
|
|
|
|
|
|
|
|
if (delta || cloned)
|
|
|
|
return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
|
|
|
|
GFP_ATOMIC);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* skb_cow - copy header of skb when it is required
|
|
|
|
* @skb: buffer to cow
|
|
|
|
* @headroom: needed headroom
|
|
|
|
*
|
|
|
|
* If the skb passed lacks sufficient headroom or its data part
|
|
|
|
* is shared, data is reallocated. If reallocation fails, an error
|
|
|
|
* is returned and original skb is not changed.
|
|
|
|
*
|
|
|
|
* The result is skb with writable area skb->head...skb->tail
|
|
|
|
* and at least @headroom of space at head.
|
|
|
|
*/
|
|
|
|
static inline int skb_cow(struct sk_buff *skb, unsigned int headroom)
|
|
|
|
{
|
2007-09-17 07:21:16 +08:00
|
|
|
return __skb_cow(skb, headroom, skb_cloned(skb));
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-09-17 07:21:16 +08:00
|
|
|
/**
|
|
|
|
* skb_cow_head - skb_cow but only making the head writable
|
|
|
|
* @skb: buffer to cow
|
|
|
|
* @headroom: needed headroom
|
|
|
|
*
|
|
|
|
* This function is identical to skb_cow except that we replace the
|
|
|
|
* skb_cloned check by skb_header_cloned. It should be used when
|
|
|
|
* you only need to push on some header and do not need to modify
|
|
|
|
* the data.
|
|
|
|
*/
|
|
|
|
static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
|
|
|
|
{
|
|
|
|
return __skb_cow(skb, headroom, skb_header_cloned(skb));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_padto - pad an skbuff up to a minimal size
|
|
|
|
* @skb: buffer to pad
|
|
|
|
* @len: minimal length
|
|
|
|
*
|
|
|
|
* Pads up a buffer to ensure the trailing bytes exist and are
|
|
|
|
* blanked. If the buffer already contains sufficient data it
|
2006-06-23 17:06:41 +08:00
|
|
|
* is untouched. Otherwise it is extended. Returns zero on
|
|
|
|
* success. The skb is freed on error.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
2006-06-23 17:06:41 +08:00
|
|
|
static inline int skb_padto(struct sk_buff *skb, unsigned int len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned int size = skb->len;
|
|
|
|
if (likely(size >= len))
|
2006-06-23 17:06:41 +08:00
|
|
|
return 0;
|
2008-08-12 09:17:17 +08:00
|
|
|
return skb_pad(skb, len - size);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int skb_add_data(struct sk_buff *skb,
|
|
|
|
char __user *from, int copy)
|
|
|
|
{
|
|
|
|
const int off = skb->len;
|
|
|
|
|
|
|
|
if (skb->ip_summed == CHECKSUM_NONE) {
|
|
|
|
int err = 0;
|
2006-11-15 13:36:34 +08:00
|
|
|
__wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy),
|
2005-04-17 06:20:36 +08:00
|
|
|
copy, 0, &err);
|
|
|
|
if (!err) {
|
|
|
|
skb->csum = csum_block_add(skb->csum, csum, off);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else if (!copy_from_user(skb_put(skb, copy), from, copy))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
__skb_trim(skb, off);
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int skb_can_coalesce(struct sk_buff *skb, int i,
|
|
|
|
struct page *page, int off)
|
|
|
|
{
|
|
|
|
if (i) {
|
|
|
|
struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];
|
|
|
|
|
|
|
|
return page == frag->page &&
|
|
|
|
off == frag->page_offset + frag->size;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-06-10 07:10:40 +08:00
|
|
|
static inline int __skb_linearize(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return __pskb_pull_tail(skb, skb->data_len) ? 0 : -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* skb_linearize - convert paged skb to linear one
|
|
|
|
* @skb: buffer to linarize
|
|
|
|
*
|
|
|
|
* If there is no free memory -ENOMEM is returned, otherwise zero
|
|
|
|
* is returned and the old skb data released.
|
|
|
|
*/
|
2006-06-10 07:10:40 +08:00
|
|
|
static inline int skb_linearize(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb_is_nonlinear(skb) ? __skb_linearize(skb) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_linearize_cow - make sure skb is linear and writable
|
|
|
|
* @skb: buffer to process
|
|
|
|
*
|
|
|
|
* If there is no free memory -ENOMEM is returned, otherwise zero
|
|
|
|
* is returned and the old skb data released.
|
|
|
|
*/
|
|
|
|
static inline int skb_linearize_cow(struct sk_buff *skb)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-06-10 07:10:40 +08:00
|
|
|
return skb_is_nonlinear(skb) || skb_cloned(skb) ?
|
|
|
|
__skb_linearize(skb) : 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* skb_postpull_rcsum - update checksum for received skb after pull
|
|
|
|
* @skb: buffer to update
|
|
|
|
* @start: start of data before pull
|
|
|
|
* @len: length of data pulled
|
|
|
|
*
|
|
|
|
* After doing a pull on a received packet, you need to call this to
|
2006-08-30 07:44:56 +08:00
|
|
|
* update the CHECKSUM_COMPLETE checksum, or set ip_summed to
|
|
|
|
* CHECKSUM_NONE so that it can be recomputed from scratch.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
static inline void skb_postpull_rcsum(struct sk_buff *skb,
|
2006-03-21 14:43:56 +08:00
|
|
|
const void *start, unsigned int len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-30 07:44:56 +08:00
|
|
|
if (skb->ip_summed == CHECKSUM_COMPLETE)
|
2005-04-17 06:20:36 +08:00
|
|
|
skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0));
|
|
|
|
}
|
|
|
|
|
2006-03-21 14:43:56 +08:00
|
|
|
unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* pskb_trim_rcsum - trim received skb and update checksum
|
|
|
|
* @skb: buffer to trim
|
|
|
|
* @len: new length
|
|
|
|
*
|
|
|
|
* This is exactly the same as pskb_trim except that it ensures the
|
|
|
|
* checksum of received packets are still valid after the operation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
|
|
|
|
{
|
2005-09-09 03:32:03 +08:00
|
|
|
if (likely(len >= skb->len))
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
2006-08-30 07:44:56 +08:00
|
|
|
if (skb->ip_summed == CHECKSUM_COMPLETE)
|
2005-04-17 06:20:36 +08:00
|
|
|
skb->ip_summed = CHECKSUM_NONE;
|
|
|
|
return __pskb_trim(skb, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define skb_queue_walk(queue, skb) \
|
|
|
|
for (skb = (queue)->next; \
|
|
|
|
prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \
|
|
|
|
skb = skb->next)
|
|
|
|
|
2007-04-30 15:07:31 +08:00
|
|
|
#define skb_queue_walk_safe(queue, skb, tmp) \
|
|
|
|
for (skb = (queue)->next, tmp = skb->next; \
|
|
|
|
skb != (struct sk_buff *)(queue); \
|
|
|
|
skb = tmp, tmp = skb->next)
|
|
|
|
|
2008-09-23 15:49:44 +08:00
|
|
|
#define skb_queue_walk_from(queue, skb) \
|
|
|
|
for (; prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \
|
|
|
|
skb = skb->next)
|
|
|
|
|
|
|
|
#define skb_queue_walk_from_safe(queue, skb, tmp) \
|
|
|
|
for (tmp = skb->next; \
|
|
|
|
skb != (struct sk_buff *)(queue); \
|
|
|
|
skb = tmp, tmp = skb->next)
|
|
|
|
|
2005-10-31 05:47:34 +08:00
|
|
|
#define skb_queue_reverse_walk(queue, skb) \
|
|
|
|
for (skb = (queue)->prev; \
|
|
|
|
prefetch(skb->prev), (skb != (struct sk_buff *)(queue)); \
|
|
|
|
skb = skb->prev)
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-12-05 17:53:40 +08:00
|
|
|
extern struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,
|
|
|
|
int *peeked, int *err);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
|
|
|
|
int noblock, int *err);
|
|
|
|
extern unsigned int datagram_poll(struct file *file, struct socket *sock,
|
|
|
|
struct poll_table_struct *wait);
|
|
|
|
extern int skb_copy_datagram_iovec(const struct sk_buff *from,
|
|
|
|
int offset, struct iovec *to,
|
|
|
|
int size);
|
2005-11-11 05:01:24 +08:00
|
|
|
extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
|
2005-04-17 06:20:36 +08:00
|
|
|
int hlen,
|
|
|
|
struct iovec *iov);
|
2008-08-16 06:13:53 +08:00
|
|
|
extern int skb_copy_datagram_from_iovec(struct sk_buff *skb,
|
|
|
|
int offset,
|
|
|
|
struct iovec *from,
|
|
|
|
int len);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
|
2007-12-05 17:51:58 +08:00
|
|
|
extern int skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
|
2005-12-14 15:16:37 +08:00
|
|
|
unsigned int flags);
|
2006-11-15 13:37:14 +08:00
|
|
|
extern __wsum skb_checksum(const struct sk_buff *skb, int offset,
|
|
|
|
int len, __wsum csum);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern int skb_copy_bits(const struct sk_buff *skb, int offset,
|
|
|
|
void *to, int len);
|
2007-04-21 07:40:01 +08:00
|
|
|
extern int skb_store_bits(struct sk_buff *skb, int offset,
|
|
|
|
const void *from, int len);
|
2006-11-15 13:37:33 +08:00
|
|
|
extern __wsum skb_copy_and_csum_bits(const struct sk_buff *skb,
|
2005-04-17 06:20:36 +08:00
|
|
|
int offset, u8 *to, int len,
|
2006-11-15 13:37:33 +08:00
|
|
|
__wsum csum);
|
2007-11-07 15:30:13 +08:00
|
|
|
extern int skb_splice_bits(struct sk_buff *skb,
|
|
|
|
unsigned int offset,
|
|
|
|
struct pipe_inode_info *pipe,
|
|
|
|
unsigned int len,
|
|
|
|
unsigned int flags);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);
|
|
|
|
extern void skb_split(struct sk_buff *skb,
|
|
|
|
struct sk_buff *skb1, const u32 len);
|
tcp: Try to restore large SKBs while SACK processing
During SACK processing, most of the benefits of TSO are eaten by
the SACK blocks that one-by-one fragment SKBs to MSS sized chunks.
Then we're in problems when cleanup work for them has to be done
when a large cumulative ACK comes. Try to return back to pre-split
state already while more and more SACK info gets discovered by
combining newly discovered SACK areas with the previous skb if
that's SACKed as well.
This approach has a number of benefits:
1) The processing overhead is spread more equally over the RTT
2) Write queue has less skbs to process (affect everything
which has to walk in the queue past the sacked areas)
3) Write queue is consistent whole the time, so no other parts
of TCP has to be aware of this (this was not the case with
some other approach that was, well, quite intrusive all
around).
4) Clean_rtx_queue can release most of the pages using single
put_page instead of previous PAGE_SIZE/mss+1 calls
In case a hole is fully filled by the new SACK block, we attempt
to combine the next skb too which allows construction of skbs
that are even larger than what tso split them to and it handles
hole per on every nth patterns that often occur during slow start
overshoot pretty nicely. Though this to be really useful also
a retransmission would have to get lost since cumulative ACKs
advance one hole at a time in the most typical case.
TODO: handle upwards only merging. That should be rather easy
when segment is fully sacked but I'm leaving that as future
work item (it won't make very large difference anyway since
this current approach already covers quite a lot of normal
cases).
I was earlier thinking of some sophisticated way of tracking
timestamps of the first and the last segment but later on
realized that it won't be that necessary at all to store the
timestamp of the last segment. The cases that can occur are
basically either:
1) ambiguous => no sensible measurement can be taken anyway
2) non-ambiguous is due to reordering => having the timestamp
of the last segment there is just skewing things more off
than does some good since the ack got triggered by one of
the holes (besides some substle issues that would make
determining right hole/skb even harder problem). Anyway,
it has nothing to do with this change then.
I choose to route some abnormal looking cases with goto noop,
some could be handled differently (eg., by stopping the
walking at that skb but again). In general, they either
shouldn't happen at all or are rare enough to make no difference
in practice.
In theory this change (as whole) could cause some macroscale
regression (global) because of cache misses that are taken over
the round-trip time but it gets very likely better because of much
less (local) cache misses per other write queue walkers and the
big recovery clearing cumulative ack.
Worth to note that these benefits would be very easy to get also
without TSO/GSO being on as long as the data is in pages so that
we can merge them. Currently I won't let that happen because
DSACK splitting at fragment that would mess up pcounts due to
sk_can_gso in tcp_set_skb_tso_segs. Once DSACKs fragments gets
avoided, we have some conditions that can be made less strict.
TODO: I will probably have to convert the excessive pointer
passing to struct sacktag_state... :-)
My testing revealed that considerable amount of skbs couldn't
be shifted because they were cloned (most likely still awaiting
tx reclaim)...
[The rest is considering future work instead since I got
repeatably EFAULT to tcpdump's recvfrom when I added
pskb_expand_head to deal with clones, so I separated that
into another, later patch]
...To counter that, I gave up on the fifth advantage:
5) When growing previous SACK block, less allocs for new skbs
are done, basically a new alloc is needed only when new hole
is detected and when the previous skb runs out of frags space
...which now only happens of if reclaim is fast enough to dispose
the clone before the SACK block comes in (the window is RTT long),
otherwise we'll have to alloc some.
With clones being handled I got these numbers (will be somewhat
worse without that), taken with fine-grained mibs:
TCPSackShifted 398
TCPSackMerged 877
TCPSackShiftFallback 320
TCPSACKCOLLAPSEFALLBACKGSO 0
TCPSACKCOLLAPSEFALLBACKSKBBITS 0
TCPSACKCOLLAPSEFALLBACKSKBDATA 0
TCPSACKCOLLAPSEFALLBACKBELOW 0
TCPSACKCOLLAPSEFALLBACKFIRST 1
TCPSACKCOLLAPSEFALLBACKPREVBITS 318
TCPSACKCOLLAPSEFALLBACKMSS 1
TCPSACKCOLLAPSEFALLBACKNOHEAD 0
TCPSACKCOLLAPSEFALLBACKSHIFT 0
TCPSACKCOLLAPSENOOPSEQ 0
TCPSACKCOLLAPSENOOPSMALLPCOUNT 0
TCPSACKCOLLAPSENOOPSMALLLEN 0
TCPSACKCOLLAPSEHOLE 12
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-11-25 13:20:15 +08:00
|
|
|
extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb,
|
|
|
|
int shiftlen);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-06-28 04:22:38 +08:00
|
|
|
extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
|
2005-08-16 13:18:02 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
|
|
|
|
int len, void *buffer)
|
|
|
|
{
|
|
|
|
int hlen = skb_headlen(skb);
|
|
|
|
|
2005-07-06 05:08:10 +08:00
|
|
|
if (hlen - offset >= len)
|
2005-04-17 06:20:36 +08:00
|
|
|
return skb->data + offset;
|
|
|
|
|
|
|
|
if (skb_copy_bits(skb, offset, buffer, len) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2007-03-28 05:55:52 +08:00
|
|
|
static inline void skb_copy_from_linear_data(const struct sk_buff *skb,
|
|
|
|
void *to,
|
|
|
|
const unsigned int len)
|
|
|
|
{
|
|
|
|
memcpy(to, skb->data, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_copy_from_linear_data_offset(const struct sk_buff *skb,
|
|
|
|
const int offset, void *to,
|
|
|
|
const unsigned int len)
|
|
|
|
{
|
|
|
|
memcpy(to, skb->data + offset, len);
|
|
|
|
}
|
|
|
|
|
2007-03-31 22:55:19 +08:00
|
|
|
static inline void skb_copy_to_linear_data(struct sk_buff *skb,
|
|
|
|
const void *from,
|
|
|
|
const unsigned int len)
|
|
|
|
{
|
|
|
|
memcpy(skb->data, from, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_copy_to_linear_data_offset(struct sk_buff *skb,
|
|
|
|
const int offset,
|
|
|
|
const void *from,
|
|
|
|
const unsigned int len)
|
|
|
|
{
|
|
|
|
memcpy(skb->data + offset, from, len);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
extern void skb_init(void);
|
|
|
|
|
2009-02-12 13:03:37 +08:00
|
|
|
static inline ktime_t skb_get_ktime(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->tstamp;
|
|
|
|
}
|
|
|
|
|
2005-08-15 08:24:31 +08:00
|
|
|
/**
|
|
|
|
* skb_get_timestamp - get timestamp from a skb
|
|
|
|
* @skb: skb to get stamp from
|
|
|
|
* @stamp: pointer to struct timeval to store stamp in
|
|
|
|
*
|
|
|
|
* Timestamps are stored in the skb as offsets to a base timestamp.
|
|
|
|
* This function converts the offset back to a struct timeval and stores
|
|
|
|
* it in stamp.
|
|
|
|
*/
|
2009-02-12 13:03:37 +08:00
|
|
|
static inline void skb_get_timestamp(const struct sk_buff *skb,
|
|
|
|
struct timeval *stamp)
|
2005-08-15 08:24:31 +08:00
|
|
|
{
|
2007-04-20 07:16:32 +08:00
|
|
|
*stamp = ktime_to_timeval(skb->tstamp);
|
2005-08-15 08:24:31 +08:00
|
|
|
}
|
|
|
|
|
2009-02-12 13:03:37 +08:00
|
|
|
static inline void skb_get_timestampns(const struct sk_buff *skb,
|
|
|
|
struct timespec *stamp)
|
|
|
|
{
|
|
|
|
*stamp = ktime_to_timespec(skb->tstamp);
|
|
|
|
}
|
|
|
|
|
2007-04-20 07:16:32 +08:00
|
|
|
static inline void __net_timestamp(struct sk_buff *skb)
|
2005-08-15 08:24:31 +08:00
|
|
|
{
|
2007-04-20 07:16:32 +08:00
|
|
|
skb->tstamp = ktime_get_real();
|
2005-08-15 08:24:31 +08:00
|
|
|
}
|
|
|
|
|
2007-04-24 13:26:16 +08:00
|
|
|
static inline ktime_t net_timedelta(ktime_t t)
|
|
|
|
{
|
|
|
|
return ktime_sub(ktime_get_real(), t);
|
|
|
|
}
|
|
|
|
|
2007-06-16 06:08:43 +08:00
|
|
|
static inline ktime_t net_invalid_timestamp(void)
|
|
|
|
{
|
|
|
|
return ktime_set(0, 0);
|
|
|
|
}
|
2005-08-15 08:24:31 +08:00
|
|
|
|
2009-02-12 13:03:37 +08:00
|
|
|
/**
|
|
|
|
* skb_tstamp_tx - queue clone of skb with send time stamps
|
|
|
|
* @orig_skb: the original outgoing packet
|
|
|
|
* @hwtstamps: hardware time stamps, may be NULL if not available
|
|
|
|
*
|
|
|
|
* If the skb has a socket associated, then this function clones the
|
|
|
|
* skb (thus sharing the actual data and optional structures), stores
|
|
|
|
* the optional hardware time stamping information (if non NULL) or
|
|
|
|
* generates a software time stamp (otherwise), then queues the clone
|
|
|
|
* to the error queue of the socket. Errors are silently ignored.
|
|
|
|
*/
|
|
|
|
extern void skb_tstamp_tx(struct sk_buff *orig_skb,
|
|
|
|
struct skb_shared_hwtstamps *hwtstamps);
|
|
|
|
|
2007-03-26 11:10:56 +08:00
|
|
|
extern __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len);
|
2006-11-15 13:40:42 +08:00
|
|
|
extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
|
2005-11-11 05:01:24 +08:00
|
|
|
|
2007-04-10 02:59:39 +08:00
|
|
|
static inline int skb_csum_unnecessary(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->ip_summed & CHECKSUM_UNNECESSARY;
|
|
|
|
}
|
|
|
|
|
2005-11-11 05:01:24 +08:00
|
|
|
/**
|
|
|
|
* skb_checksum_complete - Calculate checksum of an entire packet
|
|
|
|
* @skb: packet to process
|
|
|
|
*
|
|
|
|
* This function calculates the checksum over the entire packet plus
|
|
|
|
* the value of skb->csum. The latter can be used to supply the
|
|
|
|
* checksum of a pseudo header as used by TCP/UDP. It returns the
|
|
|
|
* checksum.
|
|
|
|
*
|
|
|
|
* For protocols that contain complete checksums such as ICMP/TCP/UDP,
|
|
|
|
* this function can be used to verify that checksum on received
|
|
|
|
* packets. In that case the function should return zero if the
|
|
|
|
* checksum is correct. In particular, this function will return zero
|
|
|
|
* if skb->ip_summed is CHECKSUM_UNNECESSARY which indicates that the
|
|
|
|
* hardware has already verified the correctness of the checksum.
|
|
|
|
*/
|
2007-07-16 04:00:11 +08:00
|
|
|
static inline __sum16 skb_checksum_complete(struct sk_buff *skb)
|
2005-11-11 05:01:24 +08:00
|
|
|
{
|
2007-04-10 02:59:39 +08:00
|
|
|
return skb_csum_unnecessary(skb) ?
|
|
|
|
0 : __skb_checksum_complete(skb);
|
2005-11-11 05:01:24 +08:00
|
|
|
}
|
|
|
|
|
2007-03-24 02:17:07 +08:00
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2007-03-24 02:17:27 +08:00
|
|
|
extern void nf_conntrack_destroy(struct nf_conntrack *nfct);
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline void nf_conntrack_put(struct nf_conntrack *nfct)
|
|
|
|
{
|
|
|
|
if (nfct && atomic_dec_and_test(&nfct->use))
|
2007-03-24 02:17:27 +08:00
|
|
|
nf_conntrack_destroy(nfct);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
static inline void nf_conntrack_get(struct nf_conntrack *nfct)
|
|
|
|
{
|
|
|
|
if (nfct)
|
|
|
|
atomic_inc(&nfct->use);
|
|
|
|
}
|
[NETFILTER]: Add nf_conntrack subsystem.
The existing connection tracking subsystem in netfilter can only
handle ipv4. There were basically two choices present to add
connection tracking support for ipv6. We could either duplicate all
of the ipv4 connection tracking code into an ipv6 counterpart, or (the
choice taken by these patches) we could design a generic layer that
could handle both ipv4 and ipv6 and thus requiring only one sub-protocol
(TCP, UDP, etc.) connection tracking helper module to be written.
In fact nf_conntrack is capable of working with any layer 3
protocol.
The existing ipv4 specific conntrack code could also not deal
with the pecularities of doing connection tracking on ipv6,
which is also cured here. For example, these issues include:
1) ICMPv6 handling, which is used for neighbour discovery in
ipv6 thus some messages such as these should not participate
in connection tracking since effectively they are like ARP
messages
2) fragmentation must be handled differently in ipv6, because
the simplistic "defrag, connection track and NAT, refrag"
(which the existing ipv4 connection tracking does) approach simply
isn't feasible in ipv6
3) ipv6 extension header parsing must occur at the correct spots
before and after connection tracking decisions, and there were
no provisions for this in the existing connection tracking
design
4) ipv6 has no need for stateful NAT
The ipv4 specific conntrack layer is kept around, until all of
the ipv4 specific conntrack helpers are ported over to nf_conntrack
and it is feature complete. Once that occurs, the old conntrack
stuff will get placed into the feature-removal-schedule and we will
fully kill it off 6 months later.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2005-11-10 08:38:16 +08:00
|
|
|
static inline void nf_conntrack_get_reasm(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (skb)
|
|
|
|
atomic_inc(&skb->users);
|
|
|
|
}
|
|
|
|
static inline void nf_conntrack_put_reasm(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (skb)
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge)
|
|
|
|
{
|
|
|
|
if (nf_bridge && atomic_dec_and_test(&nf_bridge->use))
|
|
|
|
kfree(nf_bridge);
|
|
|
|
}
|
|
|
|
static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge)
|
|
|
|
{
|
|
|
|
if (nf_bridge)
|
|
|
|
atomic_inc(&nf_bridge->use);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_BRIDGE_NETFILTER */
|
2006-03-21 11:23:05 +08:00
|
|
|
static inline void nf_reset(struct sk_buff *skb)
|
|
|
|
{
|
2007-03-24 02:17:07 +08:00
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2006-03-21 11:23:05 +08:00
|
|
|
nf_conntrack_put(skb->nfct);
|
|
|
|
skb->nfct = NULL;
|
|
|
|
nf_conntrack_put_reasm(skb->nfct_reasm);
|
|
|
|
skb->nfct_reasm = NULL;
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
nf_bridge_put(skb->nf_bridge);
|
|
|
|
skb->nf_bridge = NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-03-15 07:43:37 +08:00
|
|
|
/* Note: This doesn't put any conntrack and bridge info in dst. */
|
|
|
|
static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
|
|
|
|
{
|
2007-03-24 02:17:07 +08:00
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2007-03-15 07:43:37 +08:00
|
|
|
dst->nfct = src->nfct;
|
|
|
|
nf_conntrack_get(src->nfct);
|
|
|
|
dst->nfctinfo = src->nfctinfo;
|
|
|
|
dst->nfct_reasm = src->nfct_reasm;
|
|
|
|
nf_conntrack_get_reasm(src->nfct_reasm);
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
dst->nf_bridge = src->nf_bridge;
|
|
|
|
nf_bridge_get(src->nf_bridge);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-03-15 07:44:01 +08:00
|
|
|
static inline void nf_copy(struct sk_buff *dst, const struct sk_buff *src)
|
|
|
|
{
|
|
|
|
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
2007-03-24 02:17:07 +08:00
|
|
|
nf_conntrack_put(dst->nfct);
|
2007-03-15 07:44:01 +08:00
|
|
|
nf_conntrack_put_reasm(dst->nfct_reasm);
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
|
|
|
nf_bridge_put(dst->nf_bridge);
|
|
|
|
#endif
|
|
|
|
__nf_copy(dst, src);
|
|
|
|
}
|
|
|
|
|
2006-06-09 15:29:17 +08:00
|
|
|
#ifdef CONFIG_NETWORK_SECMARK
|
|
|
|
static inline void skb_copy_secmark(struct sk_buff *to, const struct sk_buff *from)
|
|
|
|
{
|
|
|
|
to->secmark = from->secmark;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void skb_init_secmark(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->secmark = 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void skb_copy_secmark(struct sk_buff *to, const struct sk_buff *from)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
static inline void skb_init_secmark(struct sk_buff *skb)
|
|
|
|
{ }
|
|
|
|
#endif
|
|
|
|
|
2007-07-07 04:36:20 +08:00
|
|
|
static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
|
|
|
|
{
|
|
|
|
skb->queue_mapping = queue_mapping;
|
|
|
|
}
|
|
|
|
|
2009-03-22 04:39:26 +08:00
|
|
|
static inline u16 skb_get_queue_mapping(const struct sk_buff *skb)
|
2007-10-22 08:01:29 +08:00
|
|
|
{
|
|
|
|
return skb->queue_mapping;
|
|
|
|
}
|
|
|
|
|
2007-07-07 04:36:20 +08:00
|
|
|
static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from)
|
|
|
|
{
|
|
|
|
to->queue_mapping = from->queue_mapping;
|
|
|
|
}
|
|
|
|
|
2009-01-28 08:22:11 +08:00
|
|
|
static inline void skb_record_rx_queue(struct sk_buff *skb, u16 rx_queue)
|
|
|
|
{
|
|
|
|
skb->queue_mapping = rx_queue + 1;
|
|
|
|
}
|
|
|
|
|
2009-03-22 04:39:26 +08:00
|
|
|
static inline u16 skb_get_rx_queue(const struct sk_buff *skb)
|
2009-01-28 08:22:11 +08:00
|
|
|
{
|
|
|
|
return skb->queue_mapping - 1;
|
|
|
|
}
|
|
|
|
|
2009-03-22 04:39:26 +08:00
|
|
|
static inline bool skb_rx_queue_recorded(const struct sk_buff *skb)
|
2009-01-28 08:22:11 +08:00
|
|
|
{
|
|
|
|
return (skb->queue_mapping != 0);
|
|
|
|
}
|
|
|
|
|
2009-03-22 04:39:26 +08:00
|
|
|
extern u16 skb_tx_hash(const struct net_device *dev,
|
|
|
|
const struct sk_buff *skb);
|
|
|
|
|
2008-10-29 04:24:06 +08:00
|
|
|
#ifdef CONFIG_XFRM
|
|
|
|
static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb->sp;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-07-09 04:34:32 +08:00
|
|
|
static inline int skb_is_gso(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb_shinfo(skb)->gso_size;
|
|
|
|
}
|
|
|
|
|
2007-10-13 18:33:32 +08:00
|
|
|
static inline int skb_is_gso_v6(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6;
|
|
|
|
}
|
|
|
|
|
2008-06-20 07:22:28 +08:00
|
|
|
extern void __skb_warn_lro_forwarding(const struct sk_buff *skb);
|
|
|
|
|
|
|
|
static inline bool skb_warn_if_lro(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/* LRO sets gso_size but not gso_type, whereas if GSO is really
|
|
|
|
* wanted then gso_type will be set. */
|
|
|
|
struct skb_shared_info *shinfo = skb_shinfo(skb);
|
|
|
|
if (shinfo->gso_size != 0 && unlikely(shinfo->gso_type == 0)) {
|
|
|
|
__skb_warn_lro_forwarding(skb);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-03-27 14:22:20 +08:00
|
|
|
static inline void skb_forward_csum(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/* Unfortunately we don't support this one. Any brave souls? */
|
|
|
|
if (skb->ip_summed == CHECKSUM_COMPLETE)
|
|
|
|
skb->ip_summed = CHECKSUM_NONE;
|
|
|
|
}
|
|
|
|
|
2008-02-05 12:49:54 +08:00
|
|
|
bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _LINUX_SKBUFF_H */
|