Commit e783377e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'cputime-adjustment-cleanups' of... 

Merge tag 'cputime-adjustment-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks

 into sched/core

Pull cputime cleanups from Frederic Weisbecker:

 * Improve naming and code location

 * Consolidate adjustment code

 * Comment the adjustement code

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 222e82be fa092057

fs/proc/array.c

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, 


			min_flt += sig->min_flt;

			maj_flt += sig->maj_flt;

			thread_group_times(task, &utime, &stime);

			thread_group_cputime_adjusted(task, &utime, &stime);

			gtime += sig->gtime;

		}
@@ -454,7 +454,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, 
	if (!whole) {

		min_flt = task->min_flt;

		maj_flt = task->maj_flt;

		task_times(task, &utime, &stime);

		task_cputime_adjusted(task, &utime, &stime);

		gtime = task->gtime;

	}

fs/proc/base.c

+0 −78
Original line number Diff line number Diff line
@@ -1272,81 +1272,6 @@ static const struct file_operations proc_pid_sched_operations = { 


#endif



#ifdef CONFIG_SCHED_AUTOGROUP

/*

 * Print out autogroup related information:

 */

static int sched_autogroup_show(struct seq_file *m, void *v)

{

	struct inode *inode = m->private;

	struct task_struct *p;



	p = get_proc_task(inode);

	if (!p)

		return -ESRCH;

	proc_sched_autogroup_show_task(p, m);



	put_task_struct(p);



	return 0;

}



static ssize_t

sched_autogroup_write(struct file *file, const char __user *buf,

	    size_t count, loff_t *offset)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct task_struct *p;

	char buffer[PROC_NUMBUF];

	int nice;

	int err;



	memset(buffer, 0, sizeof(buffer));

	if (count > sizeof(buffer) - 1)

		count = sizeof(buffer) - 1;

	if (copy_from_user(buffer, buf, count))

		return -EFAULT;



	err = kstrtoint(strstrip(buffer), 0, &nice);

	if (err < 0)

		return err;



	p = get_proc_task(inode);

	if (!p)

		return -ESRCH;



	err = proc_sched_autogroup_set_nice(p, nice);

	if (err)

		count = err;



	put_task_struct(p);



	return count;

}



static int sched_autogroup_open(struct inode *inode, struct file *filp)

{

	int ret;



	ret = single_open(filp, sched_autogroup_show, NULL);

	if (!ret) {

		struct seq_file *m = filp->private_data;



		m->private = inode;

	}

	return ret;

}



static const struct file_operations proc_pid_sched_autogroup_operations = {

	.open		= sched_autogroup_open,

	.read		= seq_read,

	.write		= sched_autogroup_write,

	.llseek		= seq_lseek,

	.release	= single_release,

};



#endif /* CONFIG_SCHED_AUTOGROUP */



static ssize_t comm_write(struct file *file, const char __user *buf,

				size_t count, loff_t *offset)

{
@@ -2657,9 +2582,6 @@ static const struct pid_entry tgid_base_stuff[] = { 
	INF("limits",	  S_IRUGO, proc_pid_limits),

#ifdef CONFIG_SCHED_DEBUG

	REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),

#endif

#ifdef CONFIG_SCHED_AUTOGROUP

	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),

#endif

	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),

#ifdef CONFIG_HAVE_ARCH_TRACEHOOK

include/linux/sched.h

+21 −6
Original line number Diff line number Diff line
@@ -433,14 +433,29 @@ struct cpu_itimer { 
	u32 incr_error;

};



/**

 * struct cputime - snaphsot of system and user cputime

 * @utime: time spent in user mode

 * @stime: time spent in system mode

 *

 * Gathers a generic snapshot of user and system time.

 */

struct cputime {

	cputime_t utime;

	cputime_t stime;

};



/**

 * struct task_cputime - collected CPU time counts

 * @utime:		time spent in user mode, in &cputime_t units

 * @stime:		time spent in kernel mode, in &cputime_t units

 * @sum_exec_runtime:	total time spent on the CPU, in nanoseconds

 *

 * This structure groups together three kinds of CPU time that are

 * tracked for threads and thread groups.  Most things considering

 * This is an extension of struct cputime that includes the total runtime

 * spent by the task from the scheduler point of view.

 *

 * As a result, this structure groups together three kinds of CPU time

 * that are tracked for threads and thread groups.  Most things considering

 * CPU time want to group these counts together and treat all three

 * of them in parallel.

 */
@@ -581,7 +596,7 @@ struct signal_struct { 
	cputime_t gtime;

	cputime_t cgtime;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING

	cputime_t prev_utime, prev_stime;

	struct cputime prev_cputime;

#endif

	unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;

	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
@@ -1340,7 +1355,7 @@ struct task_struct { 
	cputime_t utime, stime, utimescaled, stimescaled;

	cputime_t gtime;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING

	cputime_t prev_utime, prev_stime;

	struct cputime prev_cputime;

#endif

	unsigned long nvcsw, nivcsw; /* context switch counts */

	struct timespec start_time; 		/* monotonic time */
@@ -1751,8 +1766,8 @@ static inline void put_task_struct(struct task_struct *t) 
		__put_task_struct(t);

}



extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st);

extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st);

extern void task_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);

extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);



/*

 * Per process flags

kernel/exit.c

+2 −2
Original line number Diff line number Diff line
@@ -1186,11 +1186,11 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) 
		 * as other threads in the parent group can be right

		 * here reaping other children at the same time.

		 *

		 * We use thread_group_times() to get times for the thread

		 * We use thread_group_cputime_adjusted() to get times for the thread

		 * group, which consolidates times for all threads in the

		 * group including the group leader.

		 */

		thread_group_times(p, &tgutime, &tgstime);

		thread_group_cputime_adjusted(p, &tgutime, &tgstime);

		spin_lock_irq(&p->real_parent->sighand->siglock);

		psig = p->real_parent->signal;

		sig = p->signal;

kernel/fork.c

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
	p->utime = p->stime = p->gtime = 0;

	p->utimescaled = p->stimescaled = 0;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING

	p->prev_utime = p->prev_stime = 0;

	p->prev_cputime.utime = p->prev_cputime.stime = 0;

#endif

#if defined(SPLIT_RSS_COUNTING)

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