MFC r271743:

  Implement most of timer_{create,settime,gettime,getoverrun,delete}
  for amd64/linux32.  Fix the entirely bogus (untested) version from
  r161310 for i386/linux using the same shared code in compat/linux.

  It is unclear to me if we could support more clock mappings but
  the current set allows me to successfully run commercial
  32bit linux software under linuxolator on amd64.

  Reviewed by:			jhb
  Differential Revision:	D784
Sponsored by:			DARPA, AFRL
Approved by:			re (gjb)

2 files changed, 279 insertions, 0 deletions

diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c
new file mode 100644
index 0000000..92dae4c
--- /dev/null
+++ b/sys/compat/linux/linux_timer.c
@@ -0,0 +1,182 @@
+/*-
+ * Copyright (c) 2014 Bjoern A. Zeeb
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249
+ * ("MRC2"), as part of the DARPA MRC research programme.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_compat.h"
+
+#include <sys/param.h>
+#include <sys/errno.h>
+#include <sys/signal.h>
+#include <sys/syscallsubr.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#ifdef COMPAT_LINUX32
+#include <machine/../linux32/linux.h>
+#include <machine/../linux32/linux32_proto.h>
+#else
+#include <machine/../linux/linux.h>
+#include <machine/../linux/linux_proto.h>
+#endif
+#include <compat/linux/linux_timer.h>
+
+static int
+linux_convert_l_clockid(clockid_t *clock_id)
+{
+
+	switch (*clock_id) {
+	case LINUX_CLOCK_REALTIME:
+		*clock_id = CLOCK_REALTIME;
+		break;
+	case LINUX_CLOCK_MONOTONIC:
+		*clock_id = CLOCK_MONOTONIC;
+		break;
+	default:
+		return (EINVAL);
+	}
+
+	return (0);
+}
+
+static int
+linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
+{
+
+	CP(*l_sig, *sig, sigev_notify);
+	switch (l_sig->sigev_notify) {
+	case L_SIGEV_SIGNAL:
+		sig->sigev_notify = SIGEV_SIGNAL;
+		CP(*l_sig, *sig, sigev_signo);
+		PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
+		break;
+	case L_SIGEV_NONE:
+		sig->sigev_notify = SIGEV_NONE;
+		break;
+	case L_SIGEV_THREAD:
+#if 0
+		/* Seems to not be used anywhere (anymore)? */
+		sig->sigev_notify = SIGEV_THREAD;
+		return (ENOSYS);
+#else
+		return (EINVAL);
+#endif
+	case L_SIGEV_THREAD_ID:
+		sig->sigev_notify = SIGEV_THREAD_ID;
+		CP2(*l_sig, *sig, _l_sigev_un._tid, sigev_notify_thread_id);
+		CP(*l_sig, *sig, sigev_signo);
+		PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
+		break;
+	default:
+		return (EINVAL);
+	}
+	return (0);
+}
+
+int
+linux_timer_create(struct thread *td, struct linux_timer_create_args *uap)
+{
+	struct l_sigevent l_ev;
+	struct sigevent ev, *evp;
+	int error, id;
+
+	if (uap->evp == NULL) {
+		evp = NULL;
+	} else {
+		error = copyin(uap->evp, &l_ev, sizeof(l_ev));
+		if (error != 0)
+			return (error);
+		error = linux_convert_l_sigevent(&l_ev, &ev);
+		if (error != 0)
+			return (error);
+		evp = &ev;
+	}
+	error = linux_convert_l_clockid(&uap->clock_id);
+	if (error != 0)
+		return (error);
+	error = kern_ktimer_create(td, uap->clock_id, evp, &id, -1);
+	if (error == 0) {
+		error = copyout(&id, uap->timerid, sizeof(int));
+		if (error != 0)
+			kern_ktimer_delete(td, id);
+	}
+	return (error);
+}
+
+int
+linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap)
+{
+	struct l_itimerspec l_val, l_oval;
+	struct itimerspec val, oval, *ovalp;
+	int error;
+
+	error = copyin(uap->new, &l_val, sizeof(l_val));
+	if (error != 0)
+		return (error);
+	ITS_CP(l_val, val);
+	ovalp = uap->old != NULL ? &oval : NULL;
+	error = kern_ktimer_settime(td, uap->timerid, uap->flags, &val, ovalp);
+	if (error == 0 && uap->old != NULL) {
+		ITS_CP(oval, l_oval);
+		error = copyout(&l_oval, uap->old, sizeof(l_oval));
+	}
+	return (error);
+}
+
+int
+linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *uap)
+{
+	struct l_itimerspec l_val;
+	struct itimerspec val;
+	int error;
+
+	error = kern_ktimer_gettime(td, uap->timerid, &val);
+	if (error == 0) {
+		ITS_CP(val, l_val);
+		error = copyout(&l_val, uap->setting, sizeof(l_val));
+	}
+	return (error);
+}
+
+int
+linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *uap)
+{
+
+	return (kern_ktimer_getoverrun(td, uap->timerid));
+}
+
+int
+linux_timer_delete(struct thread *td, struct linux_timer_delete_args *uap)
+{
+
+	return (kern_ktimer_delete(td, uap->timerid));
+}
+
diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_timer.h
new file mode 100644
index 0000000..4f64ee5
--- /dev/null
+++ b/sys/compat/linux/linux_timer.h
@@ -0,0 +1,97 @@
+/*-
+ * Copyright (c) 2014 Bjoern A. Zeeb
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249
+ * ("MRC2"), as part of the DARPA MRC research programme.
+ *
+ * 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	_LINUX_TIMER_H
+#define	_LINUX_TIMER_H
+
+#ifndef	__LINUX_ARCH_SIGEV_PREAMBLE_SIZE
+#define	__LINUX_ARCH_SIGEV_PREAMBLE_SIZE	\
+	(sizeof(l_int) * 2 + sizeof(l_sigval_t))
+#endif
+
+#define	LINUX_SIGEV_MAX_SIZE			64
+#define	LINUX_SIGEV_PAD_SIZE			\
+	((LINUX_SIGEV_MAX_SIZE - __LINUX_ARCH_SIGEV_PREAMBLE_SIZE) / \
+	sizeof(l_int))
+
+#define	LINUX_CLOCK_REALTIME			0
+#define	LINUX_CLOCK_MONOTONIC			1
+#define	LINUX_CLOCK_PROCESS_CPUTIME_ID		2
+#define	LINUX_CLOCK_THREAD_CPUTIME_ID		3
+#define	LINUX_CLOCK_MONOTONIC_RAW		4
+#define	LINUX_CLOCK_REALTIME_COARSE		5
+#define	LINUX_CLOCK_MONOTONIC_COARSE		6
+#define	LINUX_CLOCK_BOOTTIME			7
+#define	LINUX_CLOCK_REALTIME_ALARM		8
+#define	LINUX_CLOCK_BOOTTIME_ALARM		9
+#define	LINUX_CLOCK_SGI_CYCLE			10
+#define	LINUX_CLOCK_TAI				11
+
+#define	L_SIGEV_SIGNAL				0
+#define	L_SIGEV_NONE				1
+#define	L_SIGEV_THREAD				2
+#define	L_SIGEV_THREAD_ID			4
+
+#define	TS_CP(src,dst,fld) do {			\
+	CP((src).fld,(dst).fld,tv_sec);		\
+	CP((src).fld,(dst).fld,tv_nsec);	\
+} while (0)
+
+#define	ITS_CP(src, dst) do {			\
+	TS_CP((src), (dst), it_interval);	\
+	TS_CP((src), (dst), it_value);		\
+} while (0)
+
+struct l_sigevent {
+	l_sigval_t sigev_value;
+	l_int sigev_signo;
+	l_int sigev_notify;
+	union {
+		l_int _pad[LINUX_SIGEV_PAD_SIZE];
+		l_int _tid;
+		struct {
+			l_uintptr_t _function;
+			l_uintptr_t _attribute;
+		} _l_sigev_thread;
+	} _l_sigev_un;
+}
+#if defined(__amd64__) && defined(COMPAT_LINUX32)
+__packed
+#endif
+;
+
+struct l_itimerspec {
+	struct l_timespec it_interval;
+	struct l_timespec it_value;
+};
+
+#endif	/* _LINUX_TIMER_H */