From patchwork Tue Feb 13 21:06:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 200660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp818386dyb; Tue, 13 Feb 2024 13:29:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVX3lsFxL+9tQKnwGSifEJ2KG+6wBPMvExkg26E+oSUmT7rA6WzBiLcd4OTtBsoNVqRfr7fgnfjACYUFNk3mtmMGY75jA== X-Google-Smtp-Source: AGHT+IGrN/fAtNmugJ49SaXTbYAzCyhpJ8jRQ1bEaOvgsgvFnXukpYJf23nDBc6e63ZML7VQ2lTT X-Received: by 2002:a05:6a20:2d10:b0:19e:a65e:5a2d with SMTP id g16-20020a056a202d1000b0019ea65e5a2dmr1215434pzl.1.1707859749281; Tue, 13 Feb 2024 13:29:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707859749; cv=pass; d=google.com; s=arc-20160816; b=nBwi0IDTW2OAmQr1tav64ZuDfueZoNTXHQO7DPRZfLmzTBzVHonPyE1XOBtXVuauO6 RUR7xBMk8FYwSOpCtispdWsXLtcWom81o2ld98pddZ+6ugHGkIrRYSwVLlDExj2wMKiQ ByXHNED15wz+M8q2fFPxfkDFvYUOV3cB3rFOPdw/gwXhO3QimpGM/6dbB4pKDfKDQ/ia BSkf4QYKA9n87gpI6ieZ2VLSfMKR4qq5GF+MEkwkJKu7gAmPH9itoLqN9pWvHuHDgNvt MQU8ufiu6RTQn0LFRYIbRlsydSTzakU0FakcP0A4TZEcnUNl4NAdt2d+mO3a9yRaKrkL /WuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:subject:cc:to:from:dkim-signature :dkim-signature:message-id; bh=2gNN8N211J8r3cEeSTx0fDaLRLHYwp4/SNdr79QRTMw=; fh=9d54VusXrTqy+I0RKueUXLa4wsBY0fddYVR31AOPnz4=; b=LskgU23jMug/ybhX0PHVR9RLEltNUVluAlr4+JBywFUeo/LQk3zRcQFHkCyOFvpPWD 9WQPefUzp1lFkHj2Jg+JuO9cdcWIZmCIAKdDWKQ4X9CtpZTkBM5kQ9jYf7YBRsTqkQIQ K1vgCWy+amGDXbtaI9oBPKLN807+SkO8qmtUCmFJavLZa7AvrGCxRiRZktPPXYIpQ6H7 JQ1B2F3uQTct5lpJPDzD1joqHoOX2RaqwfV/BTgWGk3Pjgq6n/N+JT74IZqLzcrTf/ws b77r9uvsLuhxKBhMAqkem90AIul2rxNPOGwirVfOndeZchzb57CuiGnp3QZVP+vuKxQv NwUw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hSAB2cUp; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64311-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64311-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCVz7tZfIajJx+MfSt9xT1w4UilXS67TmmWQQywkmx3UpzLj0s4OGW4+MrQ4xDknlraxwkCRz6JF1aWLCo6F1kDYklBghw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id s66-20020a632c45000000b005dbd5035ddasi2524511pgs.275.2024.02.13.13.29.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:29:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64311-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hSAB2cUp; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64311-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64311-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 933EAB28063 for ; Tue, 13 Feb 2024 21:21:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5EC5786652; Tue, 13 Feb 2024 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hSAB2cUp"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dNaSQ87A" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1417B85928 for ; Tue, 13 Feb 2024 21:06:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858372; cv=none; b=LDmw+kBVuiDAmIWHUInebZIQiw3yLzIAmHzmQhul9RaOtJ6uH8OCvBHLmfYLMprzhV0NzceIaC2iy8DeckoYcXXT7xR2zDpPqKv2viarCmuAbkvvB9Pg6/zQaVxUtuDWrQROeDF3tIkgdPOTNOXx3yBwbZ2LvPb5pf4LTgmB/q0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858372; c=relaxed/simple; bh=S+zrw2iNRe5XUZyTaQTtsAmH60QnO8xwEi9zsCOtap0=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=jYGyrPnblKBhPrUolryE/LMwPsRxTnIn6OYlrue5vJrj6my42xICFawK3ILQgcUHgMownxuaLbJQoqjoJ3tO+DzXh9++VxojSkEfKpcYME7k0NthPPfCceca3e7EL+R0+3c45Ga6xl8qXTOko16Gc5LDQXXj8IdgWTLvg6nzoAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hSAB2cUp; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dNaSQ87A; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Message-ID: <20240213210252.901865302@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707858369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=2gNN8N211J8r3cEeSTx0fDaLRLHYwp4/SNdr79QRTMw=; b=hSAB2cUpl9wuEEZBy14Sxa/PKUIbOJRrp0GNZGqglB28ge2Vo8uMuQhTnap7fHIi0+cStO tl/fQrmb2WP9Musz0rZXMxCbuDyzowJ542t2QGeTytUjowHwFJmOUbn5Cd7KABaOalu9U7 YAOnDtNUkuplDcPT/a4wjTa3VWmBI/q9vu1opSRrdWid1VwWIcdpN2nqriTMzQBb0kJcyV jeyOpNMeb2LoyOg+PU0+ngyzAQK9XNz4xePpsHl08j31gJ8po42crO3bHjkG4Lm/JfsUYk JCgE8xu5UCePDC6oIMwM4avarSDvxxDe3JEAn22Q0ALAyZcUgi3sgWr0Wg6Yjg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707858369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=2gNN8N211J8r3cEeSTx0fDaLRLHYwp4/SNdr79QRTMw=; b=dNaSQ87APbxkLU/3zJGhxo2ti+7KPT5gznzzsmW95J0CSsF77+2Ni7QVGVzsI2reipgci4 QlMs1doljFH8uHAQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko , Michael Kelley , "Peter Zijlstra (Intel)" Subject: [patch 25/30] x86/cpu/topology: Use topology logical mapping mechanism References: <20240213205415.307029033@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 13 Feb 2024 22:06:09 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790820744521352841 X-GMAIL-MSGID: 1790820744521352841 From: Thomas Gleixner Replace the logical package and die management functionality and retrieve the logical IDs from the topology bitmaps. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/topology.h | 15 ++-- arch/x86/kernel/cpu/common.c | 13 --- arch/x86/kernel/cpu/topology_common.c | 4 + arch/x86/kernel/smpboot.c | 111 ---------------------------------- 4 files changed, 12 insertions(+), 131 deletions(-) --- --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -172,6 +172,13 @@ static inline int topology_get_logical_i #define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu)) #define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu)) + +static inline int topology_phys_to_logical_pkg(unsigned int pkg) +{ + return topology_get_logical_id(pkg << x86_topo_system.dom_shifts[TOPO_PKG_DOMAIN], + TOPO_PKG_DOMAIN); +} + extern int __max_smt_threads; static inline int topology_max_smt_threads(void) @@ -181,10 +188,6 @@ static inline int topology_max_smt_threa #include -int topology_update_package_map(unsigned int apicid, unsigned int cpu); -int topology_update_die_map(unsigned int dieid, unsigned int cpu); -int topology_phys_to_logical_pkg(unsigned int pkg); - extern unsigned int __amd_nodes_per_pkg; static inline unsigned int topology_amd_nodes_per_pkg(void) @@ -205,10 +208,6 @@ static inline bool topology_is_primary_t } #else /* CONFIG_SMP */ -static inline int -topology_update_package_map(unsigned int apicid, unsigned int cpu) { return 0; } -static inline int -topology_update_die_map(unsigned int dieid, unsigned int cpu) { return 0; } static inline int topology_phys_to_logical_pkg(unsigned int pkg) { return 0; } static inline int topology_max_smt_threads(void) { return 1; } static inline bool topology_is_primary_thread(unsigned int cpu) { return true; } --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1718,18 +1718,6 @@ static void generic_identify(struct cpui #endif } -static void update_package_map(struct cpuinfo_x86 *c) -{ -#ifdef CONFIG_SMP - unsigned int cpu = smp_processor_id(); - - BUG_ON(topology_update_package_map(c->topo.pkg_id, cpu)); - BUG_ON(topology_update_die_map(c->topo.die_id, cpu)); -#else - c->topo.logical_pkg_id = 0; -#endif -} - /* * This does the hard work of actually picking apart the CPU stuff... */ @@ -1913,7 +1901,6 @@ void identify_secondary_cpu(struct cpuin #ifdef CONFIG_X86_32 enable_sep_cpu(); #endif - update_package_map(c); x86_spec_ctrl_setup_ap(); update_srbds_msr(); if (boot_cpu_has_bug(X86_BUG_GDS)) --- a/arch/x86/kernel/cpu/topology_common.c +++ b/arch/x86/kernel/cpu/topology_common.c @@ -10,6 +10,7 @@ #include "cpu.h" struct x86_topology_system x86_topo_system __ro_after_init; +EXPORT_SYMBOL_GPL(x86_topo_system); unsigned int __amd_nodes_per_pkg __ro_after_init; EXPORT_SYMBOL_GPL(__amd_nodes_per_pkg); @@ -147,6 +148,9 @@ static void topo_set_ids(struct topo_sca c->topo.pkg_id = topo_shift_apicid(apicid, TOPO_PKG_DOMAIN); c->topo.die_id = topo_shift_apicid(apicid, TOPO_DIE_DOMAIN); + c->topo.logical_pkg_id = topology_get_logical_id(apicid, TOPO_PKG_DOMAIN); + c->topo.logical_die_id = topology_get_logical_id(apicid, TOPO_DIE_DOMAIN); + /* Package relative core ID */ c->topo.core_id = (apicid & topo_domain_mask(TOPO_PKG_DOMAIN)) >> x86_topo_system.dom_shifts[TOPO_SMT_DOMAIN]; --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -125,23 +125,6 @@ struct mwait_cpu_dead { */ static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); -/* Logical package management. */ -struct logical_maps { - u32 phys_pkg_id; - u32 phys_die_id; - u32 logical_pkg_id; - u32 logical_die_id; -}; - -/* Temporary workaround until the full topology mechanics is in place */ -static DEFINE_PER_CPU_READ_MOSTLY(struct logical_maps, logical_maps) = { - .phys_pkg_id = U32_MAX, - .phys_die_id = U32_MAX, -}; - -static unsigned int logical_packages __read_mostly; -static unsigned int logical_die __read_mostly; - /* Maximum number of SMT threads on any online core */ int __read_mostly __max_smt_threads = 1; @@ -334,103 +317,11 @@ static void notrace start_secondary(void cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); } -/** - * topology_phys_to_logical_pkg - Map a physical package id to a logical - * @phys_pkg: The physical package id to map - * - * Returns logical package id or -1 if not found - */ -int topology_phys_to_logical_pkg(unsigned int phys_pkg) -{ - int cpu; - - for_each_possible_cpu(cpu) { - if (per_cpu(logical_maps.phys_pkg_id, cpu) == phys_pkg) - return per_cpu(logical_maps.logical_pkg_id, cpu); - } - return -1; -} -EXPORT_SYMBOL(topology_phys_to_logical_pkg); - -/** - * topology_phys_to_logical_die - Map a physical die id to logical - * @die_id: The physical die id to map - * @cur_cpu: The CPU for which the mapping is done - * - * Returns logical die id or -1 if not found - */ -static int topology_phys_to_logical_die(unsigned int die_id, unsigned int cur_cpu) -{ - int cpu, proc_id = cpu_data(cur_cpu).topo.pkg_id; - - for_each_possible_cpu(cpu) { - if (per_cpu(logical_maps.phys_pkg_id, cpu) == proc_id && - per_cpu(logical_maps.phys_die_id, cpu) == die_id) - return per_cpu(logical_maps.logical_die_id, cpu); - } - return -1; -} - -/** - * topology_update_package_map - Update the physical to logical package map - * @pkg: The physical package id as retrieved via CPUID - * @cpu: The cpu for which this is updated - */ -int topology_update_package_map(unsigned int pkg, unsigned int cpu) -{ - int new; - - /* Already available somewhere? */ - new = topology_phys_to_logical_pkg(pkg); - if (new >= 0) - goto found; - - new = logical_packages++; - if (new != pkg) { - pr_info("CPU %u Converting physical %u to logical package %u\n", - cpu, pkg, new); - } -found: - per_cpu(logical_maps.phys_pkg_id, cpu) = pkg; - per_cpu(logical_maps.logical_pkg_id, cpu) = new; - cpu_data(cpu).topo.logical_pkg_id = new; - return 0; -} -/** - * topology_update_die_map - Update the physical to logical die map - * @die: The die id as retrieved via CPUID - * @cpu: The cpu for which this is updated - */ -int topology_update_die_map(unsigned int die, unsigned int cpu) -{ - int new; - - /* Already available somewhere? */ - new = topology_phys_to_logical_die(die, cpu); - if (new >= 0) - goto found; - - new = logical_die++; - if (new != die) { - pr_info("CPU %u Converting physical %u to logical die %u\n", - cpu, die, new); - } -found: - per_cpu(logical_maps.phys_die_id, cpu) = die; - per_cpu(logical_maps.logical_die_id, cpu) = new; - cpu_data(cpu).topo.logical_die_id = new; - return 0; -} - static void __init smp_store_boot_cpu_info(void) { - int id = 0; /* CPU 0 */ - struct cpuinfo_x86 *c = &cpu_data(id); + struct cpuinfo_x86 *c = &cpu_data(0); *c = boot_cpu_data; - c->cpu_index = id; - topology_update_package_map(c->topo.pkg_id, id); - topology_update_die_map(c->topo.die_id, id); c->initialized = true; }