Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752591AbbFXPAF (ORCPT ); Wed, 24 Jun 2015 11:00:05 -0400 Received: from shelob.surriel.com ([74.92.59.67]:32794 "EHLO shelob.surriel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895AbbFXO6K (ORCPT ); Wed, 24 Jun 2015 10:58:10 -0400 From: riel@redhat.com To: linux-kernel@vger.kernel.org Cc: fweisbec@redhat.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, luto@amacapital.net Subject: [RFC PATCH 06/11] time,nohz: add cpu parameter to account_idle_time Date: Wed, 24 Jun 2015 10:57:55 -0400 Message-Id: <1435157880-22925-7-git-send-email-riel@redhat.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435157880-22925-1-git-send-email-riel@redhat.com> References: <1435157880-22925-1-git-send-email-riel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4516 Lines: 129 From: Rik van Riel Simple transformation to allow account_idle_time to account the idle time for another CPU. Signed-off-by: Rik van Riel --- arch/ia64/kernel/time.c | 2 +- arch/powerpc/kernel/time.c | 2 +- arch/s390/kernel/idle.c | 2 +- include/linux/kernel_stat.h | 2 +- kernel/sched/cputime.c | 15 ++++++++------- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 9a0104a38cd3..61928b01d548 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -140,7 +140,7 @@ EXPORT_SYMBOL_GPL(vtime_account_system); void vtime_account_idle(struct task_struct *tsk) { - account_idle_time(vtime_delta(tsk)); + account_idle_time(task_cpu(tsk), vtime_delta(tsk)); } #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 56f44848b044..f7c4cfdf0157 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -356,7 +356,7 @@ void vtime_account_idle(struct task_struct *tsk) u64 delta, sys_scaled, stolen; delta = vtime_delta(tsk, &sys_scaled, &stolen); - account_idle_time(delta + stolen); + account_idle_time(task_cpu(tsk), delta + stolen); } /* diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c index 7a55c29b0b33..fc3945e3dc18 100644 --- a/arch/s390/kernel/idle.c +++ b/arch/s390/kernel/idle.c @@ -43,7 +43,7 @@ void enabled_wait(void) idle->clock_idle_enter = idle->clock_idle_exit = 0ULL; idle->idle_time += idle_time; idle->idle_count++; - account_idle_time(idle_time); + account_idle_time(smp_processor_id(), idle_time); write_seqcount_end(&idle->seqcount); } NOKPROBE_SYMBOL(enabled_wait); diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 4490aef2f149..0d6e07406fd0 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -81,7 +81,7 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) extern void account_user_time(struct task_struct *, cputime_t, cputime_t); extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t); extern void account_steal_time(int cpu, cputime_t); -extern void account_idle_time(cputime_t); +extern void account_idle_time(int cpu, cputime_t); #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE static inline void account_process_tick(struct task_struct *tsk, int user) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index b684c48ad954..593f97b0fe3c 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -244,10 +244,11 @@ void account_steal_time(int cpu, cputime_t cputime) * Account for idle time. * @cputime: the cpu time spent in idle wait */ -void account_idle_time(cputime_t cputime) +void account_idle_time(int cpu, cputime_t cputime) { - u64 *cpustat = kcpustat_this_cpu->cpustat; - struct rq *rq = this_rq(); + struct kernel_cpustat *kstat = &kcpustat_cpu(cpu); + u64 *cpustat = kstat->cpustat; + struct rq *rq = cpu_rq(cpu); if (atomic_read(&rq->nr_iowait) > 0) cpustat[CPUTIME_IOWAIT] += (__force u64) cputime; @@ -366,7 +367,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int cpu, } else if (user_tick) { account_user_time(p, cputime, scaled); } else if (p == rq->idle) { - account_idle_time(cputime); + account_idle_time(cpu, cputime); } else if (p->flags & PF_VCPU) { /* System time or guest time */ account_guest_time(p, cputime, scaled); } else { @@ -493,7 +494,7 @@ void account_process_tick(struct task_struct *p, int user_tick) account_system_time(p, HARDIRQ_OFFSET, cputime_one_jiffy, one_jiffy_scaled); else - account_idle_time(cputime_one_jiffy); + account_idle_time(cpu, cputime_one_jiffy); } /* @@ -518,7 +519,7 @@ void account_idle_ticks(unsigned long ticks) return; } - account_idle_time(jiffies_to_cputime(ticks)); + account_idle_time(smp_processor_id(), jiffies_to_cputime(ticks)); } /* @@ -748,7 +749,7 @@ void vtime_account_idle(struct task_struct *tsk) { cputime_t delta_cpu = get_vtime_delta(tsk); - account_idle_time(delta_cpu); + account_idle_time(task_cpu(tsk), delta_cpu); } void arch_vtime_task_switch(struct task_struct *prev) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/