Commit 2600badf authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'net-refcount-address-dst_entry-reference-count-scalability-issues'

Thomas Gleixner says:

====================
net, refcount: Address dst_entry reference count scalability issues

This is version 3 of this series. Version 2 can be found here:

     https://lore.kernel.org/lkml/20230307125358.772287565@linutronix.de

Wangyang and Arjan reported a bottleneck in the networking code related to
struct dst_entry::__refcnt. Performance tanks massively when concurrency on
a dst_entry increases.

This happens when there are a large amount of connections to or from the
same IP address. The memtier benchmark when run on the same host as
memcached amplifies this massively. But even over real network connections
this issue can be observed at an obviously smaller scale (due to the
network bandwith limitations in my setup, i.e. 1Gb). How to reproduce:

  Run memcached with -t $N and memtier_benchmark with -t $M and --ratio=1:100
  on the same machine. localhost connections amplify the problem.

  Start with the defaults for $N and $M and increase them. Depending on
  your machine this will tank at some point. But even in reasonably small
  $N, $M scenarios the refcount operations and the resulting false sharing
  fallout becomes visible in perf top. At some point it becomes the
  dominating issue.

There are two factors which make this reference count a scalability issue:

   1) False sharing

      dst_entry:__refcnt is located at offset 64 of dst_entry, which puts
      it into a seperate cacheline vs. the read mostly members located at
      the beginning of the struct.

      That prevents false sharing vs. the struct members in the first 64
      bytes of the structure, but there is also

      	    dst_entry::lwtstate

      which is located after the reference count and in the same cache
      line. This member is read after a reference count has been acquired.

      The other problem is struct rtable, which embeds a struct dst_entry
      at offset 0. struct dst_entry has a size of 112 bytes, which means
      that the struct members of rtable which follow the dst member share
      the same cache line as dst_entry::__refcnt. Especially

      	  rtable::rt_genid

      is also read by the contexts which have a reference count acquired
      already.

      When dst_entry:__refcnt is incremented or decremented via an atomic
      operation these read accesses stall and contribute to the performance
      problem.

   2) atomic_inc_not_zero()

      A reference on dst_entry:__refcnt is acquired via
      atomic_inc_not_zero() and released via atomic_dec_return().

      atomic_inc_not_zero() is implemted via a atomic_try_cmpxchg() loop,
      which exposes O(N^2) behaviour under contention with N concurrent
      operations. Contention scalability is degrading with even a small
      amount of contenders and gets worse from there.

      Lightweight instrumentation exposed an average of 8!! retry loops per
      atomic_inc_not_zero() invocation in a inc()/dec() loop running
      concurrently on 112 CPUs.

      There is nothing which can be done to make atomic_inc_not_zero() more
      scalable.

The following series addresses these issues:

    1) Reorder and pad struct dst_entry to prevent the false sharing.

    2) Implement and use a reference count implementation which avoids the
       atomic_inc_not_zero() problem.

       It is slightly less performant in the case of the final 0 -> -1
       transition, but the deconstruction of these objects is a low
       frequency event. get()/put() pairs are in the hotpath and that's
       what this implementation optimizes for.

       The algorithm of this reference count is only suitable for RCU
       managed objects. Therefore it cannot replace the refcount_t
       algorithm, which is also based on atomic_inc_not_zero(), due to a
       subtle race condition related to the 0 -> -1 transition and the final
       verdict to mark the reference count dead. See details in patch 2/3.

       It might be just my lack of imagination which declares this to be
       impossible and I'd be happy to be proven wrong.

       As a bonus the new rcuref implementation provides underflow/overflow
       detection and mitigation while being performance wise on par with
       open coded atomic_inc_not_zero() / atomic_dec_return() pairs even in
       the non-contended case.

The combination of these two changes results in performance gains in micro
benchmarks and also localhost and networked memtier benchmarks talking to
memcached. It's hard to quantify the benchmark results as they depend
heavily on the micro-architecture and the number of concurrent operations.

The overall gain of both changes for localhost memtier ranges from 1.2X to
3.2X and from +2% to %5% range for networked operations on a 1Gb connection.

A micro benchmark which enforces maximized concurrency shows a gain between
1.2X and 4.7X!!!

Obviously this is focussed on a particular problem and therefore needs to
be discussed in detail. It also requires wider testing outside of the cases
which this is focussed on.

Though the false sharing issue is obvious and should be addressed
independent of the more focussed reference count changes.

