Commit af345201 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:

   - tickless load average calculation enhancements (Byungchul Park)

   - vtime handling enhancements (Frederic Weisbecker)

   - scalability improvement via properly aligning a key structure field
     (Jiri Olsa)

   - various stop_machine() fixes (Oleg Nesterov)

   - sched/numa enhancement (Rik van Riel)

   - various fixes and improvements (Andi Kleen, Dietmar Eggemann,
     Geliang Tang, Hiroshi Shimamoto, Joonwoo Park, Peter Zijlstra,
     Waiman Long, Wanpeng Li, Yuyang Du)"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
  sched/fair: Fix new task's load avg removed from source CPU in wake_up_new_task()
  sched/core: Move sched_entity::avg into separate cache line
  x86/fpu: Properly align size in CHECK_MEMBER_AT_END_OF() macro
  sched/deadline: Fix the earliest_dl.next logic
  sched/fair: Disable the task group load_avg update for the root_task_group
  sched/fair: Move the cache-hot 'load_avg' variable into its own cacheline
  sched/fair: Avoid redundant idle_cpu() call in update_sg_lb_stats()
  sched/core: Move the sched_to_prio[] arrays out of line
  sched/cputime: Convert vtime_seqlock to seqcount
  sched/cputime: Introduce vtime accounting check for readers
  sched/cputime: Rename vtime_accounting_enabled() to vtime_accounting_cpu_enabled()
  sched/cputime: Correctly handle task guest time on housekeepers
  sched/cputime: Clarify vtime symbols and document them
  sched/cputime: Remove extra cost in task_cputime()
  sched/fair: Make it possible to account fair load avg consistently
  sched/fair: Modify the comment about lock assumptions in migrate_task_rq_fair()
  stop_machine: Clean up the usage of the preemption counter in cpu_stopper_thread()
  stop_machine: Shift the 'done != NULL' check from cpu_stop_signal_done() to callers
  stop_machine: Kill cpu_stop_done->executed
  stop_machine: Change __stop_cpus() to rely on cpu_stop_queue_work()
  ...
parents 4bd20db2 0905f04e

arch/x86/kernel/fpu/init.c

+11 −2
Original line number Diff line number Diff line
@@ -143,9 +143,18 @@ static void __init fpu__init_system_generic(void) 
unsigned int xstate_size;

EXPORT_SYMBOL_GPL(xstate_size);



/* Enforce that 'MEMBER' is the last field of 'TYPE': */

/* Get alignment of the TYPE. */

#define TYPE_ALIGN(TYPE) offsetof(struct { char x; TYPE test; }, test)



/*

 * Enforce that 'MEMBER' is the last field of 'TYPE'.

 *

 * Align the computed size with alignment of the TYPE,

 * because that's how C aligns structs.

 */

#define CHECK_MEMBER_AT_END_OF(TYPE, MEMBER) \

	BUILD_BUG_ON(sizeof(TYPE) != offsetofend(TYPE, MEMBER))

	BUILD_BUG_ON(sizeof(TYPE) != ALIGN(offsetofend(TYPE, MEMBER), \

					   TYPE_ALIGN(TYPE)))



/*

 * We append the 'struct fpu' to the task_struct:

include/linux/context_tracking.h

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline void context_tracking_init(void) { } 
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

static inline void guest_enter(void)

{

	if (vtime_accounting_enabled())

	if (vtime_accounting_cpu_enabled())

		vtime_guest_enter(current);

	else

		current->flags |= PF_VCPU;
@@ -100,7 +100,7 @@ static inline void guest_exit(void) 
	if (context_tracking_is_enabled())

		__context_tracking_exit(CONTEXT_GUEST);



	if (vtime_accounting_enabled())

	if (vtime_accounting_cpu_enabled())

		vtime_guest_exit(current);

	else

		current->flags &= ~PF_VCPU;

include/linux/init_task.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ extern struct task_group root_task_group; 


#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

# define INIT_VTIME(tsk)						\

	.vtime_seqlock = __SEQLOCK_UNLOCKED(tsk.vtime_seqlock),	\

	.vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount),	\

	.vtime_snap = 0,				\

	.vtime_snap_whence = VTIME_SYS,

#else

include/linux/sched.h

+14 −6
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load); 
extern void calc_global_load(unsigned long ticks);



#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)

extern void update_cpu_load_nohz(void);

extern void update_cpu_load_nohz(int active);

#else

static inline void update_cpu_load_nohz(void) { }

static inline void update_cpu_load_nohz(int active) { }

#endif



extern unsigned long get_parent_ip(unsigned long addr);
@@ -1268,8 +1268,13 @@ struct sched_entity { 
#endif



#ifdef CONFIG_SMP

	/* Per entity load average tracking */

	struct sched_avg	avg;

	/*

	 * Per entity load average tracking.

	 *

	 * Put into separate cache line so it does not

	 * collide with read-mostly values above.

	 */

	struct sched_avg	avg ____cacheline_aligned_in_smp;

#endif

};
@@ -1520,11 +1525,14 @@ struct task_struct { 
	cputime_t gtime;

	struct prev_cputime prev_cputime;

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

	seqlock_t vtime_seqlock;

	seqcount_t vtime_seqcount;

	unsigned long long vtime_snap;

	enum {

		VTIME_SLEEPING = 0,

		/* Task is sleeping or running in a CPU with VTIME inactive */

		VTIME_INACTIVE = 0,

		/* Task runs in userspace in a CPU with VTIME active */

		VTIME_USER,

		/* Task runs in kernelspace in a CPU with VTIME active */

		VTIME_SYS,

	} vtime_snap_whence;

#endif

include/linux/stop_machine.h

+5 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct cpu_stop_work { 


int stop_one_cpu(unsigned int cpu, cpu_stop_fn_t fn, void *arg);

int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void *arg);

void stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg,

bool stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg,

			 struct cpu_stop_work *work_buf);

int stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);

int try_stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);
@@ -65,7 +65,7 @@ static void stop_one_cpu_nowait_workfn(struct work_struct *work) 
	preempt_enable();

}



static inline void stop_one_cpu_nowait(unsigned int cpu,

static inline bool stop_one_cpu_nowait(unsigned int cpu,

				       cpu_stop_fn_t fn, void *arg,

				       struct cpu_stop_work *work_buf)

{
@@ -74,7 +74,10 @@ static inline void stop_one_cpu_nowait(unsigned int cpu, 
		work_buf->fn = fn;

		work_buf->arg = arg;

		schedule_work(&work_buf->work);

		return true;

	}



	return false;

}



static inline int stop_cpus(const struct cpumask *cpumask,

CRA Git | Maintained and supported by SUSTech CRA and CCSE