From patchwork Mon Aug 14 08:54:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 135260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2624409vqi; Mon, 14 Aug 2023 02:32:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRV0VdpBz6hsiaF658rcaInIJeXQNhfA4pUVY7oSWvWwsSwJkEgB7lJOzBDP2uq4UcDLr2 X-Received: by 2002:a05:6808:14c2:b0:3a4:3837:3d8 with SMTP id f2-20020a05680814c200b003a4383703d8mr11457375oiw.47.1692005564187; Mon, 14 Aug 2023 02:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692005564; cv=none; d=google.com; s=arc-20160816; b=Q9VO26UPwE+cOOHzlWuG1BBU7y7uPUBgrfgsdDXnvFNEqTbGcVXk+je51N2zPUwwLr bqMz6y0jHj5pEdxiV7k6NxKoYP91CqLprSSgbBaS7CBqTueEETuts+RSSwOSuj5pWncw zsL9gs9qdNjweAOZIdTBp8LGzidY44hjjE1jQz6HwVsfC4ABhxv372XCSwDI6P+FnWn+ tMDTT8rQleb0HNV5Tq1iVPQEJPwxhnj3TKreNaD3Kd1buo62k2jGfbPjFHHmvVqeH9tL uX+2nuRuz0QaVuqpDkBzzYRFl4eY6Enhr+xmNo5/GykTwX/Gs36Chra/PDWDCfTaYbbi kj/w== 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=77oFfcRh1dz2uih5llyqW8UL7n2yCgxBjdO2NZc4Y68=; fh=vmKIJtcbtoHWhyuxI4oEq8r1SWZ2V9Rrbp1Orw2DxqA=; b=YuC/2D/uN67uv47HFSyteIJE64SEyPjlW6ayshctbSL6dImRhHETty0Gnvw4YCgUip Mk0fa6EznQ04Mz8TYGr3iXuIo+6TBeB3n6EI0l9fRTtaY6/VLhjk26YtHK2ktaZl1cFr OuBI3wHHtZC1ZQwp4JliU7U5b+iykhKaxnDcAS+zjvtoAag3pxoOED375ZBvpTMEZodT 1FpWQSB7+pM8MIrIt82UaFH7azNRvMT8g/yX6kTi9FTf2iWRuZSH7aJFpoMxU49/fmlD LzECIZtUrIdGyPUcy5rraXeFIx1zKIeqdQxvhaMQtu+mA36OrOhDUWENkK4UHvupFBol 11PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=qsnivYD0; 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 w67-20020a636246000000b00563adcaab61si8109841pgb.865.2023.08.14.02.32.31; Mon, 14 Aug 2023 02:32:44 -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=qsnivYD0; 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 S235176AbjHNIzM (ORCPT + 99 others); Mon, 14 Aug 2023 04:55:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234980AbjHNIyJ (ORCPT ); Mon, 14 Aug 2023 04:54:09 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD40C10B for ; Mon, 14 Aug 2023 01:54:08 -0700 (PDT) Message-ID: <20230814085113.292947071@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692003247; 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=77oFfcRh1dz2uih5llyqW8UL7n2yCgxBjdO2NZc4Y68=; b=qsnivYD0+xmerPdy98Wtnzybf4ZAAw9DNxH+tEtrcCN9T+3asRO4AN46sWtQzbIM9K+r41 hpUa5/GZ3gYPDFpHO6gXDIe5nbDwotehtBZ+HQOCWPbnhioqz3tD9pgz4Vn11uf0/VncM3 dLC5TKqnwt4jNHtn26p9WmivrMO5vpFd/lpjS8RkUs4BVmZeHt5/g1qHVO37G6MFG7Tb/b xrkgsdjNfuU7QG292fxlHm2B3gr8E6/jw/jHSf1bxtfe78letw1jxv7XU7ZlbIFS70pKAz 6Sp0rX2DGjXBnMA7mpIyFWSNwkJXm16fuT5gkR8de8AibjbMPp5o1thWJzNmwg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692003247; 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=77oFfcRh1dz2uih5llyqW8UL7n2yCgxBjdO2NZc4Y68=; b=hrTTYywU313iKWFC3zyAtgZXWOV7LL3VByT1vffPcCs1cydL+gi5Hhadkckk16MsphpwGD avZ6X6eYAAYA1ICQ== 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 21/41] x86/cpu/topology: Cure the abuse of cpuinfo for persisting logical ids References: <20230814085006.593997112@linutronix.de> MIME-Version: 1.0 Date: Mon, 14 Aug 2023 10:54:07 +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: 1774196426348252038 X-GMAIL-MSGID: 1774196426348252038 Per CPU cpuinfo is used to persist the logical package and die IDs. That's really not the right place simply because cpuinfo is subject to be reinitialized when a CPU goes through an offline/online cycle. This works by chance today, but that's far from correct and neither obvious nor documented. Add a per cpu datastructure which persists those logical IDs, which allows to cleanup the CPUID evaluation code. This is a temporary workaround until the larger topology management is in place, which makes all of this logical management mechanics obsolete. Signed-off-by: Thomas Gleixner Tested-by: Juergen Gross Tested-by: Sohil Mehta Tested-by: Michael Kelley --- arch/x86/kernel/smpboot.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -124,7 +124,20 @@ struct mwait_cpu_dead { */ static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); -/* Logical package management. We might want to allocate that dynamically */ +/* 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, +}; + unsigned int __max_logical_packages __read_mostly; EXPORT_SYMBOL(__max_logical_packages); static unsigned int logical_packages __read_mostly; @@ -345,10 +358,8 @@ int topology_phys_to_logical_pkg(unsigne int cpu; for_each_possible_cpu(cpu) { - struct cpuinfo_x86 *c = &cpu_data(cpu); - - if (c->initialized && c->topo.pkg_id == phys_pkg) - return c->topo.logical_pkg_id; + if (per_cpu(logical_maps.phys_pkg_id, cpu) == phys_pkg) + return per_cpu(logical_maps.logical_pkg_id, cpu); } return -1; } @@ -366,11 +377,9 @@ static int topology_phys_to_logical_die( int cpu, proc_id = cpu_data(cur_cpu).topo.pkg_id; for_each_possible_cpu(cpu) { - struct cpuinfo_x86 *c = &cpu_data(cpu); - - if (c->initialized && c->topo.die_id == die_id && - c->topo.pkg_id == proc_id) - return c->topo.logical_die_id; + 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; } @@ -395,6 +404,8 @@ int topology_update_package_map(unsigned 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; } @@ -418,6 +429,8 @@ int topology_update_die_map(unsigned int 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; }