From patchwork Thu Mar 16 22:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 6782 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp25805wrt; Thu, 16 Mar 2023 15:23:46 -0700 (PDT) X-Google-Smtp-Source: AK7set99PMaMwAB/x8uEtx9hyBmTwLQM937m4tbfjB6XwKaBnfyKG7HDa+qC03QQp1+Of8bvbNAV X-Received: by 2002:aa7:9784:0:b0:625:d682:4dd with SMTP id o4-20020aa79784000000b00625d68204ddmr3928699pfp.33.1679005425884; Thu, 16 Mar 2023 15:23:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679005425; cv=none; d=google.com; s=arc-20160816; b=UEJZHtWoRnILeSEAnmdU1F8BV76PGwrmLkD5b2FzQOUZkzKmOspvfF9swoC89uVML2 dNsRC+zSe+NuUk4EJ+BL99QAHSYmfzQjBLSaV9YlxZrmvJypHvqBLD0JQLVzTJ4gTLM3 dthg6rOpTd5FxHODrv0mgY7b8/k4wppxEIzrcahscVj52zXE90baJi/rWOY5op9M2tLV 1beS5l+OC2PK5k9g4T5OvEXx5aEuu43nnWY2hpliD7nv0E4ImHgNAzH6bRzDn7K1x196 Kge5DQag5upZcvzWoONyctzmy0DQ8jXGrkdivcOhw4CkUca88GpYiRPQfwUgRwuXDmZE EwTw== 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=1y2Lqj93bBefH84AiipmoBHTVl61wcm3FFg4LLyQYT0=; b=egGUdstMcMv3ZBgubuMy4vxIO5B2yb5pmhlrVofjfZjW0iaGykfI2gsuznGF67SQ3C i0Q0/0m+o0KTWIjWH8ZZPT6OvlMXVaSZ5FeYnA4aBtYBD4xgkXmwrozcu+NIcFp/6bLh n+wnBJJBeeUwKDoQAyTvTbBaX6ybQOw3kXASw4rO90WpukYMYbolqnBPTbYfv+rGQCJb 2MTxHo5wmdJsms2TFzck96p7YWHZw1H0r53xOUTEYpGr2HPFdW3ZS+Dtm3Pr4GwoekhZ zGsQUMJRsg5Fz3nyHP+K5QTb0iLRhS05bV7MKwpaoi3eslVCf3O+XwrcV0BuM+UK4dZx 3g7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="IF+Pa+L/"; 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 w70-20020a638249000000b005030fd34fb3si422150pgd.792.2023.03.16.15.23.31; Thu, 16 Mar 2023 15:23:45 -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="IF+Pa+L/"; 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 S229999AbjCPWVS (ORCPT + 99 others); Thu, 16 Mar 2023 18:21:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjCPWVQ (ORCPT ); Thu, 16 Mar 2023 18:21:16 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2C52B06F0 for ; Thu, 16 Mar 2023 15:21:13 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id p16so2238544wmq.5 for ; Thu, 16 Mar 2023 15:21:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1679005272; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1y2Lqj93bBefH84AiipmoBHTVl61wcm3FFg4LLyQYT0=; b=IF+Pa+L/g7OzVFhd+q08SCNHv6yogi8O+SFhA9rUSf9rZO5EEGif9z9cJzr/TMyA3n HOprNIHEF8v+PT9HR9z4pY/qmuK9CY4m75+z32O76d3jdNKMKUaR5cXmqHN7alz1z5Vu MOiNmrptLJucGHTj/Z89vmG6n/W/89/3Fnh8icL5tKpxD9ofRlK0tRI3+G+oD02JyobB +bUiXqwEpoeE1nYcfacRkgHU8067uM0C3b5KPm8kx2ca3QYfF2SBMXOF7BRtIf5nbSbG R9k4/8HQBEEYhOdPCVlty4SshvJ5vpGfyIpDlii65qUZWHcTBsONis8uDicr/mqO9Wmz foiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679005272; 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=1y2Lqj93bBefH84AiipmoBHTVl61wcm3FFg4LLyQYT0=; b=tLzKs7Tq3qm06fomxpEW25BGGv0jr1apRBeDhal3c40DQpPi4jRq7xzMpzbmS4XAAy ALoJP+YEZGoBLZelRPnVwvH92ZwYBI7S4opg3u+j/dScEtYuX4bablCz/rxLT91/ozRN Ys/jYPY0MwdyfkDGbTN3orXlNuDog5HvwBOxY8WNEhwZ9SisfiGy38zY8bBQ/c8eeU3L zb3OY+iuBzqXAbAP2LKIkt6HNUSNjdMW9tKZ3H5iyW/vJM/2SMIUlG8rsZ2qRxB2lAUR HocAy9lB+FMpqv6FiGM+9JVm46PJd5IfPtQOSHd2VLKWx6ykZQLMvfojP+ygMsVMsMzf YrLA== X-Gm-Message-State: AO0yUKUnbAMDkWNWS+A+mcwwzmIaDOAe3RdxkPeDcC5o9y/lrfnzrBJc otWykrkiSNThJXQPE/tJHbunkg== X-Received: by 2002:a05:600c:4453:b0:3eb:1432:a78c with SMTP id v19-20020a05600c445300b003eb1432a78cmr23822327wmn.37.1679005272193; Thu, 16 Mar 2023 15:21:12 -0700 (PDT) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6a:b566:0:4b87:78c3:3abe:7b0d]) by smtp.gmail.com with ESMTPSA id f9-20020adff989000000b002cea392f000sm439256wrr.69.2023.03.16.15.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 15:21:11 -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 v15 00/12] Parallel CPU bringup for x86_64 Date: Thu, 16 Mar 2023 22:20:57 +0000 Message-Id: <20230316222109.1940300-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 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?1760564793609507597?= X-GMAIL-MSGID: =?utf-8?q?1760564793609507597?= This version includes the following changes over v14: - use vendor instead of sev_es_active function to check if parallel_smp is to be done 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 (Pulled into idle_thread_get function) - Release the trampoline_lock a bit earlier. 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. 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/coco/core.c | 5 + arch/x86/include/asm/coco.h | 1 + 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/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 | 3 +- arch/x86/kernel/head_64.S | 167 ++++++-- arch/x86/kernel/smpboot.c | 372 +++++++++++++----- 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 | 10 + kernel/cpu.c | 44 ++- kernel/smpboot.c | 11 +- kernel/smpboot.h | 2 - 26 files changed, 641 insertions(+), 214 deletions(-)