Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f6c480f authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

xfrm: Move dst->path into struct xfrm_dst 



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: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
parent 3a2232e9

include/net/dst.h

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct dst_entry { 
	struct  dst_ops	        *ops;

	unsigned long		_metrics;

	unsigned long           expires;

	struct dst_entry	*path;

#ifdef CONFIG_XFRM

	struct xfrm_state	*xfrm;

#else
@@ -87,7 +86,7 @@ struct dst_entry { 
	 * Align __refcnt to a 64 bytes alignment

	 * (L1_CACHE_SIZE would be too much)

	 */

	long			__pad_to_align_refcnt[4];

	long			__pad_to_align_refcnt[5];

#endif

	/*

	 * __refcnt wants to be on a different cache line from

include/net/xfrm.h

+14 −1
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ struct xfrm_dst { 
	} u;

	struct dst_entry *route;

	struct dst_entry *child;

	struct dst_entry *path;

	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];

	int num_pols, num_xfrms;

	u32 xfrm_genid;
@@ -995,6 +996,18 @@ struct xfrm_dst { 
	u32 path_cookie;

};



static inline struct dst_entry *xfrm_dst_path(const struct dst_entry *dst)

{

#ifdef CONFIG_XFRM

	if (dst->xfrm) {

		const struct xfrm_dst *xdst = (const struct xfrm_dst *) dst;



		return xdst->path;

	}

#endif

	return (struct dst_entry *) dst;

}



static inline struct dst_entry *xfrm_dst_child(const struct dst_entry *dst)

{

#ifdef CONFIG_XFRM
@@ -1889,7 +1902,7 @@ static inline bool xfrm_dst_offload_ok(struct dst_entry *dst) 
		return false;



	xdst = (struct xfrm_dst *) dst;

	if (x->xso.offload_handle && (x->xso.dev == dst->path->dev) &&

	if (x->xso.offload_handle && (x->xso.dev == xfrm_dst_path(dst)->dev) &&

	    !xdst->child->xfrm)

		return true;

net/bridge/br_nf_core.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ void br_netfilter_rtable_init(struct net_bridge *br) 


	atomic_set(&rt->dst.__refcnt, 1);

	rt->dst.dev = br->dev;

	rt->dst.path = &rt->dst;

	dst_init_metrics(&rt->dst, br_dst_default_metrics, true);

	rt->dst.flags	= DST_NOXFRM | DST_FAKE_RTABLE;

	rt->dst.ops = &fake_dst_ops;

net/core/dst.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops, 
	dst->ops = ops;

	dst_init_metrics(dst, dst_default_metrics.metrics, true);

	dst->expires = 0UL;

	dst->path = dst;

#ifdef CONFIG_XFRM

	dst->xfrm = NULL;

#endif

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) 
		new = true;

	}



	__ip_rt_update_pmtu((struct rtable *) rt->dst.path, &fl4, mtu);

	__ip_rt_update_pmtu((struct rtable *) xfrm_dst_path(&rt->dst), &fl4, mtu);



	if (!dst_check(&rt->dst, 0)) {

		if (new)