From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
To: Huacai Chen <chenhuacai@loongson.cn>,
Arnd Bergmann <arnd@arndb.de>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>
Cc: loongarch@lists.linux.dev, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org, Huacai Chen <chenhuacai@gmail.com>,
Guo Ren <guoren@kernel.org>, Xuerui Wang <kernel@xen0n.name>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-mips@vger.kernel.org, linux-sh@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH V2 3/3] SH: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
Date: Wed, 08 Feb 2023 13:58:50 +0100 [thread overview]
Message-ID: <3a5a4bee5c0739a3b988a328376a6eed3c385fda.camel@physik.fu-berlin.de> (raw)
In-Reply-To: <20220714084136.570176-3-chenhuacai@loongson.cn>
On Thu, 2022-07-14 at 16:41 +0800, Huacai Chen wrote:
> When CONFIG_CPUMASK_OFFSTACK and CONFIG_DEBUG_PER_CPU_MAPS is selected,
> cpu_max_bits_warn() generates a runtime warning similar as below while
> we show /proc/cpuinfo. Fix this by using nr_cpu_ids (the runtime limit)
> instead of NR_CPUS to iterate CPUs.
>
> [ 3.052463] ------------[ cut here ]------------
> [ 3.059679] WARNING: CPU: 3 PID: 1 at include/linux/cpumask.h:108 show_cpuinfo+0x5e8/0x5f0
> [ 3.070072] Modules linked in: efivarfs autofs4
> [ 3.076257] CPU: 0 PID: 1 Comm: systemd Not tainted 5.19-rc5+ #1052
> [ 3.099465] Stack : 9000000100157b08 9000000000f18530 9000000000cf846c 9000000100154000
> [ 3.109127] 9000000100157a50 0000000000000000 9000000100157a58 9000000000ef7430
> [ 3.118774] 90000001001578e8 0000000000000040 0000000000000020 ffffffffffffffff
> [ 3.128412] 0000000000aaaaaa 1ab25f00eec96a37 900000010021de80 900000000101c890
> [ 3.138056] 0000000000000000 0000000000000000 0000000000000000 0000000000aaaaaa
> [ 3.147711] ffff8000339dc220 0000000000000001 0000000006ab4000 0000000000000000
> [ 3.157364] 900000000101c998 0000000000000004 9000000000ef7430 0000000000000000
> [ 3.167012] 0000000000000009 000000000000006c 0000000000000000 0000000000000000
> [ 3.176641] 9000000000d3de08 9000000001639390 90000000002086d8 00007ffff0080286
> [ 3.186260] 00000000000000b0 0000000000000004 0000000000000000 0000000000071c1c
> [ 3.195868] ...
> [ 3.199917] Call Trace:
> [ 3.203941] [<90000000002086d8>] show_stack+0x38/0x14c
> [ 3.210666] [<9000000000cf846c>] dump_stack_lvl+0x60/0x88
> [ 3.217625] [<900000000023d268>] __warn+0xd0/0x100
> [ 3.223958] [<9000000000cf3c90>] warn_slowpath_fmt+0x7c/0xcc
> [ 3.231150] [<9000000000210220>] show_cpuinfo+0x5e8/0x5f0
> [ 3.238080] [<90000000004f578c>] seq_read_iter+0x354/0x4b4
> [ 3.245098] [<90000000004c2e90>] new_sync_read+0x17c/0x1c4
> [ 3.252114] [<90000000004c5174>] vfs_read+0x138/0x1d0
> [ 3.258694] [<90000000004c55f8>] ksys_read+0x70/0x100
> [ 3.265265] [<9000000000cfde9c>] do_syscall+0x7c/0x94
> [ 3.271820] [<9000000000202fe4>] handle_syscall+0xc4/0x160
> [ 3.281824] ---[ end trace 8b484262b4b8c24c ]---
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> ---
> arch/sh/kernel/cpu/proc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/sh/kernel/cpu/proc.c b/arch/sh/kernel/cpu/proc.c
> index a306bcd6b341..5f6d0e827bae 100644
> --- a/arch/sh/kernel/cpu/proc.c
> +++ b/arch/sh/kernel/cpu/proc.c
> @@ -132,7 +132,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
>
> static void *c_start(struct seq_file *m, loff_t *pos)
> {
> - return *pos < NR_CPUS ? cpu_data + *pos : NULL;
> + return *pos < nr_cpu_ids ? cpu_data + *pos : NULL;
> }
> static void *c_next(struct seq_file *m, void *v, loff_t *pos)
> {
I build-tested the patch and also booted the patched kernel successfully
on my SH-7785LCR board.
Showing the contents of /proc/cpuinfo works fine, too:
root@tirpitz:~> cat /proc/cpuinfo
machine : SH7785LCR
processor : 0
cpu family : sh4a
cpu type : SH7785
cut : 7.x
cpu flags : fpu perfctr llsc
cache type : split (harvard)
icache size : 32KiB (4-way)
dcache size : 32KiB (4-way)
address sizes : 32 bits physical
bogomips : 599.99
root@tirpitz:~>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
I am not sure yet whether the change is also correct as I don't know whether
it's possible to change the number of CPUs at runtime on SuperH.
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
next prev parent reply other threads:[~2023-02-08 12:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 8:41 [PATCH V2 1/3] MIPS: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK Huacai Chen
2022-07-14 8:41 ` [PATCH V2 2/3] LoongArch: " Huacai Chen
2022-07-28 12:42 ` Huacai Chen
2022-07-28 12:53 ` John Paul Adrian Glaubitz
2022-11-29 14:06 ` Huacai Chen
2022-11-29 14:18 ` John Paul Adrian Glaubitz
2022-07-14 8:41 ` [PATCH V2 3/3] SH: " Huacai Chen
2022-11-28 6:25 ` Huacai Chen
2022-11-28 8:18 ` Guo Ren
2022-11-29 14:08 ` Huacai Chen
2023-02-08 12:58 ` John Paul Adrian Glaubitz [this message]
2024-03-18 14:21 ` Huacai Chen
2024-03-18 17:12 ` John Paul Adrian Glaubitz
2022-07-14 9:54 ` [PATCH V2 1/3] MIPS: " Thomas Bogendoerfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a5a4bee5c0739a3b988a328376a6eed3c385fda.camel@physik.fu-berlin.de \
--to=glaubitz@physik.fu-berlin.de \
--cc=arnd@arndb.de \
--cc=chenhuacai@gmail.com \
--cc=chenhuacai@loongson.cn \
--cc=dalias@libc.org \
--cc=guoren@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kernel@xen0n.name \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=loongarch@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).