Skip to contentSkip to conversation

x86/boot: skip realmode init code when running as Xen PV guest

PATCH Applied Juergen Gross 3 participants 6 messages Nov 23, 2022 – Nov 25, 2022

Subsystems (2)
lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH v3 1/1 x86/boot: skip realmode init code when running as Xen PV guest

When running as a Xen PV guest there is no need for setting up the realmode trampoline, as realmode isn't supported in this environment.

Trying to setup the trampoline has been proven to be problematic in some cases, especially when trying to debug early boot problems with Xen requiring to keep the EFI boot-services memory mapped (some firmware variants seem to claim basically all memory below 1M for boot services).

Introduce new x86_platform_ops operations for that purpose, which can be set to a nop by the Xen PV specific kernel boot code.

Fixes 084ee1c641a0 ("x86, realmode: Relocator for realmode code")

---
V3:
- and yet another approach (H. Peter Anvin)

---
 arch/x86/include/asm/realmode.h | 1 +
 arch/x86/include/asm/x86_init.h | 4 ++++
 arch/x86/kernel/setup.c         | 2 +-
 arch/x86/kernel/x86_init.c      | 3 +++
 arch/x86/realmode/init.c        | 8 ++++++--
 arch/x86/xen/enlighten_pv.c     | 2 ++
 6 files changed, 17 insertions(+), 3 deletions(-)
arch/x86/include/asm/realmode.h +1 -0
index fd6f6e5b755a..a336feef0af1 100644
@@ -91,6 +91,7 @@ static inline void set_real_mode_mem(phys_addr_t mem)
 
 void reserve_real_mode(void);
 void load_trampoline_pgtable(void);
+void init_real_mode(void);
 
 #endif /* __ASSEMBLY__ */
 
arch/x86/include/asm/x86_init.h +4 -0
index e9170457697e..c1c8c581759d 100644
@@ -285,6 +285,8 @@ struct x86_hyper_runtime {
  * 				possible in x86_early_init_platform_quirks() by
  * 				only using the current x86_hardware_subarch
  * 				semantics.
+ * @realmode_reserve:		reserve memory for realmode trampoline
+ * @realmode_init:		initialize realmode trampoline
  * @hyper:			x86 hypervisor specific runtime callbacks
  */
 struct x86_platform_ops {
@@ -301,6 +303,8 @@ struct x86_platform_ops {
 	void (*apic_post_init)(void);
 	struct x86_legacy_features legacy;
 	void (*set_legacy_features)(void);
+	void (*realmode_reserve)(void);
+	void (*realmode_init)(void);
 	struct x86_hyper_runtime hyper;
 	struct x86_guest guest;
 };
arch/x86/kernel/setup.c +1 -1
index 216fee7144ee..892609cde4a2 100644
@@ -1175,7 +1175,7 @@ void __init setup_arch(char **cmdline_p)
 	 * Moreover, on machines with SandyBridge graphics or in setups that use
 	 * crashkernel the entire 1M is reserved anyway.
 	 */
-	reserve_real_mode();
+	x86_platform.realmode_reserve();
 
 	init_mem_mapping();
 
arch/x86/kernel/x86_init.c +3 -0
index 57353519bc11..ef80d361b463 100644
@@ -25,6 +25,7 @@
 #include <asm/iommu.h>
 #include <asm/mach_traps.h>
 #include <asm/irqdomain.h>
+#include <asm/realmode.h>
 
 void x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
@@ -145,6 +146,8 @@ struct x86_platform_ops x86_platform __ro_after_init = {
 	.get_nmi_reason			= default_get_nmi_reason,
 	.save_sched_clock_state		= tsc_save_sched_clock_state,
 	.restore_sched_clock_state	= tsc_restore_sched_clock_state,
+	.realmode_reserve		= reserve_real_mode,
+	.realmode_init			= init_real_mode,
 	.hyper.pin_vcpu			= x86_op_int_noop,
 
 	.guest = {
arch/x86/realmode/init.c +6 -2
index 41d7669a97ad..247aca9f8ed1 100644
@@ -200,14 +200,18 @@ static void __init set_real_mode_permissions(void)
 	set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
 }
 
-static int __init init_real_mode(void)
+void __init init_real_mode(void)
 {
 	if (!real_mode_header)
 		panic("Real mode trampoline was not allocated");
 
 	setup_real_mode();
 	set_real_mode_permissions();
+}
 
+static int __init call_init_real_mode(void)
+{
+	x86_platform.realmode_init();
 	return 0;
 }
-early_initcall(init_real_mode);
+early_initcall(call_init_real_mode);
arch/x86/xen/enlighten_pv.c +2 -0
index 038da45f057a..8944726255c9 100644
@@ -1266,6 +1266,8 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si)
 	xen_vcpu_info_reset(0);
 
 	x86_platform.get_nmi_reason = xen_get_nmi_reason;
+	x86_platform.realmode_reserve = x86_init_noop;
+	x86_platform.realmode_init = x86_init_noop;
 
 	x86_init.resources.memory_setup = xen_memory_setup;
 	x86_init.irqs.intr_mode_select	= x86_init_noop;
Signature · 1 line
2.35.3
maintainer
#1 lore raw
Quoted 9 lines · Juergen Gross

When running as a Xen PV guest there is no need for setting up the realmode trampoline, as realmode isn't supported in this environment.

Trying to setup the trampoline has been proven to be problematic in some cases, especially when trying to debug early boot problems with Xen requiring to keep the EFI boot-services memory mapped (some firmware variants seem to claim basically all memory below 1M for boot services).

Quoted 4 lines

Introduce new x86_platform_ops operations for that purpose, which can be set to a nop by the Xen PV specific kernel boot code.

Fixes 084ee1c641a0 ("x86, realmode: Relocator for realmode code")

This text and Fixes: tag sounds like this needs to go to Linus and stable now?

Quoted 15 lines
arch/x86/realmode/init.c +1 -1
index 41d7669a97ad..247aca9f8ed1 100644
@@ -200,14 +200,18 @@ static void __init set_real_mode_permissions(void)
 	set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
 }
 
-static int __init init_real_mode(void)
+void __init init_real_mode(void)
 {
 	if (!real_mode_header)
 		panic("Real mode trampoline was not allocated");
 
 	setup_real_mode();

arch/x86/realmode/init.c static void __init set_real_mode_permissions(void) · line 217

Quoted 10 lines
arch/x86/realmode/init.c +5 -1
 	set_real_mode_permissions();
+}
 
+static int __init call_init_real_mode(void)
+{
+	x86_platform.realmode_init();
 	return 0;
 }
-early_initcall(init_real_mode);
+early_initcall(call_init_real_mode);

I'll name that one "do_init_real_mode" as "call init" sounds weird.

Otherwise, it is as straightforward as it gets.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
author maintainer
#2 lore raw
Quoted 10 lines · Borislav Petkov
Quoted 9 lines · Juergen Gross

When running as a Xen PV guest there is no need for setting up the realmode trampoline, as realmode isn't supported in this environment.

Trying to setup the trampoline has been proven to be problematic in some cases, especially when trying to debug early boot problems with Xen requiring to keep the EFI boot-services memory mapped (some firmware variants seem to claim basically all memory below 1M for boot services).

Quoted 7 lines
Quoted 4 lines

Introduce new x86_platform_ops operations for that purpose, which can be set to a nop by the Xen PV specific kernel boot code.

Fixes 084ee1c641a0 ("x86, realmode: Relocator for realmode code")

This text and Fixes: tag sounds like this needs to go to Linus and stable now?

Looking at the date when 084ee1c641a0 went in I don't think it _needs_ to go in now, but I wouldn't complain ...

Quoted 19 lines
Quoted 19 lines
arch/x86/realmode/init.c +2 -1
index 41d7669a97ad..247aca9f8ed1 100644
@@ -200,14 +200,18 @@ static void __init set_real_mode_permissions(void)
  	set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
  }
 
