From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042AbdANKEM (ORCPT ); Sat, 14 Jan 2017 05:04:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47664 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751865AbdANKEK (ORCPT ); Sat, 14 Jan 2017 05:04:10 -0500 Date: Sat, 14 Jan 2017 02:03:06 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: linux-kernel@vger.kernel.org, fenghua.yu@intel.com, wanpeng.li@hotmail.com, riel@redhat.com, torvalds@linux-foundation.org, benh@kernel.crashing.org, peterz@infradead.org, sgruszka@redhat.com, tglx@linutronix.de, mingo@kernel.org, paulus@samba.org, mpe@ellerman.id.au, borntraeger@de.ibm.com, tony.luck@intel.com, heiko.carstens@de.ibm.com, hpa@zytor.com, schwidefsky@de.ibm.com, fweisbec@gmail.com Reply-To: fweisbec@gmail.com, schwidefsky@de.ibm.com, hpa@zytor.com, heiko.carstens@de.ibm.com, tony.luck@intel.com, borntraeger@de.ibm.com, paulus@samba.org, mpe@ellerman.id.au, mingo@kernel.org, tglx@linutronix.de, sgruszka@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org, riel@redhat.com, benh@kernel.crashing.org, wanpeng.li@hotmail.com, fenghua.yu@intel.com, linux-kernel@vger.kernel.org In-Reply-To: <1483636310-6557-7-git-send-email-fweisbec@gmail.com> References: <1483636310-6557-7-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cputime, powerpc: Migrate stolen_time field to the accounting structure Git-Commit-ID: f828c3d0aebab130a19d36336b50afa3414fa0bc 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: f828c3d0aebab130a19d36336b50afa3414fa0bc Gitweb: http://git.kernel.org/tip/f828c3d0aebab130a19d36336b50afa3414fa0bc Author: Frederic Weisbecker AuthorDate: Thu, 5 Jan 2017 18:11:46 +0100 Committer: Ingo Molnar CommitDate: Sat, 14 Jan 2017 09:54:12 +0100 sched/cputime, powerpc: Migrate stolen_time field to the accounting structure That in order to gather all cputime accumulation to the same place. 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-7-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- arch/powerpc/include/asm/paca.h | 1 - arch/powerpc/kernel/time.c | 6 +++--- arch/powerpc/xmon/xmon.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index 6a6792b..708c3e5 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -187,7 +187,6 @@ struct paca_struct { /* Stuff for accurate time accounting */ struct cpu_accounting_data accounting; - u64 stolen_time; /* TB ticks taken by hypervisor */ u64 dtl_ridx; /* read index in dispatch log */ struct dtl_entry *dtl_curr; /* pointer corresponding to dtl_ridx */ diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 17a2cd1..714313e 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -273,7 +273,7 @@ void accumulate_stolen_time(void) ust = scan_dispatch_log(acct->starttime); acct->stime -= sst; acct->utime -= ust; - local_paca->stolen_time += ust + sst; + acct->steal_time += ust + sst; local_paca->soft_enabled = save_soft_enabled; } @@ -288,8 +288,8 @@ static inline u64 calculate_stolen_time(u64 stop_tb) acct->stime -= stolen; } - stolen += get_paca()->stolen_time; - get_paca()->stolen_time = 0; + stolen += acct->steal_time; + acct->steal_time = 0; return stolen; } diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 9f3b170..3f864c3 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -2294,7 +2294,7 @@ static void dump_one_paca(int cpu) DUMP(p, accounting.starttime_user, "llx"); DUMP(p, accounting.startspurr, "llx"); DUMP(p, accounting.utime_sspurr, "llx"); - DUMP(p, stolen_time, "llx"); + DUMP(p, accounting.steal_time, "llx"); #undef DUMP catch_memory_errors = 0;