Commit 9eef0233 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking updates from Ingo Molnar:
 "Core locking primitives updates:
    - Remove mutex_trylock_recursive() from the API - no users left
    - Simplify + constify the futex code a bit

  Lockdep updates:
    - Teach lockdep about local_lock_t
    - Add CONFIG_DEBUG_IRQFLAGS=y debug config option to check for
      potentially unsafe IRQ mask restoration patterns. (I.e.
      calling raw_local_irq_restore() with IRQs enabled.)
    - Add wait context self-tests
    - Fix graph lock corner case corrupting internal data structures
    - Fix noinstr annotations

  LKMM updates:
    - Simplify the litmus tests
    - Documentation fixes

  KCSAN updates:
    - Re-enable KCSAN instrumentation in lib/random32.c

  Misc fixes:
    - Don't branch-trace static label APIs
    - DocBook fix
    - Remove stale leftover empty file"

* tag 'locking-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  checkpatch: Don't check for mutex_trylock_recursive()
  locking/mutex: Kill mutex_trylock_recursive()
  s390: Use arch_local_irq_{save,restore}() in early boot code
  lockdep: Noinstr annotate warn_bogus_irq_restore()
  locking/lockdep: Avoid unmatched unlock
  locking/rwsem: Remove empty rwsem.h
  locking/rtmutex: Add missing kernel-doc markup
  futex: Remove unneeded gotos
  futex: Change utime parameter to be 'const ... *'
  lockdep: report broken irq restoration
  jump_label: Do not profile branch annotations
  locking: Add Reviewers
  locking/selftests: Add local_lock inversion tests
  locking/lockdep: Exclude local_lock_t from IRQ inversions
  locking/lockdep: Clean up check_redundant() a bit
  locking/lockdep: Add a skip() function to __bfs()
  locking/lockdep: Mark local_lock_t
  locking/selftests: More granular debug_locks_verbose
  lockdep/selftest: Add wait context selftests
  tools/memory-model: Fix typo in klitmus7 compatibility table
  ...
parents d089f48f 3765d01b

Documentation/admin-guide/kernel-parameters.txt

+6 −5
Original line number Diff line number Diff line
@@ -802,13 +802,14 @@ 
			insecure, please do not use on production kernels.



	debug_locks_verbose=

			[KNL] verbose self-tests

			Format=<0|1>

			[KNL] verbose locking self-tests

			Format: <int>

			Print debugging info while doing the locking API

			self-tests.

			We default to 0 (no extra messages), setting it to

			1 will print _a lot_ more information - normally

			only useful to kernel developers.

			Bitmask for the various LOCKTYPE_ tests. Defaults to 0

			(no extra messages), setting it to -1 (all bits set)

			will print _a_lot_ more information - normally only

			useful to lockdep developers.



	debug_objects	[KNL] Enable object debugging

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -10342,6 +10342,8 @@ LOCKING PRIMITIVES 
M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

M:	Will Deacon <will@kernel.org>

R:	Waiman Long <longman@redhat.com>

R:	Boqun Feng <boqun.feng@gmail.com> (LOCKDEP)

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core

drivers/s390/char/sclp_early_core.c

+2 −2
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ int sclp_early_cmd(sclp_cmdw_t cmd, void *sccb) 
	unsigned long flags;

	int rc;



	raw_local_irq_save(flags);

	flags = arch_local_irq_save();

	rc = sclp_service_call(cmd, sccb);

	if (rc)

		goto out;

	sclp_early_wait_irq();

out:

	raw_local_irq_restore(flags);

	arch_local_irq_restore(flags);

	return rc;

}

include/linux/compiler.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
#else

# define likely(x)	__builtin_expect(!!(x), 1)

# define unlikely(x)	__builtin_expect(!!(x), 0)

# define likely_notrace(x)	likely(x)

# define unlikely_notrace(x)	unlikely(x)

#endif



/* Optimization barrier */

include/linux/irqflags.h

+12 −0
Original line number Diff line number Diff line
@@ -149,6 +149,17 @@ do { \ 
# define start_critical_timings() do { } while (0)

#endif



#ifdef CONFIG_DEBUG_IRQFLAGS

extern void warn_bogus_irq_restore(void);

#define raw_check_bogus_irq_restore()			\

	do {						\

		if (unlikely(!arch_irqs_disabled()))	\

			warn_bogus_irq_restore();	\

	} while (0)

#else

#define raw_check_bogus_irq_restore() do { } while (0)

#endif



/*

 * Wrap the arch provided IRQ routines to provide appropriate checks.

 */
@@ -162,6 +173,7 @@ do { \ 
#define raw_local_irq_restore(flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		raw_check_bogus_irq_restore();		\

		arch_local_irq_restore(flags);		\

	} while (0)

#define raw_local_save_flags(flags)			\