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

sched/cputime: Allow accounting system time using cpustat index 



In order to prepare for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y to delay
cputime accounting to the tick, let's provide APIs to account system
time to precise contexts: hardirq, softirq, pure system, ...

Inspired-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1483636310-6557-4-git-send-email-fweisbec@gmail.com


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

include/linux/kernel_stat.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) 


extern void account_user_time(struct task_struct *, cputime_t);

extern void account_system_time(struct task_struct *, int, cputime_t);

extern void account_system_index_time(struct task_struct *, cputime_t,

				      enum cpu_usage_stat);

extern void account_steal_time(cputime_t);

extern void account_idle_time(cputime_t);

kernel/sched/cputime.c

+5 −5
Original line number Diff line number Diff line
@@ -176,8 +176,8 @@ static void account_guest_time(struct task_struct *p, cputime_t cputime) 
 * @cputime: the cpu time spent in kernel space since the last update

 * @index: pointer to cpustat field that has to be updated

 */

static inline

void __account_system_time(struct task_struct *p, cputime_t cputime, int index)

void account_system_index_time(struct task_struct *p,

			       cputime_t cputime, enum cpu_usage_stat index)

{

	/* Add system time to process. */

	p->stime += cputime;
@@ -213,7 +213,7 @@ void account_system_time(struct task_struct *p, int hardirq_offset, 
	else

		index = CPUTIME_SYSTEM;



	__account_system_time(p, cputime, index);

	account_system_index_time(p, cputime, index);

}



/*
@@ -400,7 +400,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick, 
		 * So, we have to handle it separately here.

		 * Also, p->stime needs to be updated for ksoftirqd.

		 */

		__account_system_time(p, cputime, CPUTIME_SOFTIRQ);

		account_system_index_time(p, cputime, CPUTIME_SOFTIRQ);

	} else if (user_tick) {

		account_user_time(p, cputime);

	} else if (p == rq->idle) {
@@ -408,7 +408,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick, 
	} else if (p->flags & PF_VCPU) { /* System time or guest time */

		account_guest_time(p, cputime);

	} else {

		__account_system_time(p, cputime, CPUTIME_SYSTEM);

		account_system_index_time(p, cputime, CPUTIME_SYSTEM);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE