aboutsummaryrefslogtreecommitdiff
path: root/sys/compat
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2015-07-21 12:47:15 +0000
committerEd Schouten <ed@FreeBSD.org>2015-07-21 12:47:15 +0000
commit21d30b29d521bce25e8a9474d4852c4da36bcf37 (patch)
tree2d981606b2543b919e648010f75b630229796277 /sys/compat
parent13aaea2fd73cdc8010394df7e4be40fa5d004e97 (diff)
downloadsrc-21d30b29d521bce25e8a9474d4852c4da36bcf37.tar.gz
src-21d30b29d521bce25e8a9474d4852c4da36bcf37.zip
Make thread creation work for CloudABI processes.
Summary: Remove the stub system call that was put in place during the system call import and replace it by a target-dependent version stored in sys/amd64. Initialize the thread in a way similar to cpu_set_upcall_kse(). We provide the entry point with two arguments: the thread ID and the argument pointer. Test Plan: Thread creation still seems to work, both for FreeBSD and CloudABI binaries. Reviewers: dchagin, mjg, kib Reviewed By: kib Subscribers: imp Differential Revision: https://reviews.freebsd.org/D3110
Notes
Notes: svn path=/head/; revision=285744
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/cloudabi64/cloudabi64_thread.c35
-rw-r--r--sys/compat/cloudabi64/cloudabi64_util.h38
2 files changed, 71 insertions, 2 deletions
diff --git a/sys/compat/cloudabi64/cloudabi64_thread.c b/sys/compat/cloudabi64/cloudabi64_thread.c
index ca26c900c26d..04b1782329b9 100644
--- a/sys/compat/cloudabi64/cloudabi64_thread.c
+++ b/sys/compat/cloudabi64/cloudabi64_thread.c
@@ -26,14 +26,45 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+
#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
#include <compat/cloudabi64/cloudabi64_proto.h>
+#include <compat/cloudabi64/cloudabi64_util.h>
+
+struct thread_create_args {
+ cloudabi64_threadattr_t attr;
+ lwpid_t tid;
+};
+
+static int
+initialize_thread(struct thread *td, void *thunk)
+{
+ struct thread_create_args *args = thunk;
+
+ /* Save the thread ID, so it can be returned. */
+ args->tid = td->td_tid;
+
+ /* Set up initial register contents. */
+ cloudabi64_thread_setregs(td, &args->attr);
+ return (0);
+}
int
cloudabi64_sys_thread_create(struct thread *td,
struct cloudabi64_sys_thread_create_args *uap)
{
+ struct thread_create_args args;
+ int error;
- /* Not implemented. */
- return (ENOSYS);
+ error = copyin(uap->attr, &args.attr, sizeof(args.attr));
+ if (error != 0)
+ return (error);
+ error = thread_create(td, NULL, initialize_thread, &args);
+ if (error != 0)
+ return (error);
+ td->td_retval[0] = args.tid;
+ return (0);
}
diff --git a/sys/compat/cloudabi64/cloudabi64_util.h b/sys/compat/cloudabi64/cloudabi64_util.h
new file mode 100644
index 000000000000..c56d4ccd25d0
--- /dev/null
+++ b/sys/compat/cloudabi64/cloudabi64_util.h
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2015 Nuxi, https://nuxi.nl/
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _CLOUDABI64_UTIL_H_
+#define _CLOUDABI64_UTIL_H_
+
+#include <compat/cloudabi64/cloudabi64_syscalldefs.h>
+
+struct thread;
+
+void cloudabi64_thread_setregs(struct thread *,
+ const cloudabi64_threadattr_t *);
+
+#endif