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

Commit 63fca65d authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller
Browse files

net: add confirm_neigh method to dst_ops 



Add confirm_neigh method to dst_ops and use it from IPv4 and IPv6
to lookup and confirm the neighbour. Its usage via the new helper
dst_confirm_neigh() should be restricted to MSG_PROBE users for
performance reasons.

For XFRM prefer the last tunnel address, if present. With help
from Steffen Klassert.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3a2e837

include/net/arp.h

+16 −0
Original line number Diff line number Diff line
@@ -35,6 +35,22 @@ static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 
	return n;

}



static inline void __ipv4_confirm_neigh(struct net_device *dev, u32 key)

{

	struct neighbour *n;



	rcu_read_lock_bh();

	n = __ipv4_neigh_lookup_noref(dev, key);

	if (n) {

		unsigned long now = jiffies;



		/* avoid dirtying neighbour */

		if (n->confirmed != now)

			n->confirmed = now;

	}

	rcu_read_unlock_bh();

}



void arp_init(void);

int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg);

void arp_send(int type, int ptype, __be32 dest_ip,

include/net/dst.h

+7 −0
Original line number Diff line number Diff line
@@ -477,6 +477,13 @@ static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst 
	return IS_ERR(n) ? NULL : n;

}



static inline void dst_confirm_neigh(const struct dst_entry *dst,

				     const void *daddr)

{

	if (dst->ops->confirm_neigh)

		dst->ops->confirm_neigh(dst, daddr);

}



static inline void dst_link_failure(struct sk_buff *skb)

{

	struct dst_entry *dst = skb_dst(skb);

include/net/dst_ops.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ struct dst_ops { 
	struct neighbour *	(*neigh_lookup)(const struct dst_entry *dst,

						struct sk_buff *skb,

						const void *daddr);

	void			(*confirm_neigh)(const struct dst_entry *dst,

						 const void *daddr);



	struct kmem_cache	*kmem_cachep;

include/net/ndisc.h

+17 −0
Original line number Diff line number Diff line
@@ -391,6 +391,23 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, cons 
	return n;

}



static inline void __ipv6_confirm_neigh(struct net_device *dev,

					const void *pkey)

{

	struct neighbour *n;



	rcu_read_lock_bh();

	n = __ipv6_neigh_lookup_noref(dev, pkey);

	if (n) {

		unsigned long now = jiffies;



		/* avoid dirtying neighbour */

		if (n->confirmed != now)

			n->confirmed = now;

	}

	rcu_read_unlock_bh();

}



int ndisc_init(void);

int ndisc_late_init(void);

net/ipv4/route.c

+19 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old) 
static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,

					   struct sk_buff *skb,

					   const void *daddr);

static void ipv4_confirm_neigh(const struct dst_entry *dst, const void *daddr);



static struct dst_ops ipv4_dst_ops = {

	.family =		AF_INET,
@@ -168,6 +169,7 @@ static struct dst_ops ipv4_dst_ops = { 
	.redirect =		ip_do_redirect,

	.local_out =		__ip_local_out,

	.neigh_lookup =		ipv4_neigh_lookup,

	.confirm_neigh =	ipv4_confirm_neigh,

};



#define ECN_OR_COST(class)	TC_PRIO_##class
@@ -461,6 +463,23 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, 
	return neigh_create(&arp_tbl, pkey, dev);

}



static void ipv4_confirm_neigh(const struct dst_entry *dst, const void *daddr)

{

	struct net_device *dev = dst->dev;

	const __be32 *pkey = daddr;

	const struct rtable *rt;



	rt = (const struct rtable *)dst;

	if (rt->rt_gateway)

		pkey = (const __be32 *)&rt->rt_gateway;

	else if (!daddr ||

		 (rt->rt_flags &

		  (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL)))

		return;



	__ipv4_confirm_neigh(dev, *(__force u32 *)pkey);

}



#define IP_IDENTS_SZ 2048u



static atomic_t *ip_idents __read_mostly;