Support for SEV-ES guest shadow stack
v3 cover Support for SEV-ES guest shadow stack
For shadow stack support in SVM when using SEV-ES, the guest kernel needs to save XSS to the GHCB in order for the hypervisor to determine the XSAVES save area size.
This series can be applied independently of the hypervisor series in order to support non-KVM hypervisors.
---
v3:
- Only CPUID.0xD.1 consumes XSS. Limit including XSS in GHCB for this case.
v2:
- Update changelog for patch 2/2
John Allen (2):
x86/boot: Move boot_*msr helpers to asm/shared/msr.h x86/sev-es: Include XSS value in GHCB CPUID request
arch/x86/boot/compressed/sev.c | 7 ++++--- arch/x86/boot/compressed/sev.h | 6 +++--- arch/x86/boot/cpucheck.c | 16 ++++++++-------- arch/x86/boot/msr.h | 26 -------------------------- arch/x86/coco/sev/vc-shared.c | 11 +++++++++++ arch/x86/include/asm/shared/msr.h | 15 +++++++++++++++ arch/x86/include/asm/svm.h | 1 + 7 files changed, 42 insertions(+), 40 deletions(-) delete mode 100644 arch/x86/boot/msr.h
Signature · 1 line
2.47.3
PATCH v3 1/2 x86/boot: Move boot_*msr helpers to asm/shared/msr.h
The boot_rdmsr and boot_wrmsr helpers used to reduce the need for inline assembly in the boot kernel can also be useful in code shared by boot and run-time kernel code. Move these helpers to asm/shared/msr.h and rename to raw_rdmsr and raw_wrmsr to indicate that these may also be used outside of the boot kernel.
--- arch/x86/boot/compressed/sev.c | 7 ++++--- arch/x86/boot/compressed/sev.h | 6 +++--- arch/x86/boot/cpucheck.c | 16 ++++++++-------- arch/x86/boot/msr.h | 26 -------------------------- arch/x86/include/asm/shared/msr.h | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 40 deletions(-) delete mode 100644 arch/x86/boot/msr.h
arch/x86/boot/compressed/sev.c +4 -3
@@ -14,6 +14,7 @@#include <asm/bootparam.h> #include <asm/pgtable_types.h> +#include <asm/shared/msr.h> #include <asm/sev.h> #include <asm/trapnr.h> #include <asm/trap_pf.h>
@@ -436,7 +437,7 @@ void sev_enable(struct boot_params *bp) }/* Set the SME mask if this is an SEV guest. */ -boot_rdmsr (MSR_AMD64_SEV , &m); +raw_rdmsr (MSR_AMD64_SEV , &m); sev_status = m.q;if (!(sev_status &MSR_AMD64_SEV_ENABLED ))return ;
@@ -499,7 +500,7 @@ u64 sev_get_status(void)if (sev_check_cpu_support () <0 )return 0 ; -boot_rdmsr (MSR_AMD64_SEV , &m); +raw_rdmsr (MSR_AMD64_SEV , &m);return m.q; }
@@ -549,7 +550,7 @@ bool early_is_sevsnp_guest(void)struct msr m;/* Obtain the address of the calling area to use */ -boot_rdmsr (MSR_SVSM_CAA , &m); +raw_rdmsr (MSR_SVSM_CAA , &m); boot_svsm_caa = (void *)m.q; boot_svsm_caa_pa = m.q;
arch/x86/boot/compressed/sev.h +3 -3
@@ -10,7 +10,7 @@#ifdef CONFIG_AMD_MEM_ENCRYPT -#include "../msr.h" +#include "asm/shared/msr.h" void snp_accept_memory (phys_addr_t start,phys_addr_t end);u64 sev_get_status (void );
@@ -20,7 +20,7 @@ static inline u64 sev_es_rd_ghcb_msr(void) {struct msr m; -boot_rdmsr (MSR_AMD64_SEV_ES_GHCB , &m); +raw_rdmsr (MSR_AMD64_SEV_ES_GHCB , &m);return m.q; }
@@ -30,7 +30,7 @@ static inline void sev_es_wr_ghcb_msr(u64 val)struct msr m; m.q = val; - boot_wrmsr(MSR_AMD64_SEV_ES_GHCB, &m); + raw_wrmsr(MSR_AMD64_SEV_ES_GHCB, &m); }#else
arch/x86/boot/cpucheck.c +8 -8
@@ -26,9 +26,9 @@#include <asm/intel-family.h> #include <asm/processor-flags.h> #include <asm/msr-index.h> +#include <asm/shared/msr.h> #include "string.h" -#include "msr.h" static u32 err_flags[NCAPINTS ];
@@ -134,9 +134,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m; -boot_rdmsr (MSR_K7_HWCR , &m); +raw_rdmsr (MSR_K7_HWCR , &m); m.l &= ~(1 <<15 ); -boot_wrmsr (MSR_K7_HWCR , &m); +raw_wrmsr (MSR_K7_HWCR , &m);get_cpuflags ();/* Make sure it really did something */ err =check_cpuflags ();
@@ -148,9 +148,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m; -boot_rdmsr (MSR_VIA_FCR , &m); +raw_rdmsr (MSR_VIA_FCR , &m); m.l |= (1 <<1 ) | (1 <<7 ); -boot_wrmsr (MSR_VIA_FCR , &m); +raw_wrmsr (MSR_VIA_FCR , &m);set_bit (X86_FEATURE_CX8 , cpu.flags); err =check_cpuflags ();
@@ -160,14 +160,14 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m, m_tmp;u32 level =1 ; -boot_rdmsr (0x80860004 , &m); +raw_rdmsr (0x80860004 , &m); m_tmp = m; m_tmp.l = ~0 ; -boot_wrmsr (0x80860004 , &m_tmp); +raw_wrmsr (0x80860004 , &m_tmp); asm("cpuid" :"+a" (level),"=d" (cpu.flags[0 ]) : :"ecx" ,"ebx" ); -boot_wrmsr (0x80860004 , &m); +raw_wrmsr (0x80860004 , &m); err =check_cpuflags (); } else if (err == 0x01 &&
arch/x86/boot/msr.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Helpers/definitions related to MSR access. -*/ - -#ifndef BOOT_MSR_H -#define BOOT_MSR_H - -#include <asm/shared/msr.h> - -/* -* The kernel proper already defines rdmsr()/wrmsr(), but they are not for the -* boot kernel since they rely on tracepoint/exception handling infrastructure -* that's not available here. -*/ -static inline void boot_rdmsr (unsigned int reg,struct msr *m) -{ - asmvolatile ("rdmsr" :"=a" (m->l),"=d" (m->h) :"c" (reg)); -} - -static inline void boot_wrmsr (unsigned int reg,const struct msr *m) -{ - asmvolatile ("wrmsr" : :"c" (reg),"a" (m->l),"d" (m->h) :"memory" ); -} - -#endif /* BOOT_MSR_H */
arch/x86/include/asm/shared/msr.h +15 -0
@@ -12,4 +12,19 @@ struct msr { }; }; +/* +* The kernel proper already defines rdmsr()/wrmsr(), but they are not for the +* boot kernel since they rely on tracepoint/exception handling infrastructure +* that's not available here. +*/ +static inline void raw_rdmsr (unsigned int reg,struct msr *m) +{ + asmvolatile ("rdmsr" :"=a" (m->l),"=d" (m->h) :"c" (reg)); +} + +static inline void raw_wrmsr (unsigned int reg,const struct msr *m) +{ + asmvolatile ("wrmsr" : :"c" (reg),"a" (m->l),"d" (m->h) :"memory" ); +} +#endif /* _ASM_X86_SHARED_MSR_H */
Signature · 1 line
2.47.3
[tip: x86/sev] x86/boot: Move boot_*msr helpers to asm/shared/msr.h
The following commit has been merged into the x86/sev branch of tip:
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: 9249bcdea0c6db4f450a9267aa6da5b4dd4153ca Gitweb: https://git.kernel.org/tip/9249bcdea0c6db4f450a9267aa6da5b4dd4153ca Author: John Allen <[email protected]> AuthorDate: Wed, 24 Sep 2025 20:08:51 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 30 Oct 2025 16:29:53 +01:00
x86/boot: Move boot_*msr helpers to asm/shared/msr.h
The boot_{rdmsr,wrmsr}() helpers are *just* the barebones MSR access functionality, without any tracing or exception handling glue as it is done in kernel proper.
Move these helpers to asm/shared/msr.h and rename to raw_{rdmsr,wrmsr}() to indicate what they are.
[ bp: Correct the reason why those helpers exist. I should've caught that in
the original patch that added them:
176db622573f ("x86/boot: Introduce helpers for MSR reads/writes"
but oh well...
- fixup include path delimiters to <> ]
--- arch/x86/boot/compressed/sev.c | 7 ++++--- arch/x86/boot/compressed/sev.h | 6 +++--- arch/x86/boot/cpucheck.c | 16 ++++++++-------- arch/x86/boot/msr.h | 26 -------------------------- arch/x86/include/asm/shared/msr.h | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 40 deletions(-) delete mode 100644 arch/x86/boot/msr.h
arch/x86/boot/compressed/sev.c +4 -3
@@ -14,6 +14,7 @@#include <asm/bootparam.h> #include <asm/pgtable_types.h> +#include <asm/shared/msr.h> #include <asm/sev.h> #include <asm/trapnr.h> #include <asm/trap_pf.h>
@@ -397,7 +398,7 @@ void sev_enable(struct boot_params *bp) }/* Set the SME mask if this is an SEV guest. */ -boot_rdmsr (MSR_AMD64_SEV , &m); +raw_rdmsr (MSR_AMD64_SEV , &m); sev_status = m.q;if (!(sev_status &MSR_AMD64_SEV_ENABLED ))return ;
@@ -446,7 +447,7 @@ u64 sev_get_status(void)if (sev_check_cpu_support () <0 )return 0 ; -boot_rdmsr (MSR_AMD64_SEV , &m); +raw_rdmsr (MSR_AMD64_SEV , &m);return m.q; }
@@ -496,7 +497,7 @@ bool early_is_sevsnp_guest(void)struct msr m;/* Obtain the address of the calling area to use */ -boot_rdmsr (MSR_SVSM_CAA , &m); +raw_rdmsr (MSR_SVSM_CAA , &m); boot_svsm_caa_pa = m.q;/*
arch/x86/boot/compressed/sev.h +3 -3
@@ -10,7 +10,7 @@#ifdef CONFIG_AMD_MEM_ENCRYPT -#include "../msr.h" +#include <asm/shared/msr.h> void snp_accept_memory (phys_addr_t start,phys_addr_t end);u64 sev_get_status (void );
@@ -20,7 +20,7 @@ static inline u64 sev_es_rd_ghcb_msr(void) {struct msr m; -boot_rdmsr (MSR_AMD64_SEV_ES_GHCB , &m); +raw_rdmsr (MSR_AMD64_SEV_ES_GHCB , &m);return m.q; }
@@ -30,7 +30,7 @@ static inline void sev_es_wr_ghcb_msr(u64 val)struct msr m; m.q = val; - boot_wrmsr(MSR_AMD64_SEV_ES_GHCB, &m); + raw_wrmsr(MSR_AMD64_SEV_ES_GHCB, &m); }#else
arch/x86/boot/cpucheck.c +8 -8
@@ -26,9 +26,9 @@#include <asm/intel-family.h> #include <asm/processor-flags.h> #include <asm/msr-index.h> +#include <asm/shared/msr.h> #include "string.h" -#include "msr.h" static u32 err_flags[NCAPINTS ];
@@ -134,9 +134,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m; -boot_rdmsr (MSR_K7_HWCR , &m); +raw_rdmsr (MSR_K7_HWCR , &m); m.l &= ~(1 <<15 ); -boot_wrmsr (MSR_K7_HWCR , &m); +raw_wrmsr (MSR_K7_HWCR , &m);get_cpuflags ();/* Make sure it really did something */ err =check_cpuflags ();
@@ -148,9 +148,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m; -boot_rdmsr (MSR_VIA_FCR , &m); +raw_rdmsr (MSR_VIA_FCR , &m); m.l |= (1 <<1 ) | (1 <<7 ); -boot_wrmsr (MSR_VIA_FCR , &m); +raw_wrmsr (MSR_VIA_FCR , &m);set_bit (X86_FEATURE_CX8 , cpu.flags); err =check_cpuflags ();
@@ -160,14 +160,14 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)struct msr m, m_tmp;u32 level =1 ; -boot_rdmsr (0x80860004 , &m); +raw_rdmsr (0x80860004 , &m); m_tmp = m; m_tmp.l = ~0 ; -boot_wrmsr (0x80860004 , &m_tmp); +raw_wrmsr (0x80860004 , &m_tmp); asm("cpuid" :"+a" (level),"=d" (cpu.flags[0 ]) : :"ecx" ,"ebx" ); -boot_wrmsr (0x80860004 , &m); +raw_wrmsr (0x80860004 , &m); err =check_cpuflags (); } else if (err == 0x01 &&
arch/x86/boot/msr.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Helpers/definitions related to MSR access. -*/ - -#ifndef BOOT_MSR_H -#define BOOT_MSR_H - -#include <asm/shared/msr.h> - -/* -* The kernel proper already defines rdmsr()/wrmsr(), but they are not for the -* boot kernel since they rely on tracepoint/exception handling infrastructure -* that's not available here. -*/ -static inline void boot_rdmsr (unsigned int reg,struct msr *m) -{ - asmvolatile ("rdmsr" :"=a" (m->l),"=d" (m->h) :"c" (reg)); -} - -static inline void boot_wrmsr (unsigned int reg,const struct msr *m) -{ - asmvolatile ("wrmsr" : :"c" (reg),"a" (m->l),"d" (m->h) :"memory" ); -} - -#endif /* BOOT_MSR_H */
arch/x86/include/asm/shared/msr.h +15 -0
@@ -12,4 +12,19 @@ struct msr { }; }; +/* +* The kernel proper already defines rdmsr()/wrmsr(), but they are not for the +* boot kernel since they rely on tracepoint/exception handling infrastructure +* that's not available here. +*/ +static inline void raw_rdmsr (unsigned int reg,struct msr *m) +{ + asmvolatile ("rdmsr" :"=a" (m->l),"=d" (m->h) :"c" (reg)); +} + +static inline void raw_wrmsr (unsigned int reg,const struct msr *m) +{ + asmvolatile ("wrmsr" : :"c" (reg),"a" (m->l),"d" (m->h) :"memory" ); +} +#endif /* _ASM_X86_SHARED_MSR_H */
PATCH v3 2/2 x86/sev-es: Include XSS value in GHCB CPUID request
In reply to John AllenWhen a guest issues a cpuid instruction for Fn0000000D_x01, the hypervisor may be intercepting the CPUID instruction and need to access the guest XSS value. For SEV-ES, the XSS value is encrypted and needs to be included in the GHCB to be visible to the hypervisor.
---
v3:
- Only CPUID.0xD.1 consumes XSS. Limit including XSS in GHCB for this case.
--- arch/x86/coco/sev/vc-shared.c | 11 +++++++++++ arch/x86/include/asm/svm.h | 1 + 2 files changed, 12 insertions(+)
arch/x86/coco/sev/vc-shared.c +11 -0
@@ -1,5 +1,9 @@// SPDX-License-Identifier: GPL-2.0 +#ifndef __BOOT_COMPRESSED +#define has_cpuflag (f) boot_cpu_has(f) +#endif +static enum es_result vc_check_opcode_bytes (struct es_em_ctxt *ctxt,unsigned long exit_code) {
@@ -452,6 +456,13 @@ static enum es_result vc_handle_cpuid(struct ghcb *ghcb,/* xgetbv will cause #GP - use reset value for xcr0 */ ghcb_set_xcr0 (ghcb,1 ); +if (has_cpuflag (X86_FEATURE_SHSTK ) && regs->ax ==0xd && regs->cx ==1 ) { +struct msr m; + +raw_rdmsr (MSR_IA32_XSS , &m); +ghcb_set_xss (ghcb, m.q); + } + ret =sev_es_ghcb_hv_call (ghcb, ctxt,SVM_EXIT_CPUID ,0 ,0 );if (ret !=ES_OK )return ret;
arch/x86/include/asm/svm.h +1 -0
@@ -701,5 +701,6 @@ DEFINE_GHCB_ACCESSORS(sw_exit_info_1) DEFINE_GHCB_ACCESSORS(sw_exit_info_2) DEFINE_GHCB_ACCESSORS(sw_scratch) DEFINE_GHCB_ACCESSORS(xcr0) +DEFINE_GHCB_ACCESSORS(xss)#endif
Signature · 1 line
2.47.3
Re: [PATCH v3 2/2] x86/sev-es: Include XSS value in GHCB CPUID request
arch/x86/coco/sev/vc-shared.c static enum es_result vc_handle_cpuid(struct ghcb *ghcb, · line 464
Quoted 6 lines · John Allen
arch/x86/coco/sev/vc-shared.c +6
-0+if (has_cpuflag (X86_FEATURE_SHSTK ) && regs->ax ==0xd && regs->cx ==1 ) { +struct msr m; + +raw_rdmsr (MSR_IA32_XSS , &m); +ghcb_set_xss (ghcb, m.q); + }
Is there a reason this is open-coding CPUID_LEAF_XSTATE?
Re: [PATCH v3 2/2] x86/sev-es: Include XSS value in GHCB CPUID request
Quoted 9 lines · Dave Hansen
arch/x86/coco/sev/vc-shared.c static enum es_result vc_handle_cpuid(struct ghcb *ghcb, · line 464
Quoted 6 lines · John Allen
arch/x86/coco/sev/vc-shared.c +6
-0+if (has_cpuflag (X86_FEATURE_SHSTK ) && regs->ax ==0xd && regs->cx ==1 ) { +struct msr m; + +raw_rdmsr (MSR_IA32_XSS , &m); +ghcb_set_xss (ghcb, m.q); + }Is there a reason this is open-coding
CPUID_LEAF_XSTATE?
That's a good question. This patch was adapted from an old SNP patch from years ago so if I had to guess, maybe there was some issue bringing in the old pre-split cpuid header into the early boot/shared environment. It looks like including asm/cpuid/types.h and using CPUID_LEAF_XSTATE works here and now so I'll include it in the next version.
Thanks,
John
Borislav Petkov
maintainerPATCH 1/1 x86/coco/sev: Convert has_cpuflag() to use cpu_feature_enabled()
In reply to John AllenQuoted 17 lines · John Allen
For shadow stack support in SVM when using SEV-ES, the guest kernel needs to save XSS to the GHCB in order for the hypervisor to determine the XSAVES save area size.
This series can be applied independently of the hypervisor series in order to support non-KVM hypervisors.
---
v3:
- Only CPUID.0xD.1 consumes XSS. Limit including XSS in GHCB for this case.
v2:
- Update changelog for patch 2/2John Allen (2):
x86/boot: Move boot_*msr helpers toasm/shared/msr.hx86/sev-es: Include XSS value in GHCB CPUID request
Quoted 9 lines
arch/x86/boot/compressed/sev.c | 7 ++++--- arch/x86/boot/compressed/sev.h | 6 +++--- arch/x86/boot/cpucheck.c | 16 ++++++++-------- arch/x86/boot/msr.h | 26 -------------------------- arch/x86/coco/sev/vc-shared.c | 11 +++++++++++ arch/x86/include/asm/shared/msr.h | 15 +++++++++++++++ arch/x86/include/asm/svm.h | 1 + 7 files changed, 42 insertions(+), 40 deletions(-) delete mode 100644 arch/x86/boot/msr.h
---
Ontop:
From: "Borislav Petkov (AMD)" <[email protected]>
Date: Thu, 30 Oct 2025 17:59:11 +0100
Subject: [PATCH] x86/coco/sev: Convert has_cpuflag() to use cpu_feature_enabled()
Drop one redundant definition, while at it.
There should be no functional changes.
--- arch/x86/boot/startup/sev-shared.c | 2 +- arch/x86/coco/sev/vc-handle.c | 1 - arch/x86/coco/sev/vc-shared.c | 2 +- arch/x86/lib/kaslr.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/boot/startup/sev-shared.c +1 -1
@@ -12,7 +12,7 @@#include <asm/setup_data.h> #ifndef __BOOT_COMPRESSED -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#else #undef WARN #define WARN(condition, format...) (!!(condition))
arch/x86/coco/sev/vc-handle.c +0 -1
@@ -352,7 +352,6 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,#define sev_printk (fmt, ...) printk(fmt, ##__VA_ARGS__)#define error (v) -#define has_cpuflag (f) boot_cpu_has(f)#include "vc-shared.c"
arch/x86/coco/sev/vc-shared.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #ifndef __BOOT_COMPRESSED -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#endif static enum es_result vc_check_opcode_bytes(struct es_em_ctxt *ctxt,
arch/x86/lib/kaslr.c +1 -1
@@ -22,7 +22,7 @@#include <asm/setup.h> #define debug_putstr (v) early_printk("%s", v) -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#define get_boot_seed () kaslr_offset()#endif
Signature · 7 lines
2.51.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: x86/sev] x86/coco/sev: Convert has_cpuflag() to use cpu_feature_enabled()
The following commit has been merged into the x86/sev branch of tip:
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: b2c1dd6c6f70a5a519532227358c82d4cfda5b36 Gitweb: https://git.kernel.org/tip/b2c1dd6c6f70a5a519532227358c82d4cfda5b36 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Thu, 30 Oct 2025 17:59:11 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Nov 2025 16:42:31 +01:00
x86/coco/sev: Convert has_cpuflag() to use cpu_feature_enabled()
Drop one redundant definition, while at it.
There should be no functional changes.
--- arch/x86/boot/startup/sev-shared.c | 2 +- arch/x86/coco/sev/vc-handle.c | 1 - arch/x86/coco/sev/vc-shared.c | 2 +- arch/x86/lib/kaslr.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/boot/startup/sev-shared.c +1 -1
@@ -12,7 +12,7 @@#include <asm/setup_data.h> #ifndef __BOOT_COMPRESSED -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#else #undef WARN #define WARN(condition, format...) (!!(condition))
arch/x86/coco/sev/vc-handle.c +0 -1
@@ -352,7 +352,6 @@ fault:#define sev_printk (fmt, ...) printk(fmt, ##__VA_ARGS__)#define error (v) -#define has_cpuflag (f) boot_cpu_has(f)#include "vc-shared.c"
arch/x86/coco/sev/vc-shared.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #ifndef __BOOT_COMPRESSED -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#endif static enum es_result vc_check_opcode_bytes(struct es_em_ctxt *ctxt,
arch/x86/lib/kaslr.c +1 -1
@@ -22,7 +22,7 @@#include <asm/setup.h> #define debug_putstr (v) early_printk("%s", v) -#define has_cpuflag (f) boot_cpu_has(f) +#define has_cpuflag (f) cpu_feature_enabled(f)#define get_boot_seed () kaslr_offset()#endif