From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751843AbdANKB1 (ORCPT ); Sat, 14 Jan 2017 05:01:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647AbdANKBZ (ORCPT ); Sat, 14 Jan 2017 05:01:25 -0500 Date: Sat, 14 Jan 2017 02:00:21 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: tony.luck@intel.com, mingo@kernel.org, tglx@linutronix.de, riel@redhat.com, sgruszka@redhat.com, wanpeng.li@hotmail.com, fenghua.yu@intel.com, fweisbec@gmail.com, benh@kernel.crashing.org, linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, borntraeger@de.ibm.com, heiko.carstens@de.ibm.com, peterz@infradead.org, mpe@ellerman.id.au, torvalds@linux-foundation.org, hpa@zytor.com, paulus@samba.org Reply-To: borntraeger@de.ibm.com, schwidefsky@de.ibm.com, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, fweisbec@gmail.com, paulus@samba.org, hpa@zytor.com, torvalds@linux-foundation.org, mpe@ellerman.id.au, heiko.carstens@de.ibm.com, peterz@infradead.org, riel@redhat.com, tglx@linutronix.de, mingo@kernel.org, tony.luck@intel.com, fenghua.yu@intel.com, wanpeng.li@hotmail.com, sgruszka@redhat.com In-Reply-To: <1483636310-6557-2-git-send-email-fweisbec@gmail.com> References: <1483636310-6557-2-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cputime, powerpc32: Fix stale scaled stime on context switch Git-Commit-ID: 90d08ba2b9b4be4aeca6a5b5a4b09fbcde30194d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 90d08ba2b9b4be4aeca6a5b5a4b09fbcde30194d Gitweb: http://git.kernel.org/tip/90d08ba2b9b4be4aeca6a5b5a4b09fbcde30194d Author: Frederic Weisbecker AuthorDate: Thu, 5 Jan 2017 18:11:41 +0100 Committer: Ingo Molnar CommitDate: Sat, 14 Jan 2017 09:54:11 +0100 sched/cputime, powerpc32: Fix stale scaled stime on context switch 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. Signed-off-by: Frederic Weisbecker Acked-by: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Christian Borntraeger Cc: Fenghua Yu Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Michael Ellerman Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stanislaw Gruszka Cc: Tony Luck Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1483636310-6557-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- arch/powerpc/kernel/time.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index bc2e08d..ce21650 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -407,6 +407,7 @@ void arch_vtime_task_switch(struct task_struct *prev) 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; }