[src/trunk]: src/sys/arch/amd64 Add the USER_LDT sysarch options in netbsd32....

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/426a051305aa
branches:  trunk
changeset: 351196:426a051305aa
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Feb 06 16:02:17 2017 +0000

description:
Add the USER_LDT sysarch options in netbsd32. We don't translate 'desc',
since if we ever implement USER_LDT we will only allow 8-byte-sized
entries, which have the same layout on amd64 and i386.

diffstat:

 sys/arch/amd64/amd64/netbsd32_machdep.c   |  85 ++++++++++++++++++++++++++++++-
 sys/arch/amd64/include/netbsd32_machdep.h |  14 ++++-
 2 files changed, 96 insertions(+), 3 deletions(-)

diffs (155 lines):

diff -r a4f3d51251bb -r 426a051305aa sys/arch/amd64/amd64/netbsd32_machdep.c
--- a/sys/arch/amd64/amd64/netbsd32_machdep.c   Mon Feb 06 16:00:50 2017 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep.c   Mon Feb 06 16:02:17 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.c,v 1.99 2017/02/05 08:52:11 maxv Exp $       */
+/*     $NetBSD: netbsd32_machdep.c,v 1.100 2017/02/06 16:02:17 maxv Exp $      */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.99 2017/02/05 08:52:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.100 2017/02/06 16:02:17 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -50,6 +50,7 @@
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/kmem.h>
+#include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
@@ -83,6 +84,14 @@
 const char     machine32[] = "i386";
 const char     machine_arch32[] = "i386";      
 
+#ifdef USER_LDT
+static int x86_64_get_ldt32(struct lwp *, void *, register_t *);
+static int x86_64_set_ldt32(struct lwp *, void *, register_t *);
+#else
+#define x86_64_get_ldt32(x, y, z)      ENOSYS
+#define x86_64_set_ldt32(x, y, z)      ENOSYS
+#endif
+
 #ifdef MTRR
 static int x86_64_get_mtrr32(struct lwp *, void *, register_t *);
 static int x86_64_set_mtrr32(struct lwp *, void *, register_t *);
@@ -575,6 +584,14 @@
                error = x86_iopl(l,
                    NETBSD32PTR64(SCARG(uap, parms)), retval);
                break;
+       case X86_GET_LDT: 
+               error = x86_64_get_ldt32(l,
+                   NETBSD32PTR64(SCARG(uap, parms)), retval);
+               break;
+       case X86_SET_LDT: 
+               error = x86_64_set_ldt32(l,
+                   NETBSD32PTR64(SCARG(uap, parms)), retval);
+               break;
        case X86_GET_MTRR:
                error = x86_64_get_mtrr32(l,
                    NETBSD32PTR64(SCARG(uap, parms)), retval);
@@ -590,6 +607,70 @@
        return error;
 }
 
+#ifdef USER_LDT
+static int
+x86_64_set_ldt32(struct lwp *l, void *args, register_t *retval)
+{
+       struct x86_set_ldt_args32 ua32;
+       struct x86_set_ldt_args ua;
+       union descriptor *descv;
+       int error;
+
+       if ((error = copyin(args, &ua32, sizeof(ua32))) != 0)
+               return (error);
+
+       ua.start = ua32.start;
+       ua.num = ua32.num;
+
+       if (ua.num < 0 || ua.num > 8192)
+               return EINVAL;
+
+       descv = malloc(sizeof(*descv) * ua.num, M_TEMP, M_NOWAIT);
+       if (descv == NULL)
+               return ENOMEM;
+
+       error = copyin((void *)(uintptr_t)ua32.desc, descv,
+           sizeof(*descv) * ua.num);
+       if (error == 0)
+               error = x86_set_ldt1(l, &ua, descv);
+       *retval = ua.start;
+
+       free(descv, M_TEMP);
+       return error;
+}
+
+static int
+x86_64_get_ldt32(struct lwp *l, void *args, register_t *retval)
+{
+       struct x86_get_ldt_args32 ua32;
+       struct x86_get_ldt_args ua;
+       union descriptor *cp;
+       int error;
+
+       if ((error = copyin(args, &ua32, sizeof(ua32))) != 0)
+               return error;
+
+       ua.start = ua32.start;
+       ua.num = ua32.num;
+
+       if (ua.num < 0 || ua.num > 8192)
+               return EINVAL;
+
+       cp = malloc(ua.num * sizeof(union descriptor), M_TEMP, M_WAITOK);
+       if (cp == NULL)
+               return ENOMEM;
+
+       error = x86_get_ldt1(l, &ua, cp);
+       *retval = ua.num;
+       if (error == 0)
+               error = copyout(cp, (void *)(uintptr_t)ua32.desc,
+                   ua.num * sizeof(*cp));
+
+       free(cp, M_TEMP);
+       return error;
+}
+#endif
+
 #ifdef MTRR
 static int
 x86_64_get_mtrr32(struct lwp *l, void *args, register_t *retval)
diff -r a4f3d51251bb -r 426a051305aa sys/arch/amd64/include/netbsd32_machdep.h
--- a/sys/arch/amd64/include/netbsd32_machdep.h Mon Feb 06 16:00:50 2017 +0000
+++ b/sys/arch/amd64/include/netbsd32_machdep.h Mon Feb 06 16:02:17 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.h,v 1.20 2016/10/19 09:44:00 skrll Exp $      */
+/*     $NetBSD: netbsd32_machdep.h,v 1.21 2017/02/06 16:02:17 maxv Exp $       */
 
 #ifndef _MACHINE_NETBSD32_H_
 #define _MACHINE_NETBSD32_H_
@@ -114,6 +114,18 @@
        char    __data[108];
 };
 
+struct x86_get_ldt_args32 {
+       int32_t start;
+       uint32_t desc;
+       int32_t num;
+};
+
+struct x86_set_ldt_args32 {
+       int32_t start;
+       uint32_t desc;
+       int32_t num;
+};
+
 struct mtrr32 {
        uint64_t base;
        uint64_t len;