Improve randomness of hash_long on 64bit.
A message that is not in the archive (sent off-list or not yet received): 20060509165610.10378.patches@notabene
I'm still bothered by the poor showing on hash_long on 64bit on number that differ only in the 3rd or 4th byte (as IP addresses might on a little-endian host).
I hacked around the problem in net/sunrpc/svcauth_unix.c until this issue got resolved, but it never did. So I am pushing again.
The problem is that the bit-spares prime that is close to the golden ratio isn't really close enough.
I propose 'fixing' it by using hash_u32 on the upper and lower halfs of a 64bit value. This is slightly less efficient, but most code would probably be happy calling hash_u32 anyway.
More comments in the code.
### Diffstat output
./include/linux/hash.h | 69 ++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 29 deletions(-)
include/linux/hash.h renamed from include/linux/hash.h~current~ +40 -29
@@ -12,45 +12,56 @@* These primes are chosen to be bit-sparse, that is operations on * them can use shifts and additions instead of multiplications for * machines where multiplications are slow. +* +* Unfortunately, the closeness to the golden ratio appears to be +* more important than the primality: The bit-sparse 64bit number +* provides particularly poor hashing for values that differ in the +* third or fourth bytes only (the 0xffff0000 bits), though the 32bit +* prime seems to work reasonably well. +* +* We never actually need anything close to 64bits from this hash function. +* The most any caller in the kernel asked for (as at 2.6.16) is 14 bits (pid_hash). +* Thus limiting the return to 32bits is safe. So we hash 64bit +* quantities with a double 32bit hash. +* +* And in many cases, we only really want hash_u32, even on a 64bit arch. */ -#if BITS_PER_LONG ==32 /* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */ -#define GOLDEN_RATIO_PRIME 0x9e370001UL -#elif BITS_PER_LONG ==64 +#define GOLDEN_RATIO_PRIME_32 0x9e370001UL/* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */ -#define GOLDEN_RATIO_PRIME 0x9e37fffffffc0001UL -#else -#error Define GOLDEN_RATIO_PRIME for your wordsize. -#endif +#define GOLDEN_RATIO_PRIME_64 0x9e37fffffffc0001UL -static inline unsigned long hash_long (unsigned long val,unsigned int bits) +static inline u32 hash_u32 (u32 val,unsigned int bits) { -unsigned long hash = val; +u32 hash = val; -#if BITS_PER_LONG ==64 -/* Sigh, gcc can't optimise this alone like it does for 32 bits. */ -unsigned long n = hash; - n <<=18 ; - hash -= n; - n <<=33 ; - hash -= n; - n <<=3 ; - hash += n; - n <<=3 ; - hash -= n; - n <<=4 ; - hash += n; - n <<=2 ; - hash += n; -#else /* On some cpus multiply is faster, on others gcc will do shifts */ - hash *=GOLDEN_RATIO_PRIME ; -#endif + hash *=GOLDEN_RATIO_PRIME_32 ;/* High bits are more random, so use them. */ -return hash >> (BITS_PER_LONG - bits); +return hash >> (32 - bits); +} + +static inline u32 hash_u64 (u64 val,unsigned int bits) +{ +u32 hi = val >>32 ; +return hash_u32 (hash_u32 ( (u32 )val ,32 ) ^ hi , + bits); +} + +#if BITS_PER_LONG ==32 +static inline unsigned long hash_long (unsigned long val,unsigned int bits) +{ +return (unsigned long )hash_u32 ( (u32 )val, bits); +} +#endif +#if BITS_PER_LONG ==64 +static inline unsigned long hash_long (unsigned long val,unsigned int bits) +{ +return (unsigned long )hash_u64 ( (u64 )val, bits); } - +#endif +static inline unsigned long hash_ptr (void *ptr,unsigned int bits) {return hash_long ((unsigned long )ptr, bits);
Quoted 7 lines · NeilBrown
I'm still bothered by the poor showing on
hash_longon 64bit
on number that differ only in the 3rd or 4th byte (as IP addresses might on a little-endian host).
I hacked around the problem innet/sunrpc/svcauth_unix.cuntil this issue got resolved, but it never did. So I am pushing again.
Quoted 6 lines
The problem is that the bit-spares prime that is close to the golden ratio isn't really close enough.
I propose 'fixing' it by using
hash_u32on the upper and lower halfs of a 64bit value. This is slightly less efficient, but most code would probably be happy callinghash_u32anyway.
We end up with
static inline u32 hash_u32(u32 val, unsigned int bits)
{
u32 hash = val;
/* On some cpus multiply is faster, on others gcc will do shifts */
hash *= GOLDEN_RATIO_PRIME_32;
/* High bits are more random, so use them. */
return hash >> (32 - bits);
}static inline u32 hash_u64(u64 val, unsigned int bits)
{
u32 hi = val >> 32;
return hash_u32(hash_u32(val, 32) ^ hi, bits);
}So if one does
hash_u64(foo, 44)
we have a negative shift distance.
Quoted 20 lines · On Thursday May 11, [email protected] wrote:
We end up with
static inline u32
hash_u32(u32 val, unsigned int bits){ u32 hash = val; /* On some cpus multiply is faster, on others gcc will do shifts */ hash *= GOLDEN_RATIO_PRIME_32; /* High bits are more random, so use them. */ return hash >> (32 - bits); }static inline u32
hash_u64(u64 val, unsigned int bits){ u32 hi = val >> 32; return hash_u32(hash_u32(val, 32) ^ hi, bits); }
Quoted 5 lines
So if one does
hash_u64(foo, 44)we have a negative shift distance.
True. But as hash_u64 returns a u32, asking for 44 bits would be clearly unwise. It really no different than doing
hash_long(foo, 100)
Based on the return type, that is equally unwise.
Fortunately no one (current) askes for more than 14 bits.
Thanks,
NeilBrown