neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit
Subsystems (3)
David Ahern
maintainerPATCH v2 1/1 neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit
From: David Ahern <[email protected]>
Commit cd9ff4de0107 changed the key for IFF_POINTOPOINT devices to INADDR_ANY, but neigh_xmit which is used for MPLS encapsulations was not updated to use the altered key. The result is that every packet Tx does a lookup on the gateway address which does not find an entry, a new one is created only to find the existing one in the table right before the insert since arp_constructor was updated to reset the primary key. This is seen in the allocs and destroys counters:
ip -s -4 ntable show | head -10 | grep alloc
which increase for each packet showing the unnecessary overhread.
Fix by having neigh_xmit use __ipv4_neigh_lookup_noref for NEIGH_ARP_TABLE. Define __ipv4_neigh_lookup_noref in case CONFIG_INET is not set.
v2
- define __ipv4_neigh_lookup_noref in case CONFIG_INET is not set as reported by kbuild test robot
--- include/net/arp.h | 8 ++++++++ net/core/neighbour.c | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)
include/net/arp.h +8 -0
@@ -18,6 +18,7 @@ static inline u32 arp_hashfn(const void *pkey, const struct net_device *dev, u32return val * hash_rnd[0 ]; } +#ifdef CONFIG_INET static inline struct neighbour *__ipv4_neigh_lookup_noref (struct net_device *dev,u32 key) {if (dev->flags & (IFF_LOOPBACK |IFF_POINTOPOINT ))
@@ -25,6 +26,13 @@ static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev return ___neigh_lookup_noref(&arp_tbl, neigh_key_eq32, arp_hashfn, &key, dev); } +#else +static inline +struct neighbour *__ipv4_neigh_lookup_noref (struct net_device *dev,u32 key) +{ +return NULL ; +} +#endif static inline struct neighbour *__ipv4_neigh_lookup (struct net_device *dev,u32 key) {
net/core/neighbour.c +8 -1
@@ -31,6 +31,7 @@#include <linux/times.h> #include <net/net_namespace.h> #include <net/neighbour.h> +#include <net/arp.h> #include <net/dst.h> #include <net/sock.h> #include <net/netevent.h>
@@ -2982,7 +2983,13 @@ int neigh_xmit(int index, struct net_device *dev,if (!tbl) goto out;rcu_read_lock_bh (); - neigh =__neigh_lookup_noref (tbl, addr, dev); +if (index ==NEIGH_ARP_TABLE ) { +u32 key = *((u32 *)addr); + + neigh =__ipv4_neigh_lookup_noref (dev, key); + }else { + neigh =__neigh_lookup_noref (tbl, addr, dev); + }if (!neigh) neigh =__neigh_create (tbl, addr, dev, false); err =PTR_ERR (neigh);
Signature · 1 line
2.11.0
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Fri, 3 May 2019 08:55:01 -0700
Quoted 20 lines
From: David Ahern <[email protected]>
Commit
cd9ff4de0107changed the key forIFF_POINTOPOINTdevices toINADDR_ANY, butneigh_xmitwhich is used for MPLS encapsulations was not updated to use the altered key. The result is that every packet Tx does a lookup on the gateway address which does not find an entry, a new one is created only to find the existing one in the table right before the insert sincearp_constructorwas updated to reset the primary key. This is seen in the allocs and destroys counters:
ip -s -4 ntable show | head -10 | grep allocwhich increase for each packet showing the unnecessary overhread.
Fix by having
neigh_xmituse__ipv4_neigh_lookup_norefforNEIGH_ARP_TABLE. Define__ipv4_neigh_lookup_norefin caseCONFIG_INETis not set.v2
- define__ipv4_neigh_lookup_norefin caseCONFIG_INETis not set as reported by kbuild test robot
Quoted 5 lines
Fixes cd9ff4de0107 ("ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY")Reported-by Alan Maguire <[email protected]>Signed-off-by David Ahern <[email protected]>Signed-off-by David Ahern <[email protected]>
Double signoff and this patch doesn't apply to the net tree.
Quoted 23 lines · David Miller
From: David Ahern <[email protected]>
Date: Fri, 3 May 2019 08:55:01 -0700Quoted 20 lines
From: David Ahern <[email protected]>
Commit
cd9ff4de0107changed the key forIFF_POINTOPOINTdevices toINADDR_ANY, butneigh_xmitwhich is used for MPLS encapsulations was not updated to use the altered key. The result is that every packet Tx does a lookup on the gateway address which does not find an entry, a new one is created only to find the existing one in the table right before the insert sincearp_constructorwas updated to reset the primary key. This is seen in the allocs and destroys counters:
ip -s -4 ntable show | head -10 | grep allocwhich increase for each packet showing the unnecessary overhread.
Fix by having
neigh_xmituse__ipv4_neigh_lookup_norefforNEIGH_ARP_TABLE. Define__ipv4_neigh_lookup_norefin caseCONFIG_INETis not set.v2
- define__ipv4_neigh_lookup_norefin caseCONFIG_INETis not set as reported by kbuild test robot
Quoted 8 lines
Quoted 5 lines
Fixes cd9ff4de0107 ("ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY")Reported-by Alan Maguire <[email protected]>Signed-off-by David Ahern <[email protected]>Signed-off-by David Ahern <[email protected]>Double signoff and this patch doesn't apply to the net tree.
oops on the double signoff; you actually took v1 so I need to send a delta.
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Sun, 5 May 2019 11:43:39 -0600
Quoted 1 line
oops on the double signoff; you actually took v1 so I need to send a delta.
Aha, I see, thanks for catching that.