Commit 005f141e authored by Chang S. Bae's avatar Chang S. Bae Committed by Thomas Gleixner

x86/process/64: Use FSGSBASE instructions on thread copy and ptrace

When FSGSBASE is enabled, copying threads and reading fsbase and gsbase
using ptrace must read the actual values.

When copying a thread, use save_fsgs() and copy the saved values.  For
ptrace, the bases must be read from memory regardless of the selector if
FSGSBASE is enabled.

[ tglx: Invoke __rdgsbase_inactive() with interrupts disabled ]
[ luto: Massage changelog ]
Suggested-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarChang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1557309753-24073-9-git-send-email-chang.seok.bae@intel.com
Link: https://lkml.kernel.org/r/20200528201402.1708239-8-sashal@kernel.org
parent 67390349
...@@ -140,10 +140,12 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp, ...@@ -140,10 +140,12 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,
memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps)); memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
savesegment(gs, p->thread.gsindex); current_save_fsgs();
p->thread.gsbase = p->thread.gsindex ? 0 : current->thread.gsbase; p->thread.fsindex = current->thread.fsindex;
savesegment(fs, p->thread.fsindex); p->thread.fsbase = current->thread.fsbase;
p->thread.fsbase = p->thread.fsindex ? 0 : current->thread.fsbase; p->thread.gsindex = current->thread.gsindex;
p->thread.gsbase = current->thread.gsbase;
savesegment(es, p->thread.es); savesegment(es, p->thread.es);
savesegment(ds, p->thread.ds); savesegment(ds, p->thread.ds);
#else #else
......
...@@ -426,7 +426,8 @@ unsigned long x86_fsbase_read_task(struct task_struct *task) ...@@ -426,7 +426,8 @@ unsigned long x86_fsbase_read_task(struct task_struct *task)
if (task == current) if (task == current)
fsbase = x86_fsbase_read_cpu(); fsbase = x86_fsbase_read_cpu();
else if (task->thread.fsindex == 0) else if (static_cpu_has(X86_FEATURE_FSGSBASE) ||
(task->thread.fsindex == 0))
fsbase = task->thread.fsbase; fsbase = task->thread.fsbase;
else else
fsbase = x86_fsgsbase_read_task(task, task->thread.fsindex); fsbase = x86_fsgsbase_read_task(task, task->thread.fsindex);
...@@ -440,7 +441,8 @@ unsigned long x86_gsbase_read_task(struct task_struct *task) ...@@ -440,7 +441,8 @@ unsigned long x86_gsbase_read_task(struct task_struct *task)
if (task == current) if (task == current)
gsbase = x86_gsbase_read_cpu_inactive(); gsbase = x86_gsbase_read_cpu_inactive();
else if (task->thread.gsindex == 0) else if (static_cpu_has(X86_FEATURE_FSGSBASE) ||
(task->thread.gsindex == 0))
gsbase = task->thread.gsbase; gsbase = task->thread.gsbase;
else else
gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex); gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment