From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933052AbcI3MFe (ORCPT ); Fri, 30 Sep 2016 08:05:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45180 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932177AbcI3MFZ (ORCPT ); Fri, 30 Sep 2016 08:05:25 -0400 Date: Fri, 30 Sep 2016 05:04:33 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: peterz@infradead.org, riel@redhat.com, pbonzini@redhat.com, fweisbec@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, wanpeng.li@hotmail.com, efault@gmx.de, mingo@kernel.org, eric.dumazet@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, fweisbec@gmail.com, peterz@infradead.org, pbonzini@redhat.com, riel@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, eric.dumazet@gmail.com, mingo@kernel.org, efault@gmx.de, wanpeng.li@hotmail.com In-Reply-To: <1474849761-12678-2-git-send-email-fweisbec@gmail.com> References: <1474849761-12678-2-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/irqtime: No need for preempt-safe accessors Git-Commit-ID: f9094a65755df86ec931f47b781f68ea3095cb56 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: f9094a65755df86ec931f47b781f68ea3095cb56 Gitweb: http://git.kernel.org/tip/f9094a65755df86ec931f47b781f68ea3095cb56 Author: Frederic Weisbecker AuthorDate: Mon, 26 Sep 2016 02:29:17 +0200 Committer: Ingo Molnar CommitDate: Fri, 30 Sep 2016 11:46:38 +0200 sched/irqtime: No need for preempt-safe accessors We can safely use the preempt-unsafe accessors for irqtime when we flush its counters to kcpustat as IRQs are disabled at this time. 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-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- kernel/sched/cputime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index b93c72d..f111076 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -82,7 +82,7 @@ static cputime_t irqtime_account_hi_update(cputime_t maxtime) cputime_t irq_cputime; local_irq_save(flags); - irq_cputime = nsecs_to_cputime64(this_cpu_read(cpu_hardirq_time)) - + 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; @@ -97,7 +97,7 @@ static cputime_t irqtime_account_si_update(cputime_t maxtime) cputime_t softirq_cputime; local_irq_save(flags); - softirq_cputime = nsecs_to_cputime64(this_cpu_read(cpu_softirq_time)) - + 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;