Skip to content

Commit 28df029

Browse files
Cheng-JuiPeter Zijlstra
authored andcommitted
lockdep: Correct lock_classes index mapping
A kernel exception was hit when trying to dump /proc/lockdep_chains after lockdep report "BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low!": Unable to handle kernel paging request at virtual address 00054005450e05c3 ... 00054005450e05c3] address between user and kernel address ranges ... pc : [0xffffffece769b3a8] string+0x50/0x10c lr : [0xffffffece769ac88] vsnprintf+0x468/0x69c ... Call trace: string+0x50/0x10c vsnprintf+0x468/0x69c seq_printf+0x8c/0xd8 print_name+0x64/0xf4 lc_show+0xb8/0x128 seq_read_iter+0x3cc/0x5fc proc_reg_read_iter+0xdc/0x1d4 The cause of the problem is the function lock_chain_get_class() will shift lock_classes index by 1, but the index don't need to be shifted anymore since commit 01bb6f0 ("locking/lockdep: Change the range of class_idx in held_lock struct") already change the index to start from 0. The lock_classes[-1] located at chain_hlocks array. When printing lock_classes[-1] after the chain_hlocks entries are modified, the exception happened. The output of lockdep_chains are incorrect due to this problem too. Fixes: f611e8c ("lockdep: Take read/write status in consideration when generate chainkey") Signed-off-by: Cheng Jui Wang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Boqun Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent dfd42fa commit 28df029

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/locking/lockdep.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3462,7 +3462,7 @@ struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i)
34623462
u16 chain_hlock = chain_hlocks[chain->base + i];
34633463
unsigned int class_idx = chain_hlock_class_idx(chain_hlock);
34643464

3465-
return lock_classes + class_idx - 1;
3465+
return lock_classes + class_idx;
34663466
}
34673467

34683468
/*
@@ -3530,7 +3530,7 @@ static void print_chain_keys_chain(struct lock_chain *chain)
35303530
hlock_id = chain_hlocks[chain->base + i];
35313531
chain_key = print_chain_key_iteration(hlock_id, chain_key);
35323532

3533-
print_lock_name(lock_classes + chain_hlock_class_idx(hlock_id) - 1);
3533+
print_lock_name(lock_classes + chain_hlock_class_idx(hlock_id));
35343534
printk("\n");
35353535
}
35363536
}

0 commit comments

Comments
 (0)