From patchwork Wed Aug 2 10:21: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: 129783 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp387960vqx; Wed, 2 Aug 2023 04:36:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFFKhfV0U8UFNVe3qnN/MfplIXGyt5JC/UfoPX9mV88I3JyFnYqYBOA0gzerycpKB75d9Ie X-Received: by 2002:a17:90a:600e:b0:263:43c6:69ac with SMTP id y14-20020a17090a600e00b0026343c669acmr12728594pji.44.1690976194776; Wed, 02 Aug 2023 04:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690976194; cv=none; d=google.com; s=arc-20160816; b=tT+kVIrLoQLKw//6Fm27mlddswK0SngLQPHYpqKCxsghPCyRoXq3prCHcMR9Z2NyB4 9zSO6HE4TFXSDl2WnCcY3fnjHkq7mj++TIpva8J0J0uqgtN+gF824C43N1bD2xDH3tEI 3UsBE1aSGhbyVhWPzyppOPgVhx+3gumqT152RG2RmXxSnXHO5dA80b+bPQaiNjHqCffe 32Bie8TPSAZKn11Xq5xXngXoEuSWOl22rBbJtzcIcq5H2/D4TMjenovpfItp6E0+2qKH 2G4+SXjqX698ldaCyk/t5EAFP/ZHST3WavIjo2JEf5pZ7sxDII6QwHFvdstlI7cJV96c 56RA== 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=LotaVQs4RlrtT3Fsb/omzWTh9eCCKi/NbM3QS9xGwX0=; fh=O9JPtEgoXN20WvvffwC9vht4C9mlV4cjm0SKbEbqoG0=; b=AMWtT0x7I3nDAMRXivA5ljvLlhZLIFoLjPZ3nJ+hXbPMRAAzW/nGZgFcKHsBn2Xex+ c4uDcJ1n5Z2aZpuqnlbDWYPwMIX8ESYDkdyiikhY7Kn3d4p+g9W4ryp1dw2Qh9MoRTQz q1clD+3OQ/qZqUmJzhlPKLhw03x5fZrYKKpC8W1ycItTLYQpLskKEIOa6d+15zTntkQx VMzFe3dhM36cYK1Q7qChWhUbpuXiBgSH+8VVOJQ5tkHp2zSl3j2+2nTNkPlTnhZSAsmL zGKoJQeBcXT3EZVWEbdtVu2+zsBx2X9qEeITvUQDDcggJxwVhTnjho7VKs8Rhqlr28rY wi/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3+1CRZOH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TEVcK9WD; 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 z17-20020a17090acb1100b00262ffca5a31si1064149pjt.161.2023.08.02.04.36.20; Wed, 02 Aug 2023 04:36:34 -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=3+1CRZOH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TEVcK9WD; 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 S233466AbjHBKXQ (ORCPT + 99 others); Wed, 2 Aug 2023 06:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233882AbjHBKWT (ORCPT ); Wed, 2 Aug 2023 06:22:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41E183C10 for ; Wed, 2 Aug 2023 03:21:31 -0700 (PDT) Message-ID: <20230802101933.851562883@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690971689; 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=LotaVQs4RlrtT3Fsb/omzWTh9eCCKi/NbM3QS9xGwX0=; b=3+1CRZOHLadMK2buL1hvcuEaY0ehlTPlFQhoQDmjk7fQjFMH/6/XumNG6YttAS1sIPZiM5 CdNsecfkWmu7keu+pnwV+H705jVmI0ekSLVJ8CC3H8CN+PDsXCa/gtfjgoNThvwa/ODJnx BgTk3tX3E/2R6XGeE4o7kZB+bNuggNxbwrO2iAx9JyUct/xWf3oA4t7n66/mWc5IaGTtrd ngBZtgRPv0f3nlJcA+qZiyyj07ZG+wv/GtsdUzg7qTnmoOdi0vz4cdWiW/jsBa9T7bYMnC B2Qyc3Vj+u76vvbsov+cHVZ3ATBmWhaGDxunvCOsSJAUDo3JxT15IpIt3Rffqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690971689; 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=LotaVQs4RlrtT3Fsb/omzWTh9eCCKi/NbM3QS9xGwX0=; b=TEVcK9WDKByA+bUuUzKp1CXx7HekO8ho4tpYNxgCmCPdxy1CwTZ0kTBvRszuYS4TjSSpiU tISU80qHRnKedPDg== 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 Subject: [patch V3 20/40] x86/cpu/topology: Cure the abuse of cpuinfo for persisting logical ids References: <20230802101635.459108805@linutronix.de> MIME-Version: 1.0 Date: Wed, 2 Aug 2023 12:21: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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1773117054643787418 X-GMAIL-MSGID: 1773117054643787418 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 --- 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; }