Merge tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull SMP cross-CPU function-call updates from Ingo Molnar:

 - Remove diagnostics and adjust config for CSD lock diagnostics

 - Add a generic IPI-sending tracepoint, as currently there's no easy
   way to instrument IPI origins: it's arch dependent and for some major
   architectures it's not even consistently available.

* tag 'smp-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  trace,smp: Trace all smp_function_call*() invocations
  trace: Add trace_ipi_send_cpu()
  sched, smp: Trace smp callback causing an IPI
  smp: reword smp call IPI comment
  treewide: Trace IPIs sent via smp_send_reschedule()
  irq_work: Trace self-IPIs sent via arch_irq_work_raise()
  smp: Trace IPIs sent via arch_send_call_function_ipi_mask()
  sched, smp: Trace IPIs sent via send_call_function_single_ipi()
  trace: Add trace_ipi_send_cpumask()
  kernel/smp: Make csdlock_debug= resettable
  locking/csd_lock: Remove per-CPU data indirection from CSD lock debugging
  locking/csd_lock: Remove added data from CSD lock debugging
  locking/csd_lock: Add Kconfig option for csd_debug default

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm64/kernel/smp.c
Simple merge

diff --cc arch/csky/kernel/smp.c
Simple merge

diff --cc arch/loongarch/kernel/smp.c
Simple merge

diff --cc arch/mips/include/asm/smp.h
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/subcore.c
Simple merge

diff --cc arch/riscv/kernel/smp.c
Simple merge

diff --cc arch/s390/kernel/smp.c
Simple merge

diff --cc arch/x86/include/asm/smp.h
index 9fa795102b939e12e30c76bbd9f3642882ac0c17,f9757123d8fa10d639d05d6b1a823b81756bd932..4e91054c84be9e6f54c41e1f5f7c3e7c87d4eefa
--- 1/arch/x86/include/asm/smp.h
--- 2/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -93,13 -93,12 +93,13 @@@ static inline void __cpu_die(unsigned i
        smp_ops.cpu_die(cpu);
  }
  
 -static inline void play_dead(void)
 +static inline void __noreturn play_dead(void)
  {
        smp_ops.play_dead();
 +      BUG();
  }
  
- static inline void smp_send_reschedule(int cpu)
+ static inline void arch_smp_send_reschedule(int cpu)
  {
        smp_ops.smp_send_reschedule(cpu);
  }

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/xtensa/kernel/smp.c
Simple merge

diff --cc include/linux/smp.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge