Commit 7743b2f7 authored by Hui Tang's avatar Hui Tang
Browse files

sched: Some fixes for select_rq hook 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9GZAQ


CVE: NA

--------------------------------

'select_idle_mask' will be polluted in 'select_idle_sibling',
so alloc per_cpu memory for ctx.select_idle_mask.

Signed-off-by: default avatarHui Tang <tanghui20@huawei.com>
parent 53fcfa07

kernel/sched/core.c

+7 −0
Original line number Diff line number Diff line
@@ -8232,6 +8232,9 @@ static struct kmem_cache *task_group_cache __read_mostly; 


DECLARE_PER_CPU(cpumask_var_t, load_balance_mask);

DECLARE_PER_CPU(cpumask_var_t, select_idle_mask);

#ifdef CONFIG_BPF_SCHED

DECLARE_PER_CPU(cpumask_var_t, select_cpu_mask);

#endif



void __init sched_init(void)

{
@@ -8285,6 +8288,10 @@ void __init sched_init(void) 
			cpumask_size(), GFP_KERNEL, cpu_to_node(i));

		per_cpu(select_idle_mask, i) = (cpumask_var_t)kzalloc_node(

			cpumask_size(), GFP_KERNEL, cpu_to_node(i));

#ifdef CONFIG_BPF_SCHED

		per_cpu(select_cpu_mask, i) = (cpumask_var_t)kzalloc_node(

			cpumask_size(), GFP_KERNEL, cpu_to_node(i));

#endif

	}

#endif /* CONFIG_CPUMASK_OFFSTACK */

kernel/sched/fair.c

+14 −12
Original line number Diff line number Diff line
@@ -6578,6 +6578,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) 
/* Working cpumask for: load_balance, load_balance_newidle. */

DEFINE_PER_CPU(cpumask_var_t, load_balance_mask);

DEFINE_PER_CPU(cpumask_var_t, select_idle_mask);

#ifdef CONFIG_BPF_SCHED

DEFINE_PER_CPU(cpumask_var_t, select_cpu_mask);

#endif



#ifdef CONFIG_NO_HZ_COMMON
@@ -7897,7 +7900,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f 
	int sync = (wake_flags & WF_SYNC) && !(current->flags & PF_EXITING);

#ifdef CONFIG_BPF_SCHED

	struct sched_migrate_ctx ctx;

	cpumask_t *cpus_prev = NULL;

	cpumask_t *cpus;

	int ret;

#endif
@@ -7912,8 +7914,11 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f 
	 */

	lockdep_assert_held(&p->pi_lock);



#ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY

#ifdef CONFIG_TASK_PLACEMENT_BY_CPU_RANGE

	p->select_cpus = p->cpus_ptr;

#endif



#ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY

	if (dynamic_affinity_used() || smart_grid_used())

		set_task_select_cpus(p, &idlest_cpu, sd_flag);

#endif
@@ -7945,18 +7950,18 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f 
		ctx.wake_flags = wake_flags;

		ctx.want_affine = want_affine;

		ctx.sd_flag = sd_flag;

		ctx.select_idle_mask = this_cpu_cpumask_var_ptr(select_idle_mask);

		ctx.select_idle_mask =

			this_cpu_cpumask_var_ptr(select_cpu_mask);



		ret = bpf_sched_cfs_select_rq(&ctx);

		if (ret >= 0) {

			rcu_read_unlock();

			return ret;

		} else if (ret != -1) {

			cpus = this_cpu_cpumask_var_ptr(select_idle_mask);

			if (cpumask_subset(cpus, p->cpus_ptr) &&

			cpus = this_cpu_cpumask_var_ptr(select_cpu_mask);

			if (cpumask_subset(cpus, p->select_cpus) &&

			    !cpumask_empty(cpus)) {

				cpus_prev = (void *)p->cpus_ptr;

				p->cpus_ptr = cpus;

				p->select_cpus = cpus;

			}

		}

	}
@@ -8004,11 +8009,8 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f 
	if (bpf_sched_enabled()) {

		ctx.new_cpu = new_cpu;

		ret = bpf_sched_cfs_select_rq_exit(&ctx);

		if (ret >= 0)

			new_cpu = ret;



		if (cpus_prev)

			p->cpus_ptr = cpus_prev;

		if (ret > 0 && ret <= nr_cpu_ids)

			new_cpu = ret - 1;

	}

#endif