Skip to contentSkip to conversation

Patch "sched/cputime, powerpc32: Fix stale scaled stime on context switch" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Nov 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

sched/cputime, powerpc32: Fix stale scaled stime on context switch

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sched-cputime-powerpc32-fix-stale-scaled-stime-on-context-switch.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Nov 9 09:48:01 CET 2017

From: Frederic Weisbecker <[email protected]>
Date: Thu, 5 Jan 2017 18:11:41 +0100
Subject: sched/cputime, powerpc32: Fix stale scaled stime on context switch

From: Frederic Weisbecker <[email protected]>

[ Upstream commit 90d08ba2b9b4be4aeca6a5b5a4b09fbcde30194d ]

On context switch with powerpc32, the cputime is accumulated in the thread_info struct. So the switching-in task must move forward its start time snapshot to the current time in order to later compute the delta spent in system mode.

This is what we do for the normal cputime by initializing the starttime field to the value of the previous task's starttime which got freshly updated.

But we are missing the update of the scaled cputime start time. As a result we may be accounting too much scaled cputime later.

Fix this by initializing the scaled cputime the same way we do for normal cputime.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rik van Riel <[email protected]>
Cc Stanislaw Gruszka <[email protected]>
Cc Tony Luck <[email protected]>
Cc Wanpeng Li <[email protected]>
---
 arch/powerpc/kernel/time.c |    1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kernel/time.c +1 -0
@@ -407,6 +407,7 @@ void arch_vtime_task_switch(struct task_
 	struct cpu_accounting_data *acct = get_accounting(current);
 
 	acct->starttime = get_accounting(prev)->starttime;
+	acct->startspurr = get_accounting(prev)->startspurr;
 	acct->system_time = 0;
 	acct->user_time = 0;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/sched-cputime-powerpc32-fix-stale-scaled-stime-on-context-switch.patch