[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <176363759729.498.9774136526940129983.tip-bot2@tip-bot2>
Date: Thu, 20 Nov 2025 11:19:57 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: core/rseq] sched/mmcid: Move initialization out of line
The following commit has been merged into the core/rseq branch of tip:
Commit-ID: 61c7810a91fb15cffaa0b44810b8074c5e8a125d
Gitweb: https://git.kernel.org/tip/61c7810a91fb15cffaa0b44810b8074c5e8a125d
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 19 Nov 2025 18:27:07 +01:00
Committer: Peter Zijlstra <peterz@...radead.org>
CommitterDate: Thu, 20 Nov 2025 12:14:55 +01:00
sched/mmcid: Move initialization out of line
It's getting bigger soon, so just move it out of line to the rest of the
code.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Link: https://patch.msgid.link/20251119172549.769636491@linutronix.de
---
include/linux/mm_types.h | 15 +--------------
kernel/sched/core.c | 14 ++++++++++++++
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index bafb81b..3b7d05e 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -1351,20 +1351,7 @@ static inline unsigned long *mm_cidmask(struct mm_struct *mm)
return (unsigned long *)cid_bitmap;
}
-static inline void mm_init_cid(struct mm_struct *mm, struct task_struct *p)
-{
- int i;
-
- for_each_possible_cpu(i) {
- struct mm_cid_pcpu *pcpu = per_cpu_ptr(mm->mm_cid.pcpu, i);
-
- pcpu->cid = MM_CID_UNSET;
- }
- mm->mm_cid.nr_cpus_allowed = p->nr_cpus_allowed;
- raw_spin_lock_init(&mm->mm_cid.lock);
- cpumask_copy(mm_cpus_allowed(mm), &p->cpus_mask);
- bitmap_zero(mm_cidmask(mm), num_possible_cpus());
-}
+void mm_init_cid(struct mm_struct *mm, struct task_struct *p);
static inline int mm_alloc_cid_noprof(struct mm_struct *mm, struct task_struct *p)
{
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3fdf90a..34b6c31 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -10431,6 +10431,20 @@ void sched_mm_cid_fork(struct task_struct *t)
WARN_ON_ONCE(!t->mm || t->mm_cid.cid != MM_CID_UNSET);
t->mm_cid.active = 1;
}
+
+void mm_init_cid(struct mm_struct *mm, struct task_struct *p)
+{
+ struct mm_cid_pcpu __percpu *pcpu = mm->mm_cid.pcpu;
+ int cpu;
+
+ for_each_possible_cpu(cpu)
+ per_cpu_ptr(pcpu, cpu)->cid = MM_CID_UNSET;
+
+ mm->mm_cid.nr_cpus_allowed = p->nr_cpus_allowed;
+ raw_spin_lock_init(&mm->mm_cid.lock);
+ cpumask_copy(mm_cpus_allowed(mm), &p->cpus_mask);
+ bitmap_zero(mm_cidmask(mm), num_possible_cpus());
+}
#else /* CONFIG_SCHED_MM_CID */
static inline void mm_update_cpus_allowed(struct mm_struct *mm, const struct cpumask *affmsk) { }
#endif /* !CONFIG_SCHED_MM_CID */
Powered by blists - more mailing lists