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

Commit 53c5f5ba authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'sched-wq' of ../wq into cmwq-base

parents 7e27d6e7 21aa9af0

include/linux/cpu.h

+25 −0
Original line number Diff line number Diff line
@@ -48,6 +48,31 @@ extern ssize_t arch_cpu_release(const char *, size_t); 
#endif

struct notifier_block;



/*

 * CPU notifier priorities.

 */

enum {

	/*

	 * SCHED_ACTIVE marks a cpu which is coming up active during

	 * CPU_ONLINE and CPU_DOWN_FAILED and must be the first

	 * notifier.  CPUSET_ACTIVE adjusts cpuset according to

	 * cpu_active mask right after SCHED_ACTIVE.  During

	 * CPU_DOWN_PREPARE, SCHED_INACTIVE and CPUSET_INACTIVE are

	 * ordered in the similar way.

	 *

	 * This ordering guarantees consistent cpu_active mask and

	 * migration behavior to all cpu notifiers.

	 */

	CPU_PRI_SCHED_ACTIVE	= INT_MAX,

	CPU_PRI_CPUSET_ACTIVE	= INT_MAX - 1,

	CPU_PRI_SCHED_INACTIVE	= INT_MIN + 1,

	CPU_PRI_CPUSET_INACTIVE	= INT_MIN,



	/* migration should happen before other stuff but after perf */

	CPU_PRI_PERF		= 20,

	CPU_PRI_MIGRATION	= 10,

};



#ifdef CONFIG_SMP

/* Need to know about CPUs going up/down? */

#if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)

include/linux/cpuset.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ extern int number_of_cpusets; /* How many cpusets are defined in system? */ 


extern int cpuset_init(void);

extern void cpuset_init_smp(void);

extern void cpuset_update_active_cpus(void);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);

extern int cpuset_cpus_allowed_fallback(struct task_struct *p);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
@@ -132,6 +133,11 @@ static inline void set_mems_allowed(nodemask_t nodemask) 
static inline int cpuset_init(void) { return 0; }

static inline void cpuset_init_smp(void) {}



static inline void cpuset_update_active_cpus(void)

{

	partition_sched_domains(1, NULL, NULL);

}



static inline void cpuset_cpus_allowed(struct task_struct *p,

				       struct cpumask *mask)

{

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static inline void perf_event_disable(struct perf_event *event) { } 
#define perf_cpu_notifier(fn)					\

do {								\

	static struct notifier_block fn##_nb __cpuinitdata =	\

		{ .notifier_call = fn, .priority = 20 };	\

		{ .notifier_call = fn, .priority = CPU_PRI_PERF }; \

	fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE,		\

		(void *)(unsigned long)smp_processor_id());	\

	fn(&fn##_nb, (unsigned long)CPU_STARTING,		\

include/linux/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,7 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t * 
#define PF_EXITING	0x00000004	/* getting shut down */

#define PF_EXITPIDONE	0x00000008	/* pi exit done on shut down */

#define PF_VCPU		0x00000010	/* I'm a virtual CPU */

#define PF_WQ_WORKER	0x00000020	/* I'm a workqueue worker */

#define PF_FORKNOEXEC	0x00000040	/* forked but didn't exec */

#define PF_MCE_PROCESS  0x00000080      /* process policy on mce errors */

#define PF_SUPERPRIV	0x00000100	/* used super-user privileges */

kernel/cpu.c

+0 −6
Original line number Diff line number Diff line
@@ -235,11 +235,8 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) 
		return -EINVAL;



	cpu_hotplug_begin();

	set_cpu_active(cpu, false);

	err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls);

	if (err) {

		set_cpu_active(cpu, true);



		nr_calls--;

		__cpu_notify(CPU_DOWN_FAILED | mod, hcpu, nr_calls, NULL);

		printk("%s: attempt to take down CPU %u failed\n",
@@ -249,7 +246,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) 


	err = __stop_machine(take_cpu_down, &tcd_param, cpumask_of(cpu));

	if (err) {

		set_cpu_active(cpu, true);

		/* CPU didn't die: tell everyone.  Can't complain. */

		cpu_notify_nofail(CPU_DOWN_FAILED | mod, hcpu);
@@ -321,8 +317,6 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) 
		goto out_notify;

	BUG_ON(!cpu_online(cpu));



	set_cpu_active(cpu, true);



	/* Now call notifier in preparation. */

	cpu_notify(CPU_ONLINE | mod, hcpu);