From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-f66.google.com ([209.85.217.66]:40129 "EHLO mail-vs1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727241AbfAGVmW (ORCPT ); Mon, 7 Jan 2019 16:42:22 -0500 Received: by mail-vs1-f66.google.com with SMTP id z3so1201357vsf.7 for ; Mon, 07 Jan 2019 13:42:21 -0800 (PST) Received: from mail-vk1-f176.google.com (mail-vk1-f176.google.com. [209.85.221.176]) by smtp.gmail.com with ESMTPSA id s185sm18265645vke.11.2019.01.07.13.42.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 13:42:19 -0800 (PST) Received: by mail-vk1-f176.google.com with SMTP id v70so429077vkv.7 for ; Mon, 07 Jan 2019 13:42:19 -0800 (PST) MIME-Version: 1.0 References: <1546873978-27797-1-git-send-email-longman@redhat.com> <1546873978-27797-2-git-send-email-longman@redhat.com> In-Reply-To: <1546873978-27797-2-git-send-email-longman@redhat.com> From: Kees Cook Date: Mon, 7 Jan 2019 13:42:07 -0800 Message-ID: Subject: Re: [PATCH 1/2] /proc/stat: Extract irqs counting code into show_stat_irqs() To: Waiman Long Cc: Andrew Morton , Alexey Dobriyan , Luis Chamberlain , Jonathan Corbet , LKML , "open list:DOCUMENTATION" , "linux-fsdevel@vger.kernel.org" , Davidlohr Bueso , Miklos Szeredi , Daniel Colascione , Dave Chinner , Randy Dunlap Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Mon, Jan 7, 2019 at 7:13 AM Waiman Long wrote: > > The code that generates the "intr" line of /proc/stat is now moved > from show_stat() into a new function - show_stat_irqs(). There is no > functional change. > > Signed-off-by: Waiman Long Reviewed-by: Kees Cook -Kees > --- > fs/proc/stat.c | 39 +++++++++++++++++++++++++++++---------- > 1 file changed, 29 insertions(+), 10 deletions(-) > > diff --git a/fs/proc/stat.c b/fs/proc/stat.c > index 535eda7..4b06f1b 100644 > --- a/fs/proc/stat.c > +++ b/fs/proc/stat.c > @@ -79,12 +79,38 @@ static u64 get_iowait_time(int cpu) > > #endif > > +static u64 compute_stat_irqs_sum(void) > +{ > + int i; > + u64 sum = 0; > + > + for_each_possible_cpu(i) { > + sum += kstat_cpu_irqs_sum(i); > + sum += arch_irq_stat_cpu(i); > + } > + sum += arch_irq_stat(); > + return sum; > +} > + > +/* > + * Print out the "intr" line of /proc/stat. > + */ > +static void show_stat_irqs(struct seq_file *p) > +{ > + int i; > + > + seq_put_decimal_ull(p, "intr ", compute_stat_irqs_sum()); > + for_each_irq_nr(i) > + seq_put_decimal_ull(p, " ", kstat_irqs_usr(i)); > + > + seq_putc(p, '\n'); > +} > + > static int show_stat(struct seq_file *p, void *v) > { > int i, j; > u64 user, nice, system, idle, iowait, irq, softirq, steal; > u64 guest, guest_nice; > - u64 sum = 0; > u64 sum_softirq = 0; > unsigned int per_softirq_sums[NR_SOFTIRQS] = {0}; > struct timespec64 boottime; > @@ -105,8 +131,6 @@ static int show_stat(struct seq_file *p, void *v) > steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL]; > guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST]; > guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE]; > - sum += kstat_cpu_irqs_sum(i); > - sum += arch_irq_stat_cpu(i); > > for (j = 0; j < NR_SOFTIRQS; j++) { > unsigned int softirq_stat = kstat_softirqs_cpu(j, i); > @@ -115,7 +139,6 @@ static int show_stat(struct seq_file *p, void *v) > sum_softirq += softirq_stat; > } > } > - sum += arch_irq_stat(); > > seq_put_decimal_ull(p, "cpu ", nsec_to_clock_t(user)); > seq_put_decimal_ull(p, " ", nsec_to_clock_t(nice)); > @@ -154,14 +177,10 @@ static int show_stat(struct seq_file *p, void *v) > seq_put_decimal_ull(p, " ", nsec_to_clock_t(guest_nice)); > seq_putc(p, '\n'); > } > - seq_put_decimal_ull(p, "intr ", (unsigned long long)sum); > - > - /* sum again ? it could be updated? */ > - for_each_irq_nr(j) > - seq_put_decimal_ull(p, " ", kstat_irqs_usr(j)); > + show_stat_irqs(p); > > seq_printf(p, > - "\nctxt %llu\n" > + "ctxt %llu\n" > "btime %llu\n" > "processes %lu\n" > "procs_running %lu\n" > -- > 1.8.3.1 > -- Kees Cook