From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932678AbcHKQVO (ORCPT ); Thu, 11 Aug 2016 12:21:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60144 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750708AbcHKQVK (ORCPT ); Thu, 11 Aug 2016 12:21:10 -0400 Date: Thu, 11 Aug 2016 09:20:40 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: torvalds@linux-foundation.org, pbonzini@redhat.com, mingo@kernel.org, kernellwp@gmail.com, hpa@zytor.com, riel@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, rkrcmar@redhat.com, fweisbec@gmail.com, wanpeng.li@hotmail.com, tglx@linutronix.de Reply-To: wanpeng.li@hotmail.com, tglx@linutronix.de, riel@redhat.com, fweisbec@gmail.com, peterz@infradead.org, rkrcmar@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, pbonzini@redhat.com, hpa@zytor.com, kernellwp@gmail.com, torvalds@linux-foundation.org In-Reply-To: <20160811125822.GB4214@lerouge> References: <20160811125822.GB4214@lerouge> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/urgent] sched/cputime: Fix omitted ticks passed in parameter Git-Commit-ID: 26f2c75cd2cf10a6120ef02ca9a94db77cc9c8e0 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: 26f2c75cd2cf10a6120ef02ca9a94db77cc9c8e0 Gitweb: http://git.kernel.org/tip/26f2c75cd2cf10a6120ef02ca9a94db77cc9c8e0 Author: Frederic Weisbecker AuthorDate: Thu, 11 Aug 2016 14:58:24 +0200 Committer: Ingo Molnar CommitDate: Thu, 11 Aug 2016 16:34:37 +0200 sched/cputime: Fix omitted ticks passed in parameter Commit: f9bcf1e0e014 ("sched/cputime: Fix steal time accounting") ... fixes a leak on steal time accounting but forgets to account the ticks passed in parameters, assuming there is only one to take into account. Let's consider that parameter back. Signed-off-by: Frederic Weisbecker Acked-by: Wanpeng Li Cc: Linus Torvalds Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Radim Cc: Rik van Riel Cc: Thomas Gleixner Cc: Wanpeng Li Cc: linux-tip-commits@vger.kernel.org Link: http://lkml.kernel.org/r/20160811125822.GB4214@lerouge Signed-off-by: Ingo Molnar --- kernel/sched/cputime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 8b9bcc5..9858266 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -509,12 +509,13 @@ void account_process_tick(struct task_struct *p, int user_tick) void account_idle_ticks(unsigned long ticks) { cputime_t cputime, steal; + if (sched_clock_irqtime) { irqtime_account_idle_ticks(ticks); return; } - cputime = cputime_one_jiffy; + cputime = jiffies_to_cputime(ticks); steal = steal_account_process_time(cputime); if (steal >= cputime)