kernel/include/net/dst.h, branch linux-4.16.y

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-01-29T15:15:51Z

Signed-off-by: David S. Miller

net: don't call update_pmtu unconditionally

2018-01-25T21:27:34Z

Some dst_ops (e.g. md_dst_ops)) doesn't set this handler. It may result to: "BUG: unable to handle kernel NULL pointer dereference at (null)" Let's add a helper to check if update_pmtu is available before calling it. Fixes: 52a589d51f10 ("geneve: update skb dst pmtu on tx path") Fixes: a93bf0ff4490 ("vxlan: update skb dst pmtu on tx path") CC: Roman Kapl CC: Xin Long Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller

net: Remove dst->next

2017-11-30T14:54:27Z

There are no more users. Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

net: Rearrange dst_entry layout to avoid useless padding.

2017-11-30T14:54:27Z

We have padding to try and align the refcount on a separate cache line. But after several simplifications the padding has increased substantially. So now it's easy to change the layout to get rid of the padding entirely. We group the write-heavy __refcnt and __use with less often used items such as the rcu_head and the error code. Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

xfrm: Move dst->path into struct xfrm_dst

2017-11-30T14:54:26Z

The first member of an IPSEC route bundle chain sets it's dst->path to the underlying ipv4/ipv6 route that carries the bundle. Stated another way, if one were to follow the xfrm_dst->child chain of the bundle, the final non-NULL pointer would be the path and point to either an ipv4 or an ipv6 route. This is largely used to make sure that PMTU events propagate down to the correct ipv4 or ipv6 route. When we don't have the top of an IPSEC bundle 'dst->path == dst'. Move it down into xfrm_dst and key off of dst->xfrm. Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

ipv6: Move dst->from into struct rt6_info.

2017-11-30T14:54:26Z

The dst->from value is only used by ipv6 routes to track where a route "came from". Any time we clone or copy a core ipv6 route in the ipv6 routing tables, we have the copy/clone's ->from point to the base route. This is used to handle route expiration properly. Only ipv6 uses this mechanism, and only ipv6 code references it. So it is safe to move it into rt6_info. Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

xfrm: Move child route linkage into xfrm_dst.

2017-11-30T14:54:26Z

XFRM bundle child chains look like this: xdst1 --> xdst2 --> xdst3 --> path_dst All of xdstN are xfrm_dst objects and xdst->u.dst.xfrm is non-NULL. The final child pointer in the chain, here called 'path_dst', is some other kind of route such as an ipv4 or ipv6 one. The xfrm output path pops routes, one at a time, via the child pointer, until we hit one which has a dst->xfrm pointer which is NULL. We can easily preserve the above mechanisms with child sitting only in the xfrm_dst structure. All children in the chain before we break out of the xfrm_output() loop have dst->xfrm non-NULL and are therefore xfrm_dst objects. Since we break out of the loop when we find dst->xfrm NULL, we will not try to dereference 'dst' as if it were an xfrm_dst. Signed-off-by: David S. Miller

ipv6: Move rt6_next from dst_entry into ipv6 route structure.

2017-11-30T14:54:25Z

Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

decnet: Move dn_next into decnet route structure.

2017-11-30T14:54:25Z

Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet

net: dst->rt_next is unused.

2017-11-30T14:54:24Z

Delete it. Signed-off-by: David S. Miller Reviewed-by: Eric Dumazet