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

Commit 7098c1ea authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

sched/cputime: Clarify vtime symbols and document them 



VTIME_SLEEPING state happens either when:

1) The task is sleeping and no tickless delta is to be added on the task
   cputime stats.
2) The CPU isn't running vtime at all, so the same properties of 1) applies.

Lets rename the vtime symbol to reflect both states.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul E . McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1447948054-28668-4-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7877a0ba

include/linux/sched.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -1522,8 +1522,11 @@ struct task_struct { 
	seqlock_t vtime_seqlock;

	seqlock_t vtime_seqlock;

	unsigned long long vtime_snap;

	unsigned long long vtime_snap;

	enum {

	enum {

		VTIME_SLEEPING = 0,

		/* Task is sleeping or running in a CPU with VTIME inactive */

		VTIME_INACTIVE = 0,

		/* Task runs in userspace in a CPU with VTIME active */

		VTIME_USER,

		VTIME_USER,

		/* Task runs in kernelspace in a CPU with VTIME active */

		VTIME_SYS,

		VTIME_SYS,

	} vtime_snap_whence;

	} vtime_snap_whence;

#endif

#endif

kernel/fork.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1350,7 +1350,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

	seqlock_init(&p->vtime_seqlock);

	seqlock_init(&p->vtime_seqlock);

	p->vtime_snap = 0;

	p->vtime_snap = 0;

	p->vtime_snap_whence = VTIME_SLEEPING;

	p->vtime_snap_whence = VTIME_INACTIVE;

#endif

#endif





#if defined(SPLIT_RSS_COUNTING)

#if defined(SPLIT_RSS_COUNTING)

kernel/sched/cputime.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -680,7 +680,7 @@ static cputime_t get_vtime_delta(struct task_struct *tsk) 
{

{

	unsigned long long delta = vtime_delta(tsk);

	unsigned long long delta = vtime_delta(tsk);





	WARN_ON_ONCE(tsk->vtime_snap_whence == VTIME_SLEEPING);

	WARN_ON_ONCE(tsk->vtime_snap_whence == VTIME_INACTIVE);

	tsk->vtime_snap += delta;

	tsk->vtime_snap += delta;





	/* CHECKME: always safe to convert nsecs to cputime? */

	/* CHECKME: always safe to convert nsecs to cputime? */
@@ -764,7 +764,7 @@ void vtime_account_idle(struct task_struct *tsk) 
void arch_vtime_task_switch(struct task_struct *prev)

void arch_vtime_task_switch(struct task_struct *prev)

{

{

	write_seqlock(&prev->vtime_seqlock);

	write_seqlock(&prev->vtime_seqlock);

	prev->vtime_snap_whence = VTIME_SLEEPING;

	prev->vtime_snap_whence = VTIME_INACTIVE;

	write_sequnlock(&prev->vtime_seqlock);

	write_sequnlock(&prev->vtime_seqlock);





	write_seqlock(&current->vtime_seqlock);

	write_seqlock(&current->vtime_seqlock);
@@ -829,7 +829,7 @@ fetch_task_cputime(struct task_struct *t, 
			*s_dst = *s_src;

			*s_dst = *s_src;





		/* Task is sleeping, nothing to add */

		/* Task is sleeping, nothing to add */

		if (t->vtime_snap_whence == VTIME_SLEEPING ||

		if (t->vtime_snap_whence == VTIME_INACTIVE ||

		    is_idle_task(t))

		    is_idle_task(t))

			continue;

			continue;