| From 0b9f386c4be6493d282aab0af6f9b70c62142777 Mon Sep 17 00:00:00 2001 |
| From: Guo Ren <guoren@linux.alibaba.com> |
| Date: Wed, 12 Feb 2020 10:24:52 +0800 |
| Subject: csky: Implement copy_thread_tls |
| |
| From: Guo Ren <guoren@linux.alibaba.com> |
| |
| commit 0b9f386c4be6493d282aab0af6f9b70c62142777 upstream. |
| |
| This is required for clone3 which passes the TLS value through a |
| struct rather than a register. |
| |
| Cc: Amanieu d'Antras <amanieu@gmail.com> |
| Signed-off-by: Guo Ren <guoren@linux.alibaba.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/csky/Kconfig | 1 + |
| arch/csky/kernel/process.c | 7 ++++--- |
| 2 files changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/arch/csky/Kconfig |
| +++ b/arch/csky/Kconfig |
| @@ -37,6 +37,7 @@ config CSKY |
| select GX6605S_TIMER if CPU_CK610 |
| select HAVE_ARCH_TRACEHOOK |
| select HAVE_ARCH_AUDITSYSCALL |
| + select HAVE_COPY_THREAD_TLS |
| select HAVE_DYNAMIC_FTRACE |
| select HAVE_FUNCTION_TRACER |
| select HAVE_FUNCTION_GRAPH_TRACER |
| --- a/arch/csky/kernel/process.c |
| +++ b/arch/csky/kernel/process.c |
| @@ -34,10 +34,11 @@ unsigned long thread_saved_pc(struct tas |
| return sw->r15; |
| } |
| |
| -int copy_thread(unsigned long clone_flags, |
| +int copy_thread_tls(unsigned long clone_flags, |
| unsigned long usp, |
| unsigned long kthread_arg, |
| - struct task_struct *p) |
| + struct task_struct *p, |
| + unsigned long tls) |
| { |
| struct switch_stack *childstack; |
| struct pt_regs *childregs = task_pt_regs(p); |
| @@ -64,7 +65,7 @@ int copy_thread(unsigned long clone_flag |
| childregs->usp = usp; |
| if (clone_flags & CLONE_SETTLS) |
| task_thread_info(p)->tp_value = childregs->tls |
| - = childregs->regs[0]; |
| + = tls; |
| |
| childregs->a0 = 0; |
| childstack->r15 = (unsigned long) ret_from_fork; |