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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 B14EFC64EB8 for ; Tue, 2 Oct 2018 19:18:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B9642064D for ; Tue, 2 Oct 2018 19:18:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="fnfe9+1A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B9642064D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728020AbeJCCCy (ORCPT ); Tue, 2 Oct 2018 22:02:54 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:27235 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727576AbeJCCCy (ORCPT ); Tue, 2 Oct 2018 22:02:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1538507882; x=1570043882; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=A39qH3ZGW6Bt3uRzn6SdP9xVcGPk530pyzGLsA+rMtQ=; b=fnfe9+1Ad3y882BW5yEoCpN6C3fy1yefUeFDz4S0i9DcNino78fXHf1M bOMAh7XvaeDnEQULrx7T8h7qyZ4QElwdXFFxxqRTidnyqQ7oUTgUM94NF f5FDNeT3v4Qjx+rZR/edvJTiRvi/THMgyCO7RpqSlxVUz8+STmzYZEWSY MS/k0hgLo2j+jxamO+lUDxDtKF8QJ64waxOhWJ2yVcQk6+ggiQYb3faKb B8QsUqzpo4ZdjqFnFbYOtWiF2vwDMbLlIqMrAqB/NG6tkhwhRr974lekw MzK2z0uStI9PyE0nmdmuLXUyeNEJnWv605yB4ba9CyZOsaonwriCuYfI5 g==; X-IronPort-AV: E=Sophos;i="5.54,332,1534780800"; d="scan'208";a="95621043" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 03 Oct 2018 03:18:02 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 02 Oct 2018 12:03:39 -0700 Received: from c02v91rdhtd5.sdcorp.global.sandisk.com (HELO [10.196.159.148]) ([10.196.159.148]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Oct 2018 12:18:02 -0700 Subject: Re: [PATCH v3] RISC-V: Show IPI stats To: Anup Patel Cc: Palmer Dabbelt , Albert Ou , Christoph Hellwig , "linux-riscv@lists.infradead.org" , "linux-kernel@vger.kernel.org List" References: <20180929062605.12888-1-anup@brainfault.org> <7d40c900-cfb2-f3a0-fce9-0136814781fe@wdc.com> From: Atish Patra Message-ID: <54503b86-cb77-9eaf-6bd9-5e8caa2ebb78@wdc.com> Date: Tue, 2 Oct 2018 12:18:01 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/1/18 8:29 PM, Anup Patel wrote: > On Tue, Oct 2, 2018 at 8:45 AM Atish Patra wrote: >> >> On 9/28/18 11:26 PM, Anup Patel wrote: >>> This patch provides arch_show_interrupts() implementation to >>> show IPI stats via /proc/interrupts. >>> >>> Now the contents of /proc/interrupts" will look like below: >>> CPU0 CPU1 CPU2 CPU3 >>> 8: 17 7 6 14 SiFive PLIC 8 virtio0 >>> 10: 10 10 9 11 SiFive PLIC 10 ttyS0 >>> IPI0: 170 673 251 79 Rescheduling interrupts >>> IPI1: 1 12 27 1 Function call interrupts >>> >>> Signed-off-by: Anup Patel >>> >>> Changes since v2: >>> - Remove use of IPI_CALL_WAKEUP because it's being removed >>> >>> Changes since v1: >>> - Add stub inline show_ipi_stats() function for !CONFIG_SMP >>> - Make ipi_names[] dynamically sized at compile time >>> - Minor beautification of ipi_names[] using tabs >>> >>> --- >>> arch/riscv/include/asm/smp.h | 9 +++++++++ >>> arch/riscv/kernel/irq.c | 8 ++++++++ >>> arch/riscv/kernel/smp.c | 39 +++++++++++++++++++++++++++++------- >>> 3 files changed, 49 insertions(+), 7 deletions(-) >>> >>> diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h >>> index fce312ce3516..5278ae8f1346 100644 >>> --- a/arch/riscv/include/asm/smp.h >>> +++ b/arch/riscv/include/asm/smp.h >>> @@ -25,8 +25,13 @@ >>> extern unsigned long __cpuid_to_hardid_map[NR_CPUS]; >>> #define cpuid_to_hardid_map(cpu) __cpuid_to_hardid_map[cpu] >>> >>> +struct seq_file; >>> + >>> #ifdef CONFIG_SMP >>> >>> +/* print IPI stats */ >>> +void show_ipi_stats(struct seq_file *p, int prec); >>> + >>> /* SMP initialization hook for setup_arch */ >>> void __init setup_smp(void); >>> >>> @@ -47,6 +52,10 @@ void riscv_cpuid_to_hartid_mask(const struct cpumask *in, struct cpumask *out); >>> >>> #else >>> >>> +static inline void show_ipi_stats(struct seq_file *p, int prec) >>> +{ >>> +} >>> + >>> static inline int riscv_hartid_to_cpuid(int hartid) >>> { >>> return 0; >>> diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c >>> index ca4593317e45..48e6b7db83a1 100644 >>> --- a/arch/riscv/kernel/irq.c >>> +++ b/arch/riscv/kernel/irq.c >>> @@ -8,6 +8,8 @@ >>> #include >>> #include >>> #include >>> +#include >>> +#include >>> >>> /* >>> * Possible interrupt causes: >>> @@ -24,6 +26,12 @@ >>> */ >>> #define INTERRUPT_CAUSE_FLAG (1UL << (__riscv_xlen - 1)) >>> >>> +int arch_show_interrupts(struct seq_file *p, int prec) >>> +{ >>> + show_ipi_stats(p, prec); >>> + return 0; >>> +} >>> + >>> asmlinkage void __irq_entry do_IRQ(struct pt_regs *regs) >>> { >>> struct pt_regs *old_regs = set_irq_regs(regs); >>> diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c >>> index 89d95866f562..686fa7a427ff 100644 >>> --- a/arch/riscv/kernel/smp.c >>> +++ b/arch/riscv/kernel/smp.c >>> @@ -22,22 +22,24 @@ >>> #include >>> #include >>> #include >>> +#include >>> >>> #include >>> #include >>> #include >>> >>> -/* A collection of single bit ipi messages. */ >>> -static struct { >>> - unsigned long bits ____cacheline_aligned; >>> -} ipi_data[NR_CPUS] __cacheline_aligned; >>> - >>> enum ipi_message_type { >>> IPI_RESCHEDULE, >>> IPI_CALL_FUNC, >>> IPI_MAX >>> }; >>> >>> +/* A collection of single bit ipi messages. */ >>> +static struct { >>> + unsigned long stats[IPI_MAX] ____cacheline_aligned; >>> + unsigned long bits ____cacheline_aligned; >>> +} ipi_data[NR_CPUS] __cacheline_aligned; >>> + >>> int riscv_hartid_to_cpuid(int hartid) >>> { >>> int i = -1; >>> @@ -67,6 +69,7 @@ int setup_profiling_timer(unsigned int multiplier) >>> void riscv_software_interrupt(void) >>> { >>> unsigned long *pending_ipis = &ipi_data[smp_processor_id()].bits; >>> + unsigned long *stats = ipi_data[smp_processor_id()].stats; >>> >>> /* Clear pending IPI */ >>> csr_clear(sip, SIE_SSIE); >>> @@ -81,11 +84,15 @@ void riscv_software_interrupt(void) >>> if (ops == 0) >>> return; >>> >>> - if (ops & (1 << IPI_RESCHEDULE)) >>> + if (ops & (1 << IPI_RESCHEDULE)) { >>> + stats[IPI_RESCHEDULE]++; >>> scheduler_ipi(); >>> + } >>> >>> - if (ops & (1 << IPI_CALL_FUNC)) >>> + if (ops & (1 << IPI_CALL_FUNC)) { >>> + stats[IPI_CALL_FUNC]++; >>> generic_smp_call_function_interrupt(); >>> + } >>> >>> BUG_ON((ops >> IPI_MAX) != 0); >>> >>> @@ -111,6 +118,24 @@ send_ipi_message(const struct cpumask *to_whom, enum ipi_message_type operation) >>> sbi_send_ipi(cpumask_bits(&hartid_mask)); >>> } >>> >>> +static const char *ipi_names[] = { >>> + [IPI_RESCHEDULE] = "Rescheduling interrupts", >>> + [IPI_CALL_FUNC] = "Function call interrupts", >>> +}; >>> + >>> +void show_ipi_stats(struct seq_file *p, int prec) >>> +{ >>> + unsigned int cpu, i; >>> + >>> + for (i = 0; i < IPI_MAX; i++) { >>> + seq_printf(p, "%*s%u:%s", prec - 1, "IPI", i, >>> + prec >= 4 ? " " : ""); >>> + for_each_online_cpu(cpu) >>> + seq_printf(p, "%10lu ", ipi_data[cpu].stats[i]); >>> + seq_printf(p, " %s\n", ipi_names[i]); >>> + } >>> +} >>> + >>> void arch_send_call_function_ipi_mask(struct cpumask *mask) >>> { >>> send_ipi_message(mask, IPI_CALL_FUNC); >>> >> some checkpatch errors. >> >> patches/smp_cleanup/0014-RISC-V-Show-IPI-stats.patch >> ---------------------------------------------------- >> WARNING: Missing a blank line after declarations >> #115: FILE: arch/riscv/kernel/smp.c:40: >> + unsigned long stats[IPI_MAX] ____cacheline_aligned; >> + unsigned long bits ____cacheline_aligned; > > This was already there in existing code. > >> >> WARNING: usage of NR_CPUS is often wrong - consider using >> cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc >> #116: FILE: arch/riscv/kernel/smp.c:41: >> +} ipi_data[NR_CPUS] __cacheline_aligned; > > Even this was already there in existing code. > >> >> WARNING: static const char * array should probably be static const char >> * const >> #151: FILE: arch/riscv/kernel/smp.c:121: >> +static const char *ipi_names[] = { >> >> total: 0 errors, 3 warnings, 120 lines checked >> >> Let me know if they were ignored on purpose. >> > > Yes, this one was added by this patch. > > Do you want me to send revised patch? > Nope. That's just a one line fix. I fixed it and submitted the patch as part of my v6. I will send a separate patch fix for the patch errors introduced by the existing code as the fix was bit involved. Regards, Atish > Regards, > Anup > Regards, Atish