From patchwork Sat Oct 22 07:18:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1089014wrr; Sat, 22 Oct 2022 00:41:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5IQPuvpxPSiGlf796IDqnGYLP7GWvtoqDW1mVhof8k4YuC6zOrkYUV9i0u2fGALOE42aDb X-Received: by 2002:a65:62c7:0:b0:463:9c67:5fe2 with SMTP id m7-20020a6562c7000000b004639c675fe2mr19441314pgv.443.1666424512204; Sat, 22 Oct 2022 00:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666424512; cv=none; d=google.com; s=arc-20160816; b=M10pY9WzxM8HCTek31szZkCgPMoalZN1M1O4T5XeczJWf7aoRd6oU0ksouijh7sCAX 78S9ZDhywBxa2bvh5WJDcjE1wiTxbJ1l05OogAWn27OnuUp1dWv1vTVPWCy2aANkidYt UGVbL8fSp5w1aOdrZbFFlJVrkeSWG8g99SAnznWitveFtuUCnw0t37ZItxTmsof27fO6 2/FEwA8QuYf5xNvBtyJ6hDvSSARWULnY1RB546n11zes97F1UlIugCQCw9w6OU1IcMnn yZMtzxnyBkIoWNq9VxpnOvHbGGo4G8mUUcPSl/VAYj5wEMG9beCu7X8s7n+tWJ81zxR7 mJ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3Zng3YthuBRp7NoZr9y9jX2epyePvtk7v3twtnGcWmM=; b=xG3eKnygmDXloklBydUwddcUX4eOJyjWCsiR6yJtOG1RP350+QUU+pZaaaZWsft9VA Qz7vBtoDrs6kGg0aI5sEL2dFhlTmwW2er3hHY3OVKTlX0kaJxl/Rz7zMGOcyPhW4ybPP 8/L1qbLoonDtbo3Wdnp0uFC14bdh84V62hpBavuyUDvhl5mTIKlhNASQc/5jXXRfNJsb pl2Orh/n4kyH2NkPzXOlkUugegmDnPObWmyt4JwKyj6Jjw5pLu3+VBUpDlNtMfUgtoyW mOvMIxkXDECvNqcxxYt1q0NfTIssIlkYbOR2wgXYKn+Rrqfn7ZVEe/K9W0G+/MkgymmM xh/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="JQ/nUPrt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k2-20020a170902c40200b001769541146bsi32502788plk.573.2022.10.22.00.41.39; Sat, 22 Oct 2022 00:41:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="JQ/nUPrt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230527AbiJVHlG (ORCPT + 99 others); Sat, 22 Oct 2022 03:41:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230441AbiJVHkQ (ORCPT ); Sat, 22 Oct 2022 03:40:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 998F05DF18; Sat, 22 Oct 2022 00:37:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8019260ADB; Sat, 22 Oct 2022 07:36:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E694C433C1; Sat, 22 Oct 2022 07:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424207; bh=fb5bovRJE0OE1x/kjgr6r3QY9hhCN3d1H51HtnbhOcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JQ/nUPrtP3w+iz5OLmSoq/BwKO9q999NZgzVTH+1AID7QsaDyu3wJz4DA+wJIJrL3 J+Wct5/1iooCRTrifItGg1GDdxv/UM6krPVHl6NwU9IHRqmXRlsTVzstYfxoyeuX/m 2B3Wte8vsPy8Nj/rjBhEStWbmuZMlYea3vhJUM+I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huacai Chen , Richard Weinberger Subject: [PATCH 5.19 060/717] UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK Date: Sat, 22 Oct 2022 09:18:59 +0200 Message-Id: <20221022072425.691137563@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747372749617538995?= X-GMAIL-MSGID: =?utf-8?q?1747372749617538995?= From: Huacai Chen commit 16c546e148fa6d14a019431436a6f7b4087dbccd upstream. 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 Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- arch/um/kernel/um_arch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -96,7 +96,7 @@ static int show_cpuinfo(struct seq_file 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)