From patchwork Tue Feb 13 21:05:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 200639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp813643dyb; Tue, 13 Feb 2024 13:17:51 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVCToI7S5jq2tx2vmHfxCWCf9A/QPo5Sgn2uJkuzh3aznZVfmL00q8TA5C5uL7+CmCSIAZyM6BGzWv0mWLioCUqjh/73A== X-Google-Smtp-Source: AGHT+IFiERfM5LhXCeO3av502gz7M27rs2VNr+5E1NInckDtGjPrBFFoiVjZdpVCY2spp1qOzjjY X-Received: by 2002:ac2:51a4:0:b0:511:730b:5c7f with SMTP id f4-20020ac251a4000000b00511730b5c7fmr604913lfk.30.1707859071666; Tue, 13 Feb 2024 13:17:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707859071; cv=pass; d=google.com; s=arc-20160816; b=UwKMIRgEtcW7zcrkVJIuM9Yx2OoeuVa52QZYz3BdrESqRY9vPllswQZtLzi6h+2mu8 WX6vnB9I0mkg90OEG7y8+u4xlyVC+pig5IuphVyUrp0Z5vJ1UDg3xX04s6+jQmbzmhDK pNMnwzBEtjT3hfCjV2y3CyOasufBpoK51oc6lhVZDdJDX0k246aGwe5qFEJBSt8Mt4eM pAC3Ha2gdg8SZQfLvbmnSvujISMdJ8qarGTiTEPP8xPOsp9Mtg3dAJlW5NJyCCWOAshr tKrHBG+z6JyUbtX1/ulDe0/UdbSiCAuyLHQUIp9puPiBOrWJhYwxC5ZopvwBfnbMgtN+ D3dg== 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=OpypAhqmQZrkizNfmx8c+dbmLYdO8pqQFziwZQcde9M=; fh=b4UksvDgyRlf+RCz1wKKopU/LmnhYhvLrs46Z48+FOE=; b=ie1E3gqYWme9zhLZNZO686UrsF7fYpHLL6lgznnla7+R/68kW1Z55OCOHDk8YDetut m1lUVwQAgusqet8f/kiibHacpnsr7CgrtrvFmNcX51w7QnOi1W6fyEVqLTEh0oEraZBx ISjXtnPcQOE0eih+tDetDsJclWiz5T8KqstuKH0PG+ciaLYDRsNTND3ki/nufSN2I2/a hUTsd62B1CvK6kF/m0je1xaPO987hqiMk+JMI+OUUO0+MhDRV4KD2iQgwxi1tQKB53DW tTleEwnPLae2I7Fse399GMs3ZtLki+k6PnKIlRBcs9qgnbJEqRb55fCvUbzG0dgX0OIU b9CA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2iheBCoV; 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-64296-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64296-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCUKpEhDrntZFILInmv6ZrdG3yoxJc4Mu9gYyKovhQbtRJj+zFJwyUXtTAQhDYV3BcOOSV6SODpCg301xmryuModYuAuVg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bs3-20020a170906d1c300b00a34af8bdd57si1589854ejb.728.2024.02.13.13.17.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:17:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64296-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2iheBCoV; 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-64296-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64296-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 1B2B41F26E79 for ; Tue, 13 Feb 2024 21:17:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B01CC80634; Tue, 13 Feb 2024 21:05:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2iheBCoV"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bKVbQihw" 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 D6B657E113 for ; Tue, 13 Feb 2024 21:05:50 +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=1707858352; cv=none; b=hr6Nx3VVzoYkDe3WqjwtPhNZ99DHWBIF9/dSR3J72t+x0PXk4tT+Yh+adLsxGK5GwatyY90eROYGYy3saQdk5EcudgqiJgheGB7idaliGoW2IMyghskedqSw75wsbukcaA3JN5+XBi98UFr+qazQA7GKOyvEXcQygTY7oxU+LIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858352; c=relaxed/simple; bh=GDWzEPUb9zuFYimCQyWCbLV5rCLk5kjo7hAaaidpubs=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=QwkftzEaSjWUfw3cG0ewIzuc+n8TSdOJX4Zd1Y0jBwZ0I3piU3vQFZz0JWeefGtF/SGZ1oeIklIEPOOcRYdtHHV2TTDhCt0rnagQ0zHdzBrYbKLlU2jXXZkdNml3wh/LNCnh7ZPwTFcOuO9/uoSeTR0i6YTQ8PZaLW2K3XDFnwc= 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=2iheBCoV; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bKVbQihw; 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.111451909@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707858349; 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=OpypAhqmQZrkizNfmx8c+dbmLYdO8pqQFziwZQcde9M=; b=2iheBCoVT54Rj25Lay1jtH5UsC9YLCsmIPT2NYf46+bMtzi0Wz+rfdLM9AKKpH19UO5jjN j8IbFgvC86b+HFEr66JqgVFPimiYGSX2Rv+ZS+EKeuBO/XQoModFlRpHpxSEP+nIz5vFGP kF4grFWoIjJNuar/1b0ekkQCc3wCfav3ZxlaNoqyp9RkK3Z4L6SjckWsNtv4/a8uHwxB6j pAzwmjZDCJK9zSVAqfXtO+jqiJeUmmsGV7KrvIhqRxqTSBw4X1msEf2AQin4hMUhBWuAtE GQsp0cOsRqbjPn0MdDczjuaGOTz4uVAmnuwrtgtZsOVHU3dGxk1MP0pv6DpkcQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707858349; 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=OpypAhqmQZrkizNfmx8c+dbmLYdO8pqQFziwZQcde9M=; b=bKVbQihwVarOzruRJQJfPao6FuH7BlEoS2px+Bzn6iuiWar2c/N92TDL65R5iHYelGTapn uo44UmovBMQweRDw== 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 11/30] x86/cpu/topology: Use a data structure for topology info 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:05:49 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790820034159892111 X-GMAIL-MSGID: 1790820034159892111 From: Thomas Gleixner Put the processor accounting into a data structure, which will gain more topology related information in the next steps, and sanitize the accounting. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/topology.c | 59 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 30 deletions(-) --- --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -23,25 +23,24 @@ DECLARE_BITMAP(phys_cpu_present_map, MAX u32 cpuid_to_apicid[] __read_mostly = { [0 ... NR_CPUS - 1] = BAD_APICID, }; /* + * Keep track of assigned, disabled and rejected CPUs. Present assigned + * with 1 as CPU #0 is reserved for the boot CPU. + */ +static struct { + unsigned int nr_assigned_cpus; + unsigned int nr_disabled_cpus; + unsigned int nr_rejected_cpus; +} topo_info __read_mostly = { + .nr_assigned_cpus = 1, +}; + +/* * Processor to be disabled specified by kernel parameter * disable_cpu_apicid=, mostly used for the kdump 2nd kernel to * avoid undefined behaviour caused by sending INIT from AP to BSP. */ static u32 disabled_cpu_apicid __ro_after_init = BAD_APICID; -static unsigned int num_processors; -static unsigned int disabled_cpus; - -/* - * The number of allocated logical CPU IDs. Since logical CPU IDs are allocated - * contiguously, it equals to current allocated max logical CPU ID plus 1. - * All allocated CPU IDs should be in the [0, nr_logical_cpuids) range, - * so the maximum of nr_logical_cpuids is nr_cpu_ids. - * - * NOTE: Reserve 0 for BSP. - */ -static int nr_logical_cpuids = 1; - bool arch_match_cpu_phys_id(int cpu, u64 phys_id) { return phys_id == (u64)cpuid_to_apicid[cpu]; @@ -75,7 +74,7 @@ static int __init smp_init_primary_threa return 0; } - for (cpu = 0; cpu < nr_logical_cpuids; cpu++) + for (cpu = 0; cpu < topo_info.nr_assigned_cpus; cpu++) cpu_mark_primary_thread(cpu, cpuid_to_apicid[cpu]); return 0; } @@ -89,7 +88,7 @@ static int topo_lookup_cpuid(u32 apic_id int i; /* CPU# to APICID mapping is persistent once it is established */ - for (i = 0; i < nr_logical_cpuids; i++) { + for (i = 0; i < topo_info.nr_assigned_cpus; i++) { if (cpuid_to_apicid[i] == apic_id) return i; } @@ -107,22 +106,21 @@ static int allocate_logical_cpuid(u32 ap if (cpu >= 0) return cpu; - cpuid_to_apicid[nr_logical_cpuids] = apic_id; - return nr_logical_cpuids++; + return topo_info.nr_assigned_cpus++; } -static void cpu_update_apic(int cpu, u32 apicid) +static void cpu_update_apic(unsigned int cpu, u32 apic_id) { #if defined(CONFIG_SMP) || defined(CONFIG_X86_64) - early_per_cpu(x86_cpu_to_apicid, cpu) = apicid; + early_per_cpu(x86_cpu_to_apicid, cpu) = apic_id; #endif + cpuid_to_apicid[cpu] = apic_id; set_cpu_possible(cpu, true); - set_bit(apicid, phys_cpu_present_map); + set_bit(apic_id, phys_cpu_present_map); set_cpu_present(cpu, true); - num_processors++; if (system_state != SYSTEM_BOOTING) - cpu_mark_primary_thread(cpu, apicid); + cpu_mark_primary_thread(cpu, apic_id); } static int generic_processor_info(int apicid) @@ -137,18 +135,18 @@ static int generic_processor_info(int ap return 0; if (disabled_cpu_apicid == apicid) { - int thiscpu = num_processors + disabled_cpus; + int thiscpu = topo_info.nr_assigned_cpus + topo_info.nr_disabled_cpus; pr_warn("APIC: Disabling requested cpu. Processor %d/0x%x ignored.\n", thiscpu, apicid); - disabled_cpus++; + topo_info.nr_rejected_cpus++; return -ENODEV; } - if (num_processors >= nr_cpu_ids) { + if (topo_info.nr_assigned_cpus >= nr_cpu_ids) { pr_warn_once("APIC: CPU limit of %d reached. Ignoring further CPUs\n", nr_cpu_ids); - disabled_cpus++; + topo_info.nr_rejected_cpus++; return -ENOSPC; } @@ -178,14 +176,16 @@ static int __initdata setup_possible_cpu */ __init void prefill_possible_map(void) { + unsigned int num_processors = topo_info.nr_assigned_cpus; + unsigned int disabled_cpus = topo_info.nr_disabled_cpus; int i, possible; i = setup_max_cpus ?: 1; if (setup_possible_cpus == -1) { - possible = num_processors; + possible = topo_info.nr_assigned_cpus; #ifdef CONFIG_HOTPLUG_CPU if (setup_max_cpus) - possible += disabled_cpus; + possible += num_processors; #else if (possible > i) possible = i; @@ -238,7 +238,7 @@ void __init topology_register_apic(u32 a } if (!present) { - disabled_cpus++; + topo_info.nr_disabled_cpus++; return; } @@ -295,7 +295,6 @@ void topology_hotunplug_apic(unsigned in per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; clear_bit(apic_id, phys_cpu_present_map); set_cpu_present(cpu, false); - num_processors--; } #endif