Commit b14f243a authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

net: Dont use ifindices in hash fns

Eric noticed, that when there will be devices with equal indices, some
hash functions that use them will become less effective as they could.
Fix this in advance by mixing the net_device address into the hash value
instead of the device index.

This is true for arp and ndisc hash fns. The netlabel, can and llc ones
are also ifindex-based, but that three are init_net-only, thus will not
be affected.

Many thanks to David and Eric for the hash32_ptr implementation!
Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a399a805
...@@ -67,4 +67,14 @@ static inline unsigned long hash_ptr(const void *ptr, unsigned int bits) ...@@ -67,4 +67,14 @@ static inline unsigned long hash_ptr(const void *ptr, unsigned int bits)
{ {
return hash_long((unsigned long)ptr, bits); return hash_long((unsigned long)ptr, bits);
} }
static inline u32 hash32_ptr(const void *ptr)
{
unsigned long val = (unsigned long)ptr;
#if BITS_PER_LONG == 64
val ^= (val >> 32);
#endif
return (u32)val;
}
#endif /* _LINUX_HASH_H */ #endif /* _LINUX_HASH_H */
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#define _ARP_H #define _ARP_H
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/hash.h>
#include <net/neighbour.h> #include <net/neighbour.h>
...@@ -10,7 +11,7 @@ extern struct neigh_table arp_tbl; ...@@ -10,7 +11,7 @@ extern struct neigh_table arp_tbl;
static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd) static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd)
{ {
u32 val = key ^ dev->ifindex; u32 val = key ^ hash32_ptr(dev);
return val * hash_rnd; return val * hash_rnd;
} }
......
...@@ -49,6 +49,7 @@ enum { ...@@ -49,6 +49,7 @@ enum {
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/hash.h>
#include <net/neighbour.h> #include <net/neighbour.h>
...@@ -134,7 +135,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _ ...@@ -134,7 +135,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _
{ {
const u32 *p32 = pkey; const u32 *p32 = pkey;
return (((p32[0] ^ dev->ifindex) * hash_rnd[0]) + return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
(p32[1] * hash_rnd[1]) + (p32[1] * hash_rnd[1]) +
(p32[2] * hash_rnd[2]) + (p32[2] * hash_rnd[2]) +
(p32[3] * hash_rnd[3])); (p32[3] * hash_rnd[3]));
......
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