From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2690CC021B0 for ; Tue, 18 Feb 2025 14:26:33 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Yy1zn54vCz3064; Wed, 19 Feb 2025 01:26:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1739888789; cv=none; b=Nk0mg6QwfYjhekcA5pYxdRDd8wwaQpcn4baplRG2NBlHSOntx18SiKVIz3M6hTbU5Blphr7O1d6GLBvX3kJcRF8WoGTSluK22s+3MTA1H4lVh9IuDjcekqVUOHY9NkcxI9+Lz/MV7qUn/kdlIqVRjpMP9a1UQU1Jmk/0uahzPGtUJOu2dPXk6wddrv9mzL7kz0VGORAxlG3vtmNUgTQ3obmh3iURjJepvqTt3wQt2YJXOk1zvbb4Yz4WT6v2diUBgTBb8gglpBZWaKsLqTkBP7IJJeXNF7uadXK1Lke6OQ/pnd0gRzaEhGEaS6rjDxPAGCJqsy0+e0ZVBFnWXcSFzQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1739888789; c=relaxed/relaxed; bh=er/4MQhLp1s/XX6/1u00SmAi7p6++fwYiQ+bGsFQQBo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CLCVCa+GccWJecY/PpqffWmddy/UniCPSTh3Is7flONHziIIHiG1xpzJmqQzP5tAdXJaRApWqWo7p9coycBC4wBl21KpHn/R66KMCVoyoWsZQ/IxOm5ItrjoIh9k6FmZdgdYZBEtovYnrUJ6sBU+BBkHAFMqgC3ZobYy9Zv4zYj9Lw2qYs3RXmm8ZV2gncZXSZI1aKfuX3088dAs5UzKNOp3RgHzUQi21lsmcWmhR8h8jn1/S4rEcckfLjlcL2LBueFtkUUsJ8PVZMDOu0lTeY1Piiiz5KKjKOAMaQtZhPIaYcbBUlJ2lp3E78v00tjJMUiW8GuPdEg793Ll2ExqOA== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass (client-ip=45.249.212.32; helo=szxga06-in.huawei.com; envelope-from=yangyicong@huawei.com; receiver=lists.ozlabs.org) smtp.mailfrom=huawei.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com (client-ip=45.249.212.32; helo=szxga06-in.huawei.com; envelope-from=yangyicong@huawei.com; receiver=lists.ozlabs.org) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Yy1zm3p3Zz2yVF for ; Wed, 19 Feb 2025 01:26:28 +1100 (AEDT) Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Yy1dW64SHzpkBd; Tue, 18 Feb 2025 22:10:39 +0800 (CST) Received: from kwepemd200014.china.huawei.com (unknown [7.221.188.8]) by mail.maildlp.com (Postfix) with ESMTPS id 2D0751A016C; Tue, 18 Feb 2025 22:10:09 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by kwepemd200014.china.huawei.com (7.221.188.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Tue, 18 Feb 2025 22:10:08 +0800 From: Yicong Yang To: , , , , , , , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v11 2/4] arch_topology: Support SMT control for OF based system Date: Tue, 18 Feb 2025 22:10:16 +0800 Message-ID: <20250218141018.18082-3-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20250218141018.18082-1-yangyicong@huawei.com> References: <20250218141018.18082-1-yangyicong@huawei.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemd200014.china.huawei.com (7.221.188.8) From: Yicong Yang On building the topology from the devicetree, we've already gotten the SMT thread number of each core. Update the largest SMT thread number and enable the SMT control by the end of topology parsing. The core's SMT control provides two interface to the users [1]: 1) enable/disable SMT by writing on/off 2) enable/disable SMT by writing thread number 1/max_thread_number If a system have more than one SMT thread number the 2) may not handle it well, since there're multiple thread numbers in the system and 2) only accept 1/max_thread_number. So issue a warning to notify the users if such system detected. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/ABI/testing/sysfs-devices-system-cpu#n542 Signed-off-by: Yicong Yang --- drivers/base/arch_topology.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 3ebe77566788..23f425a9d77a 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -506,6 +507,10 @@ core_initcall(free_raw_capacity); #endif #if defined(CONFIG_ARM64) || defined(CONFIG_RISCV) + +/* Maximum SMT thread number detected used to enable the SMT control */ +static unsigned int max_smt_thread_num; + /* * This function returns the logic cpu number of the node. * There are basically three kinds of return values: @@ -565,6 +570,16 @@ static int __init parse_core(struct device_node *core, int package_id, i++; } while (1); + /* + * If max_smt_thread_num has been initialized and doesn't match + * the thread number of this entry, then the system has + * heterogeneous SMT topology. + */ + if (max_smt_thread_num && max_smt_thread_num != i) + pr_warn_once("Heterogeneous SMT topology is partly supported by SMT control\n"); + + max_smt_thread_num = max_t(unsigned int, max_smt_thread_num, i); + cpu = get_cpu_for_node(core); if (cpu >= 0) { if (!leaf) { @@ -677,6 +692,18 @@ static int __init parse_socket(struct device_node *socket) if (!has_socket) ret = parse_cluster(socket, 0, -1, 0); + /* + * Notify the CPU framework of the SMT support. Initialize the + * max_smt_thread_num to 1 if no SMT support detected or failed + * to parse the topology. A thread number of 1 can be handled by + * the framework so we don't need to check max_smt_thread_num to + * see we support SMT or not. + */ + if (!max_smt_thread_num || ret) + max_smt_thread_num = 1; + + cpu_smt_set_num_threads(max_smt_thread_num, max_smt_thread_num); + return ret; } -- 2.24.0