From: Stafford Horne <shorne@gmail.com>
To: LKML <linux-kernel@vger.kernel.org>,
Openrisc <openrisc@lists.librecores.org>
Cc: Stafford Horne <shorne@gmail.com>,
Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Christian Brauner <christian@brauner.io>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Allison Randal <allison@lohutok.net>
Subject: [PATCH 1/3] openrisc: Convert copy_thread to copy_thread_tls
Date: Thu, 27 Feb 2020 07:56:23 +0900 [thread overview]
Message-ID: <20200226225625.28935-2-shorne@gmail.com> (raw)
In-Reply-To: <20200226225625.28935-1-shorne@gmail.com>
This is required for clone3 which passes the TLS value through a
struct rather than a register.
Signed-off-by: Stafford Horne <shorne@gmail.com>
---
arch/openrisc/Kconfig | 1 +
arch/openrisc/kernel/process.c | 15 +++++----------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 1928e061ff96..5debdbe6fc35 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -14,6 +14,7 @@ config OPENRISC
select HANDLE_DOMAIN_IRQ
select GPIOLIB
select HAVE_ARCH_TRACEHOOK
+ select HAVE_COPY_THREAD_TLS
select SPARSE_IRQ
select GENERIC_IRQ_CHIP
select GENERIC_IRQ_PROBE
diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index b06f84f6676f..6695f167e126 100644
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -117,12 +117,13 @@ void release_thread(struct task_struct *dead_task)
extern asmlinkage void ret_from_fork(void);
/*
- * copy_thread
+ * copy_thread_tls
* @clone_flags: flags
* @usp: user stack pointer or fn for kernel thread
* @arg: arg to fn for kernel thread; always NULL for userspace thread
* @p: the newly created task
* @regs: CPU context to copy for userspace thread; always NULL for kthread
+ * @tls: the Thread Local Storate pointer for the new process
*
* At the top of a newly initialized kernel stack are two stacked pt_reg
* structures. The first (topmost) is the userspace context of the thread.
@@ -148,8 +149,8 @@ extern asmlinkage void ret_from_fork(void);
*/
int
-copy_thread(unsigned long clone_flags, unsigned long usp,
- unsigned long arg, struct task_struct *p)
+copy_thread_tls(unsigned long clone_flags, unsigned long usp,
+ unsigned long arg, struct task_struct *p, unsigned long tls)
{
struct pt_regs *userregs;
struct pt_regs *kregs;
@@ -180,15 +181,9 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
/*
* For CLONE_SETTLS set "tp" (r10) to the TLS pointer passed to sys_clone.
- *
- * The kernel entry is:
- * int clone (long flags, void *child_stack, int *parent_tid,
- * int *child_tid, struct void *tls)
- *
- * This makes the source r7 in the kernel registers.
*/
if (clone_flags & CLONE_SETTLS)
- userregs->gpr[10] = userregs->gpr[7];
+ userregs->gpr[10] = tls;
userregs->gpr[11] = 0; /* Result from fork() */
--
2.21.0
next prev parent reply other threads:[~2020-02-26 22:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 22:56 [PATCH 0/3] OpenRISC clone3 support Stafford Horne
2020-02-26 22:56 ` Stafford Horne [this message]
2020-02-27 0:31 ` [PATCH 1/3] openrisc: Convert copy_thread to copy_thread_tls Stafford Horne
2020-02-27 12:19 ` Christian Brauner
2020-02-27 13:16 ` Stafford Horne
2020-02-26 22:56 ` [PATCH 2/3] openrisc: Enable the clone3 syscall Stafford Horne
2020-02-27 12:21 ` Christian Brauner
2020-02-27 13:29 ` Stafford Horne
2020-02-26 22:56 ` [PATCH 3/3] openrisc: Cleanup copy_thread_tls docs and comments Stafford Horne
2020-02-27 12:24 ` Christian Brauner
2020-02-27 12:26 ` [PATCH 0/3] OpenRISC clone3 support Christian Brauner
2020-02-27 13:18 ` Stafford Horne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200226225625.28935-2-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=allison@lohutok.net \
--cc=christian@brauner.io \
--cc=gregkh@linuxfoundation.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=openrisc@lists.librecores.org \
--cc=stefan.kristiansson@saunalahti.fi \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).