Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (dad1c12e) · Commits · 戴 / test

Pull scheduler updates from Ingo Molnar: - Remove the unused per rq load array and all its infrastructure, by Dietmar Eggemann. - Add utilization clamping support by Patrick Bellasi. This is a refinement of the energy aware scheduling framework with support for boosting of interactive and capping of background workloads: to make sure critical GUI threads get maximum frequency ASAP, and to make sure background processing doesn't unnecessarily move to cpufreq governor to higher frequencies and less energy efficient CPU modes. - Add the bare minimum of tracepoints required for LISA EAS regression testing, by Qais Yousef - which allows automated testing of various power management features, including energy aware scheduling. - Restructure the former tsk_nr_cpus_allowed() facility that the -rt kernel used to modify the scheduler's CPU affinity logic such as migrate_disable() - introduce the task->cpus_ptr value instead of taking the address of &task->cpus_allowed directly - by Sebastian Andrzej Siewior. - Misc optimizations, fixes, cleanups and small enhancements - see the Git log for details. * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits) sched/uclamp: Add uclamp support to energy_compute() sched/uclamp: Add uclamp_util_with() sched/cpufreq, sched/uclamp: Add clamps for FAIR and RT tasks sched/uclamp: Set default clamps for RT tasks sched/uclamp: Reset uclamp values on RESET_ON_FORK sched/uclamp: Extend sched_setattr() to support utilization clamping sched/core: Allow sched_setattr() to use the current policy sched/uclamp: Add system default clamps sched/uclamp: Enforce last task's UCLAMP_MAX sched/uclamp: Add bucket local max tracking sched/uclamp: Add CPU's clamp buckets refcounting sched/fair: Rename weighted_cpuload() to cpu_runnable_load() sched/debug: Export the newly added tracepoints sched/debug: Add sched_overutilized tracepoint sched/debug: Add new tracepoint to track PELT at se level sched/debug: Add new tracepoints to track PELT at rq level sched/debug: Add a new sched_trace_*() helper functions sched/autogroup: Make autogroup_path() always available sched/wait: Deduplicate code with do-while sched/topology: Remove unused 'sd' parameter from arch_scale_cpu_capacity() ...

Documentation/scheduler/sched-pelt.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@ void calc_runnable_avg_yN_inv(void)
		int i;
		unsigned int x;

		printf("static const u32 runnable_avg_yN_inv[] = {");
		/* To silence -Wunused-but-set-variable warnings. */
		printf("static const u32 runnable_avg_yN_inv[] __maybe_unused = {");
		for (i = 0; i < HALFLIFE; i++) {
		x = ((1UL<<32)-1)*pow(y, i);

arch/arm/kernel/topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ static void update_cpu_capacity(unsigned int cpu)
		topology_set_cpu_scale(cpu, cpu_capacity(cpu) / middle_capacity);

		pr_info("CPU%u: update cpu_capacity %lu\n",
		cpu, topology_get_cpu_scale(NULL, cpu));
		cpu, topology_get_cpu_scale(cpu));
		}

		#else

arch/ia64/kernel/mca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1831,7 +1831,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
		ti->cpu = cpu;
		p->stack = ti;
		p->state = TASK_UNINTERRUPTIBLE;
		cpumask_set_cpu(cpu, &p->cpus_allowed);
		cpumask_set_cpu(cpu, &p->cpus_mask);
		INIT_LIST_HEAD(&p->tasks);
		p->parent = p->real_parent = p->group_leader = p;
		INIT_LIST_HEAD(&p->children);

arch/mips/include/asm/switch_to.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ extern struct task_struct *ll_task;
		* inline to try to keep the overhead down. If we have been forced to run on
		* a "CPU" with an FPU because of a previous high level of FP computation,
		* but did not actually use the FPU during the most recent time-slice (CU1
		* isn't set), we undo the restriction on cpus_allowed.
		* isn't set), we undo the restriction on cpus_mask.
		*
		* We're not calling set_cpus_allowed() here, because we have no need to
		* force prompt migration - we're already switching the current CPU to a
		@@ -57,7 +57,7 @@ do { \
		test_ti_thread_flag(__prev_ti, TIF_FPUBOUND) && \
		(!(KSTK_STATUS(prev) & ST0_CU1))) { \
		clear_ti_thread_flag(__prev_ti, TIF_FPUBOUND); \
		prev->cpus_allowed = prev->thread.user_cpus_allowed; \
		prev->cpus_mask = prev->thread.user_cpus_allowed; \
		} \
		next->thread.emulated_fp = 0; \
		} while(0)

arch/mips/kernel/mips-mt-fpaff.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
		if (retval)
		goto out_unlock;

		cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed);
		cpumask_or(&allowed, &p->thread.user_cpus_allowed, p->cpus_ptr);
		cpumask_and(&mask, &allowed, cpu_active_mask);

		out_unlock:

Admin message