From patchwork Tue Mar 21 19:40:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 6985 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1975116wrt; Tue, 21 Mar 2023 12:46:14 -0700 (PDT) X-Google-Smtp-Source: AK7set9wws5GR+w69yU1Wk8rexxTrbEErqfBmsFyFV1AOiCo/kb5hb1CHCO4wyCcnOe2LYkfvuno X-Received: by 2002:a17:902:e54f:b0:1a0:4531:af58 with SMTP id n15-20020a170902e54f00b001a04531af58mr210353plf.63.1679427974082; Tue, 21 Mar 2023 12:46:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679427974; cv=none; d=google.com; s=arc-20160816; b=HnMVgMdDrioGJJJhbJ0idsMS0jGJpJm7LJJ5x9OlUgl3hTD4Szdgf99zYrSAV9aLFa MkEgRaKmoa6wGEaFMEA9zTC3P5/cQ5oTfkfiRHuoab3OVddPL4XAP29Vmhc2pgDhfESD aFeWaJFRzIUZmkAhwkp8K1r3duvN4IUZlvGNyAR5bvoKh4gL2FRPO5aOQVzO4n5Ab3Zl 3sQddYWTGeGOlAY58cjR+IdzjiRAr0baEpd7bo535Gh8vt+t5Sea4IIU43Ug0yvzK0I8 iXdTXuDTmTjOjW0swQuHl3qIsF4YusGKj2MWy+CsnLkRI1dECb2Mp2t7h3Hjeqa/MzTP QUvQ== 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=2zchVYrraM7s3AAvPCnvhbdIUl39F6C9hdQmcDKPK/Q=; b=qi+dKylFIRXJcH6cyNgm72YLdJI5QqMGDYxAzMlsBoHivnuoFtgKbuXn+J9WCXQqqv Ej+jJyWTSL0LO1GsVZ8KLk3YwA/JPA1Ggd3oth20HloMhXTT9rWMmkKR6Py1wfL5rEi5 3efAh+shPTavhV8ZmEZ8lUMCaxIak73vBHwzVS9Cungfv5JI5MkXWvl9BysFSKZBJSMX arbYdcdOuwZ1+0QXiqmnITFllawnx3/lXVnwJXbG2zq5xxwLroNbwjAzGHF7YXYA8YjT Fz8z2TtT53NWWFvMFLit3EPUe99abPRyixlw2fq3Vi/o9hbSKDGZTPPXiEijZKTj/vpT y6mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=eHO+13ar; 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=QUARANTINE sp=QUARANTINE 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 d18-20020a170902729200b0019f73eb630fsi13459979pll.637.2023.03.21.12.46.00; Tue, 21 Mar 2023 12:46:14 -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=@bytedance.com header.s=google header.b=eHO+13ar; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbjCUTl6 (ORCPT + 99 others); Tue, 21 Mar 2023 15:41:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbjCUTlv (ORCPT ); Tue, 21 Mar 2023 15:41:51 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888D3567BD for ; Tue, 21 Mar 2023 12:40:43 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id t15so14874563wrz.7 for ; Tue, 21 Mar 2023 12:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1679427634; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2zchVYrraM7s3AAvPCnvhbdIUl39F6C9hdQmcDKPK/Q=; b=eHO+13aro+Q5+CFqTFTEYO/acPnKq92VXA1rMDfgODABgcYcvJlqbN+8jzb4pIojMl h0PU/VR7YAe2ZQwP4QN/qgyAU7J+Xi2uc7QBgohOBHLHBldz3azXk/VpFYhLw123Q5bn GnXsxlWdyhWU3B17VU/HWn0JCgMsKwZrQZdGyhlAXhv7Kh/nNP3uypKJiqMScZcA9CsO 9a3ui4pzLyihrUNZJtnk/Zqe/AG1q7ltAySlxJ9pj2EbnPvBMVc1/xZcJoLQS+JZgszj WDKNrA0fcXnf9/h1ptbinmMggQwBmEd1BoQ4y+n1ybW+34gRPi+TpAVIB/zy2yLZNpvm 0MoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679427634; 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=2zchVYrraM7s3AAvPCnvhbdIUl39F6C9hdQmcDKPK/Q=; b=Gh9CabnKrnJ8aclfkY+Y8sVLRiYmMxOXOUNj8v/l46cf2Psdzxdwk1yWuhcb8EFCTc JaO8Ojwk6EsxcfKa86GsRGq6Ij1cQC2M8JY1M3mvNmY9oU5NJhEbHvgdSkn1b3IBMBAv 7+2kJvQ2H+Z7YkbaGgSrwVWQrhjZU002LFzYqdmpSDkm0VBkiFU2j2A+kuCIbEhqieuP PiD0fW8utf4/tSoIfYxEatw7G6onTa2s496YhXoUv0PMrpEKuc5PfeWe2g6ZXCgv4YSp DVWcNjhZomjzDIAyN8plVtGKWL4cOuXJMlOOlOjlb7FaG7/4Shtoe+sM1ImOi0I1l7qT OdqA== X-Gm-Message-State: AO0yUKXu1idiGNTq9iVaP1sJ1P4AmROaNlqxJCvdhQB0ud1jZuPOqlUw xjTG45d3GPePrNRVNUL2ytmO7Q== X-Received: by 2002:adf:fe51:0:b0:2cf:e689:e60e with SMTP id m17-20020adffe51000000b002cfe689e60emr3233898wrs.59.1679427634215; Tue, 21 Mar 2023 12:40:34 -0700 (PDT) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:7a8a:d679:ba4e:61cf]) by smtp.gmail.com with ESMTPSA id a3-20020adffb83000000b002c561805a4csm12005026wrr.45.2023.03.21.12.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 12:40:33 -0700 (PDT) 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, gpiccoli@igalia.com, Usama Arif Subject: [PATCH v16 0/8] Parallel CPU bringup for x86_64 Date: Tue, 21 Mar 2023 19:40:00 +0000 Message-Id: <20230321194008.785922-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?1761007867117847456?= X-GMAIL-MSGID: =?utf-8?q?1761007867117847456?= This version includes the following changes over v15: - Roll back to CPUHP_OFFLINE on failure in parallel bringup case. - Release trampoline_lock earlier, just before setup_gdt. - Rebase to x86/apic, Linux 6.3-rc3 with no change in boot time improvement over v15. (This already has some of the commits from v15 merged). 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. v15: use vendor parallel_smp when platform has CC_ATTR_GUEST_STATE_ENCRYPT. Call smpboot_restore_warm_reset_vector incase any of the steps in native_cpu_up fail. Reset stale stack and kasan unpoison in bringup_cpu Release trampoline_lock a bit earlier. v16: Roll back to CPUHP_OFFLINE on failure in parallel bringup case. Release trampoline_lock earlier, just before setup_gdt. Rebase to x86/apic (Linux 6.3-rc3). David Woodhouse (8): cpu/hotplug: Move idle_thread_get() to cpu/hotplug: Reset task stack state in _cpu_up() cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU 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/coco/core.c | 5 + arch/x86/include/asm/coco.h | 1 + arch/x86/include/asm/cpu.h | 1 + arch/x86/include/asm/realmode.h | 3 + arch/x86/include/asm/sev-common.h | 3 + arch/x86/include/asm/smp.h | 13 +- arch/x86/include/asm/topology.h | 2 - arch/x86/kernel/acpi/sleep.c | 9 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/common.c | 6 +- arch/x86/kernel/cpu/topology.c | 3 +- arch/x86/kernel/head_64.S | 97 +++++ arch/x86/kernel/smpboot.c | 344 +++++++++++++----- arch/x86/realmode/init.c | 3 + arch/x86/realmode/rm/trampoline_64.S | 27 +- arch/x86/xen/smp_pv.c | 4 +- include/linux/cpuhotplug.h | 2 + include/linux/smpboot.h | 7 + kernel/cpu.c | 61 +++- kernel/smpboot.h | 2 - 21 files changed, 481 insertions(+), 117 deletions(-)