Commit 16fa94b5 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 development cycle were:

   - full dynticks preparatory work by Frederic Weisbecker

   - factor out the cpu time accounting code better, by Li Zefan

   - multi-CPU load balancer cleanups and improvements by Joonsoo Kim

   - various smaller fixes and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
  sched: Fix init NOHZ_IDLE flag
  sched: Prevent to re-select dst-cpu in load_balance()
  sched: Rename load_balance_tmpmask to load_balance_mask
  sched: Move up affinity check to mitigate useless redoing overhead
  sched: Don't consider other cpus in our group in case of NEWLY_IDLE
  sched: Explicitly cpu_idle_type checking in rebalance_domains()
  sched: Change position of resched_cpu() in load_balance()
  sched: Fix wrong rq's runnable_avg update with rt tasks
  sched: Document task_struct::personality field
  sched/cpuacct/UML: Fix header file dependency bug on the UML build
  cgroup: Kill subsys.active flag
  sched/cpuacct: No need to check subsys active state
  sched/cpuacct: Initialize cpuacct subsystem earlier
  sched/cpuacct: Initialize root cpuacct earlier
  sched/cpuacct: Allocate per_cpu cpuusage for root cpuacct statically
  sched/cpuacct: Clean up cpuacct.h
  sched/cpuacct: Remove redundant NULL checks in cpuacct_acount_field()
  sched/cpuacct: Remove redundant NULL checks in cpuacct_charge()
  sched/cpuacct: Add cpuacct_acount_field()
  sched/cpuacct: Add cpuacct_init()
  ...
parents e0972916 25f55d9d

arch/x86/include/asm/context_tracking.h

+0 −21
Original line number Diff line number Diff line 
#ifndef _ASM_X86_CONTEXT_TRACKING_H

#define _ASM_X86_CONTEXT_TRACKING_H



#ifndef __ASSEMBLY__

#include <linux/context_tracking.h>

#include <asm/ptrace.h>



static inline void exception_enter(struct pt_regs *regs)

{

	user_exit();

}



static inline void exception_exit(struct pt_regs *regs)

{

#ifdef CONFIG_CONTEXT_TRACKING

	if (user_mode(regs))

		user_enter();

#endif

}



#else /* __ASSEMBLY__ */



#ifdef CONFIG_CONTEXT_TRACKING

# define SCHEDULE_USER call schedule_user

#else

# define SCHEDULE_USER call schedule

#endif



#endif /* !__ASSEMBLY__ */



#endif

arch/x86/kernel/kvm.c

+5 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 *   Authors: Anthony Liguori <aliguori@us.ibm.com>

 */



#include <linux/context_tracking.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kvm_para.h>
@@ -43,7 +44,6 @@ 
#include <asm/apicdef.h>

#include <asm/hypervisor.h>

#include <asm/kvm_guest.h>

#include <asm/context_tracking.h>



static int kvmapf = 1;
@@ -254,16 +254,18 @@ EXPORT_SYMBOL_GPL(kvm_read_and_reset_pf_reason); 
dotraplinkage void __kprobes

do_async_page_fault(struct pt_regs *regs, unsigned long error_code)

