2005-04-17 00:20:36 +02: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
|
|
|
|
|
2005-12-27 05:43:12 +01:00
|
|
|
#include <linux/netdevice.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
#include <linux/rcupdate.h>
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <net/neighbour.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 0 - no debugging messages
|
|
|
|
* 1 - rare events and bugs (default)
|
|
|
|
* 2 - trace mode.
|
|
|
|
*/
|
|
|
|
#define RT_CACHE_DEBUG 0
|
|
|
|
|
|
|
|
#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;
|
|
|
|
|
|
|
|
struct dst_entry
|
|
|
|
{
|
2007-02-10 01:26:55 +01:00
|
|
|
struct rcu_head rcu_head;
|
2005-04-17 00:20:36 +02:00
|
|
|
struct dst_entry *child;
|
|
|
|
struct net_device *dev;
|
2005-04-20 05:46:37 +02:00
|
|
|
short error;
|
|
|
|
short obsolete;
|
2005-04-17 00:20:36 +02:00
|
|
|
int flags;
|
|
|
|
#define DST_HOST 1
|
|
|
|
#define DST_NOXFRM 2
|
|
|
|
#define DST_NOPOLICY 4
|
|
|
|
#define DST_NOHASH 8
|
|
|
|
unsigned long expires;
|
|
|
|
|
|
|
|
unsigned short header_len; /* more space at head required */
|
|
|
|
unsigned short trailer_len; /* space to reserve at tail */
|
|
|
|
|
2008-01-22 15:18:34 +01:00
|
|
|
unsigned int rate_tokens;
|
[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 06:52:37 +01:00
|
|
|
unsigned long rate_last; /* rate limiting for ICMP */
|
2008-01-22 15:18:34 +01:00
|
|
|
|
[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 06:52:37 +01:00
|
|
|
struct dst_entry *path;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
struct neighbour *neighbour;
|
|
|
|
struct hh_cache *hh;
|
|
|
|
struct xfrm_state *xfrm;
|
|
|
|
|
|
|
|
int (*input)(struct sk_buff*);
|
|
|
|
int (*output)(struct sk_buff*);
|
|
|
|
|
|
|
|
struct dst_ops *ops;
|
[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 06:52:37 +01:00
|
|
|
|
|
|
|
u32 metrics[RTAX_MAX];
|
|
|
|
|
|
|
|
#ifdef CONFIG_NET_CLS_ROUTE
|
|
|
|
__u32 tclassid;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* __refcnt wants to be on a different cache line from
|
|
|
|
* input/output/ops or performance tanks badly
|
|
|
|
*/
|
2007-02-10 01:26:55 +01: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 06:52:37 +01:00
|
|
|
unsigned long lastuse;
|
2007-02-10 01:26:55 +01:00
|
|
|
union {
|
|
|
|
struct dst_entry *next;
|
|
|
|
struct rtable *rt_next;
|
|
|
|
struct rt6_info *rt6_next;
|
|
|
|
struct dn_route *dn_next;
|
|
|
|
};
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct dst_ops
|
|
|
|
{
|
|
|
|
unsigned short family;
|
2006-09-28 23:20:34 +02:00
|
|
|
__be16 protocol;
|
2005-04-17 00:20:36 +02:00
|
|
|
unsigned gc_thresh;
|
|
|
|
|
2008-01-18 12:56:57 +01:00
|
|
|
int (*gc)(struct dst_ops *ops);
|
2005-04-17 00:20:36 +02:00
|
|
|
struct dst_entry * (*check)(struct dst_entry *, __u32 cookie);
|
|
|
|
void (*destroy)(struct dst_entry *);
|
|
|
|
void (*ifdown)(struct dst_entry *,
|
|
|
|
struct net_device *dev, int how);
|
|
|
|
struct dst_entry * (*negative_advice)(struct dst_entry *);
|
|
|
|
void (*link_failure)(struct sk_buff *);
|
|
|
|
void (*update_pmtu)(struct dst_entry *dst, u32 mtu);
|
2007-11-14 06:43:11 +01:00
|
|
|
int (*local_out)(struct sk_buff *skb);
|
2005-04-17 00:20:36 +02:00
|
|
|
int entry_size;
|
|
|
|
|
|
|
|
atomic_t entries;
|
2006-12-07 05:33:20 +01:00
|
|
|
struct kmem_cache *kmem_cachep;
|
2008-01-18 12:58:07 +01:00
|
|
|
struct net *dst_net;
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
|
|
|
|
static inline u32
|
|
|
|
dst_metric(const struct dst_entry *dst, int metric)
|
|
|
|
{
|
|
|
|
return dst->metrics[metric-1];
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 dst_mtu(const struct dst_entry *dst)
|
|
|
|
{
|
|
|
|
u32 mtu = dst_metric(dst, RTAX_MTU);
|
|
|
|
/*
|
|
|
|
* Alexey put it here, so ask him about it :)
|
|
|
|
*/
|
|
|
|
barrier();
|
|
|
|
return mtu;
|
|
|
|
}
|
|
|
|
|
2008-07-19 08:02:15 +02: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));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
|
|
|
|
unsigned long rtt)
|
|
|
|
{
|
|
|
|
dst->metrics[metric-1] = jiffies_to_msecs(rtt);
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static inline u32
|
|
|
|
dst_allfrag(const struct dst_entry *dst)
|
|
|
|
{
|
|
|
|
int ret = dst_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
|
|
|
|
/* Yes, _exactly_. This is paranoia. */
|
|
|
|
barrier();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
dst_metric_locked(struct dst_entry *dst, int metric)
|
|
|
|
{
|
|
|
|
return dst_metric(dst, RTAX_LOCK) & (1<<metric);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dst_hold(struct dst_entry * dst)
|
|
|
|
{
|
|
|
|
atomic_inc(&dst->__refcnt);
|
|
|
|
}
|
|
|
|
|
2007-11-11 06:28:34 +01:00
|
|
|
static inline void dst_use(struct dst_entry *dst, unsigned long time)
|
|
|
|
{
|
|
|
|
dst_hold(dst);
|
|
|
|
dst->__use++;
|
|
|
|
dst->lastuse = time;
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static inline
|
|
|
|
struct dst_entry * dst_clone(struct dst_entry * dst)
|
|
|
|
{
|
|
|
|
if (dst)
|
|
|
|
atomic_inc(&dst->__refcnt);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2008-03-28 01:53:31 +01:00
|
|
|
extern void dst_release(struct dst_entry *dst);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Children define the path of the packet through the
|
|
|
|
* Linux networking. Thus, destinations are stackable.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline struct dst_entry *dst_pop(struct dst_entry *dst)
|
|
|
|
{
|
|
|
|
struct dst_entry *child = dst_clone(dst->child);
|
|
|
|
|
|
|
|
dst_release(dst);
|
|
|
|
return child;
|
|
|
|
}
|
|
|
|
|
2007-11-14 06:34:06 +01:00
|
|
|
extern int dst_discard(struct sk_buff *skb);
|
2005-04-17 00:20:36 +02:00
|
|
|
extern void * dst_alloc(struct dst_ops * ops);
|
|
|
|
extern void __dst_free(struct dst_entry * dst);
|
|
|
|
extern struct dst_entry *dst_destroy(struct dst_entry * dst);
|
|
|
|
|
|
|
|
static inline void dst_free(struct dst_entry * dst)
|
|
|
|
{
|
|
|
|
if (dst->obsolete > 1)
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
if (dst)
|
|
|
|
neigh_confirm(dst->neighbour);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dst_negative_advice(struct dst_entry **dst_p)
|
|
|
|
{
|
|
|
|
struct dst_entry * dst = *dst_p;
|
|
|
|
if (dst && dst->ops->negative_advice)
|
|
|
|
*dst_p = dst->ops->negative_advice(dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dst_link_failure(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct dst_entry * dst = skb->dst;
|
|
|
|
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)
|
|
|
|
{
|
2006-01-07 08:01:48 +01:00
|
|
|
return skb->dst->output(skb);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Input packet from network to transport. */
|
|
|
|
static inline int dst_input(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
err = skb->dst->input(skb);
|
|
|
|
|
|
|
|
if (likely(err == 0))
|
|
|
|
return err;
|
|
|
|
/* Oh, Jamal... Seems, I will not forgive you this mess. :-) */
|
|
|
|
if (unlikely(err != NET_XMIT_BYPASS))
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)
|
|
|
|
{
|
|
|
|
if (dst->obsolete)
|
|
|
|
dst = dst->ops->check(dst, cookie);
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern void dst_init(void);
|
|
|
|
|
2007-12-12 19:36:59 +01:00
|
|
|
/* Flags for xfrm_lookup flags argument. */
|
|
|
|
enum {
|
|
|
|
XFRM_LOOKUP_WAIT = 1 << 0,
|
2007-12-12 19:44:43 +01:00
|
|
|
XFRM_LOOKUP_ICMP = 1 << 1,
|
2007-12-12 19:36:59 +01:00
|
|
|
};
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
struct flowi;
|
|
|
|
#ifndef CONFIG_XFRM
|
|
|
|
static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
|
|
|
|
struct sock *sk, int flags)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2007-05-25 03:17:54 +02:00
|
|
|
static inline int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
|
|
|
|
struct sock *sk, int flags)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
#else
|
|
|
|
extern int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
|
|
|
|
struct sock *sk, int flags);
|
2007-05-25 03:17:54 +02:00
|
|
|
extern int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
|
|
|
|
struct sock *sk, int flags);
|
2005-04-17 00:20:36 +02:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* _NET_DST_H */
|