Module Name: src
Committed By: maxv
Date: Sun Oct 15 10:58:32 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S machdep.c
src/sys/arch/x86/x86: sys_machdep.c
src/sys/arch/xen/x86: xenfunc.c
Log Message:
Add setusergs on Xen, and simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.264 -r1.265 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/sys_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/xen/x86/xenfunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.27 src/sys/arch/amd64/amd64/cpufunc.S:1.28
--- src/sys/arch/amd64/amd64/cpufunc.S:1.27 Sun Nov 27 14:49:21 2016
+++ src/sys/arch/amd64/amd64/cpufunc.S Sun Oct 15 10:58:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.27 2016/11/27 14:49:21 kamil Exp $ */
+/* $NetBSD: cpufunc.S,v 1.28 2017/10/15 10:58:32 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -641,6 +641,7 @@ ENTRY(setfs)
movw %di, %fs
ret
+#ifndef XEN
ENTRY(setusergs)
CLI(ax)
swapgs
@@ -648,3 +649,4 @@ ENTRY(setusergs)
swapgs
STI(ax)
ret
+#endif
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.264 src/sys/arch/amd64/amd64/machdep.c:1.265
--- src/sys/arch/amd64/amd64/machdep.c:1.264 Wed Oct 11 16:56:26 2017
+++ src/sys/arch/amd64/amd64/machdep.c Sun Oct 15 10:58:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.264 2017/10/11 16:56:26 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.265 2017/10/15 10:58:32 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.264 2017/10/11 16:56:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.265 2017/10/15 10:58:32 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -2061,11 +2061,7 @@ cpu_fsgs_zero(struct lwp *l)
tf->tf_fs = 0;
tf->tf_gs = 0;
setfs(0);
-#ifndef XEN
setusergs(0);
-#else
- HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, 0);
-#endif
if ((l->l_proc->p_flag & PK_32) == 0) {
#ifndef XEN
wrmsr(MSR_FSBASE, 0);
@@ -2103,11 +2099,7 @@ cpu_fsgs_reload(struct lwp *l, int fssel
update_descriptor(&curcpu()->ci_gdt[GUFS_SEL], &pcb->pcb_fs);
update_descriptor(&curcpu()->ci_gdt[GUGS_SEL], &pcb->pcb_gs);
setfs(fssel);
-#ifndef XEN
setusergs(gssel);
-#else
- HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, gssel);
-#endif
tf->tf_fs = fssel;
tf->tf_gs = gssel;
kpreempt_enable();
Index: src/sys/arch/x86/x86/sys_machdep.c
diff -u src/sys/arch/x86/x86/sys_machdep.c:1.38 src/sys/arch/x86/x86/sys_machdep.c:1.39
--- src/sys/arch/x86/x86/sys_machdep.c:1.38 Wed Aug 30 15:44:01 2017
+++ src/sys/arch/x86/x86/sys_machdep.c Sun Oct 15 10:58:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.38 2017/08/30 15:44:01 maxv Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.39 2017/10/15 10:58:32 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2009, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.38 2017/08/30 15:44:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.39 2017/10/15 10:58:32 maxv Exp $");
#include "opt_mtrr.h"
#include "opt_pmc.h"
@@ -628,12 +628,7 @@ x86_set_sdbase32(void *arg, char which,
if (l == curlwp) {
update_descriptor(&curcpu()->ci_gdt[GUGS_SEL], &usd);
#ifdef __x86_64__
-#ifndef XEN
setusergs(GSEL(GUGS_SEL, SEL_UPL));
-#else
- HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL,
- GSEL(GUGS_SEL, SEL_UPL));
-#endif
#endif
}
tf->tf_gs = GSEL(GUGS_SEL, SEL_UPL);
Index: src/sys/arch/xen/x86/xenfunc.c
diff -u src/sys/arch/xen/x86/xenfunc.c:1.16 src/sys/arch/xen/x86/xenfunc.c:1.17
--- src/sys/arch/xen/x86/xenfunc.c:1.16 Sun Feb 5 10:42:21 2017
+++ src/sys/arch/xen/x86/xenfunc.c Sun Oct 15 10:58:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xenfunc.c,v 1.16 2017/02/05 10:42:21 maxv Exp $ */
+/* $NetBSD: xenfunc.c,v 1.17 2017/10/15 10:58:32 maxv Exp $ */
/*
*
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.16 2017/02/05 10:42:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.17 2017/10/15 10:58:32 maxv Exp $");
#include <sys/param.h>
@@ -216,3 +216,11 @@ rcr2(void)
{
return curcpu()->ci_vcpu->arch.cr2;
}
+
+#ifdef __x86_64__
+void
+setusergs(int gssel)
+{
+ HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, gssel);
+}
+#endif
