From: "Chuyi Zhou" <zhouchuyi@bytedance.com>
To: <tglx@linutronix.de>, <mingo@redhat.com>, <luto@kernel.org>,
<peterz@infradead.org>, <paulmck@kernel.org>,
<muchun.song@linux.dev>, <bp@alien8.de>,
<dave.hansen@linux.intel.com>, <pbonzini@redhat.com>,
<bigeasy@linutronix.de>, <clrkwllms@kernel.org>,
<rostedt@goodmis.org>, <nadav.amit@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, "Chuyi Zhou" <zhouchuyi@bytedance.com>
Subject: [PATCH v4 06/12] smp: Enable preemption early in smp_call_function_many_cond
Date: Tue, 31 Mar 2026 19:30:57 +0800 [thread overview]
Message-ID: <20260331113103.2197007-7-zhouchuyi@bytedance.com> (raw)
In-Reply-To: <20260331113103.2197007-1-zhouchuyi@bytedance.com>
Disabling preemption entirely during smp_call_function_many_cond() was
primarily for the following reasons:
- To prevent the remote online CPU from going offline. Specifically, we
want to ensure that no new csds are queued after smpcfd_dying_cpu() has
finished. Therefore, preemption must be disabled until all necessary IPIs
are sent.
- To prevent current CPU from going offline. Being migrated to another CPU
and calling csd_lock_wait() may cause UAF due to smpcfd_dead_cpu() during
the current CPU offline process.
- To protect the per-cpu cfd_data from concurrent modification by other
tasks on the current CPU. cfd_data contains cpumasks and per-cpu csds.
Before enqueueing a csd, we block on the csd_lock() to ensure the
previous async csd->func() has completed, and then initialize csd->func and
csd->info. After sending the IPI, we spin-wait for the remote CPU to call
csd_unlock(). Actually the csd_lock mechanism already guarantees csd
serialization. If preemption occurs during csd_lock_wait, other concurrent
smp_call_function_many_cond calls will simply block until the previous
csd->func() completes:
task A task B
sd->func = fun_a
send ipis
preempted by B
--------------->
csd_lock(csd); // block until last
// fun_a finished
csd->func = func_b;
csd->info = info;
...
send ipis
switch back to A
<---------------
csd_lock_wait(csd); // block until remote finish func_*
Previous patches replaced the per-cpu cfd->cpumask with task-local cpumask,
and the percpu csd is allocated only once and is never freed to ensure
we can safely access csd. Now we can enable preemption before
csd_lock_wait() which makes the potentially unpredictable csd_lock_wait()
preemptible and migratable.
Signed-off-by: Chuyi Zhou <zhouchuyi@bytedance.com>
---
kernel/smp.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/kernel/smp.c b/kernel/smp.c
index 2a33877dd812..4ddb1ec1e43e 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -844,7 +844,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
unsigned int scf_flags,
smp_cond_func_t cond_func)
{
- int cpu, last_cpu, this_cpu = smp_processor_id();
+ int cpu, last_cpu, this_cpu;
struct call_function_data *cfd;
bool wait = scf_flags & SCF_WAIT;
struct cpumask *cpumask, *task_mask;
@@ -852,10 +852,10 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
int nr_cpus = 0;
bool run_remote = false;
- lockdep_assert_preemption_disabled();
-
task_mask = smp_task_ipi_mask(current);
preemptible_wait = task_mask && preemptible();
+
+ this_cpu = get_cpu();
cfd = this_cpu_ptr(&cfd_data);
cpumask = preemptible_wait ? task_mask : cfd->cpumask;
@@ -937,6 +937,19 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
local_irq_restore(flags);
}
+ /*
+ * We may block in csd_lock_wait() for a significant amount of time,
+ * especially when interrupts are disabled or with a large number of
+ * remote CPUs. Try to enable preemption before csd_lock_wait().
+ *
+ * Use the cpumask_stack instead of cfd->cpumask to avoid concurrency
+ * modification from tasks on the same cpu. If preemption occurs during
+ * csd_lock_wait, other concurrent smp_call_function_many_cond() calls
+ * will simply block until the previous csd->func() completes.
+ */
+ if (preemptible_wait)
+ put_cpu();
+
if (run_remote && wait) {
for_each_cpu(cpu, cpumask) {
call_single_data_t *csd;
@@ -945,6 +958,9 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
csd_lock_wait(csd);
}
}
+
+ if (!preemptible_wait)
+ put_cpu();
}
/**
--
2.20.1
next prev parent reply other threads:[~2026-03-31 11:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-31 11:30 [PATCH v4 00/12] Allow preemption during IPI completion waiting to improve real-time performance Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 01/12] smp: Disable preemption explicitly in __csd_lock_wait Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 02/12] smp: Enable preemption early in smp_call_function_single Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 03/12] smp: Remove get_cpu from smp_call_function_any Chuyi Zhou
2026-04-09 3:48 ` Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 04/12] smp: Use task-local IPI cpumask in smp_call_function_many_cond() Chuyi Zhou
2026-04-01 15:25 ` Sebastian Andrzej Siewior
2026-04-01 15:38 ` Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 05/12] smp: Alloc percpu csd data in smpcfd_prepare_cpu() only once Chuyi Zhou
2026-03-31 11:30 ` Chuyi Zhou [this message]
2026-03-31 11:30 ` [PATCH v4 07/12] smp: Remove preempt_disable from smp_call_function Chuyi Zhou
2026-03-31 11:30 ` [PATCH v4 08/12] smp: Remove preempt_disable from on_each_cpu_cond_mask Chuyi Zhou
2026-03-31 11:31 ` [PATCH v4 09/12] scftorture: Remove preempt_disable in scftorture_invoke_one Chuyi Zhou
2026-03-31 11:31 ` [PATCH v4 10/12] x86/mm: Move flush_tlb_info back to the stack Chuyi Zhou
2026-03-31 11:31 ` [PATCH v4 11/12] x86/mm: Enable preemption during native_flush_tlb_multi Chuyi Zhou
2026-03-31 11:31 ` [PATCH v4 12/12] x86/mm: Enable preemption during flush_tlb_kernel_range Chuyi Zhou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260331113103.2197007-7-zhouchuyi@bytedance.com \
--to=zhouchuyi@bytedance.com \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=clrkwllms@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=muchun.song@linux.dev \
--cc=nadav.amit@gmail.com \
--cc=paulmck@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®