x86/fsgsbase: Replace static_cpu_has() with boot_cpu_has()
Borislav Petkov
maintainerPATCH 1/1 x86/fsgsbase: Replace static_cpu_has() with boot_cpu_has()
From: Borislav Petkov <[email protected]>
ptrace and prctl() are not really fast paths to warrant the use of static_cpu_has() and cause alternatives patching for no good reason. Replace with boot_cpu_has() which is simple and fast enough.
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/fsgsbase.h | 4 ++-- arch/x86/kernel/process_64.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/fsgsbase.h +2 -2
@@ -57,7 +57,7 @@ static inline unsigned long x86_fsbase_read_cpu(void) {unsigned long fsbase; -if (static_cpu_has (X86_FEATURE_FSGSBASE )) +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) fsbase =rdfsbase ();else rdmsrl (MSR_FS_BASE , fsbase);
@@ -67,7 +67,7 @@ static inline unsigned long x86_fsbase_read_cpu(void)static inline void x86_fsbase_write_cpu (unsigned long fsbase) { -if (static_cpu_has (X86_FEATURE_FSGSBASE )) +if (boot_cpu_has (X86_FEATURE_FSGSBASE ))wrfsbase (fsbase);else wrmsrl (MSR_FS_BASE , fsbase);
arch/x86/kernel/process_64.c +4 -4
@@ -407,7 +407,7 @@ unsigned long x86_gsbase_read_cpu_inactive(void) {unsigned long gsbase; -if (static_cpu_has (X86_FEATURE_FSGSBASE )) { +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) {unsigned long flags;local_irq_save (flags);
@@ -422,7 +422,7 @@ unsigned long x86_gsbase_read_cpu_inactive(void)void x86_gsbase_write_cpu_inactive (unsigned long gsbase) { -if (static_cpu_has (X86_FEATURE_FSGSBASE )) { +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) {unsigned long flags;local_irq_save (flags);
@@ -439,7 +439,7 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)if (task == current) fsbase =x86_fsbase_read_cpu (); -else if (static_cpu_has (X86_FEATURE_FSGSBASE ) || +else if (boot_cpu_has (X86_FEATURE_FSGSBASE ) || (task->thread.fsindex ==0 )) fsbase = task->thread.fsbase;else
@@ -454,7 +454,7 @@ unsigned long x86_gsbase_read_task(struct task_struct *task)if (task == current) gsbase =x86_gsbase_read_cpu_inactive (); -else if (static_cpu_has (X86_FEATURE_FSGSBASE ) || +else if (boot_cpu_has (X86_FEATURE_FSGSBASE ) || (task->thread.gsindex ==0 )) gsbase = task->thread.gsbase;else
Signature · 1 line
2.21.0
The following commit has been merged into the x86/fsgsbase branch of tip:
The following commit has been merged into the x86/fsgsbase branch of tip:
Commit-ID: 5f1dd4dda5c8796c405e856aaa11e187f6885924 Gitweb: https://git.kernel.org/tip/5f1dd4dda5c8796c405e856aaa11e187f6885924 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 18 Aug 2020 12:28:31 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 24 Aug 2020 18:18:32 +02:00
x86/fsgsbase: Replace static_cpu_has() with boot_cpu_has()
ptrace and prctl() are not really fast paths to warrant the use of static_cpu_has() and cause alternatives patching for no good reason. Replace with boot_cpu_has() which is simple and fast enough.
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/fsgsbase.h | 4 ++-- arch/x86/kernel/process_64.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/fsgsbase.h +2 -2
@@ -57,7 +57,7 @@ static inline unsigned long x86_fsbase_read_cpu(void) {unsigned long fsbase; -if (static_cpu_has (X86_FEATURE_FSGSBASE )) +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) fsbase =rdfsbase ();else rdmsrl (MSR_FS_BASE , fsbase);
@@ -67,7 +67,7 @@ static inline unsigned long x86_fsbase_read_cpu(void)static inline void x86_fsbase_write_cpu (unsigned long fsbase) { -if (static_cpu_has (X86_FEATURE_FSGSBASE )) +if (boot_cpu_has (X86_FEATURE_FSGSBASE ))wrfsbase (fsbase);else wrmsrl (MSR_FS_BASE , fsbase);
arch/x86/kernel/process_64.c +4 -4
@@ -407,7 +407,7 @@ unsigned long x86_gsbase_read_cpu_inactive(void) {unsigned long gsbase; -if (static_cpu_has (X86_FEATURE_FSGSBASE )) { +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) {unsigned long flags;local_irq_save (flags);
@@ -422,7 +422,7 @@ unsigned long x86_gsbase_read_cpu_inactive(void)void x86_gsbase_write_cpu_inactive (unsigned long gsbase) { -if (static_cpu_has (X86_FEATURE_FSGSBASE )) { +if (boot_cpu_has (X86_FEATURE_FSGSBASE )) {unsigned long flags;local_irq_save (flags);
@@ -439,7 +439,7 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)if (task == current) fsbase =x86_fsbase_read_cpu (); -else if (static_cpu_has (X86_FEATURE_FSGSBASE ) || +else if (boot_cpu_has (X86_FEATURE_FSGSBASE ) || (task->thread.fsindex ==0 )) fsbase = task->thread.fsbase;else
@@ -454,7 +454,7 @@ unsigned long x86_gsbase_read_task(struct task_struct *task)if (task == current) gsbase =x86_gsbase_read_cpu_inactive (); -else if (static_cpu_has (X86_FEATURE_FSGSBASE ) || +else if (boot_cpu_has (X86_FEATURE_FSGSBASE ) || (task->thread.gsindex ==0 )) gsbase = task->thread.gsbase;else