From patchwork Tue Oct 10 11:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 150694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp138131vqb; Tue, 10 Oct 2023 04:56:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUUqI2SBjp57OPz+b5/5bM01qvc+ubJnGPopWe9QrC4k+3juzUKshDc9UCdGAFdQCr6uls X-Received: by 2002:a05:6358:9226:b0:143:21e8:11f2 with SMTP id d38-20020a056358922600b0014321e811f2mr18563998rwb.11.1696939008062; Tue, 10 Oct 2023 04:56:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696939008; cv=none; d=google.com; s=arc-20160816; b=U9d9LuUG0VgYIP+maTjA2KQL97jRBNGEiZ5Vv313AEof65dkd8Z1cMgDY4aRyS0DRN H6vBlXZx0gWtiB2eMHZGYjYQ3NTBlnAPXRzHT+B/V68CulXTZ8k+zZrbgi2Ex4vJA7Hn XqmEI8SDavA942y9gydQlJ/PG7p3HVb1KnI3jmCJNnrRDCws4C9psO88w8QG3x2umi8J o7gGKACqFDlu9C8OyYPTy1R3B9SNmKVtFigQjP5CZj7tbSUSBOiizDxdyOqF0MJLwJGQ /fr27bzBFpQ+5xrNwuyelh4PXVpWczO4rEpsOejmm65Zh9Zk3p5motzIavI6HqEdI8gH /jjw== 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=uyMtNIIewUR3dRVR6Vg61q33XPTIgzZZG6/bYaGgcHQ=; fh=3iB9MPM7gOV8iaw6nlpksJFY47xoJvfTkJIkOXUlBK4=; b=teGquW3G5Gr+h3X+h+2JM3OdUWtwWEi1IkdGbIcDherTFt7E9Q/HxlPCzp/EKieRV5 Uy7ItiWaOnXs9EuWMtKLy82/uI6ZErBLmYxotA0X0vMuejU6FzLibQP4Hfmz7R5wxE0B i3kMb3ZcBA8ihOeruCTof9xL9jmkBHsbnjg+yKN8TXafCbzFG4xi4KzSJaUT8E5/ejAu D23oO6b2R6tTZ/3I9tivWWfBZKi6RSsET0EU4KSw7vWn81z0JSEB5nQEdVkXBa9+wKOm BkjEtvtgiDNYwt3jXKretjlxHUWYrTQWjq5qbB+N1cMUfMwxwJty44XpUl98Vsa0GZDo MsHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id np15-20020a17090b4c4f00b00263e299dff6si13006088pjb.74.2023.10.10.04.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 04:56:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 47AFC83700DE; Tue, 10 Oct 2023 04:56:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231435AbjJJL4a (ORCPT + 20 others); Tue, 10 Oct 2023 07:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230122AbjJJL42 (ORCPT ); Tue, 10 Oct 2023 07:56:28 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8912399 for ; Tue, 10 Oct 2023 04:56:26 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4S4Z4g6RdJztTMx; Tue, 10 Oct 2023 19:51:47 +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.31; Tue, 10 Oct 2023 19:56:23 +0800 From: Yicong Yang To: , , , CC: , , , , , , , Subject: [PATCH v2] arch_topology: Support SMT control on arm64 Date: Tue, 10 Oct 2023 19:53:35 +0800 Message-ID: <20231010115335.13862-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.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 10 Oct 2023 04:56:45 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779369517503764041 X-GMAIL-MSGID: 1779369517503764041 From: Yicong Yang The core CPU control framework supports runtime SMT control which is not yet supported on arm64. Besides the general vulnerabilities concerns we want this runtime control on our arm64 server for: - better single CPU performance in some cases - saving overall power consumption This patch implements it in the following aspects: - implement the callbacks of the core - update the SMT status after the topology enumerated on arm64 - select HOTPLUG_SMT for arm64 For disabling SMT we'll offline all the secondary threads and only leave the primary thread. Since we don't have restriction for primary thread selection, the first thread is chosen as the primary thread in this implementation. Tests has been done on our real ACPI based arm64 server and on ACPI/OF based QEMU VMs. Signed-off-by: Yicong Yang --- Change since v1: - Avoid the complexity on SMT detecting by visiting each CPU once, concerned by Sudeep Link: https://lore.kernel.org/all/20230919123319.23785-1-yangyicong@huawei.com/ arch/arm64/Kconfig | 1 + drivers/base/arch_topology.c | 75 +++++++++++++++++++++++++++++++++++ include/linux/arch_topology.h | 11 +++++ 3 files changed, 87 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 78f20e632712..339661ceabc8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -233,6 +233,7 @@ config ARM64 select HAVE_KRETPROBES select HAVE_GENERIC_VDSO select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU + select HOTPLUG_SMT if SMP select IRQ_DOMAIN select IRQ_FORCED_THREADING select KASAN_VMALLOC if KASAN diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index b741b5ba82bd..c5b453c2cd61 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -729,6 +729,75 @@ const struct cpumask *cpu_clustergroup_mask(int cpu) return &cpu_topology[cpu].cluster_sibling; } +#ifdef CONFIG_HOTPLUG_SMT +static int topology_smt_num_threads = 1; + +void __init topology_smt_set_num_threads(void) +{ + int cpu, sibling, threads; + cpumask_var_t to_visit; + + if (!alloc_cpumask_var(&to_visit, GFP_KERNEL)) { + pr_err("Failed to update the SMT info\n"); + return; + } + + cpumask_or(to_visit, to_visit, cpu_possible_mask); + + /* + * Walk all the CPUs to find the largest thread number, in case we're + * on a heterogeneous platform with only part of the CPU cores support + * SMT. + * + * Get the thread number by checking the CPUs with same core id + * rather than checking the topology_sibling_cpumask(), since the + * sibling mask will not cover all the CPUs if there's CPU offline. + */ + for_each_cpu(cpu, to_visit) { + threads = 1; + + cpumask_clear_cpu(cpu, to_visit); + + /* Invalid thread id, this CPU is not in a SMT core */ + if (cpu_topology[cpu].thread_id == -1) + continue; + + for_each_cpu(sibling, to_visit) { + if (cpu_topology[sibling].thread_id != -1 && + cpu_topology[cpu].core_id == cpu_topology[sibling].core_id) + threads++; + + cpumask_clear_cpu(sibling, to_visit); + } + + if (threads > topology_smt_num_threads) + topology_smt_num_threads = threads; + } + + free_cpumask_var(to_visit); + + /* + * We don't support CONFIG_SMT_NUM_THREADS_DYNAMIC so make the + * max_threads == num_threads. + */ + cpu_smt_set_num_threads(topology_smt_num_threads, topology_smt_num_threads); +} + +/* + * On SMT Hotplug the primary thread of the SMT won't be disabled. For x86 they + * seem to have a primary thread for special purpose. For other arthitectures + * like arm64 there's no such restriction for a primary thread, so make the + * first thread in the SMT as the primary thread. + */ +bool topology_is_primary_thread(unsigned int cpu) +{ + if (cpu == cpumask_first(topology_sibling_cpumask(cpu))) + return true; + + return false; +} +#endif + void update_siblings_masks(unsigned int cpuid) { struct cpu_topology *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; @@ -841,6 +910,12 @@ void __init init_cpu_topology(void) reset_cpu_topology(); } + /* + * By this stage we get to know whether we support SMT or not, update + * the information for the core. + */ + topology_smt_set_num_threads(); + for_each_possible_cpu(cpu) { ret = fetch_cache_info(cpu); if (!ret) diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index a07b510e7dc5..cf605a576e7b 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -92,6 +92,17 @@ void update_siblings_masks(unsigned int cpu); void remove_cpu_topology(unsigned int cpuid); void reset_cpu_topology(void); int parse_acpi_topology(void); + +#ifdef CONFIG_HOTPLUG_SMT +bool topology_smt_supported(void); +bool topology_is_primary_thread(unsigned int cpu); +void topology_smt_set_num_threads(void); +#else +static inline bool topology_smt_supported(void) { return false; } +static inline bool topology_is_primary_thread(unsigned int cpu) { return false; } +static inline void topology_smt_set_num_threads(void) { } +#endif + #endif #endif /* _LINUX_ARCH_TOPOLOGY_H_ */