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

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

   - fix affine wakeups (Peter Zijlstra)

   - improve CPU onlining (and general bootup) scalability on systems
     with ridiculous number (thousands) of CPUs (Peter Zijlstra)

   - sched/numa updates (Rik van Riel)

   - sched/deadline updates (Byungchul Park)

   - sched/cpufreq enhancements and related cleanups (Viresh Kumar)

   - sched/debug enhancements (Xie XiuQi)

   - various fixes"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  sched/debug: Optimize sched_domain sysctl generation
  sched/topology: Avoid pointless rebuild
  sched/topology, cpuset: Avoid spurious/wrong domain rebuilds
  sched/topology: Improve comments
  sched/topology: Fix memory leak in __sdt_alloc()
  sched/completion: Document that reinit_completion() must be called after complete_all()
  sched/autogroup: Fix error reporting printk text in autogroup_create()
  sched/fair: Fix wake_affine() for !NUMA_BALANCING
  sched/debug: Intruduce task_state_to_char() helper function
  sched/debug: Show task state in /proc/sched_debug
  sched/debug: Use task_pid_nr_ns in /proc/$pid/sched
  sched/core: Remove unnecessary initialization init_idle_bootup_task()
  sched/deadline: Change return value of cpudl_find()
  sched/deadline: Make find_later_rq() choose a closer CPU in topology
  sched/numa: Scale scan period with tasks in group and shared/private
  sched/numa: Slow down scan rate if shared faults dominate
  sched/pelt: Fix false running accounting
  sched: Mark pick_next_task_dl() and build_sched_domain() as static
  sched/cpupri: Don't re-initialize 'struct cpupri'
  sched/deadline: Don't re-initialize 'struct cpudl'
  ...
parents 621bee34 bbdacdfe

arch/x86/include/asm/topology.h

+0 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ static inline const struct cpumask *cpumask_of_node(int node) 


extern void setup_node_to_cpumask_map(void);



/*

 * Returns the number of the node containing Node 'node'. This

 * architecture is flat, so it is a pretty simple function!

 */

#define parent_node(node) (node)



#define pcibus_to_node(bus) __pcibus_to_node(bus)



extern int __node_distance(int, int);

fs/proc/base.c

+2 −1
Original line number Diff line number Diff line
@@ -1408,12 +1408,13 @@ static const struct file_operations proc_fail_nth_operations = { 
static int sched_show(struct seq_file *m, void *v)

{

	struct inode *inode = m->private;

	struct pid_namespace *ns = inode->i_sb->s_fs_info;

	struct task_struct *p;



	p = get_proc_task(inode);

	if (!p)

		return -ESRCH;

	proc_sched_show_task(p, m);

	proc_sched_show_task(p, ns, m);



	put_task_struct(p);

include/linux/sched.h

+13 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,19 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk) 
	return task_pgrp_nr_ns(tsk, &init_pid_ns);

}



static inline char task_state_to_char(struct task_struct *task)

{

	const char stat_nam[] = TASK_STATE_TO_CHAR_STR;

	unsigned long state = task->state;



	state = state ? __ffs(state) + 1 : 0;



	/* Make sure the string lines up properly with the number of task states: */

	BUILD_BUG_ON(sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1);



	return state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?';

}



/**

 * is_global_init - check if a task structure is init. Since init

 * is free to have sub-threads we need to check tgid.

include/linux/sched/debug.h

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



struct task_struct;

struct pid_namespace;



extern void dump_cpu_task(int cpu);
@@ -34,7 +35,8 @@ extern void sched_show_task(struct task_struct *p); 


#ifdef CONFIG_SCHED_DEBUG

struct seq_file;

extern void proc_sched_show_task(struct task_struct *p, struct seq_file *m);

extern void proc_sched_show_task(struct task_struct *p,

				 struct pid_namespace *ns, struct seq_file *m);

extern void proc_sched_set_task(struct task_struct *p);

#endif

include/linux/sched/task.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ extern int lockdep_tasklist_lock_is_held(void); 


extern asmlinkage void schedule_tail(struct task_struct *prev);

extern void init_idle(struct task_struct *idle, int cpu);

extern void init_idle_bootup_task(struct task_struct *idle);



extern int sched_fork(unsigned long clone_flags, struct task_struct *p);

extern void sched_dead(struct task_struct *p);