From patchwork Mon Aug 14 08:54:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 135316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2645912vqi; Mon, 14 Aug 2023 03:24:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdzOjUbCR1oBMkVSbRnnFykpq8ejyB+9kpOedb5uLlUSSRCjdiFxQrPVy54OXXtTuwChCO X-Received: by 2002:a17:90b:3e8d:b0:268:37b:a10e with SMTP id rj13-20020a17090b3e8d00b00268037ba10emr5070550pjb.11.1692008682981; Mon, 14 Aug 2023 03:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692008682; cv=none; d=google.com; s=arc-20160816; b=HO291/WiURknCD2fwM1cvhW7yEI/eObgXIuTs4uy4Z9Y447JPvRbX/kZosEBdmEV6+ HDFeeFyEfppvMM55YTJb0AsVZKKyHylvIzUa7ohHNIj7rH9EQRKjlmgQaxGo1VQykNCF 5NIwJGA8JtlHu8+Kzolp7KCOIXbnml981qWabDPSUYwkegJjGz8bStzYKatARqs6To4r F1k53689l7GpV0ZpjE8V8qJp3WS/gtyk06TH8XdA09/Ou+Zelw+Mlu/uDREKrNFvfhe0 IuzNEedSiZ4YEmTsadXcdEnDP42jzPZ+z+XoCLRiX9aAJftvqeNgKjIVoXgCSr7bqzrz NwtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=KNjlYqK62kvWWNdZZBwz2X0bSzPm//v1My83FVIs0LE=; fh=vmKIJtcbtoHWhyuxI4oEq8r1SWZ2V9Rrbp1Orw2DxqA=; b=ALac8w4TZqtgFghCLdQpsDcGI/LqCT0whBwCU2SRbsO60UCnCl1R1oUChTOhsg6YgI ga9KuokFP/PxT2zwlJFAkYC5kPOgtd4chlng3gEUa9FG3jtWOEtpLCqNTSPpQCXU6KaK iJMxyZWA2SKp0fQ7qXez8YoCv0e1DtL0W5SUnuM462eweJiTUrLXTr5b+Gi7lyATL9u6 nAH7rgAsZmscXwSxgHD7ZCsL9UDvwhbclcsx5IWZw0w7Fj+b675VMFEe4UYCQUrnOaQe TpCKTus44NUgdpf56PUDuQO5CIa0y0JTeDF7UomgdZw27SUqGQHklH0BP24uhe5/e96X DyVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=y32DxOth; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gm16-20020a17090b101000b002682dc64492si7866897pjb.185.2023.08.14.03.24.30; Mon, 14 Aug 2023 03:24:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=y32DxOth; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235489AbjHNI4Z (ORCPT + 99 others); Mon, 14 Aug 2023 04:56:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235288AbjHNIye (ORCPT ); Mon, 14 Aug 2023 04:54:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D916A1BD for ; Mon, 14 Aug 2023 01:54:30 -0700 (PDT) Message-ID: <20230814085114.122486064@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692003269; 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=KNjlYqK62kvWWNdZZBwz2X0bSzPm//v1My83FVIs0LE=; b=y32DxOthr4bdHzCepPeCBGvrJjWN+PshCCm7Ido13cXCC/q61sCOizcxzkRfl3tuwX4U0l xTKC04oKKx03utvQp83umNWARZc/7JDH4ZFBVcugb1s6BW4/ll1Emkk9WwzDd/fmcwqAFC HX9wLU4J/Pjjk6FsDxLhzUtcOFEaiEfDBXOK4visJMw/S5DgXjamJ42dOZ+Jhy4iMAVO03 Ng2Pew376PBoA+uMvUnq1gstcyTvKgBxOutTJ5fGWaAQAms1NE7VyDQSrqoICCK2bVaJra Y1FfTIvGxYNZx+jKjNz8FkO9BrV/VSdsnS/PjiWX/qWSQ4Wj9XxGVmccoJbttQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692003269; 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=KNjlYqK62kvWWNdZZBwz2X0bSzPm//v1My83FVIs0LE=; b=nYtRPNGmcgvVRf0ireuShfidQojMADom6vxlmsPdFK4shcIqOMngLUPsQ5bQNuQIRGMW3l /u8OOBOjHAKe9/CA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Wei Liu , Pu Wen , Qiuxu Zhuo , Sohil Mehta Subject: [patch V4 35/41] x86/mm/numa: Use core domain size on AMD References: <20230814085006.593997112@linutronix.de> MIME-Version: 1.0 Date: Mon, 14 Aug 2023 10:54:29 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774199696260696097 X-GMAIL-MSGID: 1774199696260696097 cpuinfo::topo::x86_coreid_bits is about to be phased out. Use the core domain size from the topology information. Add a comment why the early MPTABLE parsing is required and decrapify the loop which sets the APIC ID to node map. Signed-off-by: Thomas Gleixner Tested-by: Juergen Gross Tested-by: Sohil Mehta Tested-by: Michael Kelley --- arch/x86/mm/amdtopology.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) --- a/arch/x86/mm/amdtopology.c +++ b/arch/x86/mm/amdtopology.c @@ -54,13 +54,11 @@ static __init int find_northbridge(void) int __init amd_numa_init(void) { - u64 start = PFN_PHYS(0); + unsigned int numnodes, cores, apicid; + u64 prevbase, start = PFN_PHYS(0); u64 end = PFN_PHYS(max_pfn); - unsigned numnodes; - u64 prevbase; - int i, j, nb; u32 nodeid, reg; - unsigned int bits, cores, apicid_base; + int i, j, nb; if (!early_pci_allowed()) return -EINVAL; @@ -158,26 +156,25 @@ int __init amd_numa_init(void) return -ENOENT; /* - * We seem to have valid NUMA configuration. Map apicids to nodes - * using the coreid bits from early_identify_cpu. + * We seem to have valid NUMA configuration. Map apicids to nodes + * using the size of the core domain in the APIC space. */ - bits = boot_cpu_data.x86_coreid_bits; - cores = 1 << bits; - apicid_base = 0; + cores = topology_get_domain_size(TOPO_CORE_DOMAIN); /* - * get boot-time SMP configuration: + * Scan MPTABLE to map the local APIC and ensure that the boot CPU + * APIC ID is valid. This is required because on pre ACPI/SRAT + * systems IO-APICs are mapped before the boot CPU. */ early_get_smp_config(); - if (boot_cpu_physical_apicid > 0) { - pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid); - apicid_base = boot_cpu_physical_apicid; + apicid = boot_cpu_physical_apicid; + if (apicid > 0) + pr_info("BSP APIC ID: %02x\n", apicid); + + for_each_node_mask(i, numa_nodes_parsed) { + for (j = 0; j < cores; j++, apicid++) + set_apicid_to_node(apicid, i); } - - for_each_node_mask(i, numa_nodes_parsed) - for (j = apicid_base; j < cores + apicid_base; j++) - set_apicid_to_node((i << bits) + j, i); - return 0; }