Switch X86_FEATURE_XENPV to cpu_feature_enabled() use
Subsystems (4)
cover Switch X86_FEATURE_XENPV to cpu_feature_enabled() use
Make especially kernels without CONFIG_XEN_PV more efficient by using cpu_feature_enabled(X86_FEATURE_XENPV) instead of boot_cpu_has() and friends.
Juergen Gross (4):
x86: add X86_FEATURE_XENPV to disabled-features.h
x86: remove unneeded 64-bit dependency in arch_enter_from_user_mode()
x86: drop 32-bit Xen PV guest code in update_task_stack()
x86: switch to cpu_feature_enabled() for X86_FEATURE_XENPV
arch/x86/include/asm/disabled-features.h | 8 +++++++- arch/x86/include/asm/entry-common.h | 4 ++-- arch/x86/include/asm/switch_to.h | 7 ++----- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/hygon.c | 2 +- arch/x86/kernel/process_64.c | 4 ++-- arch/x86/kernel/topology.c | 2 +- arch/x86/mm/cpu_entry_area.c | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/4 x86: add X86_FEATURE_XENPV to disabled-features.h
Add X86_FEATURE_XENPV to the features handled specially in disabled-features.h.
--- arch/x86/include/asm/disabled-features.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/include/asm/disabled-features.h +7 -1
@@ -81,6 +81,12 @@# define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31))#endif +#ifdef CONFIG_XEN_PV +# define DISABLE_XENPV 0 +#else +# define DISABLE_XENPV (1 << (X86_FEATURE_XENPV & 31)) +#endif +#ifdef CONFIG_INTEL_TDX_GUEST # define DISABLE_TDX_GUEST 0#else
@@ -98,7 +104,7 @@#define DISABLED_MASK5 0#define DISABLED_MASK6 0#define DISABLED_MASK7 (DISABLE_PTI) -#define DISABLED_MASK8 (DISABLE_TDX_GUEST) +#define DISABLED_MASK8 (DISABLE_XENPV|DISABLE_TDX_GUEST)#define DISABLED_MASK9 (DISABLE_SGX)#define DISABLED_MASK10 0#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET)
Signature · 1 line
2.35.3
PATCH 2/4 x86: remove unneeded 64-bit dependency in arch_enter_from_user_mode()
In reply to Juergen GrossThe check for 64-bit mode when testing X86_FEATURE_XENPV isn't needed, as Xen PV guests are no longer supported in 32-bit mode.
While at it switch from boot_cpu_has() to cpu_feature_enabled().
--- arch/x86/include/asm/entry-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/entry-common.h +2 -2
@@ -24,8 +24,8 @@ static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs)/* * For !SMAP hardware we patch out CLAC on entry. */ -if (boot_cpu_has (X86_FEATURE_SMAP ) || - (IS_ENABLED (CONFIG_64BIT ) &&boot_cpu_has (X86_FEATURE_XENPV ))) +if (cpu_feature_enabled (X86_FEATURE_SMAP ) || +cpu_feature_enabled (X86_FEATURE_XENPV )) mask |=X86_EFLAGS_AC ;WARN_ON_ONCE (flags & mask);
Signature · 1 line
2.35.3
PATCH 3/4 x86: drop 32-bit Xen PV guest code in update_task_stack()
In reply to Juergen GrossTesting for Xen PV guest mode in a 32-bit only code section can be dropped, as Xen PV guests are supported in 64-bit mode only.
While at it switch from boot_cpu_has() to cpu_feature_enabled() in the 64-bit part of the code.
--- arch/x86/include/asm/switch_to.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/include/asm/switch_to.h +2 -5
@@ -66,13 +66,10 @@ static inline void update_task_stack(struct task_struct *task) {/* sp0 always points to the entry trampoline stack, which is constant: */ #ifdef CONFIG_X86_32 -if (static_cpu_has (X86_FEATURE_XENPV )) -load_sp0 (task->thread.sp0); -else -this_cpu_write (cpu_tss_rw.x86_tss.sp1, task->thread.sp0); +this_cpu_write (cpu_tss_rw.x86_tss.sp1, task->thread.sp0);#else /* Xen PV enters the kernel on the thread stack. */ -if (static_cpu_has (X86_FEATURE_XENPV )) +if (cpu_feature_enabled (X86_FEATURE_XENPV ))load_sp0 (task_top_of_stack (task));#endif }
Signature · 1 line
2.35.3
PATCH 4/4 x86: switch to cpu_feature_enabled() for X86_FEATURE_XENPV
In reply to Juergen GrossConvert the remaining cases of static_cpu_has(X86_FEATURE_XENPV) and boot_cpu_has(X86_FEATURE_XENPV) to use cpu_feature_enabled(), allowing more efficient code in case the kernel is configured without CONFIG_XEN_PV.
--- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/hygon.c | 2 +- arch/x86/kernel/process_64.c | 4 ++-- arch/x86/kernel/topology.c | 2 +- arch/x86/mm/cpu_entry_area.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -985,7 +985,7 @@ static void init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_3DNOWPREFETCH );/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );/*
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -1302,7 +1302,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)return SPECTRE_V2_CMD_AUTO ; } -if (cmd ==SPECTRE_V2_CMD_IBRS &&boot_cpu_has (X86_FEATURE_XENPV )) { +if (cmd ==SPECTRE_V2_CMD_IBRS &&cpu_feature_enabled (X86_FEATURE_XENPV )) {pr_err ("%s selected but running as XenPV guest. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ;
arch/x86/kernel/cpu/hygon.c +1 -1
@@ -339,7 +339,7 @@ static void init_hygon(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_ARAT );/* Hygon CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );check_null_seg_clears_base (c);
arch/x86/kernel/process_64.c +2 -2
@@ -165,7 +165,7 @@ static noinstr unsigned long __rdgsbase_inactive(void)lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs (); gsbase =rdgsbase ();native_swapgs ();
@@ -190,7 +190,7 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase) {lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs ();wrgsbase (gsbase);native_swapgs ();
arch/x86/kernel/topology.c +1 -1
@@ -106,7 +106,7 @@ int arch_register_cpu(int num)* Xen PV guests don't support CPU0 hotplug at all. */ if (c->x86_vendor !=X86_VENDOR_INTEL || -boot_cpu_has (X86_FEATURE_XENPV )) +cpu_feature_enabled (X86_FEATURE_XENPV )) cpu0_hotpluggable =0 ;/*
arch/x86/mm/cpu_entry_area.c +1 -1
@@ -147,7 +147,7 @@ static void __init setup_cpu_entry_area(unsigned int cpu)* On Xen PV, the GDT must be read-only because the hypervisor * requires it. */ -pgprot_t gdt_prot =boot_cpu_has (X86_FEATURE_XENPV ) ? +pgprot_t gdt_prot =cpu_feature_enabled (X86_FEATURE_XENPV ) ?PAGE_KERNEL_RO :PAGE_KERNEL ;pgprot_t tss_prot =PAGE_KERNEL ;#endif
Signature · 1 line
2.35.3
Re: [PATCH 4/4] x86: switch to cpu_feature_enabled() for X86_FEATURE_XENPV
Quoted 95 lines · Juergen Gross
Convert the remaining cases of
static_cpu_has(X86_FEATURE_XENPV)andboot_cpu_has(X86_FEATURE_XENPV)to usecpu_feature_enabled(), allowing more efficient code in case the kernel is configured withoutCONFIG_XEN_PV.Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/hygon.c | 2 +- arch/x86/kernel/process_64.c | 4 ++-- arch/x86/kernel/topology.c | 2 +- arch/x86/mm/cpu_entry_area.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)arch/x86/kernel/cpu/amd.c +1
-1@@ -985,7 +985,7 @@ static void init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_3DNOWPREFETCH );/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );/* arch/x86/kernel/cpu/bugs.c +1
-1@@ -1302,7 +1302,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)return SPECTRE_V2_CMD_AUTO ; } -if (cmd ==SPECTRE_V2_CMD_IBRS &&boot_cpu_has (X86_FEATURE_XENPV )) { +if (cmd ==SPECTRE_V2_CMD_IBRS &&cpu_feature_enabled (X86_FEATURE_XENPV )) {pr_err ("%s selected but running as XenPV guest. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ;arch/x86/kernel/cpu/hygon.c +1
-1@@ -339,7 +339,7 @@ static void init_hygon(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_ARAT );/* Hygon CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );check_null_seg_clears_base (c);arch/x86/kernel/process_64.c +2
-2@@ -165,7 +165,7 @@ static noinstr unsigned long __rdgsbase_inactive(void)lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs (); gsbase =rdgsbase ();native_swapgs ();@@ -190,7 +190,7 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase) {lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs ();wrgsbase (gsbase);native_swapgs ();arch/x86/kernel/topology.c +1
-1@@ -106,7 +106,7 @@ int arch_register_cpu(int num)* Xen PV guests don't support CPU0 hotplug at all. */ if (c->x86_vendor !=X86_VENDOR_INTEL || -boot_cpu_has (X86_FEATURE_XENPV )) +cpu_feature_enabled (X86_FEATURE_XENPV )) cpu0_hotpluggable =0 ;/* arch/x86/mm/cpu_entry_area.c +0
-0
arch/x86/mm/cpu_entry_area.c static void __init setup_cpu_entry_area(unsigned int cpu) · line 153
Quoted 8 lines
arch/x86/mm/cpu_entry_area.c +1
-1@@ -147,7 +147,7 @@ static void __init setup_cpu_entry_area(unsigned int cpu)* On Xen PV, the GDT must be read-only because the hypervisor * requires it. */ -pgprot_t gdt_prot =boot_cpu_has (X86_FEATURE_XENPV ) ? +pgprot_t gdt_prot =cpu_feature_enabled (X86_FEATURE_XENPV ) ?PAGE_KERNEL_RO :PAGE_KERNEL ;pgprot_t tss_prot =PAGE_KERNEL ;#endif
This is another case that can be removed because it's for 32-bit.
--
Brian Gerst
Re: [PATCH 4/4] x86: switch to cpu_feature_enabled() for X86_FEATURE_XENPV
Quoted 90 lines · Brian Gerst
Quoted 89 lines · Juergen Gross
Convert the remaining cases of
static_cpu_has(X86_FEATURE_XENPV)andboot_cpu_has(X86_FEATURE_XENPV)to usecpu_feature_enabled(), allowing more efficient code in case the kernel is configured withoutCONFIG_XEN_PV.Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/hygon.c | 2 +- arch/x86/kernel/process_64.c | 4 ++-- arch/x86/kernel/topology.c | 2 +- arch/x86/mm/cpu_entry_area.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)arch/x86/kernel/cpu/amd.c +1
-1@@ -985,7 +985,7 @@ static void init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_3DNOWPREFETCH );/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );/* arch/x86/kernel/cpu/bugs.c +1
-1@@ -1302,7 +1302,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)return SPECTRE_V2_CMD_AUTO ; } -if (cmd ==SPECTRE_V2_CMD_IBRS &&boot_cpu_has (X86_FEATURE_XENPV )) { +if (cmd ==SPECTRE_V2_CMD_IBRS &&cpu_feature_enabled (X86_FEATURE_XENPV )) {pr_err ("%s selected but running as XenPV guest. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ;arch/x86/kernel/cpu/hygon.c +1
-1@@ -339,7 +339,7 @@ static void init_hygon(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_ARAT );/* Hygon CPUs don't reset SS attributes on SYSRET, Xen does. */ -if (!cpu_has (c,X86_FEATURE_XENPV )) +if (!cpu_feature_enabled (X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS );check_null_seg_clears_base (c);arch/x86/kernel/process_64.c +2
-2@@ -165,7 +165,7 @@ static noinstr unsigned long __rdgsbase_inactive(void)lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs (); gsbase =rdgsbase ();native_swapgs ();@@ -190,7 +190,7 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase) {lockdep_assert_irqs_disabled (); -if (!static_cpu_has (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs ();wrgsbase (gsbase);native_swapgs ();arch/x86/kernel/topology.c +1
-1@@ -106,7 +106,7 @@ int arch_register_cpu(int num)* Xen PV guests don't support CPU0 hotplug at all. */ if (c->x86_vendor !=X86_VENDOR_INTEL || -boot_cpu_has (X86_FEATURE_XENPV )) +cpu_feature_enabled (X86_FEATURE_XENPV )) cpu0_hotpluggable =0 ;
Quoted 16 lines
Quoted 6 lines
arch/x86/kernel/topology.c +0
-0/* arch/x86/mm/cpu_entry_area.c +0
-0arch/x86/mm/cpu_entry_area.c static void __init setup_cpu_entry_area(unsigned int cpu) · line 153
Quoted 8 lines
arch/x86/mm/cpu_entry_area.c +1
-1@@ -147,7 +147,7 @@ static void __init setup_cpu_entry_area(unsigned int cpu)* On Xen PV, the GDT must be read-only because the hypervisor * requires it. */ -pgprot_t gdt_prot =boot_cpu_has (X86_FEATURE_XENPV ) ? +pgprot_t gdt_prot =cpu_feature_enabled (X86_FEATURE_XENPV ) ?PAGE_KERNEL_RO :PAGE_KERNEL ;pgprot_t tss_prot =PAGE_KERNEL ;#endif This is another case that can be removed because it's for 32-bit.
Oh yes, indeed. Thanks for noticing.
Juergen