The series is also available from git:

  git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git rcuref

Changes vs. V2:

  - Rename __refcnt to __rcuref (Linus)

  - Fix comments and changelogs (Mark, Qiuxu)

  - Fixup kernel doc of generated atomic_add_negative() variants

I want to say thanks to Wangyang who analyzed the issue and provided the
initial fix for the false sharing problem. Further thanks go to Arjan
Peter, Marc, Will and Borislav for valuable input and providing test
results on machines which I do not have access to, and to Linus and
Eric, Qiuxu and Mark for helpful feedback.
====================

Link: https://lore.kernel.org/r/20230323102649.764958589@linutronix.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b133fffe bc9d3a9f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/rcuref.h>
#include <net/neighbour.h> #include <net/neighbour.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/indirect_call_wrapper.h> #include <linux/indirect_call_wrapper.h>
...@@ -61,23 +62,36 @@ struct dst_entry { ...@@ -61,23 +62,36 @@ struct dst_entry {
unsigned short trailer_len; /* space to reserve at tail */ unsigned short trailer_len; /* space to reserve at tail */
/* /*
* __refcnt wants to be on a different cache line from * __rcuref wants to be on a different cache line from
* input/output/ops or performance tanks badly * input/output/ops or performance tanks badly
*/ */
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
atomic_t __refcnt; /* 64-bit offset 64 */ rcuref_t __rcuref; /* 64-bit offset 64 */
#endif #endif
int __use; int __use;
unsigned long lastuse; unsigned long lastuse;
struct lwtunnel_state *lwtstate;
struct rcu_head rcu_head; struct rcu_head rcu_head;
short error; short error;
short __pad; short __pad;
__u32 tclassid; __u32 tclassid;
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT
atomic_t __refcnt; /* 32-bit offset 64 */ struct lwtunnel_state *lwtstate;
rcuref_t __rcuref; /* 32-bit offset 64 */
#endif #endif
netdevice_tracker dev_tracker; netdevice_tracker dev_tracker;
/*
* Used by rtable and rt6_info. Moves lwtstate into the next cache
* line on 64bit so that lwtstate does not cause false sharing with
* __rcuref under contention of __rcuref. This also puts the
* frequently accessed members of rtable and rt6_info out of the
* __rcuref cache line.
*/
struct list_head rt_uncached;
struct uncached_list *rt_uncached_list;
#ifdef CONFIG_64BIT
struct lwtunnel_state *lwtstate;
#endif
}; };
struct dst_metrics { struct dst_metrics {
...@@ -225,10 +239,10 @@ static inline void dst_hold(struct dst_entry *dst) ...@@ -225,10 +239,10 @@ static inline void dst_hold(struct dst_entry *dst)
{ {
/* /*
* If your kernel compilation stops here, please check * If your kernel compilation stops here, please check
* the placement of __refcnt in struct dst_entry * the placement of __rcuref in struct dst_entry
*/ */
BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63); BUILD_BUG_ON(offsetof(struct dst_entry, __rcuref) & 63);
WARN_ON(atomic_inc_not_zero(&dst->__refcnt) == 0); WARN_ON(!rcuref_get(&dst->__rcuref));
} }
static inline void dst_use_noref(struct dst_entry *dst, unsigned long time) static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
...@@ -292,7 +306,7 @@ static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb ...@@ -292,7 +306,7 @@ static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb
*/ */
static inline bool dst_hold_safe(struct dst_entry *dst) static inline bool dst_hold_safe(struct dst_entry *dst)
{ {
return atomic_inc_not_zero(&dst->__refcnt); return rcuref_get(&dst->__rcuref);
} }
/** /**
......
...@@ -217,9 +217,6 @@ struct rt6_info { ...@@ -217,9 +217,6 @@ struct rt6_info {
struct inet6_dev *rt6i_idev; struct inet6_dev *rt6i_idev;
u32 rt6i_flags; u32 rt6i_flags;
struct list_head rt6i_uncached;
struct uncached_list *rt6i_uncached_list;
/* more non-fragment space at head required */ /* more non-fragment space at head required */
unsigned short rt6i_nfheader_len; unsigned short rt6i_nfheader_len;
}; };
......
...@@ -100,7 +100,7 @@ static inline struct dst_entry *ip6_route_output(struct net *net, ...@@ -100,7 +100,7 @@ static inline struct dst_entry *ip6_route_output(struct net *net,
static inline void ip6_rt_put_flags(struct rt6_info *rt, int flags) static inline void ip6_rt_put_flags(struct rt6_info *rt, int flags)
{ {
if (!(flags & RT6_LOOKUP_F_DST_NOREF) || if (!(flags & RT6_LOOKUP_F_DST_NOREF) ||
!list_empty(&rt->rt6i_uncached)) !list_empty(&rt->dst.rt_uncached))
ip6_rt_put(rt); ip6_rt_put(rt);
} }
......
...@@ -78,9 +78,6 @@ struct rtable { ...@@ -78,9 +78,6 @@ struct rtable {
/* Miscellaneous cached information */ /* Miscellaneous cached information */
u32 rt_mtu_locked:1, u32 rt_mtu_locked:1,
rt_pmtu:31; rt_pmtu:31;
struct list_head rt_uncached;
struct uncached_list *rt_uncached_list;
}; };
static inline bool rt_is_input_route(const struct rtable *rt) static inline bool rt_is_input_route(const struct rtable *rt)
......
...@@ -2131,7 +2131,7 @@ sk_dst_get(struct sock *sk) ...@@ -2131,7 +2131,7 @@ sk_dst_get(struct sock *sk)
rcu_read_lock(); rcu_read_lock();
dst = rcu_dereference(sk->sk_dst_cache); dst = rcu_dereference(sk->sk_dst_cache);
if (dst && !atomic_inc_not_zero(&dst->__refcnt)) if (dst && !rcuref_get(&dst->__rcuref))
dst = NULL; dst = NULL;
rcu_read_unlock(); rcu_read_unlock();
return dst; return dst;
......
...@@ -73,7 +73,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) ...@@ -73,7 +73,7 @@ void br_netfilter_rtable_init(struct net_bridge *br)
{ {
struct rtable *rt = &br->fake_rtable; struct rtable *rt = &br->fake_rtable;
atomic_set(&rt->dst.__refcnt, 1); rcuref_init(&rt->dst.__rcuref, 1);
rt->dst.dev = br->dev; rt->dst.dev = br->dev;
dst_init_metrics(&rt->dst, br_dst_default_metrics, true); dst_init_metrics(&rt->dst, br_dst_default_metrics, true);
rt->dst.flags = DST_NOXFRM | DST_FAKE_RTABLE; rt->dst.flags = DST_NOXFRM | DST_FAKE_RTABLE;
......
...@@ -66,7 +66,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops, ...@@ -66,7 +66,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,
dst->tclassid = 0; dst->tclassid = 0;
#endif #endif
dst->lwtstate = NULL; dst->lwtstate = NULL;
atomic_set(&dst->__refcnt, initial_ref); rcuref_init(&dst->__rcuref, initial_ref);
dst->__use = 0; dst->__use = 0;
dst->lastuse = jiffies; dst->lastuse = jiffies;
dst->flags = flags; dst->flags = flags;
...@@ -162,31 +162,15 @@ EXPORT_SYMBOL(dst_dev_put); ...@@ -162,31 +162,15 @@ EXPORT_SYMBOL(dst_dev_put);
void dst_release(struct dst_entry *dst) void dst_release(struct dst_entry *dst)
{ {
if (dst) { if (dst && rcuref_put(&dst->__rcuref))
int newrefcnt; call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
newrefcnt = atomic_dec_return(&dst->__refcnt);
if (WARN_ONCE(newrefcnt < 0, "dst_release underflow"))
net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
__func__, dst, newrefcnt);
if (!newrefcnt)
call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
}
} }
EXPORT_SYMBOL(dst_release); EXPORT_SYMBOL(dst_release);
void dst_release_immediate(struct dst_entry *dst) void dst_release_immediate(struct dst_entry *dst)
{ {
if (dst) { if (dst && rcuref_put(&dst->__rcuref))
int newrefcnt; dst_destroy(dst);
newrefcnt = atomic_dec_return(&dst->__refcnt);
if (WARN_ONCE(newrefcnt < 0, "dst_release_immediate underflow"))
net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
__func__, dst, newrefcnt);
if (!newrefcnt)
dst_destroy(dst);
}
} }
EXPORT_SYMBOL(dst_release_immediate); EXPORT_SYMBOL(dst_release_immediate);
......
...@@ -843,7 +843,7 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, ...@@ -843,7 +843,7 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,
if (dst) { if (dst) {
ci.rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse); ci.rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse);
ci.rta_used = dst->__use; ci.rta_used = dst->__use;
ci.rta_clntref = atomic_read(&dst->__refcnt); ci.rta_clntref = rcuref_read(&dst->__rcuref);
} }
if (expires) { if (expires) {
unsigned long clock; unsigned long clock;
......
...@@ -1508,20 +1508,20 @@ void rt_add_uncached_list(struct rtable *rt) ...@@ -1508,20 +1508,20 @@ void rt_add_uncached_list(struct rtable *rt)
{ {
struct uncached_list *ul = raw_cpu_ptr(&rt_uncached_list); struct uncached_list *ul = raw_cpu_ptr(&rt_uncached_list);
rt->rt_uncached_list = ul; rt->dst.rt_uncached_list = ul;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_add_tail(&rt->rt_uncached, &ul->head); list_add_tail(&rt->dst.rt_uncached, &ul->head);
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
} }
void rt_del_uncached_list(struct rtable *rt) void rt_del_uncached_list(struct rtable *rt)
{ {
if (!list_empty(&rt->rt_uncached)) { if (!list_empty(&rt->dst.rt_uncached)) {
struct uncached_list *ul = rt->rt_uncached_list; struct uncached_list *ul = rt->dst.rt_uncached_list;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_del_init(&rt->rt_uncached); list_del_init(&rt->dst.rt_uncached);
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
} }
} }
...@@ -1546,13 +1546,13 @@ void rt_flush_dev(struct net_device *dev) ...@@ -1546,13 +1546,13 @@ void rt_flush_dev(struct net_device *dev)
continue; continue;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_for_each_entry_safe(rt, safe, &ul->head, rt_uncached) { list_for_each_entry_safe(rt, safe, &ul->head, dst.rt_uncached) {
if (rt->dst.dev != dev) if (rt->dst.dev != dev)
continue; continue;
rt->dst.dev = blackhole_netdev; rt->dst.dev = blackhole_netdev;
netdev_ref_replace(dev, blackhole_netdev, netdev_ref_replace(dev, blackhole_netdev,
&rt->dst.dev_tracker, GFP_ATOMIC); &rt->dst.dev_tracker, GFP_ATOMIC);
list_move(&rt->rt_uncached, &ul->quarantine); list_move(&rt->dst.rt_uncached, &ul->quarantine);
} }
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
} }
...@@ -1644,7 +1644,7 @@ struct rtable *rt_dst_alloc(struct net_device *dev, ...@@ -1644,7 +1644,7 @@ struct rtable *rt_dst_alloc(struct net_device *dev,
rt->rt_uses_gateway = 0; rt->rt_uses_gateway = 0;
rt->rt_gw_family = 0; rt->rt_gw_family = 0;
rt->rt_gw4 = 0; rt->rt_gw4 = 0;
INIT_LIST_HEAD(&rt->rt_uncached); INIT_LIST_HEAD(&rt->dst.rt_uncached);
rt->dst.output = ip_output; rt->dst.output = ip_output;
if (flags & RTCF_LOCAL) if (flags & RTCF_LOCAL)
...@@ -1675,7 +1675,7 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt) ...@@ -1675,7 +1675,7 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt)
new_rt->rt_gw4 = rt->rt_gw4; new_rt->rt_gw4 = rt->rt_gw4;
else if (rt->rt_gw_family == AF_INET6) else if (rt->rt_gw_family == AF_INET6)
new_rt->rt_gw6 = rt->rt_gw6; new_rt->rt_gw6 = rt->rt_gw6;
INIT_LIST_HEAD(&new_rt->rt_uncached); INIT_LIST_HEAD(&new_rt->dst.rt_uncached);
new_rt->dst.input = rt->dst.input; new_rt->dst.input = rt->dst.input;
new_rt->dst.output = rt->dst.output; new_rt->dst.output = rt->dst.output;
...@@ -2859,7 +2859,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or ...@@ -2859,7 +2859,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
else if (rt->rt_gw_family == AF_INET6) else if (rt->rt_gw_family == AF_INET6)
rt->rt_gw6 = ort->rt_gw6; rt->rt_gw6 = ort->rt_gw6;
INIT_LIST_HEAD(&rt->rt_uncached); INIT_LIST_HEAD(&rt->dst.rt_uncached);
} }
dst_release(dst_orig); dst_release(dst_orig);
......
...@@ -91,7 +91,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ...@@ -91,7 +91,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
xdst->u.rt.rt_gw6 = rt->rt_gw6; xdst->u.rt.rt_gw6 = rt->rt_gw6;
xdst->u.rt.rt_pmtu = rt->rt_pmtu; xdst->u.rt.rt_pmtu = rt->rt_pmtu;
xdst->u.rt.rt_mtu_locked = rt->rt_mtu_locked; xdst->u.rt.rt_mtu_locked = rt->rt_mtu_locked;
INIT_LIST_HEAD(&xdst->u.rt.rt_uncached); INIT_LIST_HEAD(&xdst->u.rt.dst.rt_uncached);
rt_add_uncached_list(&xdst->u.rt); rt_add_uncached_list(&xdst->u.rt);
return 0; return 0;
...@@ -121,7 +121,7 @@ static void xfrm4_dst_destroy(struct dst_entry *dst) ...@@ -121,7 +121,7 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)
struct xfrm_dst *xdst = (struct xfrm_dst *)dst; struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
dst_destroy_metrics_generic(dst); dst_destroy_metrics_generic(dst);
if (xdst->u.rt.rt_uncached_list) if (xdst->u.rt.dst.rt_uncached_list)
rt_del_uncached_list(&xdst->u.rt); rt_del_uncached_list(&xdst->u.rt);
xfrm_dst_destroy(xdst); xfrm_dst_destroy(xdst);
} }
......
...@@ -139,20 +139,20 @@ void rt6_uncached_list_add(struct rt6_info *rt) ...@@ -139,20 +139,20 @@ void rt6_uncached_list_add(struct rt6_info *rt)
{ {
struct uncached_list *ul = raw_cpu_ptr(&rt6_uncached_list); struct uncached_list *ul = raw_cpu_ptr(&rt6_uncached_list);
rt->rt6i_uncached_list = ul; rt->dst.rt_uncached_list = ul;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_add_tail(&rt->rt6i_uncached, &ul->head); list_add_tail(&rt->dst.rt_uncached, &ul->head);
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
} }
void rt6_uncached_list_del(struct rt6_info *rt) void rt6_uncached_list_del(struct rt6_info *rt)
{ {
if (!list_empty(&rt->rt6i_uncached)) { if (!list_empty(&rt->dst.rt_uncached)) {
struct uncached_list *ul = rt->rt6i_uncached_list; struct uncached_list *ul = rt->dst.rt_uncached_list;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_del_init(&rt->rt6i_uncached); list_del_init(&rt->dst.rt_uncached);
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
} }
} }
...@@ -169,7 +169,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev) ...@@ -169,7 +169,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev)
continue; continue;
spin_lock_bh(&ul->lock); spin_lock_bh(&ul->lock);
list_for_each_entry_safe(rt, safe, &ul->head, rt6i_uncached) { list_for_each_entry_safe(rt, safe, &ul->head, dst.rt_uncached) {
struct inet6_dev *rt_idev = rt->rt6i_idev; struct inet6_dev *rt_idev = rt->rt6i_idev;
struct net_device *rt_dev = rt->dst.dev; struct net_device *rt_dev = rt->dst.dev;
bool handled = false; bool handled = false;
...@@ -188,7 +188,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev) ...@@ -188,7 +188,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev)
handled = true; handled = true;
} }
if (handled) if (handled)
list_move(&rt->rt6i_uncached, list_move(&rt->dst.rt_uncached,
&ul->quarantine); &ul->quarantine);
} }
spin_unlock_bh(&ul->lock); spin_unlock_bh(&ul->lock);
...@@ -293,7 +293,7 @@ static const struct fib6_info fib6_null_entry_template = { ...@@ -293,7 +293,7 @@ static const struct fib6_info fib6_null_entry_template = {
static const struct rt6_info ip6_null_entry_template = { static const struct rt6_info ip6_null_entry_template = {
.dst = { .dst = {
.__refcnt = ATOMIC_INIT(1), .__rcuref = RCUREF_INIT(1),
.__use = 1, .__use = 1,
.obsolete = DST_OBSOLETE_FORCE_CHK, .obsolete = DST_OBSOLETE_FORCE_CHK,
.error = -ENETUNREACH, .error = -ENETUNREACH,
...@@ -307,7 +307,7 @@ static const struct rt6_info ip6_null_entry_template = { ...@@ -307,7 +307,7 @@ static const struct rt6_info ip6_null_entry_template = {
static const struct rt6_info ip6_prohibit_entry_template = { static const struct rt6_info ip6_prohibit_entry_template = {
.dst = { .dst = {
.__refcnt = ATOMIC_INIT(1), .__rcuref = RCUREF_INIT(1),
.__use = 1, .__use = 1,
.obsolete = DST_OBSOLETE_FORCE_CHK, .obsolete = DST_OBSOLETE_FORCE_CHK,
.error = -EACCES, .error = -EACCES,
...@@ -319,7 +319,7 @@ static const struct rt6_info ip6_prohibit_entry_template = { ...@@ -319,7 +319,7 @@ static const struct rt6_info ip6_prohibit_entry_template = {
static const struct rt6_info ip6_blk_hole_entry_template = { static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = { .dst = {
.__refcnt = ATOMIC_INIT(1), .__rcuref = RCUREF_INIT(1),
.__use = 1, .__use = 1,
.obsolete = DST_OBSOLETE_FORCE_CHK, .obsolete = DST_OBSOLETE_FORCE_CHK,
.error = -EINVAL, .error = -EINVAL,
...@@ -334,7 +334,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = { ...@@ -334,7 +334,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = {
static void rt6_info_init(struct rt6_info *rt) static void rt6_info_init(struct rt6_info *rt)
{ {
memset_after(rt, 0, dst); memset_after(rt, 0, dst);
INIT_LIST_HEAD(&rt->rt6i_uncached); INIT_LIST_HEAD(&rt->dst.rt_uncached);
} }
/* allocate dst with ip6_dst_ops */ /* allocate dst with ip6_dst_ops */
...@@ -2638,7 +2638,7 @@ struct dst_entry *ip6_route_output_flags(struct net *net, ...@@ -2638,7 +2638,7 @@ struct dst_entry *ip6_route_output_flags(struct net *net,
dst = ip6_route_output_flags_noref(net, sk, fl6, flags); dst = ip6_route_output_flags_noref(net, sk, fl6, flags);
rt6 = (struct rt6_info *)dst; rt6 = (struct rt6_info *)dst;
/* For dst cached in uncached_list, refcnt is already taken. */ /* For dst cached in uncached_list, refcnt is already taken. */
if (list_empty(&rt6->rt6i_uncached) && !dst_hold_safe(dst)) { if (list_empty(&rt6->dst.rt_uncached) && !dst_hold_safe(dst)) {
dst = &net->ipv6.ip6_null_entry->dst; dst = &net->ipv6.ip6_null_entry->dst;
dst_hold(dst); dst_hold(dst);
} }
...@@ -2748,7 +2748,7 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry *ip6_dst_check(struct dst_entry *dst, ...@@ -2748,7 +2748,7 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry *ip6_dst_check(struct dst_entry *dst,
from = rcu_dereference(rt->from); from = rcu_dereference(rt->from);
if (from && (rt->rt6i_flags & RTF_PCPU || if (from && (rt->rt6i_flags & RTF_PCPU ||
unlikely(!list_empty(&rt->rt6i_uncached)))) unlikely(!list_empty(&rt->dst.rt_uncached))))
dst_ret = rt6_dst_from_check(rt, from, cookie); dst_ret = rt6_dst_from_check(rt, from, cookie);
else else
dst_ret = rt6_check(rt, from, cookie); dst_ret = rt6_check(rt, from, cookie);
...@@ -6477,7 +6477,7 @@ static int __net_init ip6_route_net_init(struct net *net) ...@@ -6477,7 +6477,7 @@ static int __net_init ip6_route_net_init(struct net *net)
net->ipv6.ip6_null_entry->dst.ops = &net->ipv6.ip6_dst_ops; net->ipv6.ip6_null_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_null_entry->dst, dst_init_metrics(&net->ipv6.ip6_null_entry->dst,
ip6_template_metrics, true); ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_null_entry->rt6i_uncached); INIT_LIST_HEAD(&net->ipv6.ip6_null_entry->dst.rt_uncached);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES #ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false; net->ipv6.fib6_has_custom_rules = false;
...@@ -6489,7 +6489,7 @@ static int __net_init ip6_route_net_init(struct net *net) ...@@ -6489,7 +6489,7 @@ static int __net_init ip6_route_net_init(struct net *net)
net->ipv6.ip6_prohibit_entry->dst.ops = &net->ipv6.ip6_dst_ops; net->ipv6.ip6_prohibit_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_prohibit_entry->dst, dst_init_metrics(&net->ipv6.ip6_prohibit_entry->dst,
ip6_template_metrics, true); ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached);
net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template, net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,
sizeof(*net->ipv6.ip6_blk_hole_entry), sizeof(*net->ipv6.ip6_blk_hole_entry),
...@@ -6499,7 +6499,7 @@ static int __net_init ip6_route_net_init(struct net *net) ...@@ -6499,7 +6499,7 @@ static int __net_init ip6_route_net_init(struct net *net)
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true); ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_blk_hole_entry->rt6i_uncached); INIT_LIST_HEAD(&net->ipv6.ip6_blk_hole_entry->dst.rt_uncached);
#ifdef CONFIG_IPV6_SUBTREES #ifdef CONFIG_IPV6_SUBTREES
net->ipv6.fib6_routes_require_src = 0; net->ipv6.fib6_routes_require_src = 0;
#endif #endif
......
...@@ -89,7 +89,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ...@@ -89,7 +89,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
xdst->u.rt6.rt6i_gateway = rt->rt6i_gateway; xdst->u.rt6.rt6i_gateway = rt->rt6i_gateway;
xdst->u.rt6.rt6i_dst = rt->rt6i_dst; xdst->u.rt6.rt6i_dst = rt->rt6i_dst;
xdst->u.rt6.rt6i_src = rt->rt6i_src; xdst->u.rt6.rt6i_src = rt->rt6i_src;
INIT_LIST_HEAD(&xdst->u.rt6.rt6i_uncached); INIT_LIST_HEAD(&xdst->u.rt6.dst.rt_uncached);
rt6_uncached_list_add(&xdst->u.rt6); rt6_uncached_list_add(&xdst->u.rt6);
return 0; return 0;
...@@ -121,7 +121,7 @@ static void xfrm6_dst_destroy(struct dst_entry *dst) ...@@ -121,7 +121,7 @@ static void xfrm6_dst_destroy(struct dst_entry *dst)
if (likely(xdst->u.rt6.rt6i_idev)) if (likely(xdst->u.rt6.rt6i_idev))
in6_dev_put(xdst->u.rt6.rt6i_idev); in6_dev_put(xdst->u.rt6.rt6i_idev);
dst_destroy_metrics_generic(dst); dst_destroy_metrics_generic(dst);
if (xdst->u.rt6.rt6i_uncached_list) if (xdst->u.rt6.dst.rt_uncached_list)
rt6_uncached_list_del(&xdst->u.rt6); rt6_uncached_list_del(&xdst->u.rt6);
xfrm_dst_destroy(xdst); xfrm_dst_destroy(xdst);
} }
......
...@@ -339,7 +339,7 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb, ...@@ -339,7 +339,7 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
spin_unlock_bh(&dest->dst_lock); spin_unlock_bh(&dest->dst_lock);
IP_VS_DBG(10, "new dst %pI4, src %pI4, refcnt=%d\n", IP_VS_DBG(10, "new dst %pI4, src %pI4, refcnt=%d\n",
&dest->addr.ip, &dest_dst->dst_saddr.ip, &dest->addr.ip, &dest_dst->dst_saddr.ip,
atomic_read(&rt->dst.__refcnt)); rcuref_read(&rt->dst.__rcuref));
} }
if (ret_saddr) if (ret_saddr)
*ret_saddr = dest_dst->dst_saddr.ip; *ret_saddr = dest_dst->dst_saddr.ip;
...@@ -507,7 +507,7 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb, ...@@ -507,7 +507,7 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
spin_unlock_bh(&dest->dst_lock); spin_unlock_bh(&dest->dst_lock);
IP_VS_DBG(10, "new dst %pI6, src %pI6, refcnt=%d\n", IP_VS_DBG(10, "new dst %pI6, src %pI6, refcnt=%d\n",
&dest->addr.in6, &dest_dst->dst_saddr.in6, &dest->addr.in6, &dest_dst->dst_saddr.in6,
atomic_read(&rt->dst.__refcnt)); rcuref_read(&rt->dst.__rcuref));
} }
if (ret_saddr) if (ret_saddr)
*ret_saddr = dest_dst->dst_saddr.in6; *ret_saddr = dest_dst->dst_saddr.in6;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment