2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* net/dst.h Protocol independent destination cache definitions.
|
|
|
|
|
*
|
|
|
|
|
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef _NET_DST_H
|
|
|
|
|
#define _NET_DST_H
|
|
|
|
|
|
2009-08-29 09:34:49 +08:00
|
|
|
#include <net/dst_ops.h>
|
2005-12-27 12:43:12 +08:00
|
|
|
#include <linux/netdevice.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
|
#include <linux/rcupdate.h>
|
2011-11-24 09:12:59 +08:00
|
|
|
#include <linux/bug.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/jiffies.h>
|
|
|
|
|
#include <net/neighbour.h>
|
|
|
|
|
#include <asm/processor.h>
|
|
|
|
|
|
|
|
|
|
#define DST_GC_MIN (HZ/10)
|
|
|
|
|
#define DST_GC_INC (HZ/2)
|
|
|
|
|
#define DST_GC_MAX (120*HZ)
|
|
|
|
|
|
|
|
|
|
/* Each dst_entry has reference count and sits in some parent list(s).
|
|
|
|
|
* When it is removed from parent list, it is "freed" (dst_free).
|
|
|
|
|
* After this it enters dead state (dst->obsolete > 0) and if its refcnt
|
|
|
|
|
* is zero, it can be destroyed immediately, otherwise it is added
|
|
|
|
|
* to gc list and garbage collector periodically checks the refcnt.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
struct sk_buff;
|
|
|
|
|
|
2009-11-03 11:26:03 +08:00
|
|
|
struct dst_entry {
|
2007-02-10 08:26:55 +08:00
|
|
|
struct rcu_head rcu_head;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct dst_entry *child;
|
|
|
|
|
struct net_device *dev;
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
struct dst_ops *ops;
|
|
|
|
|
unsigned long _metrics;
|
ipv6: fix race condition regarding dst->expires and dst->from.
Eric Dumazet wrote:
| Some strange crashes happen in rt6_check_expired(), with access
| to random addresses.
|
| At first glance, it looks like the RTF_EXPIRES and
| stuff added in commit 1716a96101c49186b
| (ipv6: fix problem with expired dst cache)
| are racy : same dst could be manipulated at the same time
| on different cpus.
|
| At some point, our stack believes rt->dst.from contains a dst pointer,
| while its really a jiffie value (as rt->dst.expires shares the same area
| of memory)
|
| rt6_update_expires() should be fixed, or am I missing something ?
|
| CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
Because we do not have any locks for dst_entry, we cannot change
essential structure in the entry; e.g., we cannot change reference
to other entity.
To fix this issue, split 'from' and 'expires' field in dst_entry
out of union. Once it is 'from' is assigned in the constructor,
keep the reference until the very last stage of the life time of
the object.
Of course, it is unsafe to change 'from', so make rt6_set_from simple
just for fresh entries.
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Reported-by: Neil Horman <nhorman@tuxdriver.com>
CC: Gao Feng <gaofeng@cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reported-by: Steinar H. Gunderson <sesse@google.com>
Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-20 08:29:08 +08:00
|
|
|
unsigned long expires;
|
[NET]: Fix tbench regression in 2.6.25-rc1
Comparing with kernel 2.6.24, tbench result has regression with
2.6.25-rc1.
1) On 2 quad-core processor stoakley: 4%.
2) On 4 quad-core processor tigerton: more than 30%.
bisect located below patch.
b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b is first bad commit
commit b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Nov 13 21:33:32 2007 -0800
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
Above patch changes the cache line alignment, especially member
__refcnt. I did a testing by adding 2 unsigned long pading before
lastuse, so the 3 members, lastuse/__refcnt/__use, are moved to next
cache line. The performance is recovered.
I created a patch to rearrange the members in struct dst_entry.
With Eric and Valdis Kletnieks's suggestion, I made finer arrangement.
1) Move tclassid under ops in case CONFIG_NET_CLS_ROUTE=y. So
sizeof(dst_entry)=200 no matter if CONFIG_NET_CLS_ROUTE=y/n. I
tested many patches on my 16-core tigerton by moving tclassid to
different place. It looks like tclassid could also have impact on
performance. If moving tclassid before metrics, or just don't move
tclassid, the performance isn't good. So I move it behind metrics.
2) Add comments before __refcnt.
On 16-core tigerton:
If CONFIG_NET_CLS_ROUTE=y, the result with below patch is about 18%
better than the one without the patch;
If CONFIG_NET_CLS_ROUTE=n, the result with below patch is about 30%
better than the one without the patch.
With 32bit 2.6.25-rc1 on 8-core stoakley, the new patch doesn't
introduce regression.
Thank Eric, Valdis, and David!
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-13 13:52:37 +08:00
|
|
|
struct dst_entry *path;
|
ipv6: fix race condition regarding dst->expires and dst->from.
Eric Dumazet wrote:
| Some strange crashes happen in rt6_check_expired(), with access
| to random addresses.
|
| At first glance, it looks like the RTF_EXPIRES and
| stuff added in commit 1716a96101c49186b
| (ipv6: fix problem with expired dst cache)
| are racy : same dst could be manipulated at the same time
| on different cpus.
|
| At some point, our stack believes rt->dst.from contains a dst pointer,
| while its really a jiffie value (as rt->dst.expires shares the same area
| of memory)
|
| rt6_update_expires() should be fixed, or am I missing something ?
|
| CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
Because we do not have any locks for dst_entry, we cannot change
essential structure in the entry; e.g., we cannot change reference
to other entity.
To fix this issue, split 'from' and 'expires' field in dst_entry
out of union. Once it is 'from' is assigned in the constructor,
keep the reference until the very last stage of the life time of
the object.
Of course, it is unsafe to change 'from', so make rt6_set_from simple
just for fresh entries.
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Reported-by: Neil Horman <nhorman@tuxdriver.com>
CC: Gao Feng <gaofeng@cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reported-by: Steinar H. Gunderson <sesse@google.com>
Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-20 08:29:08 +08:00
|
|
|
struct dst_entry *from;
|
2008-10-29 04:24:06 +08:00
|
|
|
#ifdef CONFIG_XFRM
|
2005-04-17 06:20:36 +08:00
|
|
|
struct xfrm_state *xfrm;
|
2008-11-17 11:46:36 +08:00
|
|
|
#else
|
|
|
|
|
void *__pad1;
|
2008-10-29 04:24:06 +08:00
|
|
|
#endif
|
2012-06-16 21:14:49 +08:00
|
|
|
int (*input)(struct sk_buff *);
|
|
|
|
|
int (*output)(struct sk_buff *);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-07-02 17:21:03 +08:00
|
|
|
unsigned short flags;
|
2011-07-14 22:53:20 +08:00
|
|
|
#define DST_HOST 0x0001
|
|
|
|
|
#define DST_NOXFRM 0x0002
|
|
|
|
|
#define DST_NOPOLICY 0x0004
|
|
|
|
|
#define DST_NOHASH 0x0008
|
|
|
|
|
#define DST_NOCACHE 0x0010
|
|
|
|
|
#define DST_NOCOUNT 0x0020
|
2014-03-06 16:11:07 +08:00
|
|
|
#define DST_FAKE_RTABLE 0x0040
|
|
|
|
|
#define DST_XFRM_TUNNEL 0x0080
|
|
|
|
|
#define DST_XFRM_QUEUE 0x0100
|
2011-07-14 22:53:20 +08:00
|
|
|
|
2012-07-02 17:21:03 +08:00
|
|
|
unsigned short pending_confirm;
|
|
|
|
|
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
short error;
|
2012-07-20 03:31:33 +08:00
|
|
|
|
|
|
|
|
/* A non-zero value of dst->obsolete forces by-hand validation
|
|
|
|
|
* of the route entry. Positive values are set by the generic
|
|
|
|
|
* dst layer to indicate that the entry has been forcefully
|
|
|
|
|
* destroyed.
|
|
|
|
|
*
|
|
|
|
|
* Negative values are used by the implementation layer code to
|
|
|
|
|
* force invocation of the dst_ops->check() method.
|
|
|
|
|
*/
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
short obsolete;
|
2012-07-20 03:31:33 +08:00
|
|
|
#define DST_OBSOLETE_NONE 0
|
|
|
|
|
#define DST_OBSOLETE_DEAD 2
|
|
|
|
|
#define DST_OBSOLETE_FORCE_CHK -1
|
2012-07-18 02:31:28 +08:00
|
|
|
#define DST_OBSOLETE_KILL -2
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
unsigned short header_len; /* more space at head required */
|
|
|
|
|
unsigned short trailer_len; /* space to reserve at tail */
|
2011-01-14 20:36:42 +08:00
|
|
|
#ifdef CONFIG_IP_ROUTE_CLASSID
|
[NET]: Fix tbench regression in 2.6.25-rc1
Comparing with kernel 2.6.24, tbench result has regression with
2.6.25-rc1.
1) On 2 quad-core processor stoakley: 4%.
2) On 4 quad-core processor tigerton: more than 30%.
bisect located below patch.
b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b is first bad commit
commit b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Nov 13 21:33:32 2007 -0800
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
Above patch changes the cache line alignment, especially member
__refcnt. I did a testing by adding 2 unsigned long pading before
lastuse, so the 3 members, lastuse/__refcnt/__use, are moved to next
cache line. The performance is recovered.
I created a patch to rearrange the members in struct dst_entry.
With Eric and Valdis Kletnieks's suggestion, I made finer arrangement.
1) Move tclassid under ops in case CONFIG_NET_CLS_ROUTE=y. So
sizeof(dst_entry)=200 no matter if CONFIG_NET_CLS_ROUTE=y/n. I
tested many patches on my 16-core tigerton by moving tclassid to
different place. It looks like tclassid could also have impact on
performance. If moving tclassid before metrics, or just don't move
tclassid, the performance isn't good. So I move it behind metrics.
2) Add comments before __refcnt.
On 16-core tigerton:
If CONFIG_NET_CLS_ROUTE=y, the result with below patch is about 18%
better than the one without the patch;
If CONFIG_NET_CLS_ROUTE=n, the result with below patch is about 30%
better than the one without the patch.
With 32bit 2.6.25-rc1 on 8-core stoakley, the new patch doesn't
introduce regression.
Thank Eric, Valdis, and David!
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-13 13:52:37 +08:00
|
|
|
__u32 tclassid;
|
2008-11-17 11:46:36 +08:00
|
|
|
#else
|
|
|
|
|
__u32 __pad2;
|
[NET]: Fix tbench regression in 2.6.25-rc1
Comparing with kernel 2.6.24, tbench result has regression with
2.6.25-rc1.
1) On 2 quad-core processor stoakley: 4%.
2) On 4 quad-core processor tigerton: more than 30%.
bisect located below patch.
b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b is first bad commit
commit b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Nov 13 21:33:32 2007 -0800
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
Above patch changes the cache line alignment, especially member
__refcnt. I did a testing by adding 2 unsigned long pading before
lastuse, so the 3 members, lastuse/__refcnt/__use, are moved to next
cache line. The performance is recovered.
I created a patch to rearrange the members in struct dst_entry.
With Eric and Valdis Kletnieks's suggestion, I made finer arrangement.
1) Move tclassid under ops in case CONFIG_NET_CLS_ROUTE=y. So
sizeof(dst_entry)=200 no matter if CONFIG_NET_CLS_ROUTE=y/n. I
tested many patches on my 16-core tigerton by moving tclassid to
different place. It looks like tclassid could also have impact on
performance. If moving tclassid before metrics, or just don't move
tclassid, the performance isn't good. So I move it behind metrics.
2) Add comments before __refcnt.
On 16-core tigerton:
If CONFIG_NET_CLS_ROUTE=y, the result with below patch is about 18%
better than the one without the patch;
If CONFIG_NET_CLS_ROUTE=n, the result with below patch is about 30%
better than the one without the patch.
With 32bit 2.6.25-rc1 on 8-core stoakley, the new patch doesn't
introduce regression.
Thank Eric, Valdis, and David!
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-13 13:52:37 +08:00
|
|
|
#endif
|
|
|
|
|
|
2008-11-17 11:46:36 +08:00
|
|
|
/*
|
|
|
|
|
* Align __refcnt to a 64 bytes alignment
|
|
|
|
|
* (L1_CACHE_SIZE would be too much)
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_64BIT
|
2011-07-14 22:53:20 +08:00
|
|
|
long __pad_to_align_refcnt[2];
|
2008-11-17 11:46:36 +08:00
|
|
|
#endif
|
[NET]: Fix tbench regression in 2.6.25-rc1
Comparing with kernel 2.6.24, tbench result has regression with
2.6.25-rc1.
1) On 2 quad-core processor stoakley: 4%.
2) On 4 quad-core processor tigerton: more than 30%.
bisect located below patch.
b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b is first bad commit
commit b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Nov 13 21:33:32 2007 -0800
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
Above patch changes the cache line alignment, especially member
__refcnt. I did a testing by adding 2 unsigned long pading before
lastuse, so the 3 members, lastuse/__refcnt/__use, are moved to next
cache line. The performance is recovered.
I created a patch to rearrange the members in struct dst_entry.
With Eric and Valdis Kletnieks's suggestion, I made finer arrangement.
1) Move tclassid under ops in case CONFIG_NET_CLS_ROUTE=y. So
sizeof(dst_entry)=200 no matter if CONFIG_NET_CLS_ROUTE=y/n. I
tested many patches on my 16-core tigerton by moving tclassid to
different place. It looks like tclassid could also have impact on
performance. If moving tclassid before metrics, or just don't move
tclassid, the performance isn't good. So I move it behind metrics.
2) Add comments before __refcnt.
On 16-core tigerton:
If CONFIG_NET_CLS_ROUTE=y, the result with below patch is about 18%
better than the one without the patch;
If CONFIG_NET_CLS_ROUTE=n, the result with below patch is about 30%
better than the one without the patch.
With 32bit 2.6.25-rc1 on 8-core stoakley, the new patch doesn't
introduce regression.
Thank Eric, Valdis, and David!
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-13 13:52:37 +08:00
|
|
|
/*
|
|
|
|
|
* __refcnt wants to be on a different cache line from
|
|
|
|
|
* input/output/ops or performance tanks badly
|
|
|
|
|
*/
|
2007-02-10 08:26:55 +08:00
|
|
|
atomic_t __refcnt; /* client references */
|
|
|
|
|
int __use;
|
[NET]: Fix tbench regression in 2.6.25-rc1
Comparing with kernel 2.6.24, tbench result has regression with
2.6.25-rc1.
1) On 2 quad-core processor stoakley: 4%.
2) On 4 quad-core processor tigerton: more than 30%.
bisect located below patch.
b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b is first bad commit
commit b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Nov 13 21:33:32 2007 -0800
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
Above patch changes the cache line alignment, especially member
__refcnt. I did a testing by adding 2 unsigned long pading before
lastuse, so the 3 members, lastuse/__refcnt/__use, are moved to next
cache line. The performance is recovered.
I created a patch to rearrange the members in struct dst_entry.
With Eric and Valdis Kletnieks's suggestion, I made finer arrangement.
1) Move tclassid under ops in case CONFIG_NET_CLS_ROUTE=y. So
sizeof(dst_entry)=200 no matter if CONFIG_NET_CLS_ROUTE=y/n. I
tested many patches on my 16-core tigerton by moving tclassid to
different place. It looks like tclassid could also have impact on
performance. If moving tclassid before metrics, or just don't move
tclassid, the performance isn't good. So I move it behind metrics.
2) Add comments before __refcnt.
On 16-core tigerton:
If CONFIG_NET_CLS_ROUTE=y, the result with below patch is about 18%
better than the one without the patch;
If CONFIG_NET_CLS_ROUTE=n, the result with below patch is about 30%
better than the one without the patch.
With 32bit 2.6.25-rc1 on 8-core stoakley, the new patch doesn't
introduce regression.
Thank Eric, Valdis, and David!
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-03-13 13:52:37 +08:00
|
|
|
unsigned long lastuse;
|
2007-02-10 08:26:55 +08:00
|
|
|
union {
|
2010-10-29 11:09:24 +08:00
|
|
|
struct dst_entry *next;
|
|
|
|
|
struct rtable __rcu *rt_next;
|
|
|
|
|
struct rt6_info *rt6_next;
|
|
|
|
|
struct dn_route __rcu *dn_next;
|
2007-02-10 08:26:55 +08:00
|
|
|
};
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
2013-09-21 02:23:21 +08:00
|
|
|
u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
|
2012-08-07 18:55:45 +08:00
|
|
|
extern const u32 dst_default_metrics[];
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
|
2014-03-27 20:04:08 +08:00
|
|
|
#define DST_METRICS_READ_ONLY 0x1UL
|
|
|
|
|
#define DST_METRICS_FORCE_OVERWRITE 0x2UL
|
|
|
|
|
#define DST_METRICS_FLAGS 0x3UL
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
#define __DST_METRICS_PTR(Y) \
|
2014-03-27 20:04:08 +08:00
|
|
|
((u32 *)((Y) & ~DST_METRICS_FLAGS))
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
#define DST_METRICS_PTR(X) __DST_METRICS_PTR((X)->_metrics)
|
|
|
|
|
|
|
|
|
|
static inline bool dst_metrics_read_only(const struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
return dst->_metrics & DST_METRICS_READ_ONLY;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-27 20:04:08 +08:00
|
|
|
static inline void dst_metrics_set_force_overwrite(struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
dst->_metrics |= DST_METRICS_FORCE_OVERWRITE;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-21 02:23:21 +08:00
|
|
|
void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old);
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
|
|
|
|
|
static inline void dst_destroy_metrics_generic(struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
unsigned long val = dst->_metrics;
|
|
|
|
|
if (!(val & DST_METRICS_READ_ONLY))
|
|
|
|
|
__dst_destroy_metrics_generic(dst, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline u32 *dst_metrics_write_ptr(struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
unsigned long p = dst->_metrics;
|
|
|
|
|
|
2011-05-25 01:50:52 +08:00
|
|
|
BUG_ON(!p);
|
|
|
|
|
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
if (p & DST_METRICS_READ_ONLY)
|
|
|
|
|
return dst->ops->cow_metrics(dst, p);
|
|
|
|
|
return __DST_METRICS_PTR(p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This may only be invoked before the entry has reached global
|
|
|
|
|
* visibility.
|
|
|
|
|
*/
|
|
|
|
|
static inline void dst_init_metrics(struct dst_entry *dst,
|
|
|
|
|
const u32 *src_metrics,
|
|
|
|
|
bool read_only)
|
|
|
|
|
{
|
|
|
|
|
dst->_metrics = ((unsigned long) src_metrics) |
|
|
|
|
|
(read_only ? DST_METRICS_READ_ONLY : 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void dst_copy_metrics(struct dst_entry *dest, const struct dst_entry *src)
|
|
|
|
|
{
|
|
|
|
|
u32 *dst_metrics = dst_metrics_write_ptr(dest);
|
|
|
|
|
|
|
|
|
|
if (dst_metrics) {
|
|
|
|
|
u32 *src_metrics = DST_METRICS_PTR(src);
|
|
|
|
|
|
|
|
|
|
memcpy(dst_metrics, src_metrics, RTAX_MAX * sizeof(u32));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline u32 *dst_metrics_ptr(struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
return DST_METRICS_PTR(dst);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline u32
|
2010-12-13 13:35:57 +08:00
|
|
|
dst_metric_raw(const struct dst_entry *dst, const int metric)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
u32 *p = DST_METRICS_PTR(dst);
|
|
|
|
|
|
|
|
|
|
return p[metric-1];
|
2010-12-09 13:16:57 +08:00
|
|
|
}
|
|
|
|
|
|
2010-12-13 13:35:57 +08:00
|
|
|
static inline u32
|
|
|
|
|
dst_metric(const struct dst_entry *dst, const int metric)
|
|
|
|
|
{
|
2010-12-14 04:52:14 +08:00
|
|
|
WARN_ON_ONCE(metric == RTAX_HOPLIMIT ||
|
2010-12-15 05:01:14 +08:00
|
|
|
metric == RTAX_ADVMSS ||
|
|
|
|
|
metric == RTAX_MTU);
|
2010-12-13 13:35:57 +08:00
|
|
|
return dst_metric_raw(dst, metric);
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-14 04:52:14 +08:00
|
|
|
static inline u32
|
|
|
|
|
dst_metric_advmss(const struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
u32 advmss = dst_metric_raw(dst, RTAX_ADVMSS);
|
|
|
|
|
|
|
|
|
|
if (!advmss)
|
|
|
|
|
advmss = dst->ops->default_advmss(dst);
|
|
|
|
|
|
|
|
|
|
return advmss;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-09 13:16:57 +08:00
|
|
|
static inline void dst_metric_set(struct dst_entry *dst, int metric, u32 val)
|
|
|
|
|
{
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
u32 *p = dst_metrics_write_ptr(dst);
|
2010-12-09 13:16:57 +08:00
|
|
|
|
net: Implement read-only protection and COW'ing of metrics.
Routing metrics are now copy-on-write.
Initially a route entry points it's metrics at a read-only location.
If a routing table entry exists, it will point there. Else it will
point at the all zero metric place-holder called 'dst_default_metrics'.
The writeability state of the metrics is stored in the low bits of the
metrics pointer, we have two bits left to spare if we want to store
more states.
For the initial implementation, COW is implemented simply via kmalloc.
However future enhancements will change this to place the writable
metrics somewhere else, in order to increase sharing. Very likely
this "somewhere else" will be the inetpeer cache.
Note also that this means that metrics updates may transiently fail
if we cannot COW the metrics successfully.
But even by itself, this patch should decrease memory usage and
increase cache locality especially for routing workloads. In those
cases the read-only metric copies stay in place and never get written
to.
TCP workloads where metrics get updated, and those rare cases where
PMTU triggers occur, will take a very slight performance hit. But
that hit will be alleviated when the long-term writable metrics
move to a more sharable location.
Since the metrics storage went from a u32 array of RTAX_MAX entries to
what is essentially a pointer, some retooling of the dst_entry layout
was necessary.
Most importantly, we need to preserve the alignment of the reference
count so that it doesn't share cache lines with the read-mostly state,
as per Eric Dumazet's alignment assertion checks.
The only non-trivial bit here is the move of the 'flags' member into
the writeable cacheline. This is OK since we are always accessing the
flags around the same moment when we made a modification to the
reference count.
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-01-27 12:51:05 +08:00
|
|
|
if (p)
|
|
|
|
|
p[metric-1] = val;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2009-10-28 12:15:23 +08:00
|
|
|
static inline u32
|
|
|
|
|
dst_feature(const struct dst_entry *dst, u32 feature)
|
|
|
|
|
{
|
tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
It creates a regression, triggering badness for SYN_RECV
sockets, for example:
[19148.022102] Badness at net/ipv4/inet_connection_sock.c:293
[19148.022570] NIP: c02a0914 LR: c02a0904 CTR: 00000000
[19148.023035] REGS: eeecbd30 TRAP: 0700 Not tainted (2.6.32)
[19148.023496] MSR: 00029032 <EE,ME,CE,IR,DR> CR: 24002442 XER: 00000000
[19148.024012] TASK = eee9a820[1756] 'privoxy' THREAD: eeeca000
This is likely caused by the change in the 'estab' parameter
passed to tcp_parse_options() when invoked by the functions
in net/ipv4/tcp_minisocks.c
But even if that is fixed, the ->conn_request() changes made in
this patch series is fundamentally wrong. They try to use the
listening socket's 'dst' to probe the route settings. The
listening socket doesn't even have a route, and you can't
get the right route (the child request one) until much later
after we setup all of the state, and it must be done by hand.
This stuff really isn't ready, so the best thing to do is a
full revert. This reverts the following commits:
f55017a93f1a74d50244b1254b9a2bd7ac9bbf7d
022c3f7d82f0f1c68018696f2f027b87b9bb45c2
1aba721eba1d84a2defce45b950272cee1e6c72a
cda42ebd67ee5fdf09d7057b5a4584d36fe8a335
345cda2fd695534be5a4494f1b59da9daed33663
dc343475ed062e13fc260acccaab91d7d80fd5b2
05eaade2782fb0c90d3034fd7a7d5a16266182bb
6a2a2d6bf8581216e08be15fcb563cfd6c430e1e
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-12-16 12:56:42 +08:00
|
|
|
return dst_metric(dst, RTAX_FEATURES) & feature;
|
2009-10-28 12:15:23 +08:00
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline u32 dst_mtu(const struct dst_entry *dst)
|
|
|
|
|
{
|
2011-11-23 10:13:31 +08:00
|
|
|
return dst->ops->mtu(dst);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2008-07-19 14:02:15 +08:00
|
|
|
/* RTT metrics are stored in milliseconds for user ABI, but used as jiffies */
|
|
|
|
|
static inline unsigned long dst_metric_rtt(const struct dst_entry *dst, int metric)
|
|
|
|
|
{
|
|
|
|
|
return msecs_to_jiffies(dst_metric(dst, metric));
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline u32
|
|
|
|
|
dst_allfrag(const struct dst_entry *dst)
|
|
|
|
|
{
|
2009-10-28 12:15:23 +08:00
|
|
|
int ret = dst_feature(dst, RTAX_FEATURE_ALLFRAG);
|
2005-04-17 06:20:36 +08:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int
|
2010-12-15 05:01:14 +08:00
|
|
|
dst_metric_locked(const struct dst_entry *dst, int metric)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
return dst_metric(dst, RTAX_LOCK) & (1<<metric);
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-16 21:14:49 +08:00
|
|
|
static inline void dst_hold(struct dst_entry *dst)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-11-17 11:46:36 +08:00
|
|
|
/*
|
|
|
|
|
* If your kernel compilation stops here, please check
|
|
|
|
|
* __pad_to_align_refcnt declaration in struct dst_entry
|
|
|
|
|
*/
|
|
|
|
|
BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63);
|
2005-04-17 06:20:36 +08:00
|
|
|
atomic_inc(&dst->__refcnt);
|
|
|
|
|
}
|
|
|
|
|
|
2007-11-11 13:28:34 +08:00
|
|
|
static inline void dst_use(struct dst_entry *dst, unsigned long time)
|
|
|
|
|
{
|
|
|
|
|
dst_hold(dst);
|
|
|
|
|
dst->__use++;
|
|
|
|
|
dst->lastuse = time;
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-12 07:19:48 +08:00
|
|
|
static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
|
|
|
|
|
{
|
|
|
|
|
dst->__use++;
|
|
|
|
|
dst->lastuse = time;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-16 21:14:49 +08:00
|
|
|
static inline struct dst_entry *dst_clone(struct dst_entry *dst)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
if (dst)
|
|
|
|
|
atomic_inc(&dst->__refcnt);
|
|
|
|
|
return dst;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-21 02:23:21 +08:00
|
|
|
void dst_release(struct dst_entry *dst);
|
2010-05-12 07:19:48 +08:00
|
|
|
|
|
|
|
|
static inline void refdst_drop(unsigned long refdst)
|
|
|
|
|
{
|
|
|
|
|
if (!(refdst & SKB_DST_NOREF))
|
|
|
|
|
dst_release((struct dst_entry *)(refdst & SKB_DST_PTRMASK));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* skb_dst_drop - drops skb dst
|
|
|
|
|
* @skb: buffer
|
|
|
|
|
*
|
|
|
|
|
* Drops dst reference count if a reference was taken.
|
|
|
|
|
*/
|
2009-06-02 13:19:30 +08:00
|
|
|
static inline void skb_dst_drop(struct sk_buff *skb)
|
|
|
|
|
{
|
2010-05-12 07:19:48 +08:00
|
|
|
if (skb->_skb_refdst) {
|
|
|
|
|
refdst_drop(skb->_skb_refdst);
|
|
|
|
|
skb->_skb_refdst = 0UL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb)
|
|
|
|
|
{
|
|
|
|
|
nskb->_skb_refdst = oskb->_skb_refdst;
|
|
|
|
|
if (!(nskb->_skb_refdst & SKB_DST_NOREF))
|
|
|
|
|
dst_clone(skb_dst(nskb));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* skb_dst_force - makes sure skb dst is refcounted
|
|
|
|
|
* @skb: buffer
|
|
|
|
|
*
|
|
|
|
|
* If dst is not yet refcounted, let's do it
|
|
|
|
|
*/
|
|
|
|
|
static inline void skb_dst_force(struct sk_buff *skb)
|
|
|
|
|
{
|
|
|
|
|
if (skb_dst_is_noref(skb)) {
|
|
|
|
|
WARN_ON(!rcu_read_lock_held());
|
|
|
|
|
skb->_skb_refdst &= ~SKB_DST_NOREF;
|
|
|
|
|
dst_clone(skb_dst(skb));
|
|
|
|
|
}
|
2009-06-02 13:19:30 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-05-18 13:36:55 +08:00
|
|
|
|
2010-09-27 08:33:35 +08:00
|
|
|
/**
|
|
|
|
|
* __skb_tunnel_rx - prepare skb for rx reinsert
|
|
|
|
|
* @skb: buffer
|
|
|
|
|
* @dev: tunnel device
|
2013-09-02 21:34:58 +08:00
|
|
|
* @net: netns for packet i/o
|
2010-09-27 08:33:35 +08:00
|
|
|
*
|
|
|
|
|
* After decapsulation, packet is going to re-enter (netif_rx()) our stack,
|
|
|
|
|
* so make some cleanups. (no accounting done)
|
|
|
|
|
*/
|
2013-09-02 21:34:58 +08:00
|
|
|
static inline void __skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
|
struct net *net)
|
2010-09-27 08:33:35 +08:00
|
|
|
{
|
|
|
|
|
skb->dev = dev;
|
2011-08-15 03:45:55 +08:00
|
|
|
|
|
|
|
|
/*
|
2013-12-16 14:12:18 +08:00
|
|
|
* Clear hash so that we can recalulate the hash for the
|
2011-08-15 03:45:55 +08:00
|
|
|
* encapsulated packet, unless we have already determine the hash
|
|
|
|
|
* over the L4 4-tuple.
|
|
|
|
|
*/
|
2013-12-16 14:12:18 +08:00
|
|
|
skb_clear_hash_if_not_l4(skb);
|
2010-09-27 08:33:35 +08:00
|
|
|
skb_set_queue_mapping(skb, 0);
|
2013-09-02 21:34:58 +08:00
|
|
|
skb_scrub_packet(skb, !net_eq(net, dev_net(dev)));
|
2010-09-27 08:33:35 +08:00
|
|
|
}
|
|
|
|
|
|
2010-05-18 13:36:55 +08:00
|
|
|
/**
|
|
|
|
|
* skb_tunnel_rx - prepare skb for rx reinsert
|
|
|
|
|
* @skb: buffer
|
|
|
|
|
* @dev: tunnel device
|
|
|
|
|
*
|
|
|
|
|
* After decapsulation, packet is going to re-enter (netif_rx()) our stack,
|
|
|
|
|
* so make some cleanups, and perform accounting.
|
2010-09-27 08:33:35 +08:00
|
|
|
* Note: this accounting is not SMP safe.
|
2010-05-18 13:36:55 +08:00
|
|
|
*/
|
2013-09-02 21:34:58 +08:00
|
|
|
static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
|
struct net *net)
|
2010-05-18 13:36:55 +08:00
|
|
|
{
|
|
|
|
|
/* TODO : stats should be SMP safe */
|
|
|
|
|
dev->stats.rx_packets++;
|
|
|
|
|
dev->stats.rx_bytes += skb->len;
|
2013-09-02 21:34:58 +08:00
|
|
|
__skb_tunnel_rx(skb, dev, net);
|
2010-05-18 13:36:55 +08:00
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Children define the path of the packet through the
|
|
|
|
|
* Linux networking. Thus, destinations are stackable.
|
|
|
|
|
*/
|
|
|
|
|
|
2010-06-04 09:57:38 +08:00
|
|
|
static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-03-16 05:09:32 +08:00
|
|
|
struct dst_entry *child = dst_clone(skb_dst(skb)->child);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-06-04 09:57:38 +08:00
|
|
|
skb_dst_drop(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
return child;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-21 02:23:21 +08:00
|
|
|
int dst_discard(struct sk_buff *skb);
|
|
|
|
|
void *dst_alloc(struct dst_ops *ops, struct net_device *dev, int initial_ref,
|
|
|
|
|
int initial_obsolete, unsigned short flags);
|
|
|
|
|
void __dst_free(struct dst_entry *dst);
|
|
|
|
|
struct dst_entry *dst_destroy(struct dst_entry *dst);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-06-16 21:14:49 +08:00
|
|
|
static inline void dst_free(struct dst_entry *dst)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2012-07-20 03:31:33 +08:00
|
|
|
if (dst->obsolete > 0)
|
2005-04-17 06:20:36 +08:00
|
|
|
return;
|
|
|
|
|
if (!atomic_read(&dst->__refcnt)) {
|
|
|
|
|
dst = dst_destroy(dst);
|
|
|
|
|
if (!dst)
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
__dst_free(dst);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void dst_rcu_free(struct rcu_head *head)
|
|
|
|
|
{
|
|
|
|
|
struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);
|
|
|
|
|
dst_free(dst);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void dst_confirm(struct dst_entry *dst)
|
|
|
|
|
{
|
2012-07-02 17:21:03 +08:00
|
|
|
dst->pending_confirm = 1;
|
|
|
|
|
}
|
2011-07-30 03:00:53 +08:00
|
|
|
|
2012-07-02 17:21:03 +08:00
|
|
|
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
|
|
|
|
|
struct sk_buff *skb)
|
|
|
|
|
{
|
net: output path optimizations
1) Avoid dirtying neighbour's confirmed field.
TCP workloads hits this cache line for each incoming ACK.
Lets write n->confirmed only if there is a jiffie change.
2) Optimize neigh_hh_output() for the common Ethernet case, were
hh_len is less than 16 bytes. Replace the memcpy() call
by two inlined 64bit load/stores on x86_64.
Bench results using udpflood test, with -C option (MSG_CONFIRM flag
added to sendto(), to reproduce the n->confirmed dirtying on UDP)
24 threads doing 1.000.000 UDP sendto() on dummy device, 4 runs.
before : 2.247s, 2.235s, 2.247s, 2.318s
after : 1.884s, 1.905s, 1.891s, 1.895s
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-07 10:19:56 +08:00
|
|
|
const struct hh_cache *hh;
|
|
|
|
|
|
|
|
|
|
if (dst->pending_confirm) {
|
|
|
|
|
unsigned long now = jiffies;
|
2012-07-02 17:21:03 +08:00
|
|
|
|
|
|
|
|
dst->pending_confirm = 0;
|
net: output path optimizations
1) Avoid dirtying neighbour's confirmed field.
TCP workloads hits this cache line for each incoming ACK.
Lets write n->confirmed only if there is a jiffie change.
2) Optimize neigh_hh_output() for the common Ethernet case, were
hh_len is less than 16 bytes. Replace the memcpy() call
by two inlined 64bit load/stores on x86_64.
Bench results using udpflood test, with -C option (MSG_CONFIRM flag
added to sendto(), to reproduce the n->confirmed dirtying on UDP)
24 threads doing 1.000.000 UDP sendto() on dummy device, 4 runs.
before : 2.247s, 2.235s, 2.247s, 2.318s
after : 1.884s, 1.905s, 1.891s, 1.895s
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-07 10:19:56 +08:00
|
|
|
/* avoid dirtying neighbour */
|
|
|
|
|
if (n->confirmed != now)
|
|
|
|
|
n->confirmed = now;
|
2011-07-18 14:09:49 +08:00
|
|
|
}
|
2012-07-02 17:21:03 +08:00
|
|
|
|
|
|
|
|
hh = &n->hh;
|
|
|
|
|
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
|
|
|
|
|
return neigh_hh_output(hh, skb);
|
|
|
|
|
else
|
|
|
|
|
return n->output(n, skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2011-07-18 15:40:17 +08:00
|
|
|
static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
|
|
|
|
|
{
|
2013-03-15 01:21:50 +08:00
|
|
|
struct neighbour *n = dst->ops->neigh_lookup(dst, NULL, daddr);
|
|
|
|
|
return IS_ERR(n) ? NULL : n;
|
2012-07-03 12:52:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst,
|
|
|
|
|
struct sk_buff *skb)
|
|
|
|
|
{
|
2013-03-15 01:21:50 +08:00
|
|
|
struct neighbour *n = dst->ops->neigh_lookup(dst, skb, NULL);
|
|
|
|
|
return IS_ERR(n) ? NULL : n;
|
2011-07-18 15:40:17 +08:00
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline void dst_link_failure(struct sk_buff *skb)
|
|
|
|
|
{
|
2009-06-02 13:19:30 +08:00
|
|
|
struct dst_entry *dst = skb_dst(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (dst && dst->ops && dst->ops->link_failure)
|
|
|
|
|
dst->ops->link_failure(skb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void dst_set_expires(struct dst_entry *dst, int timeout)
|
|
|
|
|
{
|
|
|
|
|
unsigned long expires = jiffies + timeout;
|
|
|
|
|
|
|
|
|
|
if (expires == 0)
|
|
|
|
|
expires = 1;
|
|
|
|
|
|
|
|
|
|
if (dst->expires == 0 || time_before(expires, dst->expires))
|
|
|
|
|
dst->expires = expires;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Output packet to network from transport. */
|
|
|
|
|
static inline int dst_output(struct sk_buff *skb)
|
|
|
|
|
{
|
2009-06-02 13:19:30 +08:00
|
|
|
return skb_dst(skb)->output(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Input packet from network to transport. */
|
|
|
|
|
static inline int dst_input(struct sk_buff *skb)
|
|
|
|
|
{
|
2009-06-02 13:19:30 +08:00
|
|
|
return skb_dst(skb)->input(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)
|
|
|
|
|
{
|
|
|
|
|
if (dst->obsolete)
|
|
|
|
|
dst = dst->ops->check(dst, cookie);
|
|
|
|
|
return dst;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-21 02:23:21 +08:00
|
|
|
void dst_init(void);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-12-13 02:36:59 +08:00
|
|
|
/* Flags for xfrm_lookup flags argument. */
|
|
|
|
|
enum {
|
2011-03-02 06:36:37 +08:00
|
|
|
XFRM_LOOKUP_ICMP = 1 << 0,
|
2007-12-13 02:36:59 +08:00
|
|
|
};
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
struct flowi;
|
|
|
|
|
#ifndef CONFIG_XFRM
|
2011-03-03 05:27:41 +08:00
|
|
|
static inline struct dst_entry *xfrm_lookup(struct net *net,
|
|
|
|
|
struct dst_entry *dst_orig,
|
|
|
|
|
const struct flowi *fl, struct sock *sk,
|
|
|
|
|
int flags)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-03-03 05:27:41 +08:00
|
|
|
return dst_orig;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2013-10-16 10:01:29 +08:00
|
|
|
|
|
|
|
|
static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#else
|
2013-09-21 02:23:21 +08:00
|
|
|
struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
|
|
|
|
|
const struct flowi *fl, struct sock *sk,
|
|
|
|
|
int flags);
|
2013-10-16 10:01:29 +08:00
|
|
|
|
|
|
|
|
/* skb attached with this dst needs transformation if dst->xfrm is valid */
|
|
|
|
|
static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
|
|
|
|
|
{
|
|
|
|
|
return dst->xfrm;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif /* _NET_DST_H */
|