From patchwork Tue Mar 28 11:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 76019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2154963vqo; Tue, 28 Mar 2023 04:56:36 -0700 (PDT) X-Google-Smtp-Source: AKy350ax0pN7BA7luZT7CtBJhBeqURrTjZEZD8ndveorNkJe1d5OITxO4rIG+RG0Jaw/xXZy7aVf X-Received: by 2002:a17:906:a416:b0:924:d90a:6f97 with SMTP id l22-20020a170906a41600b00924d90a6f97mr16109030ejz.13.1680004595893; Tue, 28 Mar 2023 04:56:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680004595; cv=none; d=google.com; s=arc-20160816; b=o8l07pxZ9nI38saGftZlUQrHC1SKjVASfxn9HXrbCPJd+9hJco0f0vKPsLlmh//Sq3 Hb8AL9+j/9nXBboiatPGgENpHHJy+xVu9E3jhH63eBd1W94+oS8iAu2Y/EHOgLHUCaQy byzs8yDfzn+wHJcOJUhQvdoqHhf4V93/4NTab6QdgRgxTNY+Ye/aTsm/bCoZm4Kc0qwo mQUMYqol+6EcNdoaGj79S01HIZluDaNHmFqWbrHMcoUqmqO1dEKNzFUnB3b+FJYPKQPl 4JQLKOtNUoXhpjjfFIaYsoADBfAP+QwvmyeoIuCQX+6ErK1J1ndhPiJk3o+NrMplNr0D Ry0g== 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 :message-id:date:subject:cc:to:from; bh=l8Z5bwVYA9fmjgdCruxcSSgFyJSvBJMrx/cbmKD9wmA=; b=XKO5xD0iC1KKdErUaFPrhBL4ggdAuoIDSPwtBR8UCwKZvlu7fYrNTRDEUysetT1emG oBgFGOJWPUBPm23czUur68f5P8yaqEz9Awh3Wmoi8b0i/EE/iNop+tlHc11ybU0M2zxS UwoyylalifsWnfeQxqzc+zOFpDcDIH92HctmAiiWGKrqloKxwRFNsrAHUFAdOD6HBYML jBjrX0sLZotj1peyx+nTkGihfqXFWjPdbfmsyf/f/bXRP5BCDW56BGV1n3lJSWZ8CTQg iCez1h0BnPUt8+vEuIg/YoBOtPOvra6BbP8hZM9VTlUWsAONLwqpbTEMtC0hHxwFGNdc LK3w== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qw23-20020a1709066a1700b0093a9258f5e4si23600200ejc.358.2023.03.28.04.56.11; Tue, 28 Mar 2023 04:56:35 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232951AbjC1LuC (ORCPT + 99 others); Tue, 28 Mar 2023 07:50:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232950AbjC1Lt7 (ORCPT ); Tue, 28 Mar 2023 07:49:59 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54DAA8A6E for ; Tue, 28 Mar 2023 04:49:54 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Pm7FB5VHCz17PdD; Tue, 28 Mar 2023 19:46:38 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 28 Mar 2023 19:49:52 +0800 From: Yicong Yang To: , , , , , CC: , , Subject: [PATCH v2] cacheinfo: Fix LLC is not exported through sysfs Date: Tue, 28 Mar 2023 19:49:15 +0800 Message-ID: <20230328114915.33340-1-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761161817938361644?= X-GMAIL-MSGID: =?utf-8?q?1761612499327188944?= From: Yicong Yang After entering 6.3-rc1 the LLC cacheinfo is not exported on our ACPI based arm64 server. This is because the LLC cacheinfo is partly reset when secondary CPUs boot up. On arm64 the primary cpu will allocate and setup cacheinfo: init_cpu_topology() for_each_possible_cpu() fetch_cache_info() // Allocate cacheinfo and init levels detect_cache_attributes() cache_shared_cpu_map_setup() if (!last_level_cache_is_valid()) // not valid, setup LLC cache_setup_properties() // setup LLC On secondary CPU boot up: detect_cache_attributes() populate_cache_leaves() get_cache_type() // Get cache type from clidr_el1, // for LLC type=CACHE_TYPE_NOCACHE cache_shared_cpu_map_setup() if (!last_level_cache_is_valid()) // Valid and won't go to this branch, // leave LLC's type=CACHE_TYPE_NOCACHE The last_level_cache_is_valid() use cacheinfo->{attributes, fw_token} to test it's valid or not, but populate_cache_leaves() will only reset LLC's type, so we won't try to re-setup LLC's type and leave it CACHE_TYPE_NOCACHE and won't export it through sysfs. This patch tries to fix this by not re-populating the cache leaves if the LLC is valid. Fixes: 5944ce092b97 ("arch_topology: Build cacheinfo from primary CPU") Signed-off-by: Yicong Yang Reviewed-by: Pierre Gondois Reviewed-by: Sudeep Holla --- Change since v1: - Get rid of the goto label, per Pierre Link: https://lore.kernel.org/all/20230323122528.16691-1-yangyicong@huawei.com/ drivers/base/cacheinfo.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index f6573c335f4c..f3903d002819 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -474,12 +474,18 @@ int detect_cache_attributes(unsigned int cpu) populate_leaves: /* - * populate_cache_leaves() may completely setup the cache leaves and - * shared_cpu_map or it may leave it partially setup. + * If LLC is valid the cache leaves were already populated so just go to + * update the cpu map. */ - ret = populate_cache_leaves(cpu); - if (ret) - goto free_ci; + if (!last_level_cache_is_valid(cpu)) { + /* + * populate_cache_leaves() may completely setup the cache leaves and + * shared_cpu_map or it may leave it partially setup. + */ + ret = populate_cache_leaves(cpu); + if (ret) + goto free_ci; + } /* * For systems using DT for cache hierarchy, fw_token