From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933245AbcI3MF7 (ORCPT ); Fri, 30 Sep 2016 08:05:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45218 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbcI3MFu (ORCPT ); Fri, 30 Sep 2016 08:05:50 -0400 Date: Fri, 30 Sep 2016 05:05:00 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: hpa@zytor.com, torvalds@linux-foundation.org, efault@gmx.de, peterz@infradead.org, pbonzini@redhat.com, fweisbec@gmail.com, mingo@kernel.org, wanpeng.li@hotmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, riel@redhat.com, eric.dumazet@gmail.com Reply-To: pbonzini@redhat.com, fweisbec@gmail.com, mingo@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, efault@gmx.de, peterz@infradead.org, linux-kernel@vger.kernel.org, eric.dumazet@gmail.com, riel@redhat.com, tglx@linutronix.de, wanpeng.li@hotmail.com In-Reply-To: <1474849761-12678-3-git-send-email-fweisbec@gmail.com> References: <1474849761-12678-3-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/irqtime: Remove needless IRQs disablement on kcpustat update Git-Commit-ID: 2810f611f908112ea1b30bc016d25205acb3d486 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: 2810f611f908112ea1b30bc016d25205acb3d486 Gitweb: http://git.kernel.org/tip/2810f611f908112ea1b30bc016d25205acb3d486 Author: Frederic Weisbecker AuthorDate: Mon, 26 Sep 2016 02:29:18 +0200 Committer: Ingo Molnar CommitDate: Fri, 30 Sep 2016 11:46:39 +0200 sched/irqtime: Remove needless IRQs disablement on kcpustat update The callers of the functions performing irqtime kcpustat updates have IRQS disabled, no need to disable them again. Signed-off-by: Frederic Weisbecker Reviewed-by: Rik van Riel Cc: Eric Dumazet Cc: Linus Torvalds Cc: Mike Galbraith Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1474849761-12678-3-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- kernel/sched/cputime.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index f111076..94b1a72 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -78,30 +78,26 @@ EXPORT_SYMBOL_GPL(irqtime_account_irq); static cputime_t irqtime_account_hi_update(cputime_t maxtime) { u64 *cpustat = kcpustat_this_cpu->cpustat; - unsigned long flags; cputime_t irq_cputime; - local_irq_save(flags); irq_cputime = nsecs_to_cputime64(__this_cpu_read(cpu_hardirq_time)) - cpustat[CPUTIME_IRQ]; irq_cputime = min(irq_cputime, maxtime); cpustat[CPUTIME_IRQ] += irq_cputime; - local_irq_restore(flags); + return irq_cputime; } static cputime_t irqtime_account_si_update(cputime_t maxtime) { u64 *cpustat = kcpustat_this_cpu->cpustat; - unsigned long flags; cputime_t softirq_cputime; - local_irq_save(flags); softirq_cputime = nsecs_to_cputime64(__this_cpu_read(cpu_softirq_time)) - cpustat[CPUTIME_SOFTIRQ]; softirq_cputime = min(softirq_cputime, maxtime); cpustat[CPUTIME_SOFTIRQ] += softirq_cputime; - local_irq_restore(flags); + return softirq_cputime; } @@ -295,6 +291,9 @@ static inline cputime_t account_other_time(cputime_t max) { cputime_t accounted; + /* Shall be converted to a lockdep-enabled lightweight check */ + WARN_ON_ONCE(!irqs_disabled()); + accounted = steal_account_process_time(max); if (accounted < max)