Message ID | 20231205004510.27164-1-kirill.shutemov@linux.intel.com |
---|---|
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3133725vqy; Mon, 4 Dec 2023 16:46:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEekfHjDeKwiHTgpQbvRMwww4P+i8bshcXBHEzIARL6cNzEEFUu5bD//sgsB1T/ThUs5Wx5 X-Received: by 2002:a17:902:848a:b0:1cc:6cc3:d9ba with SMTP id c10-20020a170902848a00b001cc6cc3d9bamr25241389plo.4.1701737172961; Mon, 04 Dec 2023 16:46:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701737172; cv=none; d=google.com; s=arc-20160816; b=XEMrBp9Ju6ujfJvtrcWq7HkjgbQ5qQziv7PDjsqt4R8Vy1gUhgZyK8SSjDhCdXH5ey M3qVPXcvBOvZ9jzleHbZlqcefM/X0IZd3dUNuHqXwpnSdKHFdVBVKHCRoo8chnozKjrs Hdf0V5vWmTog7ga9CVTWXR6VQOTCrsT9yYgIWyOTwezTKhQ3dEC3a+0FkDJ08q7Exa/o 0mK2o1cYJEBU1JA6JwoJwTicPWglO35TJfBw8CHxe62GfTB/F90JTWZ2s0ywTEFF2B66 OTIdqNv78mPuwP5SLSxWU5pxYLGdO0sCglOF6NRzp453cgdSZXXiKpzyHDn6n7QNP6C6 7Gfg== 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=0+1G5foxgRGGC9Sglprujwuireyhct9QWGwB085kc3g=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=PdZVWEPiTJo4rlxpafHy78NAjS7Guf565odo2kczeZ1sX2vWOQdTriiJ/kckIR6D3J gLqJMZsu47VCoJQxr4oRjLO8c/UTZwCTGBRZwIB3PCjUpvjPMkDjtosOOY2uoMSFxMwp 4ECuGoA2kVhZOyOkOsT1pHnGLZA4BLA4GSL9fwy0cQ3DgUQF77VMOxxxwNgvEfluH5E1 h1YvDyforv3+sVpgZzjcXIzsEy8DbsoRmfDDyFpiUJTU2zrEKp/PnOX0DaOCFsRZNsVl WgfB8gCHCDwrQ7jALv21Vi4utjjPn6U7ghNwGMX1dJkqYhT+sixeq0qP1Uh/1hKgH8v9 5x1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VIoxRmim; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id z7-20020a170902834700b001d0b78ea7a2si1374946pln.516.2023.12.04.16.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 16:46:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VIoxRmim; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 8F38C80787C2; Mon, 4 Dec 2023 16:45:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343661AbjLEAp2 (ORCPT <rfc822;chrisfriedt@gmail.com> + 99 others); Mon, 4 Dec 2023 19:45:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbjLEApY (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 4 Dec 2023 19:45:24 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25516101 for <linux-kernel@vger.kernel.org>; Mon, 4 Dec 2023 16:45:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701737129; x=1733273129; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=BXT87HuHx1IXeFYwiHOiVWUcms/fvvDi+Ha0MJa2ebw=; b=VIoxRmimhkjgzknh+08m3U3jjd09Tt0tcOVbgWYleykQKRmUw/lBCMmn rA7EpTDR7Uc1fg4KzB6oC7owNSVnUvlKmGBCQj52ly3I2iFrq++2WKWbr EANjjFSQGIFqw0ZCnOObVdwoL5i7efvRe+JeBE6MD6kshkISYxKDbPX4N CU06MtMQ7r7ns3bQ37prjYuCTZu74c+VpawunI5UzOSvtN64Nwx52Jq1e 4du0KA4IjIDQt+pB0K/xrQ9JWufGtWmQBnRK1CCxfDE3lFg7nrQqRThrG qU/n0y5QU0fInaFc6ca50yXX+RpTFuIGDO1lO7J3xzpTh0oeRJceqo37o w==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="392688615" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="392688615" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 16:45:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="888704374" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="888704374" Received: from abijaz-mobl2.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.61.240]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 16:45:22 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 3177310A43D; Tue, 5 Dec 2023 03:45:20 +0300 (+03) From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org Cc: "Rafael J. Wysocki" <rafael@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Adrian Hunter <adrian.hunter@intel.com>, Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>, Elena Reshetova <elena.reshetova@intel.com>, Jun Nakajima <jun.nakajima@intel.com>, Rick Edgecombe <rick.p.edgecombe@intel.com>, Tom Lendacky <thomas.lendacky@amd.com>, "Kalra, Ashish" <ashish.kalra@amd.com>, Sean Christopherson <seanjc@google.com>, "Huang, Kai" <kai.huang@intel.com>, Baoquan He <bhe@redhat.com>, kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCHv4 00/14] x86/tdx: Add kexec support Date: Tue, 5 Dec 2023 03:44:56 +0300 Message-ID: <20231205004510.27164-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 04 Dec 2023 16:45:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784400757525842513 X-GMAIL-MSGID: 1784400757525842513 |
Series |
x86/tdx: Add kexec support
|
|
Message
Kirill A. Shutemov
Dec. 5, 2023, 12:44 a.m. UTC
The patchset adds bits and pieces to get kexec (and crashkernel) work on TDX guest. The last patch implements CPU offlining according to the approved ACPI spec change poposal[1]. It unlocks kexec with all CPUs visible in the target kernel. It requires BIOS-side enabling. If it missing we fallback to booting 2nd kernel with single CPU. Please review. I would be glad for any feedback. v4: - Fix build for !KEXEC_CORE; - Cleaner ATLERNATIVE use; - Update commit messages and comments; - Add Reviewed-bys; v3: - Rework acpi_mp_crash_stop_other_cpus() to avoid invoking hotplug state machine; - Free page tables if reset vector setup failed; - Change asm_acpi_mp_play_dead() to pass reset vector and PGD as arguments; - Mark acpi_mp_* variables as static and __ro_after_init; - Use u32 for apicid; - Disable CPU offlining if reset vector setup failed; - Rename madt.S -> madt_playdead.S; - Mark tdx_kexec_unshare_mem() as static; - Rebase onto up-to-date tip/master; - Whitespace fixes; - Reorder patches; - Add Reviewed-bys; - Update comments and commit messages; v2: - Rework how unsharing hook ups into kexec codepath; - Rework kvmclock_disable() fix based on Sean's; - s/cpu_hotplug_not_supported()/cpu_hotplug_disable_offlining()/; - use play_dead_common() to implement acpi_mp_play_dead(); - cond_resched() in tdx_shared_memory_show(); - s/target kernel/second kernel/; - Update commit messages and comments; [1] https://lore.kernel.org/all/13356251.uLZWGnKmhe@kreacher Kirill A. Shutemov (14): x86/acpi: Extract ACPI MADT wakeup code into a separate file x86/apic: Mark acpi_mp_wake_* variables as __ro_after_init cpu/hotplug: Add support for declaring CPU offlining not supported cpu/hotplug, x86/acpi: Disable CPU offlining for ACPI MADT wakeup x86/kvm: Do not try to disable kvmclock if it was not enabled x86/kexec: Keep CR4.MCE set during kexec for TDX guest x86/mm: Make x86_platform.guest.enc_status_change_*() return errno x86/mm: Return correct level from lookup_address() if pte is none x86/tdx: Account shared memory x86/tdx: Convert shared memory back to private on kexec x86/mm: Make e820_end_ram_pfn() cover E820_TYPE_ACPI ranges x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure x86/acpi: Do not attempt to bring up secondary CPUs in kexec case x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method arch/x86/Kconfig | 7 + arch/x86/coco/core.c | 1 - arch/x86/coco/tdx/kexec.c | 0 arch/x86/coco/tdx/tdx.c | 205 ++++++++++++++- arch/x86/hyperv/ivm.c | 9 +- arch/x86/include/asm/acpi.h | 5 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/smp.h | 1 + arch/x86/include/asm/x86_init.h | 5 +- arch/x86/kernel/acpi/Makefile | 11 +- arch/x86/kernel/acpi/boot.c | 86 +------ arch/x86/kernel/acpi/madt_playdead.S | 21 ++ arch/x86/kernel/acpi/madt_wakeup.c | 363 +++++++++++++++++++++++++++ arch/x86/kernel/crash.c | 4 + arch/x86/kernel/e820.c | 9 +- arch/x86/kernel/kvmclock.c | 12 +- arch/x86/kernel/reboot.c | 22 +- arch/x86/kernel/relocate_kernel_64.S | 3 + arch/x86/kernel/x86_init.c | 4 +- arch/x86/mm/mem_encrypt_amd.c | 8 +- arch/x86/mm/pat/set_memory.c | 17 +- include/acpi/actbl2.h | 19 +- include/linux/cc_platform.h | 10 - include/linux/cpu.h | 2 + kernel/cpu.c | 12 +- 25 files changed, 689 insertions(+), 148 deletions(-) create mode 100644 arch/x86/coco/tdx/kexec.c create mode 100644 arch/x86/kernel/acpi/madt_playdead.S create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c