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

Commit 53528695 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 changes from Ingo Molnar:
 "The main changes in this cycle were:

   - sched/fair load tracking fixes and cleanups (Byungchul Park)

   - Make load tracking frequency scale invariant (Dietmar Eggemann)

   - sched/deadline updates (Juri Lelli)

   - stop machine fixes, cleanups and enhancements for bugs triggered by
     CPU hotplug stress testing (Oleg Nesterov)

   - scheduler preemption code rework: remove PREEMPT_ACTIVE and related
     cleanups (Peter Zijlstra)

   - Rework the sched_info::run_delay code to fix races (Peter Zijlstra)

   - Optimize per entity utilization tracking (Peter Zijlstra)

   - ... misc other fixes, cleanups and smaller updates"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (57 commits)
  sched: Don't scan all-offline ->cpus_allowed twice if !CONFIG_CPUSETS
  sched: Move cpu_active() tests from stop_two_cpus() into migrate_swap_stop()
  sched: Start stopper early
  stop_machine: Kill cpu_stop_threads->setup() and cpu_stop_unpark()
  stop_machine: Kill smp_hotplug_thread->pre_unpark, introduce stop_machine_unpark()
  stop_machine: Change cpu_stop_queue_two_works() to rely on stopper->enabled
  stop_machine: Introduce __cpu_stop_queue_work() and cpu_stop_queue_two_works()
  stop_machine: Ensure that a queued callback will be called before cpu_stop_park()
  sched/x86: Fix typo in __switch_to() comments
  sched/core: Remove a parameter in the migrate_task_rq() function
  sched/core: Drop unlikely behind BUG_ON()
  sched/core: Fix task and run queue sched_info::run_delay inconsistencies
  sched/numa: Fix task_tick_fair() from disabling numa_balancing
  sched/core: Add preempt_count invariant check
  sched/core: More notrace annotations
  sched/core: Kill PREEMPT_ACTIVE
  sched/core, sched/x86: Kill thread_info::saved_preempt_count
  sched/core: Simplify preempt_count tests
  sched/core: Robustify preemption leak checks
  sched/core: Stop setting PREEMPT_ACTIVE
  ...
parents b831ef2c e73e85f0

arch/x86/include/asm/preempt.h

+1 −4
Original line number Diff line number Diff line
@@ -30,12 +30,9 @@ static __always_inline void preempt_count_set(int pc) 
/*

 * must be macros to avoid header recursion hell

 */

#define init_task_preempt_count(p) do { \

	task_thread_info(p)->saved_preempt_count = PREEMPT_DISABLED; \

} while (0)

#define init_task_preempt_count(p) do { } while (0)



#define init_idle_preempt_count(p, cpu) do { \

	task_thread_info(p)->saved_preempt_count = PREEMPT_ENABLED; \

	per_cpu(__preempt_count, (cpu)) = PREEMPT_ENABLED; \

} while (0)

arch/x86/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ struct thread_info { 
	__u32			flags;		/* low level flags */

	__u32			status;		/* thread synchronous flags */

	__u32			cpu;		/* current CPU */

	int			saved_preempt_count;

	mm_segment_t		addr_limit;

	void __user		*sysenter_return;

	unsigned int		sig_on_uaccess_error:1;
@@ -69,7 +68,6 @@ struct thread_info { 
	.task		= &tsk,			\

	.flags		= 0,			\

	.cpu		= 0,			\

	.saved_preempt_count = INIT_PREEMPT_COUNT,	\

	.addr_limit	= KERNEL_DS,		\

}

arch/x86/kernel/process_32.c

+0 −8
Original line number Diff line number Diff line
@@ -279,14 +279,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
	if (get_kernel_rpl() && unlikely(prev->iopl != next->iopl))

		set_iopl_mask(next->iopl);



	/*

	 * If it were not for PREEMPT_ACTIVE we could guarantee that the

	 * preempt_count of all tasks was equal here and this would not be

	 * needed.

	 */

	task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);

	this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);



	/*

	 * Now maybe handle debug registers and/or IO bitmaps

	 */

arch/x86/kernel/process_64.c

+1 −9
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
	/*

	 * Switch FS and GS.

	 *

	 * These are even more complicated than FS and GS: they have

	 * These are even more complicated than DS and ES: they have

	 * 64-bit bases are that controlled by arch_prctl.  Those bases

	 * only differ from the values in the GDT or LDT if the selector

	 * is 0.
@@ -401,14 +401,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
	 */

	this_cpu_write(current_task, next_p);



	/*

	 * If it were not for PREEMPT_ACTIVE we could guarantee that the

	 * preempt_count of all tasks was equal here and this would not be

	 * needed.

	 */

	task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);

	this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);



	/* Reload esp0 and ss1.  This changes current_thread_info(). */

	load_sp0(tss, next);

include/asm-generic/preempt.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static __always_inline void preempt_count_set(int pc) 
 * must be macros to avoid header recursion hell

 */

#define init_task_preempt_count(p) do { \

	task_thread_info(p)->preempt_count = PREEMPT_DISABLED; \

	task_thread_info(p)->preempt_count = FORK_PREEMPT_COUNT; \

} while (0)



#define init_idle_preempt_count(p, cpu) do { \