{

	enum ctx_state prev_state;



	switch (kvm_read_and_reset_pf_reason()) {

	default:

		do_page_fault(regs, error_code);

		break;

	case KVM_PV_REASON_PAGE_NOT_PRESENT:

		/* page is swapped out by the host. */

		exception_enter(regs);

		prev_state = exception_enter();

		exit_idle();

		kvm_async_pf_task_wait((u32)read_cr2());

		exception_exit(regs);

		exception_exit(prev_state);

		break;

	case KVM_PV_REASON_PAGE_READY:

		rcu_irq_enter();

arch/x86/kernel/traps.c

+42 −26
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/context_tracking.h>

#include <linux/interrupt.h>

#include <linux/kallsyms.h>

#include <linux/spinlock.h>
@@ -55,8 +56,6 @@ 
#include <asm/i387.h>

#include <asm/fpu-internal.h>

#include <asm/mce.h>

#include <asm/context_tracking.h>



#include <asm/mach_traps.h>



#ifdef CONFIG_X86_64
@@ -176,34 +175,38 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, 
#define DO_ERROR(trapnr, signr, str, name)				\

dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\

{									\

	exception_enter(regs);						\

	enum ctx_state prev_state;					\

									\

	prev_state = exception_enter();					\

	if (notify_die(DIE_TRAP, str, regs, error_code,			\

			trapnr, signr) == NOTIFY_STOP) {		\

		exception_exit(regs);					\

		exception_exit(prev_state);				\

		return;							\

	}								\

	conditional_sti(regs);						\

	do_trap(trapnr, signr, str, regs, error_code, NULL);		\

	exception_exit(regs);						\

	exception_exit(prev_state);					\

}



#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)		\

dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\

{									\

	siginfo_t info;							\

	enum ctx_state prev_state;					\

									\

	info.si_signo = signr;						\

	info.si_errno = 0;						\

	info.si_code = sicode;						\

	info.si_addr = (void __user *)siaddr;				\

	exception_enter(regs);						\

	prev_state = exception_enter();					\

	if (notify_die(DIE_TRAP, str, regs, error_code,			\

			trapnr, signr) == NOTIFY_STOP) {		\

		exception_exit(regs);					\

		exception_exit(prev_state);				\

		return;							\

	}								\

	conditional_sti(regs);						\

	do_trap(trapnr, signr, str, regs, error_code, &info);		\

	exception_exit(regs);						\

	exception_exit(prev_state);					\

}



DO_ERROR_INFO(X86_TRAP_DE, SIGFPE, "divide error", divide_error, FPE_INTDIV,
@@ -226,14 +229,16 @@ DO_ERROR_INFO(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check, 
/* Runs on IST stack */

dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)

{

	exception_enter(regs);

	enum ctx_state prev_state;



	prev_state = exception_enter();

	if (notify_die(DIE_TRAP, "stack segment", regs, error_code,

		       X86_TRAP_SS, SIGBUS) != NOTIFY_STOP) {

		preempt_conditional_sti(regs);

		do_trap(X86_TRAP_SS, SIGBUS, "stack segment", regs, error_code, NULL);

		preempt_conditional_cli(regs);

	}

	exception_exit(regs);

	exception_exit(prev_state);

}



dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
@@ -241,7 +246,7 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code) 
	static const char str[] = "double fault";

	struct task_struct *tsk = current;



	exception_enter(regs);

	exception_enter();

	/* Return not checked because double check cannot be ignored */

	notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
@@ -261,8 +266,9 @@ dotraplinkage void __kprobes 
do_general_protection(struct pt_regs *regs, long error_code)

{

	struct task_struct *tsk;

	enum ctx_state prev_state;



	exception_enter(regs);

	prev_state = exception_enter();

	conditional_sti(regs);



#ifdef CONFIG_X86_32
@@ -300,12 +306,14 @@ do_general_protection(struct pt_regs *regs, long error_code) 


	force_sig(SIGSEGV, tsk);

exit:

	exception_exit(regs);

	exception_exit(prev_state);

}



/* May run on IST stack. */

dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_code)

{

	enum ctx_state prev_state;



#ifdef CONFIG_DYNAMIC_FTRACE

	/*

	 * ftrace must be first, everything else may cause a recursive crash.
@@ -315,7 +323,7 @@ dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_co 
	    ftrace_int3_handler(regs))

		return;

#endif

	exception_enter(regs);

	prev_state = exception_enter();

#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP

	if (kgdb_ll_trap(DIE_INT3, "int3", regs, error_code, X86_TRAP_BP,

				SIGTRAP) == NOTIFY_STOP)
@@ -336,7 +344,7 @@ dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_co 
	preempt_conditional_cli(regs);

	debug_stack_usage_dec();

exit:

	exception_exit(regs);

	exception_exit(prev_state);

}



#ifdef CONFIG_X86_64
@@ -393,11 +401,12 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs) 
dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)

{

	struct task_struct *tsk = current;

	enum ctx_state prev_state;

	int user_icebp = 0;

	unsigned long dr6;

	int si_code;



	exception_enter(regs);

	prev_state = exception_enter();



	get_debugreg(dr6, 6);
@@ -467,7 +476,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) 
	debug_stack_usage_dec();



exit:

	exception_exit(regs);

	exception_exit(prev_state);

}



/*
@@ -561,17 +570,21 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) 


dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code)

{

	exception_enter(regs);

	enum ctx_state prev_state;



	prev_state = exception_enter();

	math_error(regs, error_code, X86_TRAP_MF);

	exception_exit(regs);

	exception_exit(prev_state);

}



dotraplinkage void

do_simd_coprocessor_error(struct pt_regs *regs, long error_code)

{

	exception_enter(regs);

	enum ctx_state prev_state;



	prev_state = exception_enter();

	math_error(regs, error_code, X86_TRAP_XF);

	exception_exit(regs);

	exception_exit(prev_state);

}



dotraplinkage void
@@ -639,7 +652,9 @@ EXPORT_SYMBOL_GPL(math_state_restore); 
dotraplinkage void __kprobes

do_device_not_available(struct pt_regs *regs, long error_code)

{

	exception_enter(regs);

	enum ctx_state prev_state;



	prev_state = exception_enter();

	BUG_ON(use_eager_fpu());



#ifdef CONFIG_MATH_EMULATION
@@ -650,7 +665,7 @@ do_device_not_available(struct pt_regs *regs, long error_code) 


		info.regs = regs;

		math_emulate(&info);

		exception_exit(regs);

		exception_exit(prev_state);

		return;

	}

#endif
@@ -658,15 +673,16 @@ do_device_not_available(struct pt_regs *regs, long error_code) 
#ifdef CONFIG_X86_32

	conditional_sti(regs);

#endif

	exception_exit(regs);

	exception_exit(prev_state);

}



#ifdef CONFIG_X86_32

dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)

{

	siginfo_t info;

	enum ctx_state prev_state;



	exception_enter(regs);

	prev_state = exception_enter();

	local_irq_enable();



	info.si_signo = SIGILL;
@@ -678,7 +694,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) 
		do_trap(X86_TRAP_IRET, SIGILL, "iret exception", regs, error_code,

			&info);

	}

	exception_exit(regs);

	exception_exit(prev_state);

}

#endif

arch/x86/mm/fault.c

+5 −3
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 
#include <linux/perf_event.h>		/* perf_sw_event		*/

#include <linux/hugetlb.h>		/* hstate_index_to_shift	*/

#include <linux/prefetch.h>		/* prefetchw			*/

#include <linux/context_tracking.h>	/* exception_enter(), ...	*/



#include <asm/traps.h>			/* dotraplinkage, ...		*/

#include <asm/pgalloc.h>		/* pgd_*(), ...			*/

#include <asm/kmemcheck.h>		/* kmemcheck_*(), ...		*/

#include <asm/fixmap.h>			/* VSYSCALL_START		*/

#include <asm/context_tracking.h>	/* exception_enter(), ...	*/



/*

 * Page fault error code bits:
@@ -1224,7 +1224,9 @@ good_area: 
dotraplinkage void __kprobes

do_page_fault(struct pt_regs *regs, unsigned long error_code)

{

	exception_enter(regs);

	enum ctx_state prev_state;



	prev_state = exception_enter();

	__do_page_fault(regs, error_code);

	exception_exit(regs);

	exception_exit(prev_state);

}

include/linux/cgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -586,7 +586,6 @@ struct cgroup_subsys { 
	void (*bind)(struct cgroup *root);



	int subsys_id;

	int active;

	int disabled;

	int early_init;

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE