Commit 0200fbdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull locking and misc x86 updates from Ingo Molnar:
 "Lots of changes in this cycle - in part because locking/core attracted
  a number of related x86 low level work which was easier to handle in a
  single tree:

   - Linux Kernel Memory Consistency Model updates (Alan Stern, Paul E.
     McKenney, Andrea Parri)

   - lockdep scalability improvements and micro-optimizations (Waiman
     Long)

   - rwsem improvements (Waiman Long)

   - spinlock micro-optimization (Matthew Wilcox)

   - qspinlocks: Provide a liveness guarantee (more fairness) on x86.
     (Peter Zijlstra)

   - Add support for relative references in jump tables on arm64, x86
     and s390 to optimize jump labels (Ard Biesheuvel, Heiko Carstens)

   - Be a lot less permissive on weird (kernel address) uaccess faults
     on x86: BUG() when uaccess helpers fault on kernel addresses (Jann
     Horn)

   - macrofy x86 asm statements to un-confuse the GCC inliner. (Nadav
     Amit)

   - ... and a handful of other smaller changes as well"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (57 commits)
  locking/lockdep: Make global debug_locks* variables read-mostly
  locking/lockdep: Fix debug_locks off performance problem
  locking/pvqspinlock: Extend node size when pvqspinlock is configured
  locking/qspinlock_stat: Count instances of nested lock slowpaths
  locking/qspinlock, x86: Provide liveness guarantee
  x86/asm: 'Simplify' GEN_*_RMWcc() macros
  locking/qspinlock: Rework some comments
  locking/qspinlock: Re-order code
  locking/lockdep: Remove duplicated 'lock_class_ops' percpu array
  x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y
  futex: Replace spin_is_locked() with lockdep
  locking/lockdep: Make class->ops a percpu counter and move it under CONFIG_DEBUG_LOCKDEP=y
  x86/jump-labels: Macrofy inline assembly code to work around GCC inlining bugs
  x86/cpufeature: Macrofy inline assembly code to work around GCC inlining bugs
  x86/extable: Macrofy inline assembly code to work around GCC inlining bugs
  x86/paravirt: Work around GCC inlining bugs when compiling paravirt ops
  x86/bug: Macrofy the BUG table section handling, to work around GCC inlining bugs
  x86/alternatives: Macrofy lock prefixes to work around GCC inlining bugs
  x86/refcount: Work around GCC inlining bug
  x86/objtool: Use asm macros to work around GCC inlining bugs
  ...
parents de3fbb2a 01a14bda

Documentation/locking/lockstat.txt

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ Look at the current lock statistics: 
07                         &mm->mmap_sem-R:            37            100           1.31      299502.61      325629.52        3256.30         212344       34316685           0.10        7744.91    95016910.20           2.77

08                         ---------------

09                           &mm->mmap_sem              1          [<ffffffff811502a7>] khugepaged_scan_mm_slot+0x57/0x280

19                           &mm->mmap_sem             96          [<ffffffff815351c4>] __do_page_fault+0x1d4/0x510

10                           &mm->mmap_sem             96          [<ffffffff815351c4>] __do_page_fault+0x1d4/0x510

11                           &mm->mmap_sem             34          [<ffffffff81113d77>] vm_mmap_pgoff+0x87/0xd0

12                           &mm->mmap_sem             17          [<ffffffff81127e71>] vm_munmap+0x41/0x80

13                         ---------------

Documentation/memory-barriers.txt

+1 −2
Original line number Diff line number Diff line
@@ -471,8 +471,7 @@ And a couple of implicit varieties: 
     operations after the ACQUIRE operation will appear to happen after the

     ACQUIRE operation with respect to the other components of the system.

     ACQUIRE operations include LOCK operations and both smp_load_acquire()

     and smp_cond_acquire() operations. The later builds the necessary ACQUIRE

     semantics from relying on a control dependency and smp_rmb().

     and smp_cond_load_acquire() operations.



     Memory operations that occur before an ACQUIRE operation may appear to

     happen after it completes.

Makefile

+7 −2
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h) 
# version.h and scripts_basic is processed / created.



# Listed in dependency order

PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3

PHONY += prepare archprepare macroprepare prepare0 prepare1 prepare2 prepare3



# prepare3 is used to check if we are building in a separate output directory,

# and if so do:
@@ -1096,7 +1096,9 @@ prepare2: prepare3 outputmakefile asm-generic 
prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h

	$(cmd_crmodverdir)



archprepare: archheaders archscripts prepare1 scripts_basic

macroprepare: prepare1 archmacros



archprepare: archheaders archscripts macroprepare scripts_basic



prepare0: archprepare gcc-plugins

	$(Q)$(MAKE) $(build)=.
@@ -1164,6 +1166,9 @@ archheaders: 
PHONY += archscripts

archscripts:



PHONY += archmacros

archmacros:



PHONY += __headers

__headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts

	$(Q)$(MAKE) $(build)=scripts build_unifdef

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -359,6 +359,9 @@ config HAVE_PERF_USER_STACK_DUMP 
config HAVE_ARCH_JUMP_LABEL

	bool



config HAVE_ARCH_JUMP_LABEL_RELATIVE

	bool



config HAVE_RCU_TABLE_FREE

	bool

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ config ARM64 
	select HAVE_ARCH_BITREVERSE

	select HAVE_ARCH_HUGE_VMAP

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48)

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

CRA Git | Maintained and supported by SUSTech CRA and CCSE