Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch into tip/master: 'locking/core'

Browse Source 
# New commits in locking/core:
    63a48181fb ("smp/scf: Evaluate local cond_func() before IPI side-effects")
    d387ceb171 ("locking/lockdep: Enforce PROVE_RAW_LOCK_NESTING only if ARCH_SUPPORTS_RT")

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2024-12-19 20:24:24 +01:00
commit c46f39a3e7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/smp.c
View File

@ -815,7 +815,8 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
WARN_ON_ONCE(!in_task()); WARN_ON_ONCE(!in_task());
/* Check if we need local execution. */ /* Check if we need local execution. */
if ((scf_flags & SCF_RUN_LOCAL) && cpumask_test_cpu(this_cpu, mask)) if ((scf_flags & SCF_RUN_LOCAL) && cpumask_test_cpu(this_cpu, mask) &&
(!cond_func || cond_func(this_cpu, info)))
run_local = true; run_local = true;
/* Check if we need remote execution, i.e., any CPU excluding this one. */ /* Check if we need remote execution, i.e., any CPU excluding this one. */
@ -868,7 +869,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
send_call_function_ipi_mask(cfd->cpumask_ipi); send_call_function_ipi_mask(cfd->cpumask_ipi);
} }
if (run_local && (!cond_func || cond_func(this_cpu, info))) { if (run_local) {
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);

4
lib/Kconfig.debug
View File

@ -1397,9 +1397,9 @@ config PROVE_LOCKING
For more details, see Documentation/locking/lockdep-design.rst. For more details, see Documentation/locking/lockdep-design.rst.
config PROVE_RAW_LOCK_NESTING config PROVE_RAW_LOCK_NESTING
bool bool "Enable raw_spinlock - spinlock nesting checks" if !ARCH_SUPPORTS_RT
depends on PROVE_LOCKING depends on PROVE_LOCKING
default y default y if ARCH_SUPPORTS_RT
help help
Enable the raw_spinlock vs. spinlock nesting checks which ensure Enable the raw_spinlock vs. spinlock nesting checks which ensure
that the lock nesting rules for PREEMPT_RT enabled kernels are that the lock nesting rules for PREEMPT_RT enabled kernels are