Commit b08ef5fc authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Peter Zijlstra
Browse files

sched/mmcid: Move scheduler code out of global header 



This is only used in the scheduler core code, so there is no point to have
it in a global header.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: default avatarYury Norov (NVIDIA) <yury.norov@gmail.com>
Link: https://patch.msgid.link/20251119172549.321259077@linutronix.de
parent 925b7847

include/linux/mm_types.h

+0 −13
Original line number Diff line number Diff line
@@ -1387,27 +1387,14 @@ static inline unsigned int mm_cid_size(void) 
	return 2 * cpumask_size();	/* mm_cpus_allowed(), mm_cidmask(). */

}



static inline void mm_set_cpus_allowed(struct mm_struct *mm, const struct cpumask *cpumask)

{

	struct cpumask *mm_allowed = mm_cpus_allowed(mm);



	if (!mm)

		return;

	/* The mm_cpus_allowed is the union of each thread allowed CPUs masks. */

	guard(raw_spinlock)(&mm->mm_cid.lock);

	cpumask_or(mm_allowed, mm_allowed, cpumask);

	WRITE_ONCE(mm->mm_cid.nr_cpus_allowed, cpumask_weight(mm_allowed));

}

#else /* CONFIG_SCHED_MM_CID */

static inline void mm_init_cid(struct mm_struct *mm, struct task_struct *p) { }

static inline int mm_alloc_cid(struct mm_struct *mm, struct task_struct *p) { return 0; }

static inline void mm_destroy_cid(struct mm_struct *mm) { }



static inline unsigned int mm_cid_size(void)

{

	return 0;

}

static inline void mm_set_cpus_allowed(struct mm_struct *mm, const struct cpumask *cpumask) { }

#endif /* CONFIG_SCHED_MM_CID */



struct mmu_gather;

kernel/sched/core.c

+18 −2
Original line number Diff line number Diff line
@@ -2669,6 +2669,8 @@ int push_cpu_stop(void *arg) 
	return 0;

}



static inline void mm_update_cpus_allowed(struct mm_struct *mm, const cpumask_t *affmask);



/*

 * sched_class::set_cpus_allowed must do the below, but is not required to

 * actually call this function.
@@ -2728,7 +2730,7 @@ __do_set_cpus_allowed(struct task_struct *p, struct affinity_context *ctx) 
		put_prev_task(rq, p);



	p->sched_class->set_cpus_allowed(p, ctx);

	mm_set_cpus_allowed(p->mm, ctx->new_mask);

	mm_update_cpus_allowed(p->mm, ctx->new_mask);



	if (queued)

		enqueue_task(rq, p, ENQUEUE_RESTORE | ENQUEUE_NOCLOCK);
@@ -10372,6 +10374,18 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count) 
 * When a task exits, the MM CID held by the task is not longer required as

 * the task cannot return to user space.

 */

static inline void mm_update_cpus_allowed(struct mm_struct *mm, const struct cpumask *affmsk)

{

	struct cpumask *mm_allowed = mm_cpus_allowed(mm);



	if (!mm)

		return;

	/* The mm_cpus_allowed is the union of each thread allowed CPUs masks. */

	guard(raw_spinlock)(&mm->mm_cid.lock);

	cpumask_or(mm_allowed, mm_allowed, affmsk);

	WRITE_ONCE(mm->mm_cid.nr_cpus_allowed, cpumask_weight(mm_allowed));

}



void sched_mm_cid_exit_signals(struct task_struct *t)

{

	struct mm_struct *mm = t->mm;
@@ -10411,7 +10425,9 @@ 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;

}

#endif /* CONFIG_SCHED_MM_CID */

#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 */



#ifdef CONFIG_SCHED_CLASS_EXT

void sched_deq_and_put_task(struct task_struct *p, int queue_flags,