History

locking/lockdep: Use __jhash_mix() for iterate_chain_key()

Use __jhash_mix() to mix the class_idx into the class_key. This function provides better mixing than the previously used, home grown mix function. Leave hashing to the professionals :-)

Peter Zijlstra committed 10 years ago

Commit dfaaf3f1 parent ed8ebd11 file · +9 −4Browse files

Unified · Split

kernel/locking/lockdep.c+9−4
@@ -46,6 +46,7 @@ · 45 unmodified lines
4646 #include <linux/gfp.h>
4747 #include <linux/kmemcheck.h>
4848 #include <linux/random.h>
49+#include <linux/jhash.h>
4950
5051 #include <asm/sections.h>
5152
@@ -309,10 +310,14 @@ static struct hlist_head chainhash_table[CHAINHASH_SIZE]; · 257 unmodified lines
309310 * It's a 64-bit hash, because it's important for the keys to be
310311 * unique.
311312 */
312−#define iterate_chain_key(key1, key2) \
313− (((key1) << MAX_LOCKDEP_KEYS_BITS) ^ \
314− ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \
315− (key2))
313+static inline u64 iterate_chain_key(u64 key, u32 idx)
314+{
315+ u32 k0 = key, k1 = key >> 32;
316+
317+ __jhash_mix(idx, k0, k1); /* Macro that modifies arguments! */
318+
319+ return k0 | (u64)k1 << 32;
320+}
316321
317322 void lockdep_off(void)
318323 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t