From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47EAAC76188 for ; Mon, 22 Jul 2019 07:38:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 271012229C for ; Mon, 22 Jul 2019 07:38:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728031AbfGVHiz (ORCPT ); Mon, 22 Jul 2019 03:38:55 -0400 Received: from out30-42.freemail.mail.aliyun.com ([115.124.30.42]:48749 "EHLO out30-42.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727572AbfGVHiz (ORCPT ); Mon, 22 Jul 2019 03:38:55 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0TXUNmbb_1563781131; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0TXUNmbb_1563781131) by smtp.aliyun-inc.com(127.0.0.1); Mon, 22 Jul 2019 15:38:52 +0800 From: Alex Shi Cc: Alex Shi , Ingo Molnar , Peter Zijlstra , Frederic Weisbecker , Wanpeng Li , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] cputime: remove duplicate code in account_process_tick Date: Mon, 22 Jul 2019 15:38:39 +0800 Message-Id: <20190722073840.32613-1-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.856.g8858448bb MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The irqtime_account_process_tick path was introduced for precise ns irq time account from commit abb74cefa9c6 ("sched: Export ns irqtimes through /proc/stat") while account_process_tick still use jiffes. This divide isn't necessary especially now both paths are ns precison. Move out the irqtime_account_process_tick func from IRQ_TIME_ACCOUNTING. So it do generally same things as account_process_tick whenever if IRQ_TIME_ACCOUNTING set or if sched_clock_irqtime enabled. Signed-off-by: Alex Shi Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Wanpeng Li Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org --- kernel/sched/cputime.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 2305ce89a26c..5086b24d7bee 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -332,7 +332,6 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times) rcu_read_unlock(); } -#ifdef CONFIG_IRQ_TIME_ACCOUNTING /* * Account a tick to a process and cpustat * @p: the process that the CPU time gets accounted to @@ -390,6 +389,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick, } } +#ifdef CONFIG_IRQ_TIME_ACCOUNTING static void irqtime_account_idle_ticks(int ticks) { struct rq *rq = this_rq(); @@ -398,8 +398,6 @@ static void irqtime_account_idle_ticks(int ticks) } #else /* CONFIG_IRQ_TIME_ACCOUNTING */ static inline void irqtime_account_idle_ticks(int ticks) { } -static inline void irqtime_account_process_tick(struct task_struct *p, int user_tick, - struct rq *rq, int nr_ticks) { } #endif /* CONFIG_IRQ_TIME_ACCOUNTING */ /* @@ -474,31 +472,12 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st) */ void account_process_tick(struct task_struct *p, int user_tick) { - u64 cputime, steal; struct rq *rq = this_rq(); if (vtime_accounting_cpu_enabled()) return; - if (sched_clock_irqtime) { - irqtime_account_process_tick(p, user_tick, rq, 1); - return; - } - - cputime = TICK_NSEC; - steal = steal_account_process_time(ULONG_MAX); - - if (steal >= cputime) - return; - - cputime -= steal; - - if (user_tick) - account_user_time(p, cputime); - else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET)) - account_system_time(p, HARDIRQ_OFFSET, cputime); - else - account_idle_time(cputime); + irqtime_account_process_tick(p, user_tick, rq, 1); } /* -- 2.19.1.856.g8858448bb