public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: bp@alien8.de
Cc: adrian.hunter@intel.com, ardb@kernel.org, ashish.kalra@amd.com,
	bhe@redhat.com, dave.hansen@linux.intel.com,
	elena.reshetova@intel.com, haiyangz@microsoft.com, hpa@zytor.com,
	jun.nakajima@intel.com, kai.huang@intel.com,
	kexec@lists.infradead.org, kirill.shutemov@linux.intel.com,
	kys@microsoft.com, linux-acpi@vger.kernel.org,
	linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org,
	linux-kernel@vger.kernel.org, ltao@redhat.com, mingo@redhat.com,
	nik.borisov@suse.com, peterz@infradead.org, rafael@kernel.org,
	rick.p.edgecombe@intel.com,
	sathyanarayanan.kuppuswamy@linux.intel.com, seanjc@google.com,
	tglx@linutronix.de, thomas.lendacky@amd.com, x86@kernel.org
Subject: [PATCHv11.2 10/19] x86/mm: Add callbacks to prepare encrypted memory for kexec
Date: Sun,  2 Jun 2024 15:44:03 +0300	[thread overview]
Message-ID: <20240602124403.2122693-1-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20240529104257.GIZlcGsTkJHVBblkrY@fat_crate.local>

AMD SEV and Intel TDX guests allocate shared buffers for performing I/O.
This is done by allocating pages normally from the buddy allocator and
then converting them to shared using set_memory_decrypted().

On kexec, the second kernel is unaware of which memory has been
converted in this manner. It only sees E820_TYPE_RAM. Accessing shared
memory as private is fatal.

Therefore, the memory state must be reset to its original state before
starting the new kernel with kexec.

The process of converting shared memory back to private occurs in two
steps:

- enc_kexec_begin() stops new conversions.

- enc_kexec_finish() unshares all existing shared memory, reverting it
  back to private.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Tested-by: Tao Liu <ltao@redhat.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 arch/x86/include/asm/x86_init.h | 12 ++++++++++++
 arch/x86/kernel/crash.c         | 12 ++++++++++++
 arch/x86/kernel/reboot.c        | 12 ++++++++++++
 arch/x86/kernel/x86_init.c      |  4 ++++
 4 files changed, 40 insertions(+)

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 28ac3cb9b987..b0f313278967 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -149,12 +149,24 @@ struct x86_init_acpi {
  * @enc_status_change_finish	Notify HV after the encryption status of a range is changed
  * @enc_tlb_flush_required	Returns true if a TLB flush is needed before changing page encryption status
  * @enc_cache_flush_required	Returns true if a cache flush is needed before changing page encryption status
+ * @enc_kexec_begin		Begin the two-step process of converting shared memory back
+ *				to private. It stops the new conversions from being started
+ *				and waits in-flight conversions to finish, if possible.
+ *				The @crash parameter denotes whether the function is being
+ *				called in the crash shutdown path.
+ * @enc_kexec_finish		Finish the two-step process of converting shared memory to
+ *				private. All memory is private after the call when
+ *				the function returns.
+ *				It is called on only one CPU while the others are shut down
+ *				and with interrupts disabled.
  */
 struct x86_guest {
 	int (*enc_status_change_prepare)(unsigned long vaddr, int npages, bool enc);
 	int (*enc_status_change_finish)(unsigned long vaddr, int npages, bool enc);
 	bool (*enc_tlb_flush_required)(bool enc);
 	bool (*enc_cache_flush_required)(void);
+	void (*enc_kexec_begin)(bool crash);
+	void (*enc_kexec_finish)(void);
 };
 
 /**
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index f06501445cd9..fc52ea80cdc8 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -128,6 +128,18 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
 #ifdef CONFIG_HPET_TIMER
 	hpet_disable();
 #endif
+
+	/*
+	 * Non-crash kexec calls enc_kexec_begin() while scheduling is still
+	 * active. This allows the callback to wait until all in-flight
+	 * shared<->private conversions are complete. In a crash scenario,
+	 * enc_kexec_begin() gets called after all but one CPU have been shut
+	 * down and interrupts have been disabled. This allows the callback to
+	 * detect a race with the conversion and report it.
+	 */
+	x86_platform.guest.enc_kexec_begin(true);
+	x86_platform.guest.enc_kexec_finish();
+
 	crash_save_cpu(regs, safe_smp_processor_id());
 }
 
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index f3130f762784..097313147ad3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/objtool.h>
 #include <linux/pgtable.h>
+#include <linux/kexec.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
@@ -716,6 +717,14 @@ static void native_machine_emergency_restart(void)
 
 void native_machine_shutdown(void)
 {
+	/*
+	 * Call enc_kexec_begin() while all CPUs are still active and
+	 * interrupts are enabled. This will allow all in-flight memory
+	 * conversions to finish cleanly.
+	 */
+	if (kexec_in_progress)
+		x86_platform.guest.enc_kexec_begin(false);
+
 	/* Stop the cpus and apics */
 #ifdef CONFIG_X86_IO_APIC
 	/*
@@ -752,6 +761,9 @@ void native_machine_shutdown(void)
 #ifdef CONFIG_X86_64
 	x86_platform.iommu_shutdown();
 #endif
+
+	if (kexec_in_progress)
+		x86_platform.guest.enc_kexec_finish();
 }
 
 static void __machine_emergency_restart(int emergency)
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index a7143bb7dd93..8a79fb505303 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -138,6 +138,8 @@ static int enc_status_change_prepare_noop(unsigned long vaddr, int npages, bool
 static int enc_status_change_finish_noop(unsigned long vaddr, int npages, bool enc) { return 0; }
 static bool enc_tlb_flush_required_noop(bool enc) { return false; }
 static bool enc_cache_flush_required_noop(void) { return false; }
+static void enc_kexec_begin_noop(bool crash) {}
+static void enc_kexec_finish_noop(void) {}
 static bool is_private_mmio_noop(u64 addr) {return false; }
 
 struct x86_platform_ops x86_platform __ro_after_init = {
@@ -161,6 +163,8 @@ struct x86_platform_ops x86_platform __ro_after_init = {
 		.enc_status_change_finish  = enc_status_change_finish_noop,
 		.enc_tlb_flush_required	   = enc_tlb_flush_required_noop,
 		.enc_cache_flush_required  = enc_cache_flush_required_noop,
+		.enc_kexec_begin	   = enc_kexec_begin_noop,
+		.enc_kexec_finish	   = enc_kexec_finish_noop,
 	},
 };
 
-- 
2.43.0


  parent reply	other threads:[~2024-06-02 12:44 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-28  9:55 [PATCHv11 00/19] x86/tdx: Add kexec support Kirill A. Shutemov
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     ` Kirill A. Shutemov [this message]
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

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=20240602124403.2122693-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=ltao@redhat.com \
    --cc=mingo@redhat.com \
    --cc=nik.borisov@suse.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