Commit 4840ce22 authored by Xiongwei Song's avatar Xiongwei Song Committed by Ingo Molnar
Browse files

locking/lockdep: Fix meaningless /proc/lockdep output of lock classes on !CONFIG_PROVE_LOCKING 



When enabling CONFIG_LOCK_STAT=y, then CONFIG_LOCKDEP=y is forcedly enabled,
but CONFIG_PROVE_LOCKING is disabled.

We can get output from /proc/lockdep, which currently includes usages of
lock classes. But the usages are meaningless, see the output below:

	/ # cat /proc/lockdep
	all lock classes:
	ffffffff9af63350 ....: cgroup_mutex

	ffffffff9af54eb8 ....: (console_sem).lock

	ffffffff9af54e60 ....: console_lock

	ffffffff9ae74c38 ....: console_owner_lock

	ffffffff9ae74c80 ....: console_owner

	ffffffff9ae66e60 ....: cpu_hotplug_lock

Only one usage context for each lock, this is because each usage is only
changed in mark_lock() that is in the CONFIG_PROVE_LOCKING=y section,
however in the test situation, it's not.

The fix is to move the usages reading and seq_print from the
!CONFIG_PROVE_LOCKING section to its defined section.

Also, locks_after list of lock_class is empty when !CONFIG_PROVE_LOCKING,
so do the same thing as what have done for usages of lock classes.

With this patch with !CONFIG_PROVE_LOCKING we can get the results below:

	/ # cat /proc/lockdep
	all lock classes:
	ffffffff85163290: cgroup_mutex
	ffffffff85154dd8: (console_sem).lock
	ffffffff85154d80: console_lock
	ffffffff85074b58: console_owner_lock
	ffffffff85074ba0: console_owner
	ffffffff85066d60: cpu_hotplug_lock

... a class key and the relevant class name each line.

Signed-off-by: default avatarXiongwei Song <sxwjean@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarWaiman Long <longman@redhat.com>
Link: https://lore.kernel.org/r/20210629135916.308210-1-sxwjean@me.com
parent 1b1cf8fe

kernel/locking/lockdep_proc.c

+14 −12
Original line number Diff line number Diff line
@@ -70,18 +70,19 @@ static int l_show(struct seq_file *m, void *v) 
#ifdef CONFIG_DEBUG_LOCKDEP

	seq_printf(m, " OPS:%8ld", debug_class_ops_read(class));

#endif

#ifdef CONFIG_PROVE_LOCKING

	if (IS_ENABLED(CONFIG_PROVE_LOCKING)) {

		seq_printf(m, " FD:%5ld", lockdep_count_forward_deps(class));

		seq_printf(m, " BD:%5ld", lockdep_count_backward_deps(class));

#endif



		get_usage_chars(class, usage);

		seq_printf(m, " %s", usage);

	}



	seq_printf(m, ": ");

	print_name(m, class);

	seq_puts(m, "\n");



	if (IS_ENABLED(CONFIG_PROVE_LOCKING)) {

		list_for_each_entry(entry, &class->locks_after, entry) {

			if (entry->distance == 1) {

				seq_printf(m, " -> [%p] ", entry->class->key);
@@ -90,6 +91,7 @@ static int l_show(struct seq_file *m, void *v) 
			}

		}

		seq_puts(m, "\n");

	}



	return 0;

}