Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15f043a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep/waitqueues: Add better annotation
  lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
  lockdep: Print lock name in lockdep_init_error()
  init/main.c: Execute lockdep_init() as early as possible
  lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
  lockdep, rtmutex, bug: Show taint flags on error
  lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
  lockdep: Always try to set ->class_cache in register_lock_class() lockdep_init_map()
parents 8c717b72 f07fdec5

include/linux/wait.h

+2 −2
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ struct task_struct; 
#define __WAIT_BIT_KEY_INITIALIZER(word, bit)				\

	{ .flags = word, .bit_nr = bit, }



extern void __init_waitqueue_head(wait_queue_head_t *q, struct lock_class_key *);

extern void __init_waitqueue_head(wait_queue_head_t *q, const char *name, struct lock_class_key *);



#define init_waitqueue_head(q)				\

	do {						\

		static struct lock_class_key __key;	\

							\

		__init_waitqueue_head((q), &__key);	\

		__init_waitqueue_head((q), #q, &__key);	\

	} while (0)



#ifdef CONFIG_LOCKDEP

init/main.c

+1 −2
Original line number Diff line number Diff line
@@ -469,13 +469,12 @@ asmlinkage void __init start_kernel(void) 
	char * command_line;

	extern const struct kernel_param __start___param[], __stop___param[];



	smp_setup_processor_id();



	/*

	 * Need to run as early as possible, to initialize the

	 * lockdep hash:

	 */

	lockdep_init();

	smp_setup_processor_id();

	debug_objects_early_init();



	/*

kernel/lockdep.c

+21 −10
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ unsigned int max_lockdep_depth; 
 * about it later on, in lockdep_info().

 */

static int lockdep_init_error;

static const char *lock_init_error;

static unsigned long lockdep_init_trace_data[20];

static struct stack_trace lockdep_init_trace = {

	.max_entries = ARRAY_SIZE(lockdep_init_trace_data),
@@ -568,11 +569,12 @@ static void lockdep_print_held_locks(struct task_struct *curr) 
	}

}



static void print_kernel_version(void)

static void print_kernel_ident(void)

{

	printk("%s %.*s\n", init_utsname()->release,

	printk("%s %.*s %s\n", init_utsname()->release,

		(int)strcspn(init_utsname()->version, " "),

		init_utsname()->version);

		init_utsname()->version,

		print_tainted());

}



static int very_verbose(struct lock_class *class)
@@ -656,6 +658,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass) 
	if (unlikely(!lockdep_initialized)) {

		lockdep_init();

		lockdep_init_error = 1;

		lock_init_error = lock->name;

		save_stack_trace(&lockdep_init_trace);

	}

