From patchwork Wed Mar 8 17:13:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 6315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp459826wrd; Wed, 8 Mar 2023 09:16:18 -0800 (PST) X-Google-Smtp-Source: AK7set9fObdHVl7HlIFKMzA4EQNc23Pg+uZ1wM0+F9WwD3f55h+/EhGCwFTLZQfPlLRxzU81nnrn X-Received: by 2002:a62:1d0b:0:b0:5df:421d:1962 with SMTP id d11-20020a621d0b000000b005df421d1962mr13300085pfd.2.1678295778013; Wed, 08 Mar 2023 09:16:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678295777; cv=none; d=google.com; s=arc-20160816; b=bEB6jevCmpXvupcZFT6Ae7kZH/B7PET/h6xyBPK6b8Ga99lmTyz2YGHplkjsRiivLe JnaY5ScUrTTmdVn64z0AgRU/RlSs00m1dprh7+MEYZr2u881JyHRSaHPe+rMsEf+nmV1 w6Lm7l5iIw1RUsKDNXFQw0SQkbvrBDaICflJs/FcwjV7qi9c+BZo8tIsxee+Z00D9IHD 1BqdjjF2E+HOS6isQ3U1O5r6Sgm8TI+/JhChLk3o9G9ibHrfbk7ywU/QSfV2MqGh8za+ cleo1Z+IY4yVriI9uFUF25HYh40am6FddvKOWCRmXyT5pMQ6DpS3m39NzGMQfsXBkjgm jH/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5Hbd9XxfEHV1OJLQFkD6huyFI87+kHUzsYgNvadq9ro=; b=FA1eB4DtWcNqujOlRSULS1c8V8vs7WIEiWT5HtJtxi037eGbndTvQiLK6quiUELTHF wSP3cd6PdFjEtKLzdyNKXycM7tLpGXphKUJmvE7fsDw1lt8sTIf/1ejSvBZD9kC+XErA Y665RHFv2LSW2VbVKGOxvEPo/0VgsxXanUOiaQXrsAtiDbWz0tvjQPoDWzySSnJxxDXK zn0I4sIf3wKL5oNOvmR4YTW3f7j7/vSrS+UUJlvWXrBubF8AYY757HulhyM9OIUsFLuv QPO8RETcV7CbWkIvpK75t9VKxcwfdhoTkyoR6TrSpVpiJpVecjrF8ePzH1WPSwo0VqhB 58gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=VbM39aUk; 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=NONE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c22-20020a621c16000000b005a8e403a325si2389829pfc.10.2023.03.08.09.16.02; Wed, 08 Mar 2023 09:16:17 -0800 (PST) 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=@bytedance.com header.s=google header.b=VbM39aUk; 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=NONE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230173AbjCHROX (ORCPT + 99 others); Wed, 8 Mar 2023 12:14:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbjCHRON (ORCPT ); Wed, 8 Mar 2023 12:14:13 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E58675D8BD for ; Wed, 8 Mar 2023 09:13:32 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id d41-20020a05600c4c2900b003e9e066550fso1593360wmp.4 for ; Wed, 08 Mar 2023 09:13:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1678295611; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5Hbd9XxfEHV1OJLQFkD6huyFI87+kHUzsYgNvadq9ro=; b=VbM39aUkBb6MZLrUtznBsn7M6L1Jpk274NlRplE7z13AYroWy2VxSrZPFffDMdI7cQ dmp9r9zVIP8nQiXgRoNCUeNgZd7y0TApSThRSn3CxvArGSk9zviFpJURRrk46yYe6cGe Vdu17uscUhhmxZKdgZ1PD5g3ni2HxvsoGOi2IqEWPoaYmxo8cOlbP20fre1/ucsz4LJq YN2OzURIxGrYLL56rPNP6ghvpSWjN++ESzUVBh08EX9KUQ0Mg0baOHe2xmrBaXwYTR+d UrfHWtGiQdmVj/ignDNSAqXQonpeuTj9mqmEzDQR7ij378Mn24u6daBnhg/i4ncGXFq4 JcPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678295611; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5Hbd9XxfEHV1OJLQFkD6huyFI87+kHUzsYgNvadq9ro=; b=1Syk9Gl3qttltjqbvNx/STJ/y0sJoECdGFCybKxK3coWFXfssHfWUe+aj795NjTZtD YZKjsJT6RcIBA23IJS/ZLTMcyDPfAJIt3BbIXZydwFyOqzm9igv6cNu4YqvM8+2vaDCa TABCNKHDmhy7LDdjLd93phe5Sqw9ApZaNy+5H05QSw392aqr92cMgyeDTgjxUb0SLAdN jAoefK2l9dwYGPWcUABgEEZyNkYNPfjN2se9mBU3YKfQbanKD9YMd82IZ5c8DqCAW5Nq WYuubqTEtz6l7HEphGECds/NOcusmChrHtjzK665y1sf19sFgKRWbHRwiHqS/etR+1oO 11EA== X-Gm-Message-State: AO0yUKUohJ7VoLv28etS6At8So47f5AS9dmT0OaCyvF6EjKGIbZO4xi4 dKyzUhEFak3XLaCEkmX7AHKodg== X-Received: by 2002:a05:600c:4f11:b0:3df:ef18:b0a1 with SMTP id l17-20020a05600c4f1100b003dfef18b0a1mr16958315wmq.12.1678295611256; Wed, 08 Mar 2023 09:13:31 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:fe40:3ba4:afe4:4609]) by smtp.gmail.com with ESMTPSA id l15-20020a1c790f000000b003e0238d9101sm11668wme.31.2023.03.08.09.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 09:13:30 -0800 (PST) From: Usama Arif To: dwmw2@infradead.org, tglx@linutronix.de, kim.phillips@amd.com, brgerst@gmail.com Cc: piotrgorski@cachyos.org, oleksandr@natalenko.name, arjan@linux.intel.com, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, x86@kernel.org, pbonzini@redhat.com, paulmck@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, rcu@vger.kernel.org, mimoja@mimoja.de, hewenliang4@huawei.com, thomas.lendacky@amd.com, seanjc@google.com, pmenzel@molgen.mpg.de, fam.zheng@bytedance.com, punit.agrawal@bytedance.com, simon.evans@bytedance.com, liangma@liangbit.com, Usama Arif Subject: [PATCH v14 00/12] Parallel CPU bringup for x86_64 Date: Wed, 8 Mar 2023 17:13:16 +0000 Message-Id: <20230308171328.1562857-1-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759820673959891547?= X-GMAIL-MSGID: =?utf-8?q?1759820673959891547?= The main code change over v13 is to enable parallel bringup for SEV-ES guests. Thanks, Usama Changes across versions: v2: Cut it back to just INIT/SIPI/SIPI in parallel for now, nothing more v3: Clean up x2apic patch, add MTRR optimisation, lock topology update in preparation for more parallelisation. v4: Fixes to the real mode parallelisation patch spotted by SeanC, to avoid scribbling on initial_gs in common_cpu_up(), and to allow all 24 bits of the physical X2APIC ID to be used. That patch still needs a Signed-off-by from its original author, who once claimed not to remember writing it at all. But now we've fixed it, hopefully he'll admit it now :) v5: rebase to v6.1 and remeasure performance, disable parallel bringup for AMD CPUs. v6: rebase to v6.2-rc6, disabled parallel boot on amd as a cpu bug and reused timer calibration for secondary CPUs. v7: [David Woodhouse] iterate over all possible CPUs to find any existing cluster mask in alloc_clustermask. (patch 1/9) Keep parallel AMD support enabled in AMD, using APIC ID in CPUID leaf 0x0B (for x2APIC mode) or CPUID leaf 0x01 where 8 bits are sufficient. Included sanity checks for APIC id from 0x0B. (patch 6/9) Removed patch for reusing timer calibration for secondary CPUs. commit message and code improvements. v8: Fix CPU0 hotplug by setting up the initial_gs, initial_stack and early_gdt_descr. Drop trampoline lock and bail if APIC ID not found in find_cpunr. Code comments improved and debug prints added. v9: Drop patch to avoid repeated saves of MTRR at boot time. rebased and retested at v6.2-rc8. added kernel doc for no_parallel_bringup and made do_parallel_bringup __ro_after_init. v10: Fixed suspend/resume not working with parallel smpboot. rebased and retested to 6.2. fixed checkpatch errors. v11: Added patches from Brian Gerst to remove the global variables initial_gs, initial_stack, and early_gdt_descr from the 64-bit boot code (https://lore.kernel.org/all/20230222221301.245890-1-brgerst@gmail.com/). v12: Fixed compilation errors, acquire tr_lock for every stack setup in trampoline_64.S. Rearranged commits for a cleaner git history. v13: Fix build error with CONFIG_FORCE_NR_CPUS. Commit message improved, typos fixed and extra comments added. v14: Enable parallel bringup for SEV-ES guests Brian Gerst (3): x86/smpboot: Remove initial_stack on 64-bit x86/smpboot: Remove early_gdt_descr on 64-bit x86/smpboot: Remove initial_gs David Woodhouse (9): x86/apic/x2apic: Allow CPU cluster_mask to be populated in parallel cpu/hotplug: Move idle_thread_get() to cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU x86/smpboot: Reference count on smpboot_setup_warm_reset_vector() x86/smpboot: Split up native_cpu_up into separate phases and document them x86/smpboot: Support parallel startup of secondary CPUs x86/smpboot: Send INIT/SIPI/SIPI to secondary CPUs in parallel x86/smpboot: Serialize topology updates for secondary bringup x86/smpboot: Allow parallel bringup for SEV-ES .../admin-guide/kernel-parameters.txt | 3 + arch/x86/include/asm/cpu.h | 1 + arch/x86/include/asm/processor.h | 6 +- arch/x86/include/asm/realmode.h | 4 +- arch/x86/include/asm/sev-common.h | 3 + arch/x86/include/asm/sev.h | 5 + arch/x86/include/asm/smp.h | 18 +- arch/x86/include/asm/topology.h | 2 - arch/x86/kernel/acpi/sleep.c | 30 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/x2apic_cluster.c | 126 +++--- arch/x86/kernel/asm-offsets.c | 1 + arch/x86/kernel/cpu/common.c | 6 +- arch/x86/kernel/cpu/topology.c | 2 +- arch/x86/kernel/head_64.S | 162 ++++++-- arch/x86/kernel/smpboot.c | 366 +++++++++++++----- arch/x86/realmode/init.c | 3 + arch/x86/realmode/rm/trampoline_64.S | 27 +- arch/x86/xen/smp_pv.c | 4 +- arch/x86/xen/xen-head.S | 2 +- include/linux/cpuhotplug.h | 2 + include/linux/smpboot.h | 7 + kernel/cpu.c | 31 +- kernel/smpboot.h | 2 - 24 files changed, 614 insertions(+), 201 deletions(-) Tested-by: Tor Vic