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

Commit 22a093b2 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:
 "Debug info and other statistics fixes and related enhancements"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/numa: Fix numa balancing stats in /proc/pid/sched
  sched/numa: Show numa_group ID in /proc/sched_debug task listings
  sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h
  sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y
  sched/stat: Simplify the sched_info accounting dependency
parents c1776a18 397f2378

fs/proc/base.c

+7 −4
Original line number Diff line number Diff line
@@ -491,13 +491,16 @@ static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns, 
}

#endif



#ifdef CONFIG_SCHEDSTATS

#ifdef CONFIG_SCHED_INFO

/*

 * Provides /proc/PID/schedstat

 */

static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns,

			      struct pid *pid, struct task_struct *task)

{

	if (unlikely(!sched_info_on()))

		seq_printf(m, "0 0 0\n");

	else

		seq_printf(m, "%llu %llu %lu\n",

		   (unsigned long long)task->se.sum_exec_runtime,

		   (unsigned long long)task->sched_info.run_delay,
@@ -2787,7 +2790,7 @@ static const struct pid_entry tgid_base_stuff[] = { 
#ifdef CONFIG_STACKTRACE

	ONE("stack",      S_IRUSR, proc_pid_stack),

#endif

#ifdef CONFIG_SCHEDSTATS

#ifdef CONFIG_SCHED_INFO

	ONE("schedstat",  S_IRUGO, proc_pid_schedstat),

#endif

#ifdef CONFIG_LATENCYTOP
@@ -3135,7 +3138,7 @@ static const struct pid_entry tid_base_stuff[] = { 
#ifdef CONFIG_STACKTRACE

	ONE("stack",      S_IRUSR, proc_pid_stack),

#endif

#ifdef CONFIG_SCHEDSTATS

#ifdef CONFIG_SCHED_INFO

	ONE("schedstat", S_IRUGO, proc_pid_schedstat),

#endif

#ifdef CONFIG_LATENCYTOP

include/linux/sched.h

+3 −5
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ struct task_group; 
#ifdef CONFIG_SCHED_DEBUG

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

extern void proc_sched_set_task(struct task_struct *p);

extern void

print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq);

#endif



/*
@@ -838,7 +836,7 @@ extern struct user_struct root_user; 
struct backing_dev_info;

struct reclaim_state;



#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)

#ifdef CONFIG_SCHED_INFO

struct sched_info {

	/* cumulative counters */

	unsigned long pcount;	      /* # of times run on this cpu */
@@ -848,7 +846,7 @@ struct sched_info { 
	unsigned long long last_arrival,/* when we last ran on a cpu */

			   last_queued;	/* when we were last queued to run */

};

#endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */

#endif /* CONFIG_SCHED_INFO */



#ifdef CONFIG_TASK_DELAY_ACCT

struct task_delay_info {
@@ -1397,7 +1395,7 @@ struct task_struct { 
	int rcu_tasks_idle_cpu;

#endif /* #ifdef CONFIG_TASKS_RCU */



#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)

#ifdef CONFIG_SCHED_INFO

	struct sched_info sched_info;

#endif

init/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ config TASKSTATS 
config TASK_DELAY_ACCT

	bool "Enable per-task delay accounting"

	depends on TASKSTATS

	select SCHED_INFO

	help

	  Collect information on time spent by a task waiting for system

	  resources like cpu, synchronous block I/O completion and swapping

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2164,7 +2164,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) 
	set_task_cpu(p, cpu);

	raw_spin_unlock_irqrestore(&p->pi_lock, flags);



#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)

#ifdef CONFIG_SCHED_INFO

	if (likely(sched_info_on()))

		memset(&p->sched_info, 0, sizeof(p->sched_info));

#endif

kernel/sched/debug.c

+18 −22
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) 
		0LL, 0L);

#endif

#ifdef CONFIG_NUMA_BALANCING

	SEQ_printf(m, " %d", task_node(p));

	SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));

#endif

#ifdef CONFIG_CGROUP_SCHED

	SEQ_printf(m, " %s", task_group_path(task_group(p)));
@@ -517,11 +517,21 @@ __initcall(init_sched_debug_procfs); 
	SEQ_printf(m, "%-45s:%14Ld.%06ld\n", #F, SPLIT_NS((long long)p->F))





#ifdef CONFIG_NUMA_BALANCING

void print_numa_stats(struct seq_file *m, int node, unsigned long tsf,

		unsigned long tpf, unsigned long gsf, unsigned long gpf)

{

	SEQ_printf(m, "numa_faults node=%d ", node);

	SEQ_printf(m, "task_private=%lu task_shared=%lu ", tsf, tpf);

	SEQ_printf(m, "group_private=%lu group_shared=%lu\n", gsf, gpf);

}

#endif





static void sched_show_numa(struct task_struct *p, struct seq_file *m)

{

#ifdef CONFIG_NUMA_BALANCING

	struct mempolicy *pol;

	int node, i;



	if (p->mm)

		P(mm->numa_scan_seq);
@@ -533,26 +543,12 @@ static void sched_show_numa(struct task_struct *p, struct seq_file *m) 
	mpol_get(pol);

	task_unlock(p);



	SEQ_printf(m, "numa_migrations, %ld\n", xchg(&p->numa_pages_migrated, 0));



	for_each_online_node(node) {

		for (i = 0; i < 2; i++) {

			unsigned long nr_faults = -1;

			int cpu_current, home_node;



			if (p->numa_faults)

				nr_faults = p->numa_faults[2*node + i];



			cpu_current = !i ? (task_node(p) == node) :

				(pol && node_isset(node, pol->v.nodes));



			home_node = (p->numa_preferred_nid == node);



			SEQ_printf(m, "numa_faults_memory, %d, %d, %d, %d, %ld\n",

				i, node, cpu_current, home_node, nr_faults);

		}

	}



	P(numa_pages_migrated);

	P(numa_preferred_nid);

	P(total_numa_faults);

	SEQ_printf(m, "current_node=%d, numa_group_id=%d\n",

			task_node(p), task_numa_group_id(p));

	show_numa_stats(p, m);

	mpol_put(pol);

#endif

}