-static int __init init_real_mode(void)
+void __init init_real_mode(void)
  {
  	if (!real_mode_header)
  		panic("Real mode trampoline was not allocated");
 
  	setup_real_mode();
  	set_real_mode_permissions();
+}
 
Quoted 9 lines

arch/x86/realmode/init.c static void __init set_real_mode_permissions(void) · line 217

Quoted 7 lines
arch/x86/realmode/init.c +4 -1
+static int __init call_init_real_mode(void)
+{
+	x86_platform.realmode_init();
  	return 0;
  }
-early_initcall(init_real_mode);
+early_initcall(call_init_real_mode);

I'll name that one "do_init_real_mode" as "call init" sounds weird.

Fine with me.

Quoted 2 lines

Otherwise, it is as straightforward as it gets.

Thanks,

Juergen

maintainer
#3 lore raw
Quoted 2 lines · Juergen Gross

Looking at the date when 084ee1c641a0 went in I don't think it _needs_ to go in now, but I wouldn't complain ...

So if you don't have a particular and specific reason, I won't queue it for stable at all.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
author maintainer
#4 lore raw
Quoted 7 lines · Borislav Petkov
Quoted 2 lines · Juergen Gross

Looking at the date when 084ee1c641a0 went in I don't think it _needs_ to go in now, but I wouldn't complain ...

So if you don't have a particular and specific reason, I won't queue it for stable at all.

Yes, I think this is fine.

Juergen

merge bot Applied
#5 lore raw

[tip: x86/boot] x86/boot: Skip realmode init code when running as Xen PV guest

In reply to Juergen Gross
The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     f1e525009493cbd569e7c8dd7d58157855f8658d
Gitweb:        https://git.kernel.org/tip/f1e525009493cbd569e7c8dd7d58157855f8658d
Author:        Juergen Gross <[email protected]>
AuthorDate:    Wed, 23 Nov 2022 12:45:23 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Fri, 25 Nov 2022 12:05:22 +01:00

