Skip to content

Commit

Permalink
x86/cpu: Add 'unsafe_fsgsbase' to enable CR4.FSGSBASE
Browse files Browse the repository at this point in the history
This is temporary.  It will allow the next few patches to be tested
incrementally.

Setting unsafe_fsgsbase is a root hole.  Don't do it.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/1557309753-24073-4-git-send-email-chang.seok.bae@intel.com
Link: https://lkml.kernel.org/r/20200528201402.1708239-3-sashal@kernel.org
  • Loading branch information
Andy Lutomirski authored and Thomas Gleixner committed Jun 18, 2020
1 parent fddf8ba commit dd649bd
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3079,6 +3079,9 @@
no5lvl [X86-64] Disable 5-level paging mode. Forces
kernel to use 4-level paging instead.

unsafe_fsgsbase [X86] Allow FSGSBASE instructions. This will be
replaced with a nofsgsbase flag.

no_console_suspend
[HW] Never suspend the console
Disable suspending of consoles during suspend and
Expand Down
24 changes: 24 additions & 0 deletions arch/x86/kernel/cpu/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,22 @@ static void __init setup_cr_pinning(void)
static_key_enable(&cr_pinning.key);
}

/*
* Temporary hack: FSGSBASE is unsafe until a few kernel code paths are
* updated. This allows us to get the kernel ready incrementally.
*
* Once all the pieces are in place, these will go away and be replaced with
* a nofsgsbase chicken flag.
*/
static bool unsafe_fsgsbase;

static __init int setup_unsafe_fsgsbase(char *arg)
{
unsafe_fsgsbase = true;
return 1;
}
__setup("unsafe_fsgsbase", setup_unsafe_fsgsbase);

/*
* Protection Keys are not available in 32-bit mode.
*/
Expand Down Expand Up @@ -1495,6 +1511,14 @@ static void identify_cpu(struct cpuinfo_x86 *c)
setup_smap(c);
setup_umip(c);

/* Enable FSGSBASE instructions if available. */
if (cpu_has(c, X86_FEATURE_FSGSBASE)) {
if (unsafe_fsgsbase)
cr4_set_bits(X86_CR4_FSGSBASE);
else
clear_cpu_cap(c, X86_FEATURE_FSGSBASE);
}

/*
* The vendor-specific functions might have changed features.
* Now we do "generic changes."
Expand Down

0 comments on commit dd649bd

Please sign in to comment.