diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-06-23 14:02:08 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-23 19:02:49 +0200 |
| commit | 739e2eec0f4849eb411567407d61491f923db405 (patch) | |
| tree | a2c168a290b56bf65229c6dc82f203223fdc7480 | |
| parent | x86/cpu: Sanitize X86_FEATURE_OSPKE (diff) | |
| download | linux-739e2eec0f4849eb411567407d61491f923db405.tar.xz linux-739e2eec0f4849eb411567407d61491f923db405.zip | |
x86/pkru: Provide pkru_get_init_value()
When CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is disabled then the following
code fails to compile:
if (cpu_feature_enabled(X86_FEATURE_OSPKE)) {
u32 pkru = READ_ONCE(init_pkru_value);
..
}
because init_pkru_value is defined as '0' which makes READ_ONCE() upset.
Provide an accessor macro to avoid #ifdeffery all over the place.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210623121455.404880646@linutronix.de
| -rw-r--r-- | arch/x86/include/asm/pkru.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pkru.h b/arch/x86/include/asm/pkru.h index ec8dd2878dc9..19d3d7b98465 100644 --- a/arch/x86/include/asm/pkru.h +++ b/arch/x86/include/asm/pkru.h @@ -10,8 +10,10 @@ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS extern u32 init_pkru_value; +#define pkru_get_init_value() READ_ONCE(init_pkru_value) #else #define init_pkru_value 0 +#define pkru_get_init_value() 0 #endif static inline bool __pkru_allows_read(u32 pkru, u16 pkey) |