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;
From:   Qing Wang <wangqing@vivo.com>
To:     Sudeep Holla <sudeep.holla@arm.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        linux-kernel@vger.kernel.org
Cc:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] arch_topology: Do not set llc_sibling if llc_id is invalid
Date:   Mon, 28 Mar 2022 00:24:58 -0700
Message-Id: <1648452300-3233-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rf7wXEByGNTLtD9apIhkjbPfcs/rH92aGOJSQddldsyv9kN5KhETb9dICGWm?=
 =?us-ascii?Q?NUBgl5v+rmMHZNzdDYAHJvmc8zO4a8Z0fJAdD5Zrp/PMOlE2UXRsU2HKaolZ?=
 =?us-ascii?Q?loqdZxnJmD3ovPgtR1OoOV2RiEgmsjgTP4nIJxAjxQMai2+cYyKizWyqt5MY?=
 =?us-ascii?Q?9sqMKYBYat9MtzApzi2EQqvbKHwk6tWueJsxZhHrwIPurxf5Kmt7oAEs9zzG?=
 =?us-ascii?Q?bhxgJ2Sw0SrD3M5/T5uA+T2pzcGL3ln4/fETUWA7qcFdxtdzYnD6oxstgr8S?=
 =?us-ascii?Q?otubTnZtHGjsN4K7ffjMn673WeVLsDZiHiKeIhJPpU4rZMIH3pvEjJz3ZdiI?=
 =?us-ascii?Q?DGPj5V+kVT6QdEbl/tQwknl3+0lVIGRRGgLBgRJlM1ZgK6jJPJdojgT2XdPG?=
 =?us-ascii?Q?sO6VuPlQdHC9AoHXJbTTJgVzw4hJr5aqVP9Bvg2cbM8fFzcKwhYnyT/pyoxm?=
 =?us-ascii?Q?3DCiyr8futKtkuxfLTcC8rsDxwi1db03GpfJWZXh/aQrwr4S02XjroGA/ZHH?=
 =?us-ascii?Q?I2XpEZkMg19KdzTQGj86qFIF4ZLLxjCinMx/0+E00RxsfOJiNSvn2kPo4ItP?=
 =?us-ascii?Q?tQs1lxWlczdWxdZdle7VW667wV9M0JmYctL1BAe0wyRhKf5WoaKXURH6+LKr?=
 =?us-ascii?Q?qmCgEz/5R/fPoKBdF17oEfdrfMYkzMwJqUu/1Lf0jhOeM+jFeUhe7Yd+TOec?=
 =?us-ascii?Q?0LksMM5CX1Wqd2gVxoznXmSOD/aGmpua3xm/Ir9VGzG+zopTQMB7qeAiQ/Ek?=
 =?us-ascii?Q?9hWl6mm+cQXhpx8fZSMRhi1MvQ3h/fSBvU6jPNC5RJucDCjy+FBSiVlt/Dun?=
 =?us-ascii?Q?e1xy722CI+qYK4DvKxoeyz/XwFcpZZJTfuIdu90GNxviHfc4bAYGlq8NDOBm?=
 =?us-ascii?Q?XDBoX040s54NGU7PFLggNHJAPDZTbAPklQiSiZydzv/KpyKrWS2PXsOTSJPq?=
 =?us-ascii?Q?nt/XuWGDIl3e5DKPv3Dr6yaLfIP9DGSbupErYTU3DWpr1PAKOVuPM8/t2Ux3?=
 =?us-ascii?Q?/9GIycqBpjQF6EdqiDIwZ8VUkSKmnQQB48AEczTWr4R9GG1tDjT+JL9Hk/DD?=
 =?us-ascii?Q?ewIGbUvEe20mzD+YsPOpNjtoUa/wfpaR+20szLOTePVXz6rm/Mlx/veto0Mx?=
 =?us-ascii?Q?GeuVxyeqs5MW1OgI/VG+pcxldyNy7Vzu3io2ggCyVh21hjOUgcb5z7E3T3Yw?=
 =?us-ascii?Q?QeGkzk6896oCKlqY/RHXZhZHtKrbbNFz+9HVoenJVdo2VkJe1t7K2YAk7Ymx?=
 =?us-ascii?Q?f97GqtDgAvvEcHVKGNw5nNVMjhWxyWgOvJlFPS4MQH+BSx9YGF1bOU9T/jDo?=
 =?us-ascii?Q?DzTKKd0qsQWNNPSSfzU42dHwjVeDwsV2JHFWRQEue8QK1p7uzvpadTIWy9HQ?=
 =?us-ascii?Q?hnrDkLQAaLETaeqqYXI8PvQD5wM0iCoNxbSJ1BkiNTBTEUf5zgVC/kh6o+al?=
 =?us-ascii?Q?zLXD+7iAPAyqsCRDqNWxiPyAnLUupM21nzTYw8EuBp0h6IfjuyEHcJ9oi1AR?=
 =?us-ascii?Q?A7CEEHsfrZyXF3YRtmthwQKVmL4D2k3Lpa7bJA7vfFPiNvR88liEKmTDERAr?=
 =?us-ascii?Q?WhqKYAXTgKcbY8t46iELOoAKKqbBU7Al2iDWbdxed8D4aWPt/CNMMlyT26hT?=
 =?us-ascii?Q?QyLfCj7EWbcaraxWnsHC5JRwoRL9Tm0Cz4iFOL2MnETfbUCjB198ycHOYiz8?=
 =?us-ascii?Q?unJP68amVkKEBca0krVPDyoTRXNsQDNyzF+l0TQ2JcveV9F/vyDAuOUN3HAu?=
 =?us-ascii?Q?yv3rIVNwaQ=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2ab6606f-6b26-4c15-433a-08da108c2275
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3080.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2022 07:25:28.9359
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jDbu5B/Yti+/1HV3TnqW8ttl3YqS/fjPjbooGuHUD4r6BSysEgK7dHv/CnqVIq2pLj62IWj3OHEo2VeEhOXkog==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5333
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wang Qing <wangqing@vivo.com>

When ACPI is not enabled, cpuid_topo->llc_id = cpu_topo->llc_id = -1, which
will set llc_sibling 0xff(...), this is misleading.

Don't set llc_sibling(default 0) if we don't know the cache topology.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 drivers/base/arch_topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 1d6636e..5c3a642
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -684,7 +684,7 @@ void update_siblings_masks(unsigned int cpuid)
 	for_each_online_cpu(cpu) {
 		cpu_topo = &cpu_topology[cpu];
 
-		if (cpuid_topo->llc_id == cpu_topo->llc_id) {
+		if (cpu_topo->llc_id != -1 && cpuid_topo->llc_id == cpu_topo->llc_id) {
 			cpumask_set_cpu(cpu, &cpuid_topo->llc_sibling);
 			cpumask_set_cpu(cpuid, &cpu_topo->llc_sibling);
 		}
-- 
2.7.4