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>,
Ard Biesheuvel <ardb@kernel.org>, Baoquan He <bhe@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
kexec@lists.infradead.org, linux-hyperv@vger.kernel.org,
linux-acpi@vger.kernel.org, linux-coco@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: [PATCHv11 00/19] x86/tdx: Add kexec support
Date: Tue, 28 May 2024 12:55:03 +0300 [thread overview]
Message-ID: <20240528095522.509667-1-kirill.shutemov@linux.intel.com> (raw)
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.
[1] https://lore.kernel.org/all/13356251.uLZWGnKmhe@kreacher
v11:
- Rebased onto current tip/master;
- Rename CONFIG_X86_ACPI_MADT_WAKEUP to CONFIG_ACPI_MADT_WAKEUP;
- Drop CC_ATTR_GUEST_MEM_ENCRYPT checks around x86_platform.guest.enc_kexec_*
callbacks;
- Rename x86_platform.guest.enc_kexec_* callbacks;
- Report error code in case of vmm call fail in __set_memory_enc_pgtable();
- Update commit messages and comments;
- Add Reviewed-bys;
v10:
- Rebased to current tip/master;
- Preserve CR4.MCE instead of setting it unconditionally;
- Fix build error in Hyper-V code after rebase;
- Include Ashish's patch for real;
v9:
- Rebased;
- Keep page tables that maps E820_TYPE_ACPI (Ashish);
- Ack/Reviewed/Tested-bys from Sathya, Kai, Tao;
- Minor printk() message adjustments;
v8:
- Rework serialization of around conversion memory back to private;
- Print ACPI_MADT_TYPE_MULTIPROC_WAKEUP in acpi_table_print_madt_entry();
- Drop debugfs interface to dump info on shared memory;
- Adjust comments and commit messages;
- Reviewed-bys by Baoquan, Dave and Thomas;
v7:
- Call enc_kexec_stop_conversion() and enc_kexec_unshare_mem() after shutting
down IO-APIC, lapic and hpet. It meets AMD requirements.
- Minor style changes;
- Add Acked/Reviewed-bys;
v6:
- Rebased to v6.8-rc1;
- Provide default noop callbacks from .enc_kexec_stop_conversion and
.enc_kexec_unshare_mem;
- Split off patch that introduces .enc_kexec_* callbacks;
- asm_acpi_mp_play_dead(): program CR3 directly from RSI, no MOV to RAX
required;
- Restructure how smp_ops.stop_this_cpu() hooked up in crash_nmi_callback();
- kvmclock patch got merged via KVM tree;
v5:
- Rename smp_ops.crash_play_dead to smp_ops.stop_this_cpu and use it in
stop_this_cpu();
- Split off enc_kexec_stop_conversion() from enc_kexec_unshare_mem();
- Introduce kernel_ident_mapping_free();
- Add explicit include for alternatives and stringify.
- Add barrier() after setting conversion_allowed to false;
- Mark cpu_hotplug_offline_disabled __ro_after_init;
- Print error if failed to hand over CPU to BIOS;
- Update comments and commit messages;
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;
Ashish Kalra (1):
x86/mm: Do not zap page table entries mapping unaccepted memory table
during kdump.
Borislav Petkov (1):
x86/relocate_kernel: Use named labels for less confusion
Kirill A. Shutemov (17):
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/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/mm: Add callbacks to prepare encrypted memory for kexec
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/smp: Add smp_ops.stop_this_cpu() callback
x86/mm: Introduce kernel_ident_mapping_free()
x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method
ACPI: tables: Print MULTIPROC_WAKEUP when MADT is parsed
arch/x86/Kconfig | 7 +
arch/x86/coco/core.c | 1 -
arch/x86/coco/tdx/tdx.c | 96 ++++++++-
arch/x86/hyperv/ivm.c | 22 +-
arch/x86/include/asm/acpi.h | 7 +
arch/x86/include/asm/init.h | 3 +
arch/x86/include/asm/pgtable.h | 5 +
arch/x86/include/asm/pgtable_types.h | 1 +
arch/x86/include/asm/set_memory.h | 3 +
arch/x86/include/asm/smp.h | 1 +
arch/x86/include/asm/x86_init.h | 13 +-
arch/x86/kernel/acpi/Makefile | 1 +
arch/x86/kernel/acpi/boot.c | 86 +-------
arch/x86/kernel/acpi/madt_playdead.S | 28 +++
arch/x86/kernel/acpi/madt_wakeup.c | 292 +++++++++++++++++++++++++++
arch/x86/kernel/crash.c | 12 ++
arch/x86/kernel/e820.c | 9 +-
arch/x86/kernel/process.c | 7 +
arch/x86/kernel/reboot.c | 18 ++
arch/x86/kernel/relocate_kernel_64.S | 25 ++-
arch/x86/kernel/x86_init.c | 8 +-
arch/x86/mm/ident_map.c | 73 +++++++
arch/x86/mm/init_64.c | 16 +-
arch/x86/mm/mem_encrypt_amd.c | 8 +-
arch/x86/mm/pat/set_memory.c | 74 +++++--
drivers/acpi/tables.c | 14 ++
include/acpi/actbl2.h | 19 +-
include/linux/cc_platform.h | 10 -
include/linux/cpu.h | 2 +
kernel/cpu.c | 12 +-
30 files changed, 707 insertions(+), 166 deletions(-)
create mode 100644 arch/x86/kernel/acpi/madt_playdead.S
create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c
--
2.43.0
next reply other threads:[~2024-05-28 9:55 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 9:55 Kirill A. Shutemov [this message]
2024-05-28 9:55 ` [PATCHv11 01/19] x86/acpi: Extract ACPI MADT wakeup code into a separate file Kirill A. Shutemov
2024-05-28 13:47 ` Borislav Petkov
2024-05-28 9:55 ` [PATCHv11 02/19] x86/apic: Mark acpi_mp_wake_* variables as __ro_after_init Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 03/19] cpu/hotplug: Add support for declaring CPU offlining not supported Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 04/19] cpu/hotplug, x86/acpi: Disable CPU offlining for ACPI MADT wakeup Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 05/19] x86/relocate_kernel: Use named labels for less confusion Kirill A. Shutemov
2024-05-29 10:47 ` Nikolay Borisov
2024-05-29 11:17 ` Kirill A. Shutemov
2024-05-29 11:28 ` Borislav Petkov
2024-05-29 12:33 ` Andrew Cooper
2024-05-29 15:15 ` Borislav Petkov
2024-06-04 0:24 ` H. Peter Anvin
2024-06-04 9:15 ` Borislav Petkov
2024-06-04 15:21 ` Kirill A. Shutemov
2024-06-04 17:57 ` Borislav Petkov
2024-06-11 18:26 ` H. Peter Anvin
2024-06-12 9:22 ` Kirill A. Shutemov
2024-06-12 23:06 ` Andrew Cooper
2024-06-12 23:25 ` H. Peter Anvin
2024-06-03 14:43 ` H. Peter Anvin
2024-06-12 12:10 ` Nikolay Borisov
2024-06-03 22:43 ` H. Peter Anvin
2024-05-28 9:55 ` [PATCHv11 06/19] x86/kexec: Keep CR4.MCE set during kexec for TDX guest Kirill A. Shutemov
2024-05-28 11:12 ` Huang, Kai
2024-05-29 11:39 ` Nikolay Borisov
2024-05-28 9:55 ` [PATCHv11 07/19] x86/mm: Make x86_platform.guest.enc_status_change_*() return errno Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 08/19] x86/mm: Return correct level from lookup_address() if pte is none Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 09/19] x86/tdx: Account shared memory Kirill A. Shutemov
2024-06-04 16:08 ` Dave Hansen
2024-06-04 16:24 ` Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 10/19] x86/mm: Add callbacks to prepare encrypted memory for kexec Kirill A. Shutemov
2024-05-29 10:42 ` Borislav Petkov
2024-06-02 12:39 ` [PATCHv11.1 " Kirill A. Shutemov
2024-06-02 12:42 ` Kirill A. Shutemov
2024-06-02 12:44 ` [PATCHv11.2 " Kirill A. Shutemov
2024-06-04 16:16 ` [PATCHv11 " Dave Hansen
2024-05-28 9:55 ` [PATCHv11 11/19] x86/tdx: Convert shared memory back to private on kexec Kirill A. Shutemov
2024-05-31 15:14 ` Borislav Petkov
2024-05-31 17:34 ` Kalra, Ashish
2024-05-31 18:06 ` Borislav Petkov
2024-06-02 14:20 ` Kirill A. Shutemov
2024-06-02 14:23 ` [PATCHv11.1 " Kirill A. Shutemov
2024-06-03 8:37 ` Borislav Petkov
2024-06-04 15:32 ` Kirill A. Shutemov
2024-06-04 15:47 ` Dave Hansen
2024-06-04 16:14 ` Kirill A. Shutemov
2024-06-04 18:05 ` Borislav Petkov
2024-06-05 12:21 ` Kirill A. Shutemov
2024-06-05 16:24 ` Borislav Petkov
2024-06-06 12:39 ` Kirill A. Shutemov
2024-06-04 16:27 ` [PATCHv11 " Dave Hansen
2024-06-05 12:43 ` Kirill A. Shutemov
2024-06-05 16:05 ` Dave Hansen
2024-05-28 9:55 ` [PATCHv11 12/19] x86/mm: Make e820__end_ram_pfn() cover E820_TYPE_ACPI ranges Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 13/19] x86/mm: Do not zap page table entries mapping unaccepted memory table during kdump Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 14/19] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 15/19] x86/acpi: Do not attempt to bring up secondary CPUs in kexec case Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 16/19] x86/smp: Add smp_ops.stop_this_cpu() callback Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 17/19] x86/mm: Introduce kernel_ident_mapping_free() Kirill A. Shutemov
2024-05-28 9:55 ` [PATCHv11 18/19] x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method Kirill A. Shutemov
2024-06-03 8:39 ` Borislav Petkov
2024-06-07 15:14 ` Kirill A. Shutemov
2024-06-10 13:40 ` Borislav Petkov
2024-06-10 14:01 ` Kirill A. Shutemov
2024-06-11 15:47 ` Kirill A. Shutemov
2024-06-11 19:46 ` Borislav Petkov
2024-06-12 9:24 ` Kirill A. Shutemov
2024-06-12 9:29 ` Borislav Petkov
2024-06-13 13:41 ` Kirill A. Shutemov
2024-06-13 14:56 ` Borislav Petkov
2024-06-14 14:06 ` Tom Lendacky
2024-06-18 12:20 ` Kirill A. Shutemov
2024-06-21 13:38 ` Borislav Petkov
2024-05-28 9:55 ` [PATCHv11 19/19] ACPI: tables: Print MULTIPROC_WAKEUP when MADT is parsed Kirill A. Shutemov
2024-05-28 10:01 ` [PATCHv11 00/19] x86/tdx: Add kexec support Rafael J. Wysocki
2024-05-30 23:36 ` [PATCH v7 0/3] x86/snp: " Ashish Kalra
2024-05-30 23:36 ` [PATCH v7 1/3] efi/x86: Fix EFI memory map corruption with kexec Ashish Kalra
2024-05-31 9:12 ` Alexander Kuleshov
2024-06-03 8:56 ` Borislav Petkov
2024-06-03 13:06 ` Kalra, Ashish
2024-06-03 13:39 ` Mike Rapoport
2024-06-03 14:01 ` Kalra, Ashish
2024-06-03 14:46 ` Borislav Petkov
2024-06-03 15:31 ` Mike Rapoport
2024-06-03 16:48 ` Kalra, Ashish
2024-06-03 16:57 ` Borislav Petkov
2024-06-03 17:08 ` Kalra, Ashish
2024-06-03 17:12 ` Borislav Petkov
2024-06-04 22:12 ` Kalra, Ashish
2024-06-04 22:35 ` Kalra, Ashish
2024-06-05 1:48 ` Dave Young
2024-06-05 1:52 ` Dave Young
2024-06-05 1:58 ` Dave Young
2024-06-05 2:08 ` Kalra, Ashish
2024-06-05 2:28 ` Dave Young
2024-06-05 11:09 ` Borislav Petkov
2024-06-06 1:52 ` Dave Young
2024-06-05 2:14 ` Kalra, Ashish
2024-06-03 17:05 ` Kalra, Ashish
2024-06-03 17:10 ` Borislav Petkov
2024-06-04 1:23 ` Dave Young
2024-06-04 9:43 ` Borislav Petkov
2024-06-04 11:09 ` Dave Young
2024-06-04 18:02 ` Borislav Petkov
2024-06-05 2:53 ` Dave Young
2024-06-05 7:42 ` Borislav Petkov
2024-06-05 8:17 ` Ard Biesheuvel
2024-06-05 11:15 ` Borislav Petkov
2024-06-03 15:29 ` Mike Rapoport
2024-06-03 16:56 ` Kalra, Ashish
2024-06-03 17:41 ` Mike Rapoport
2024-05-30 23:37 ` [PATCH v7 2/3] x86/boot/compressed: Skip Video Memory access in Decompressor for SEV-ES/SNP Ashish Kalra
2024-06-05 20:14 ` Borislav Petkov
2024-05-30 23:37 ` [PATCH v7 3/3] x86/snp: Convert shared memory back to private on kexec Ashish Kalra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240528095522.509667-1-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=adrian.hunter@intel.com \
--cc=ardb@kernel.org \
--cc=ashish.kalra@amd.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=elena.reshetova@intel.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=jun.nakajima@intel.com \
--cc=kai.huang@intel.com \
--cc=kexec@lists.infradead.org \
--cc=kys@microsoft.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--cc=rick.p.edgecombe@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).