From patchwork Fri Feb 16 15:17:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 202169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp585546dyb; Fri, 16 Feb 2024 07:21:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXvpSDVdbz/1v/zBCsZnjdTERqQ/hUtji/N7GhsCue6k1Ju+j/H3hnGLyvnQygjIUr/9QHSBKcu6S6jMjavopQL9lKYOw== X-Google-Smtp-Source: AGHT+IGb93yBeRt69p3GpHVeUAhscjvJO7PeM8XoSEvCGfr2ut/ko7TIBT3PZjrOYwhgUVzzbmUg X-Received: by 2002:a17:902:ef43:b0:1db:92e1:2e4e with SMTP id e3-20020a170902ef4300b001db92e12e4emr5338708plx.30.1708096902186; Fri, 16 Feb 2024 07:21:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708096902; cv=pass; d=google.com; s=arc-20160816; b=GOoSNN7mbG4bE0p47YRJOqtMOo1oMBodRevwZzIM2TMoTmj0HDqa69+ANJ9mKMd3b/ lFQyaiIXlkNUBkWGwkPLCIScqyeK9MkrB5LjMIKl4VpBlL61kxavn9peVVFNZxsj8b97 EYChy3YKYwQ/3ZC+tGLIc8O1lv5lpyqbcsRyRFzeFhaGudOVZc48bQrCM/0E7zvNK9vT BsMTunDFP2iopGPfYXqiXXucLsvVd21lNgPxRzwdbZiOVyY166Sp8wusJ7/HDi2A5v8D M6KRrpvctVfBRFHbnrHu+ZEOJQ1mcCu9NJiKn8QdzeBWLwG+12+R4wjrTsHIzCHDRfkO OqFQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=iIkNn5y9RDjsmq+FKmQznWLW0Cv0Je6Y9XSM3DuE1Qk=; fh=HfXWoIhgCc+vt39DMIJv/Ec0aAKnw0eFA8QxuIQTUoQ=; b=uR8IX8c4YUevOjy+ylaPgcUfvaWwHrqF+XXv/KXxABDOou99nciCyZvwcONTJBR0cW 381zIrjL4SPJA/jXfpm72dovGQ8SmG6kDXuTEq1oIi4F1VZfLnjCGNUF8YFmO/ykLjy7 kq9hycmeXWU8G241usTVjEhvgGWmF0RwM4wh8ZENDpyYq91ZOxKMzW8zhuWDcK7Nj3gm YEI5cUBC+LaV0t9zF24dVqI/bl5N45XKGgvdeE9EvMth1Ko8A6hr6p1SzRRkCe5u43Pq kuEVpYUkYIyLBmWyWVqUPu74UuhIQdc2Rgb57PQ5iERhcyQQl/z751mzE4wGOWg5CLk0 rfDA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wr8PRE0V; 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-68809-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68809-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id b3-20020a170902e94300b001d8e2c08e1asi15551pll.70.2024.02.16.07.21.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:21:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68809-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wr8PRE0V; 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-68809-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68809-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 0A69D2828B6 for ; Fri, 16 Feb 2024 15:21:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EFBF8768F2; Fri, 16 Feb 2024 15:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="wr8PRE0V"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="srvYKC5B" 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 4BCDB134CCB; Fri, 16 Feb 2024 15:17:03 +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=1708096625; cv=none; b=iP+Md1p9FB6Q4Yuln22I80GcQCP7qCEDNAMBVwnF8eWWLYqtveVuYoKr8LI8pJ+NeaPNJ8oM9f4q7XHApWLii0mb7HJrCuG+HRVTm+yjec0zd+gow0wGFwC3dhfdmUy2Vg87sRXdXM5/x8fJksOzsy02yPoXXtmOMwF0Oao0dt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708096625; c=relaxed/simple; bh=RTx+H+vBhQMbKg6b2qhlPjHWtSlweeJGFro/wRY4EZM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Kmdhb9Ob0saKyxL6+YiiW1RJ3mmaZgb5sdeBOQNoxLjAxZmTIaCXBWFhi+PYLTDqHTLEYdAMQxWqKoibTP3gq1cyvALYj51wu50ABMOCl0qzMsV7Qq1Pslvj7+S1xs/h+rHLqtPmob35v4/rZJIg4GKktW8qOoBOETWv7tKkTWQ= 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=wr8PRE0V; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=srvYKC5B; 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 Date: Fri, 16 Feb 2024 15:17:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708096621; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iIkNn5y9RDjsmq+FKmQznWLW0Cv0Je6Y9XSM3DuE1Qk=; b=wr8PRE0V6SFHQnW2wnaeVd/+UjAKMoBpfIRzl2Rp6fJcawS5zIBth50nJ5eyFuER7Xxpn1 ts1lNzziAuiQg0XyljYqyV5tPC2pfRCotBvVUIgsyB78uzYGNUi1ff/83iuFJtp2C68++E m85vh86AFnYymo/nhkE6Ngf8z4Telygzvai244YdBH1qnxyI38bQPjlyjkgIQf9bqnHqXM GjLYsADtPBYy4AdNOh+tPBocuOCGqFXZV7/imUAWr9tK8lgNLYCt+8BgKAnkJzN0tdjR5a KENQR+8ylDloAvsyfUEu63JWP+Xc8spXRcY5nPkH9Rhz7daMbLRNiZ4XhOfyuA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708096621; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iIkNn5y9RDjsmq+FKmQznWLW0Cv0Je6Y9XSM3DuE1Qk=; b=srvYKC5B2mFRTX7WuBpBR9hI4nxk4tlkNMGH/f90uH9k7woSCbLfK5RERS0JfBZ6B5a+3/ Riuwd2BhNOERm5Cw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/cpu/topology: Use a data structure for topology info Cc: Thomas Gleixner , Michael Kelley , Sohil Mehta , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240213210252.111451909@linutronix.de> References: <20240213210252.111451909@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170809662109.398.3557889395932667096.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790820034159892111 X-GMAIL-MSGID: 1791069417617729179 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 72530464ed609bcdd49a760e9d0bc3b16717ff2b Gitweb: https://git.kernel.org/tip/72530464ed609bcdd49a760e9d0bc3b16717ff2b Author: Thomas Gleixner AuthorDate: Tue, 13 Feb 2024 22:05:49 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 15 Feb 2024 22:07:43 +01:00 x86/cpu/topology: Use a data structure for topology info 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 Tested-by: Michael Kelley Tested-by: Sohil Mehta Link: https://lore.kernel.org/r/20240213210252.111451909@linutronix.de --- arch/x86/kernel/cpu/topology.c | 59 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 8b42918..815e3ee 100644 --- 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_LOCAL_APIC) __read_mostly; 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_thread_mask(void) 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 apic_id) 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 apicid) 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_cpus = -1; */ __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 apic_id, u32 acpi_id, bool present) } if (!present) { - disabled_cpus++; + topo_info.nr_disabled_cpus++; return; } @@ -295,7 +295,6 @@ void topology_hotunplug_apic(unsigned int cpu) 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