#endif
@@ -723,7 +726,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) 


	class = look_up_lock_class(lock, subclass);

	if (likely(class))

		return class;

		goto out_set_class_cache;



	/*

	 * Debug-check: all keys must be persistent!
@@ -808,6 +811,7 @@ out_unlock_set: 
	graph_unlock();

	raw_local_irq_restore(flags);



out_set_class_cache:

	if (!subclass || force)

		lock->class_cache[0] = class;

	else if (subclass < NR_LOCKDEP_CACHING_CLASSES)
@@ -1149,7 +1153,7 @@ print_circular_bug_header(struct lock_list *entry, unsigned int depth, 
	printk("\n");

	printk("======================================================\n");

	printk("[ INFO: possible circular locking dependency detected ]\n");

	print_kernel_version();

	print_kernel_ident();

	printk("-------------------------------------------------------\n");

	printk("%s/%d is trying to acquire lock:\n",

		curr->comm, task_pid_nr(curr));
@@ -1488,7 +1492,7 @@ print_bad_irq_dependency(struct task_struct *curr, 
	printk("======================================================\n");

	printk("[ INFO: %s-safe -> %s-unsafe lock order detected ]\n",

		irqclass, irqclass);

	print_kernel_version();

	print_kernel_ident();

	printk("------------------------------------------------------\n");

	printk("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] is trying to acquire:\n",

		curr->comm, task_pid_nr(curr),
@@ -1717,7 +1721,7 @@ print_deadlock_bug(struct task_struct *curr, struct held_lock *prev, 
	printk("\n");

	printk("=============================================\n");

	printk("[ INFO: possible recursive locking detected ]\n");

	print_kernel_version();

	print_kernel_ident();

	printk("---------------------------------------------\n");

	printk("%s/%d is trying to acquire lock:\n",

		curr->comm, task_pid_nr(curr));
@@ -2224,7 +2228,7 @@ print_usage_bug(struct task_struct *curr, struct held_lock *this, 
	printk("\n");

	printk("=================================\n");

	printk("[ INFO: inconsistent lock state ]\n");

	print_kernel_version();

	print_kernel_ident();

	printk("---------------------------------\n");



	printk("inconsistent {%s} -> {%s} usage.\n",
@@ -2289,7 +2293,7 @@ print_irq_inversion_bug(struct task_struct *curr, 
	printk("\n");

	printk("=========================================================\n");

	printk("[ INFO: possible irq lock inversion dependency detected ]\n");

	print_kernel_version();

	print_kernel_ident();

	printk("---------------------------------------------------------\n");

	printk("%s/%d just changed the state of lock:\n",

		curr->comm, task_pid_nr(curr));
@@ -3175,6 +3179,7 @@ print_unlock_inbalance_bug(struct task_struct *curr, struct lockdep_map *lock, 
	printk("\n");

	printk("=====================================\n");

	printk("[ BUG: bad unlock balance detected! ]\n");

	print_kernel_ident();

	printk("-------------------------------------\n");

	printk("%s/%d is trying to release lock (",

		curr->comm, task_pid_nr(curr));
@@ -3619,6 +3624,7 @@ print_lock_contention_bug(struct task_struct *curr, struct lockdep_map *lock, 
	printk("\n");

	printk("=================================\n");

	printk("[ BUG: bad contention detected! ]\n");

	print_kernel_ident();

	printk("---------------------------------\n");

	printk("%s/%d is trying to contend lock (",

		curr->comm, task_pid_nr(curr));
@@ -3974,7 +3980,8 @@ void __init lockdep_info(void) 


#ifdef CONFIG_DEBUG_LOCKDEP

	if (lockdep_init_error) {

		printk("WARNING: lockdep init error! Arch code didn't call lockdep_init() early enough?\n");

		printk("WARNING: lockdep init error! lock-%s was acquired"

			"before lockdep_init\n", lock_init_error);

		printk("Call stack leading to lockdep invocation was:\n");

		print_stack_trace(&lockdep_init_trace, 0);

	}
@@ -3993,6 +4000,7 @@ print_freed_lock_bug(struct task_struct *curr, const void *mem_from, 
	printk("\n");

	printk("=========================\n");

	printk("[ BUG: held lock freed! ]\n");

	print_kernel_ident();

	printk("-------------------------\n");

	printk("%s/%d is freeing memory %p-%p, with a lock still held there!\n",

		curr->comm, task_pid_nr(curr), mem_from, mem_to-1);
@@ -4050,6 +4058,7 @@ static void print_held_locks_bug(struct task_struct *curr) 
	printk("\n");

	printk("=====================================\n");

	printk("[ BUG: lock held at task exit time! ]\n");

	print_kernel_ident();

	printk("-------------------------------------\n");

	printk("%s/%d is exiting with locks still held!\n",

		curr->comm, task_pid_nr(curr));
@@ -4147,6 +4156,7 @@ void lockdep_sys_exit(void) 
		printk("\n");

		printk("================================================\n");

		printk("[ BUG: lock held when returning to user space! ]\n");

		print_kernel_ident();

		printk("------------------------------------------------\n");

		printk("%s/%d is leaving the kernel with locks still held!\n",

				curr->comm, curr->pid);
@@ -4166,6 +4176,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) 
	printk("\n");

	printk("===============================\n");

	printk("[ INFO: suspicious RCU usage. ]\n");

	print_kernel_ident();

	printk("-------------------------------\n");

	printk("%s:%d %s!\n", file, line, s);

	printk("\nother info that might help us debug this:\n\n");

kernel/panic.c

+13 −4
Original line number Diff line number Diff line
@@ -237,11 +237,20 @@ void add_taint(unsigned flag) 
	 * Can't trust the integrity of the kernel anymore.

	 * We don't call directly debug_locks_off() because the issue

	 * is not necessarily serious enough to set oops_in_progress to 1

	 * Also we want to keep up lockdep for staging development and

	 * post-warning case.

	 * Also we want to keep up lockdep for staging/out-of-tree

	 * development and post-warning case.

	 */

	if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())

	switch (flag) {

	case TAINT_CRAP:

	case TAINT_OOT_MODULE:

	case TAINT_WARN:

	case TAINT_FIRMWARE_WORKAROUND:

		break;



	default:

		if (__debug_locks_off())

			printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");

	}



	set_bit(flag, &tainted_mask);

}

kernel/rtmutex-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter) 


	printk("\n============================================\n");

	printk(  "[ BUG: circular locking deadlock detected! ]\n");

	printk("%s\n", print_tainted());

	printk(  "--------------------------------------------\n");

	printk("%s/%d is deadlocking current task %s/%d\n\n",

	       task->comm, task_pid_nr(task),