Commit 0ff0edb5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull locking updates from Ingo Molnar:

 - rtmutex cleanup & spring cleaning pass that removes ~400 lines of
   code

 - Futex simplifications & cleanups

 - Add debugging to the CSD code, to help track down a tenacious race
   (or hw problem)

 - Add lockdep_assert_not_held(), to allow code to require a lock to not
   be held, and propagate this into the ath10k driver

 - Misc LKMM documentation updates

 - Misc KCSAN updates: cleanups & documentation updates

 - Misc fixes and cleanups

 - Fix locktorture bugs with ww_mutexes

* tag 'locking-core-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
  kcsan: Fix printk format string
  static_call: Relax static_call_update() function argument type
  static_call: Fix unused variable warn w/o MODULE
  locking/rtmutex: Clean up signal handling in __rt_mutex_slowlock()
  locking/rtmutex: Restrict the trylock WARN_ON() to debug
  locking/rtmutex: Fix misleading comment in rt_mutex_postunlock()
  locking/rtmutex: Consolidate the fast/slowpath invocation
  locking/rtmutex: Make text section and inlining consistent
  locking/rtmutex: Move debug functions as inlines into common header
  locking/rtmutex: Decrapify __rt_mutex_init()
  locking/rtmutex: Remove pointless CONFIG_RT_MUTEXES=n stubs
  locking/rtmutex: Inline chainwalk depth check
  locking/rtmutex: Move rt_mutex_debug_task_free() to rtmutex.c
  locking/rtmutex: Remove empty and unused debug stubs
  locking/rtmutex: Consolidate rt_mutex_init()
  locking/rtmutex: Remove output from deadlock detector
  locking/rtmutex: Remove rtmutex deadlock tester leftovers
  locking/rtmutex: Remove rt_mutex_timed_lock()
  MAINTAINERS: Add myself as futex reviewer
  locking/mutex: Remove repeated declaration
  ...
parents 9a45da92 f4abe996

Documentation/admin-guide/kernel-parameters.txt

+10 −0
Original line number Diff line number Diff line
@@ -782,6 +782,16 @@ 
	cs89x0_media=	[HW,NET]

			Format: { rj45 | aui | bnc }



	csdlock_debug=	[KNL] Enable debug add-ons of cross-CPU function call

			handling. When switched on, additional debug data is

			printed to the console in case a hanging CPU is

			detected, and that CPU is pinged again in order to try

			to resolve the hang situation.

			0: disable csdlock debugging (default)

			1: enable basic csdlock debugging (minor impact)

			ext: enable extended csdlock debugging (more impact,

			     but more data)



	dasd=		[HW,NET]

			See header of drivers/s390/block/dasd_devmap.c.

Documentation/dev-tools/kcsan.rst

+3 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. Copyright (C) 2019, Google LLC.



The Kernel Concurrency Sanitizer (KCSAN)

========================================

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7452,6 +7452,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
M:	Ingo Molnar <mingo@redhat.com>

R:	Peter Zijlstra <peterz@infradead.org>

R:	Darren Hart <dvhart@infradead.org>

R:	Davidlohr Bueso <dave@stgolabs.net>

L:	linux-kernel@vger.kernel.org

S:	Maintained

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

arch/arm/include/asm/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * assembler to insert a extra (16-bit) IT instruction, depending on the

 * presence or absence of neighbouring conditional instructions.

 *

 * To avoid this unpredictableness, an approprite IT is inserted explicitly:

 * To avoid this unpredictability, an appropriate IT is inserted explicitly:

 * the assembler won't change IT instructions which are explicitly present

 * in the input.

 */

arch/x86/include/asm/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/stringify.h>

#include <linux/types.h>



static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch)

{

	asm_volatile_goto("1:"

		".byte " __stringify(BYTES_NOP5) "\n\t"
@@ -30,7 +30,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran 
	return true;

}



static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)

static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch)

{

	asm_volatile_goto("1:"

		".byte 0xe9\n\t .long %l[l_yes] - 2f\n\t"