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
46#include <linux/gfp.h>46#include <linux/gfp.h>
47#include <linux/kmemcheck.h>47#include <linux/kmemcheck.h>
48#include <linux/random.h>48#include <linux/random.h>
49#include <linux/jhash.h>
49 50
50#include <asm/sections.h>51#include <asm/sections.h>
51 52
@@ -309,10 +310,14 @@ static struct hlist_head chainhash_table[CHAINHASH_SIZE]; · 257 unmodified lines
309 * It's a 64-bit hash, because it's important for the keys to be310 * It's a 64-bit hash, because it's important for the keys to be
310 * unique.311 * unique.
311 */312 */
312#define iterate_chain_key(key1, key2) \313static inline u64 iterate_chain_key(u64 key, u32 idx)
313 (((key1) << MAX_LOCKDEP_KEYS_BITS) ^ \314{
314 ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \315 u32 k0 = key, k1 = key >> 32;
315 (key2))316
317 __jhash_mix(idx, k0, k1); /* Macro that modifies arguments! */
318
319 return k0 | (u64)k1 << 32;
320}
316 321
317void lockdep_off(void)322void lockdep_off(void)
318{323{

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