From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay-us1.mymailcheap.com (relay-us1.mymailcheap.com [51.81.35.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBB6A1482E2; Fri, 27 Sep 2024 05:42:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=51.81.35.219 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727415734; cv=none; b=lXo+zkYRfce3Kfvzw5L1sDzCCyxoy7+x/IaydlCsdTnSUtODdQJgMFcwT1+V+/Q+F7BkUzxce2IN+VeA+AAeTVZp7Y9UoNvK2gTOlqnVWsiq3v2s3m9J3vcfjyUEQ7RY3jeNDVr4YmO+KCoJQpnJGzuPlqV24Ljb8wPZ+HuYlJI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727415734; c=relaxed/simple; bh=T/fL2yq9tBoba5IhlMXnsNngOGBBV8VhjaWX89GHVYo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=tHfCRhFrsNcng4M55Sqpuwg6o/p/OhWuzzZYwULubTOiRoByVKO8MyCdA+HcjBvsCD6fyzOWJUKL8iEf2yrNL3KXdUOot55I7Rf5v2j4hCh/ksg3iRHFMKLK5X+wXEysCI30p+SMTTysN+9+qTsMVu2trZUMmqh86ZvVH2Bmzys= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=aosc.io; spf=pass smtp.mailfrom=aosc.io; dkim=pass (1024-bit key) header.d=aosc.io header.i=@aosc.io header.b=STIgCIvA; arc=none smtp.client-ip=51.81.35.219 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=aosc.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aosc.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=aosc.io header.i=@aosc.io header.b="STIgCIvA" Received: from relay5.mymailcheap.com (relay5.mymailcheap.com [159.100.248.207]) by relay-us1.mymailcheap.com (Postfix) with ESMTPS id 0415A202B2; Fri, 27 Sep 2024 05:32:09 +0000 (UTC) Received: from relay1.mymailcheap.com (relay1.mymailcheap.com [144.217.248.100]) by relay5.mymailcheap.com (Postfix) with ESMTPS id BEA1126042; Fri, 27 Sep 2024 05:31:59 +0000 (UTC) Received: from nf1.mymailcheap.com (nf1.mymailcheap.com [51.75.14.91]) by relay1.mymailcheap.com (Postfix) with ESMTPS id 24F283E88C; Fri, 27 Sep 2024 05:31:52 +0000 (UTC) Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) by nf1.mymailcheap.com (Postfix) with ESMTPSA id 131E14075D; Fri, 27 Sep 2024 05:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; t=1727415110; bh=T/fL2yq9tBoba5IhlMXnsNngOGBBV8VhjaWX89GHVYo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=STIgCIvA+HNIleeMnxogPV7Y/eBejpRUBf/lJ+UGP170entokzgyEyn9z2lABHYAn KzwhOhY3JEB14sH0hULBulktG54E1NUni3HcFF5I+u6DuInHwK/V19uU01wMyCZgYA AbH1BRkG71+hV9MQ81RPyWU3udwCjA7p1PxGD4j4= Received: from [198.18.0.1] (unknown [58.32.43.121]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail20.mymailcheap.com (Postfix) with ESMTPSA id 23CBE401D1; Fri, 27 Sep 2024 05:31:41 +0000 (UTC) Message-ID: Date: Fri, 27 Sep 2024 13:31:38 +0800 Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Thunderbird Daily Subject: Re: [PATCH V2 3/3] SH: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK To: John Paul Adrian Glaubitz , Huacai Chen Cc: Huacai Chen , Arnd Bergmann , Thomas Bogendoerfer , Yoshinori Sato , Rich Felker , loongarch@lists.linux.dev, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Guo Ren , Xuerui Wang , Jiaxun Yang , linux-mips@vger.kernel.org, linux-sh@vger.kernel.org, stable@vger.kernel.org References: <20220714084136.570176-1-chenhuacai@loongson.cn> <20220714084136.570176-3-chenhuacai@loongson.cn> <3a5a4bee5c0739a3b988a328376a6eed3c385fda.camel@physik.fu-berlin.de> <8947f91ba1a10f98723a5982f0fc13ee589d3bf7.camel@physik.fu-berlin.de> Content-Language: en-US From: Kexy Biscuit In-Reply-To: <8947f91ba1a10f98723a5982f0fc13ee589d3bf7.camel@physik.fu-berlin.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: nf1.mymailcheap.com X-Rspamd-Queue-Id: 131E14075D X-Rspamd-Action: no action X-Spamd-Result: default: False [-1.46 / 10.00]; BAYES_HAM(-1.37)[90.69%]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:16276, ipnet:51.83.0.0/16, country:FR]; MIME_TRACE(0.00)[0:+]; FREEMAIL_TO(0.00)[physik.fu-berlin.de,gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_DN_SOME(0.00)[] On 3/19/2024 1:12 AM, John Paul Adrian Glaubitz wrote: > Hi Hucai, > > On Mon, 2024-03-18 at 22:21 +0800, Huacai Chen wrote: >> Hi, SuperH maintainers, >> >> On Wed, Feb 8, 2023 at 8:59 PM John Paul Adrian Glaubitz >> wrote: >>> >>> 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 >>>> --- >>>> 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 >>> >>> 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. >> Can this patch be merged? This is the only one still unmerged in the >> whole series. > > Thanks for the reminder. I will pick it up for 6.10. > > Got sick this week, so I can't pick up anymore patches for 6.9 and will just > send Linus a PR later this week. > > Adrian > Gentle ping on this, can we get this patch merged into 6.12? -- Best Regards, Kexy Biscuit