Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c8a6d3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: Update fair and rt placement logic to use scheduler clusters"

parents 18d22563 0fc21b2b

arch/arm/kernel/topology.c

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ void __init init_cpu_topology(void) 


	parse_dt_topology();



	for_each_possible_cpu(cpu)

		update_siblings_masks(cpu);



	/* Set scheduler topology descriptor */

	set_sched_topology(arm_topology);

}

arch/arm64/kernel/topology.c

+7 −1
Original line number Diff line number Diff line
@@ -452,14 +452,20 @@ static void __init reset_cpu_power(void) 


void __init init_cpu_topology(void)

{

	int cpu;



	reset_cpu_topology();



	/*

	 * Discard anything that was parsed if we hit an error so we

	 * don't use partial information.

	 */

	if (parse_dt_topology())

	if (parse_dt_topology()) {

		reset_cpu_topology();

	} else {

		for_each_possible_cpu(cpu)

			update_siblings_masks(cpu);

	}



	reset_cpu_power();

	parse_dt_cpu_power();

include/linux/sched/sysctl.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ extern unsigned int sysctl_sched_spill_load_pct; 
extern unsigned int sysctl_sched_upmigrate_pct;

extern unsigned int sysctl_sched_downmigrate_pct;

extern int sysctl_sched_upmigrate_min_nice;

extern unsigned int sysctl_sched_powerband_limit_pct;

extern unsigned int sysctl_sched_boost;

extern unsigned int sysctl_early_detection_duration;

include/trace/events/sched.h

+6 −6
Original line number Diff line number Diff line
@@ -182,15 +182,15 @@ DECLARE_EVENT_CLASS(sched_cpu_load, 
		__entry->idle			= idle;

		__entry->nr_running		= rq->nr_running;

		__entry->nr_big_tasks		= rq->hmp_stats.nr_big_tasks;

		__entry->load_scale_factor	= rq->load_scale_factor;

		__entry->capacity		= rq->capacity;

		__entry->load_scale_factor	= cpu_load_scale_factor(rq->cpu);

		__entry->capacity		= cpu_capacity(rq->cpu);

		__entry->cumulative_runnable_avg = rq->hmp_stats.cumulative_runnable_avg;

		__entry->irqload		= irqload;

		__entry->cur_freq		= rq->cur_freq;

		__entry->max_freq		= rq->max_freq;

		__entry->cur_freq		= cpu_cur_freq(rq->cpu);

		__entry->max_freq		= cpu_max_freq(rq->cpu);

		__entry->power_cost		= power_cost;

		__entry->cstate			= rq->cstate;

		__entry->dstate			= rq->dstate;

		__entry->dstate			= rq->cluster->dstate;

		__entry->temp			= temp;

	),
@@ -274,7 +274,7 @@ TRACE_EVENT(sched_update_task_ravg, 
		__entry->evt            = evt;

		__entry->cpu            = rq->cpu;

		__entry->cur_pid        = rq->curr->pid;

		__entry->cur_freq       = rq->cur_freq;

		__entry->cur_freq       = cpu_cur_freq(rq->cpu);

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid            = p->pid;

		__entry->mark_start     = p->ravg.mark_start;

kernel/sched/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer 
endif



ifdef CONFIG_SCHED_QHMP

obj-y += qhmp_core.o qhmp_fair.o

obj-y += qhmp_core.o qhmp_fair.o qhmp_rt.o

else

obj-y += core.o fair.o

obj-y += core.o fair.o rt.o

endif



obj-y += proc.o clock.o cputime.o

obj-y += idle_task.o rt.o deadline.o stop_task.o

obj-y += idle_task.o deadline.o stop_task.o

obj-y += wait.o completion.o idle.o sched_avg.o

obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o

obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o