Commit af8c5e2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Implement frequency/CPU invariance and OPP selection for
     SCHED_DEADLINE (Juri Lelli)

   - Tweak the task migration logic for better multi-tasking
     workload scalability (Mel Gorman)

   - Misc cleanups, fixes and improvements"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/deadline: Make bandwidth enforcement scale-invariant
  sched/cpufreq: Move arch_scale_{freq,cpu}_capacity() outside of #ifdef CONFIG_SMP
  sched/cpufreq: Remove arch_scale_freq_capacity()'s 'sd' parameter
  sched/cpufreq: Always consider all CPUs when deciding next freq
  sched/cpufreq: Split utilization signals
  sched/cpufreq: Change the worker kthread to SCHED_DEADLINE
  sched/deadline: Move CPU frequency selection triggering points
  sched/cpufreq: Use the DEADLINE utilization signal
  sched/deadline: Implement "runtime overrun signal" support
  sched/fair: Only immediately migrate tasks due to interrupts if prev and target CPUs share cache
  sched/fair: Correct obsolete comment about cpufreq_update_util()
  sched/fair: Remove impossible condition from find_idlest_group_cpu()
  sched/cpufreq: Don't pass flags to sugov_set_iowait_boost()
  sched/cpufreq: Initialize sg_cpu->flags to 0
  sched/fair: Consider RT/IRQ pressure in capacity_spare_wake()
  sched/fair: Use 'unsigned long' for utilization, consistently
  sched/core: Rework and clarify prepare_lock_switch()
  sched/fair: Remove unused 'curr' parameter from wakeup_gran
  sched/headers: Constify object_is_on_stack()
parents a1c75e17 07881166

include/linux/arch_topology.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity); 
DECLARE_PER_CPU(unsigned long, freq_scale);



static inline

unsigned long topology_get_freq_scale(struct sched_domain *sd, int cpu)

unsigned long topology_get_freq_scale(int cpu)

{

	return per_cpu(freq_scale, cpu);

}

include/linux/sched.h

+5 −0
Original line number Diff line number Diff line
@@ -472,11 +472,15 @@ struct sched_dl_entity { 
	 * has not been executed yet. This flag is useful to avoid race

	 * conditions between the inactive timer handler and the wakeup

	 * code.

	 *

	 * @dl_overrun tells if the task asked to be informed about runtime

	 * overruns.

	 */

	unsigned int			dl_throttled      : 1;

	unsigned int			dl_boosted        : 1;

	unsigned int			dl_yielded        : 1;

	unsigned int			dl_non_contending : 1;

	unsigned int			dl_overrun	  : 1;



	/*

	 * Bandwidth enforcement timer. Each -deadline task has its
@@ -1427,6 +1431,7 @@ extern int idle_cpu(int cpu); 
extern int sched_setscheduler(struct task_struct *, int, const struct sched_param *);

extern int sched_setscheduler_nocheck(struct task_struct *, int, const struct sched_param *);

extern int sched_setattr(struct task_struct *, const struct sched_attr *);

extern int sched_setattr_nocheck(struct task_struct *, const struct sched_attr *);

extern struct task_struct *idle_task(int cpu);



/**

include/linux/sched/cpufreq.h

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#define SCHED_CPUFREQ_DL	(1U << 1)

#define SCHED_CPUFREQ_IOWAIT	(1U << 2)



#define SCHED_CPUFREQ_RT_DL	(SCHED_CPUFREQ_RT | SCHED_CPUFREQ_DL)



#ifdef CONFIG_CPU_FREQ

struct update_util_data {

       void (*func)(struct update_util_data *data, u64 time, unsigned int flags);

include/linux/sched/task_stack.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline void put_task_stack(struct task_struct *tsk) {} 
#define task_stack_end_corrupted(task) \

		(*(end_of_stack(task)) != STACK_END_MAGIC)



static inline int object_is_on_stack(void *obj)

static inline int object_is_on_stack(const void *obj)

{

	void *stack = task_stack_page(current);

include/linux/sched/topology.h

+6 −6
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


#include <linux/sched/idle.h>



/*

 * Increase resolution of cpu_capacity calculations

 */

#define SCHED_CAPACITY_SHIFT	SCHED_FIXEDPOINT_SHIFT

#define SCHED_CAPACITY_SCALE	(1L << SCHED_CAPACITY_SHIFT)



/*

 * sched-domains (multiprocessor balancing) declarations:

 */
@@ -27,12 +33,6 @@ 
#define SD_OVERLAP		0x2000	/* sched_domains of this level overlap */

#define SD_NUMA			0x4000	/* cross-node balancing */



/*

 * Increase resolution of cpu_capacity calculations

 */

#define SCHED_CAPACITY_SHIFT	SCHED_FIXEDPOINT_SHIFT

#define SCHED_CAPACITY_SCALE	(1L << SCHED_CAPACITY_SHIFT)



#ifdef CONFIG_SCHED_SMT

static inline int cpu_smt_flags(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE