Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1475176

[PATCH 1/5] irqtime: No need for preempt-safe accessors

Show all headers | View raw

We can safely use the preempt-unsafe accessors for irqtime when we
flush its counters to kcpustat as IRQs are disabled at this time.

Cc: Rik van Riel <riel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
 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;
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] sched/cputime: irqtime cleanups Frederic Weisbecker <fweisbec@gmail.com> - 2016-09-02 16:10 +0200
  [PATCH 1/5] irqtime: No need for preempt-safe accessors Frederic Weisbecker <fweisbec@gmail.com> - 2016-09-02 16:10 +0200
    Re: [PATCH 1/5] irqtime: No need for preempt-safe accessors Rik van Riel <riel@redhat.com> - 2016-09-06 19:10 +0200
  [PATCH 2/5] irqtime: Remove needless IRQs disablement on kcpustat update Frederic Weisbecker <fweisbec@gmail.com> - 2016-09-02 16:10 +0200
    Re: [PATCH 2/5] irqtime: Remove needless IRQs disablement on kcpustat  update Paolo Bonzini <pbonzini@redhat.com> - 2016-09-02 17:00 +0200
      Re: [PATCH 2/5] irqtime: Remove needless IRQs disablement on  kcpustat update Peter Zijlstra <peterz@infradead.org> - 2016-09-02 18:40 +0200
    Re: [PATCH 2/5] irqtime: Remove needless IRQs disablement on  kcpustat update Rik van Riel <riel@redhat.com> - 2016-09-06 19:10 +0200
    Re: [PATCH 2/5] irqtime: Remove needless IRQs disablement on  kcpustat update Peter Zijlstra <peterz@infradead.org> - 2016-09-07 10:00 +0200
  [PATCH 3/5] u64_stats: Introduce IRQs disabled helpers Frederic Weisbecker <fweisbec@gmail.com> - 2016-09-02 16:10 +0200
    Re: [PATCH 3/5] u64_stats: Introduce IRQs disabled helpers Paolo Bonzini <pbonzini@redhat.com> - 2016-09-02 16:40 +0200
  [PATCH 5/5] irqtime: Consolidate irqtime flushing code Frederic Weisbecker <fweisbec@gmail.com> - 2016-09-02 16:10 +0200
    Re: [PATCH 5/5] irqtime: Consolidate irqtime flushing code Rik van Riel <riel@redhat.com> - 2016-09-06 19:00 +0200

csiph-web