x86/boot: Skip realmode init code when running as Xen PV guest

When running as a Xen PV guest there is no need for setting up the realmode trampoline, as realmode isn't supported in this environment.

Trying to setup the trampoline has been proven to be problematic in some cases, especially when trying to debug early boot problems with Xen requiring to keep the EFI boot-services memory mapped (some firmware variants seem to claim basically all memory below 1Mb for boot services).

Introduce new x86_platform_ops operations for that purpose, which can be set to a NOP by the Xen PV specific kernel boot code.

[ bp: s/call_init_real_mode/do_init_real_mode/ ]

Fixes 084ee1c641a0 ("x86, realmode: Relocator for realmode code")
---
 arch/x86/include/asm/realmode.h | 1 +
 arch/x86/include/asm/x86_init.h | 4 ++++
 arch/x86/kernel/setup.c         | 2 +-
 arch/x86/kernel/x86_init.c      | 3 +++
 arch/x86/realmode/init.c        | 8 ++++++--
 arch/x86/xen/enlighten_pv.c     | 2 ++
 6 files changed, 17 insertions(+), 3 deletions(-)
arch/x86/include/asm/realmode.h +1 -0
index fd6f6e5..a336fee 100644
@@ -91,6 +91,7 @@ static inline void set_real_mode_mem(phys_addr_t mem)
 
 void reserve_real_mode(void);
 void load_trampoline_pgtable(void);
+void init_real_mode(void);
 
 #endif /* __ASSEMBLY__ */
 
arch/x86/include/asm/x86_init.h +4 -0
index e917045..c1c8c58 100644
@@ -285,6 +285,8 @@ struct x86_hyper_runtime {
  * 				possible in x86_early_init_platform_quirks() by
  * 				only using the current x86_hardware_subarch
  * 				semantics.
+ * @realmode_reserve:		reserve memory for realmode trampoline
+ * @realmode_init:		initialize realmode trampoline
  * @hyper:			x86 hypervisor specific runtime callbacks
  */
 struct x86_platform_ops {
@@ -301,6 +303,8 @@ struct x86_platform_ops {
 	void (*apic_post_init)(void);
 	struct x86_legacy_features legacy;
 	void (*set_legacy_features)(void);
+	void (*realmode_reserve)(void);
+	void (*realmode_init)(void);
 	struct x86_hyper_runtime hyper;
 	struct x86_guest guest;
 };
arch/x86/kernel/setup.c +1 -1
index 216fee7..892609c 100644
@@ -1175,7 +1175,7 @@ void __init setup_arch(char **cmdline_p)
 	 * Moreover, on machines with SandyBridge graphics or in setups that use
 	 * crashkernel the entire 1M is reserved anyway.
 	 */
-	reserve_real_mode();
+	x86_platform.realmode_reserve();
 
 	init_mem_mapping();
 
arch/x86/kernel/x86_init.c +3 -0
index 5735351..ef80d36 100644
@@ -25,6 +25,7 @@
 #include <asm/iommu.h>
 #include <asm/mach_traps.h>
 #include <asm/irqdomain.h>
+#include <asm/realmode.h>
 
 void x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
@@ -145,6 +146,8 @@ struct x86_platform_ops x86_platform __ro_after_init = {
 	.get_nmi_reason			= default_get_nmi_reason,
 	.save_sched_clock_state		= tsc_save_sched_clock_state,
 	.restore_sched_clock_state	= tsc_restore_sched_clock_state,
+	.realmode_reserve		= reserve_real_mode,
+	.realmode_init			= init_real_mode,
 	.hyper.pin_vcpu			= x86_op_int_noop,
 
 	.guest = {
arch/x86/realmode/init.c +6 -2
index 41d7669..af56581 100644
@@ -200,14 +200,18 @@ static void __init set_real_mode_permissions(void)
 	set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
 }
 
-static int __init init_real_mode(void)
+void __init init_real_mode(void)
 {
 	if (!real_mode_header)
 		panic("Real mode trampoline was not allocated");
 
 	setup_real_mode();
 	set_real_mode_permissions();
+}
 
+static int __init do_init_real_mode(void)
+{
+	x86_platform.realmode_init();
 	return 0;
 }
-early_initcall(init_real_mode);
+early_initcall(do_init_real_mode);
arch/x86/xen/enlighten_pv.c +2 -0
index 038da45..8944726 100644
@@ -1266,6 +1266,8 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si)
 	xen_vcpu_info_reset(0);
 
 	x86_platform.get_nmi_reason = xen_get_nmi_reason;
+	x86_platform.realmode_reserve = x86_init_noop;
+	x86_platform.realmode_init = x86_init_noop;
 
 	x86_init.resources.memory_setup = xen_memory_setup;
 	x86_init.irqs.intr_mode_select	= x86_init_noop;