Commit 7fda0412 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fixes from Ingo Molnar.

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpusets: Remove an unused variable
  sched/rt: Improve pick_next_highest_task_rt()
  sched: Fix select_fallback_rq() vs cpu_active/cpu_online
  sched/x86/smp: Do not enable IRQs over calibrate_delay()
  sched: Fix compiler warning about declared inline after use
  MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS
parents 6b8212a3 160594e9

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5185,7 +5185,7 @@ F: kernel/delayacct.c 
PERFORMANCE EVENTS SUBSYSTEM

M:	Peter Zijlstra <a.p.zijlstra@chello.nl>

M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

M:	Ingo Molnar <mingo@redhat.com>

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core

S:	Supported
@@ -5833,7 +5833,7 @@ S: Maintained 
F:	drivers/watchdog/sc1200wdt.c



SCHEDULER

M:	Ingo Molnar <mingo@elte.hu>

M:	Ingo Molnar <mingo@redhat.com>

M:	Peter Zijlstra <peterz@infradead.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core

S:	Maintained

arch/x86/kernel/smpboot.c

+0 −5
Original line number Diff line number Diff line
@@ -219,14 +219,9 @@ static void __cpuinit smp_callin(void) 
	 * Update loops_per_jiffy in cpu_data. Previous call to

	 * smp_store_cpu_info() stored a value that is close but not as

	 * accurate as the value just calculated.

	 *

	 * Need to enable IRQs because it can take longer and then

	 * the NMI watchdog might kill us.

	 */

	local_irq_enable();

	calibrate_delay();

	cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;

	local_irq_disable();

	pr_debug("Stack at about %p\n", &cpuid);



	/*

include/linux/cpuset.h

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 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 void cpuset_cpus_allowed_fallback(struct task_struct *p);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);

#define cpuset_current_mems_allowed (current->mems_allowed)

void cpuset_init_current_mems_allowed(void);
@@ -135,10 +135,8 @@ static inline void cpuset_cpus_allowed(struct task_struct *p, 
	cpumask_copy(mask, cpu_possible_mask);

}



static inline int cpuset_cpus_allowed_fallback(struct task_struct *p)

static inline void cpuset_cpus_allowed_fallback(struct task_struct *p)

{

	do_set_cpus_allowed(p, cpu_possible_mask);

	return cpumask_any(cpu_active_mask);

}



static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)

kernel/cpuset.c

+4 −17
Original line number Diff line number Diff line
@@ -2162,10 +2162,9 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask) 
	mutex_unlock(&callback_mutex);

}



int cpuset_cpus_allowed_fallback(struct task_struct *tsk)

void cpuset_cpus_allowed_fallback(struct task_struct *tsk)

{

	const struct cpuset *cs;

	int cpu;



	rcu_read_lock();

	cs = task_cs(tsk);
@@ -2186,22 +2185,10 @@ int cpuset_cpus_allowed_fallback(struct task_struct *tsk) 
	 * changes in tsk_cs()->cpus_allowed. Otherwise we can temporary

	 * set any mask even if it is not right from task_cs() pov,

	 * the pending set_cpus_allowed_ptr() will fix things.

	 *

	 * select_fallback_rq() will fix things ups and set cpu_possible_mask

	 * if required.

	 */



	cpu = cpumask_any_and(&tsk->cpus_allowed, cpu_active_mask);

	if (cpu >= nr_cpu_ids) {

		/*

		 * Either tsk->cpus_allowed is wrong (see above) or it

		 * is actually empty. The latter case is only possible

		 * if we are racing with remove_tasks_in_empty_cpuset().

		 * Like above we can temporary set any mask and rely on

		 * set_cpus_allowed_ptr() as synchronization point.

		 */

		do_set_cpus_allowed(tsk, cpu_possible_mask);

		cpu = cpumask_any(cpu_active_mask);

	}



	return cpu;

}



void cpuset_init_current_mems_allowed(void)

kernel/sched/core.c

+46 −16
Original line number Diff line number Diff line
@@ -1265,21 +1265,50 @@ EXPORT_SYMBOL_GPL(kick_process); 
 */

static int select_fallback_rq(int cpu, struct task_struct *p)

{

	int dest_cpu;

	const struct cpumask *nodemask = cpumask_of_node(cpu_to_node(cpu));

	enum { cpuset, possible, fail } state = cpuset;

	int dest_cpu;



	/* Look for allowed, online CPU in same node. */

	for_each_cpu_and(dest_cpu, nodemask, cpu_active_mask)

	for_each_cpu_mask(dest_cpu, *nodemask) {

		if (!cpu_online(dest_cpu))

			continue;

		if (!cpu_active(dest_cpu))

			continue;

		if (cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p)))

			return dest_cpu;

	}



	for (;;) {

		/* Any allowed, online CPU? */

	dest_cpu = cpumask_any_and(tsk_cpus_allowed(p), cpu_active_mask);

	if (dest_cpu < nr_cpu_ids)

		return dest_cpu;

		for_each_cpu_mask(dest_cpu, *tsk_cpus_allowed(p)) {

			if (!cpu_online(dest_cpu))

				continue;

			if (!cpu_active(dest_cpu))

				continue;

			goto out;

		}



		switch (state) {

		case cpuset:

			/* No more Mr. Nice Guy. */

	dest_cpu = cpuset_cpus_allowed_fallback(p);

			cpuset_cpus_allowed_fallback(p);

			state = possible;

			break;



		case possible:

			do_set_cpus_allowed(p, cpu_possible_mask);

			state = fail;

			break;



		case fail:

			BUG();

			break;

		}

	}



out:

	if (state != cpuset) {

		/*

		 * Don't tell them about moving exiting tasks or

		 * kernel threads (both mm NULL), since they never
@@ -1289,6 +1318,7 @@ static int select_fallback_rq(int cpu, struct task_struct *p) 
			printk_sched("process %d (%s) no longer affine to cpu%d\n",

					task_pid_nr(p), p->comm, cpu);

		}

	}



	return dest_cpu;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE