Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4648888iob; Sun, 8 May 2022 20:32:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjIGJKh6x75Q6AnAS0XJhI3xc+5fcTIxoDWJboJF5uXUxdkayvgwuC6L3mdfofGDek6YiF X-Received: by 2002:a63:197:0:b0:3aa:9c7a:b269 with SMTP id 145-20020a630197000000b003aa9c7ab269mr11446854pgb.158.1652067178234; Sun, 08 May 2022 20:32:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652067178; cv=none; d=google.com; s=arc-20160816; b=wAOraAAxr6IME6HbrKOpF3FA7/CXjsmLhTWjxZn6tWBHY3fMt3JzMVU23rpEXonH/0 Mlrc0Usn5LqsFO9e9XLRfMBu4VJg0YkqqHqUyPzEdz0zKie5P6jet5LX4QK9stoqis1C Qjpv2Fv5DFjTsZd2UUVQb/YlZIOrwRBb9HfMBbE0/Lrg8/oQzmL4HWod4QX4hposBPES Hhy7Uf8p1xi8LVZX5X6fMkpyqOaqZ03WdY34SXILjwh/1VDXytnfXWS5wDXPziMdU19q ZRui/rN4Iv8nMqvsVuVCFxg+Lao3XCps5Lkmu/0/99xwwz+MxGgVCfGcEvGk6BMXa84v dueA== 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=2jqt0cCm0mtHUFNo3vt4UGebFF7VLHFxfF5+2fRnfoI=; b=Kc5MHiHo7xAvd1e3+OCVqnAgTylWgQI4Ip1DK3QrHQW8Ys1Yhfk9P+IbRkBDUI2hlD rWjfkFwnH2mZE20qQrkeMxbaoAmbAzNOlcQ3k0MybxVnaQfkaUfm1gasDhsBkEnPfWU8 RLcC7XLl4M0fHID3lZxKvtJqyNyEwunoz3pg+a/b6sg5Kp3PLUxxnYIxWlm9KQz5rcna H22nk4i5BeBEF/Ya4/KcmuCGZzmxY/hs3kSa7Xkcv2qI+R1pVTDytUsEumZRlBnCuypx PH9SKzr/QBd7CrvBC9BXubFfu7iIZjUSaFNBK3a0OWn6N8L51Bwsm9D4egK6u6w5NM9g tJOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=guqSvtVk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id 14-20020a630e4e000000b003ab0e9b4af5si12923660pgo.464.2022.05.08.20.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 20:32:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=guqSvtVk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E25CBA76EB; Sun, 8 May 2022 20:31:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358545AbiEDRia (ORCPT + 99 others); Wed, 4 May 2022 13:38:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356854AbiEDRJq (ORCPT ); Wed, 4 May 2022 13:09:46 -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 F11832CE39; Wed, 4 May 2022 09:56:00 -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 D1987617DE; Wed, 4 May 2022 16:56:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23220C385AA; Wed, 4 May 2022 16:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683360; bh=HYJR58QEHHoSYs3l8IRgOcIy5CFAG2cxLrnEXmuFJVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guqSvtVkuvafm6bYenYJG5oCKaFrGSBvLFgh5rpJjopTpkeR02NSESBv4ro9BiK6F 0nutNYsEcqT2nbH7z5tPXaGO741QUqwl/wUKPr/s2NezfeUCSlYyGvuMbJgG1L1kH8 E0TsebAAciUClyv3dD/6O0pRHFLFSCVkvKfmbneM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sudeep Holla , Wang Qing Subject: [PATCH 5.17 039/225] arch_topology: Do not set llc_sibling if llc_id is invalid Date: Wed, 4 May 2022 18:44:37 +0200 Message-Id: <20220504153113.670016499@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Wang Qing commit 1dc9f1a66e1718479e1c4f95514e1750602a3cb9 upstream. 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. Reviewed-by: Sudeep Holla Signed-off-by: Wang Qing Fixes: 37c3ec2d810f ("arm64: topology: divorce MC scheduling domain from core_siblings") Cc: stable Link: https://lore.kernel.org/r/1649644580-54626-1-git-send-email-wangqing@vivo.com Signed-off-by: Greg Kroah-Hartman --- drivers/base/arch_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -645,7 +645,7 @@ void update_siblings_masks(unsigned int 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); }