From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Jun 2023 21:14:30 +0000 (-0700)
Subject: Merge tag 'locking-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc6cb4d5bc3a44197de30784eae71d8ba28483eb;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'locking-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking updates from Ingo Molnar:

 - Introduce cmpxchg128() -- aka. the demise of cmpxchg_double()

   The cmpxchg128() family of functions is basically & functionally the
   same as cmpxchg_double(), but with a saner interface.

   Instead of a 6-parameter horror that forced u128 - u64/u64-halves
   layout details on the interface and exposed users to complexity,
   fragility & bugs, use a natural 3-parameter interface with u128
   types.

 - Restructure the generated atomic headers, and add kerneldoc comments
   for all of the generic atomic{,64,_long}_t operations.

   The generated definitions are much cleaner now, and come with
   documentation.

 - Implement lock_set_cmp_fn() on lockdep, for defining an ordering when
   taking multiple locks of the same type.

   This gets rid of one use of lockdep_set_novalidate_class() in the
   bcache code.

 - Fix raw_cpu_generic_try_cmpxchg() bug due to an unintended variable
   shadowing generating garbage code on Clang on certain ARM builds.

* tag 'locking-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (43 commits)
  locking/atomic: scripts: fix ${atomic}_dec_if_positive() kerneldoc
  percpu: Fix self-assignment of __old in raw_cpu_generic_try_cmpxchg()
  locking/atomic: treewide: delete arch_atomic_*() kerneldoc
  locking/atomic: docs: Add atomic operations to the driver basic API documentation
  locking/atomic: scripts: generate kerneldoc comments
  docs: scripts: kernel-doc: accept bitwise negation like ~@var
  locking/atomic: scripts: simplify raw_atomic*() definitions
  locking/atomic: scripts: simplify raw_atomic_long*() definitions
  locking/atomic: scripts: split pfx/name/sfx/order
  locking/atomic: scripts: restructure fallback ifdeffery
  locking/atomic: scripts: build raw_atomic_long*() directly
  locking/atomic: treewide: use raw_atomic*_<op>()
  locking/atomic: scripts: add trivial raw_atomic*_<op>()
  locking/atomic: scripts: factor out order template generation
  locking/atomic: scripts: remove leftover "${mult}"
  locking/atomic: scripts: remove bogus order parameter
  locking/atomic: xtensa: add preprocessor symbols
  locking/atomic: x86: add preprocessor symbols
  locking/atomic: sparc: add preprocessor symbols
  locking/atomic: sh: add preprocessor symbols
  ...
---

bc6cb4d5bc3a44197de30784eae71d8ba28483eb
diff --cc include/linux/lockdep.h
index 74bd269a80a2,3bac1501fb58..310f85903c91
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@@ -442,11 -432,16 +442,19 @@@ extern int lockdep_is_held(const void *
  #define lockdep_repin_lock(l, c)		do { (void)(l); (void)(c); } while (0)
  #define lockdep_unpin_lock(l, c)		do { (void)(l); (void)(c); } while (0)
  
 +#define DEFINE_WAIT_OVERRIDE_MAP(_name, _wait_type)	\
 +	struct lockdep_map __maybe_unused _name = {}
 +
  #endif /* !LOCKDEP */
  
+ #ifdef CONFIG_PROVE_LOCKING
+ void lockdep_set_lock_cmp_fn(struct lockdep_map *, lock_cmp_fn, lock_print_fn);
+ 
+ #define lock_set_cmp_fn(lock, ...)	lockdep_set_lock_cmp_fn(&(lock)->dep_map, __VA_ARGS__)
+ #else
+ #define lock_set_cmp_fn(lock, ...)	do { } while (0)
+ #endif
+ 
  enum xhlock_context_t {
  	XHLOCK_HARD,
  	XHLOCK_SOFT,