[src/trunk]: src/sys/arch Enable the NX bit feature for Xen i386pae and amd64...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Enable the NX bit feature for Xen i386pae and amd64...
From: jym <jym%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:57:07 +0000

details:   https://anonhg.NetBSD.org/src/rev/0c9a92f1d696
branches:  trunk
changeset: 754583:0c9a92f1d696
user:      jym <jym%NetBSD.org@localhost>
date:      Tue May 04 23:27:13 2010 +0000

description:
Enable the NX bit feature for Xen i386pae and amd64 kernels.

Tested with Xen 3.1 and Xen 3.3, dom0 and domU, by bouyer@ and jym@.

Ok bouyer@.

diffstat:

 sys/arch/amd64/amd64/machdep.c    |   5 ++---
 sys/arch/i386/i386/machdep.c      |   5 ++---
 sys/arch/i386/i386/trap.c         |   6 ++++--
 sys/arch/i386/include/pte.h       |   3 ++-
 sys/arch/x86/include/specialreg.h |   4 +---
 sys/arch/x86/x86/pmap.c           |  14 ++++++--------
 sys/arch/xen/x86/cpu.c            |   7 +++++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diffs (190 lines):

diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.144 2010/04/18 23:47:50 jym Exp $        */
+/*     $NetBSD: machdep.c,v 1.145 2010/05/04 23:27:13 jym Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.144 2010/04/18 23:47:50 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.145 2010/05/04 23:27:13 jym Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -1253,7 +1253,6 @@
 #endif /* XEN */
 
        cpu_feature[0] &= ~CPUID_FEAT_BLACKLIST;
-       cpu_feature[2] &= ~CPUID_EXT_FEAT_BLACKLIST;
 
        cpu_init_msrs(&cpu_info_primary, true);
 
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/i386/i386/machdep.c      Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.686 2010/04/23 16:07:33 joerg Exp $      */
+/*     $NetBSD: machdep.c,v 1.687 2010/05/04 23:27:13 jym Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.686 2010/04/23 16:07:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.687 2010/05/04 23:27:13 jym Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -1299,7 +1299,6 @@
        pcb = lwp_getpcb(&lwp0);
 
        cpu_feature[0] &= ~CPUID_FEAT_BLACKLIST;
-       cpu_feature[2] &= ~CPUID_EXT_FEAT_BLACKLIST;
 
        cpu_init_msrs(&cpu_info_primary, true);
 
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/i386/i386/trap.c
--- a/sys/arch/i386/i386/trap.c Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/i386/i386/trap.c Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.256 2010/04/23 19:18:09 rmind Exp $ */
+/*     $NetBSD: trap.c,v 1.257 2010/05/04 23:27:13 jym Exp $   */
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.256 2010/04/23 19:18:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.257 2010/05/04 23:27:13 jym Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -671,6 +671,8 @@
                        map = &vm->vm_map;
                if (frame->tf_err & PGEX_W)
                        ftype = VM_PROT_WRITE;
+               else if (frame->tf_err & PGEX_X)
+                       ftype = VM_PROT_EXECUTE;
                else
                        ftype = VM_PROT_READ;
 
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/i386/include/pte.h
--- a/sys/arch/i386/include/pte.h       Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/i386/include/pte.h       Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.22 2010/04/06 20:43:57 jld Exp $     */
+/*     $NetBSD: pte.h,v 1.23 2010/05/04 23:27:14 jym Exp $     */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -274,5 +274,6 @@
 #define PGEX_P         0x01    /* protection violation (vs. no mapping) */
 #define PGEX_W         0x02    /* exception during a write cycle */
 #define PGEX_U         0x04    /* exception while in user mode (upl) */
+#define PGEX_X         0x10    /* exception during instruction fetch */
 
 #endif /* _I386_PTE_H_ */
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/x86/include/specialreg.h
--- a/sys/arch/x86/include/specialreg.h Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/x86/include/specialreg.h Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: specialreg.h,v 1.40 2010/04/18 23:47:51 jym Exp $      */
+/*     $NetBSD: specialreg.h,v 1.41 2010/05/04 23:27:14 jym Exp $      */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -262,10 +262,8 @@
 #ifdef XEN
 /* Not on Xen */
 #define CPUID_FEAT_BLACKLIST    (CPUID_PGE|CPUID_PSE|CPUID_MTRR|CPUID_FXSR)
-#define CPUID_EXT_FEAT_BLACKLIST (CPUID_NOX)
 #else
 #define CPUID_FEAT_BLACKLIST    0
-#define CPUID_EXT_FEAT_BLACKLIST 0
 #endif /* XEN */
 
 /*
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/x86/x86/pmap.c   Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.107 2010/04/18 23:47:51 jym Exp $   */
+/*     $NetBSD: pmap.c,v 1.108 2010/05/04 23:27:14 jym Exp $   */
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.107 2010/04/18 23:47:51 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.108 2010/05/04 23:27:14 jym Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1146,10 +1146,9 @@
        if (flags & PMAP_NOCACHE)
                npte |= PG_N;
 
-#ifndef XEN
        if ((cpu_feature[2] & CPUID_NOX) && !(prot & VM_PROT_EXECUTE))
                npte |= PG_NX;
-#endif
+
        opte = pmap_pte_testset (pte, npte); /* zap! */
 
        if (pmap_valid_entry(opte)) {
@@ -1268,13 +1267,12 @@
        struct pcb *pcb;
        int i;
        vaddr_t kva;
-#ifdef XEN
-       pt_entry_t pg_nx = 0;
-#else
+#ifndef XEN
        unsigned long p1i;
        vaddr_t kva_end;
+#endif
+
        pt_entry_t pg_nx = (cpu_feature[2] & CPUID_NOX ? PG_NX : 0);
-#endif
 
        /*
         * set up our local static global vars that keep track of the
diff -r 690609d28b11 -r 0c9a92f1d696 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Tue May 04 21:17:10 2010 +0000
+++ b/sys/arch/xen/x86/cpu.c    Tue May 04 23:27:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.43 2010/04/18 23:47:52 jym Exp $     */
+/*     $NetBSD: cpu.c,v 1.44 2010/05/04 23:27:14 jym Exp $     */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.43 2010/04/18 23:47:52 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.44 2010/05/04 23:27:14 jym Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -1005,6 +1005,9 @@
                HYPERVISOR_set_segment_base (SEGBASE_GS_USER, 0);
        }
 #endif /* __x86_64__ */
+
+       if (cpu_feature[2] & CPUID_NOX)
+               wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_NXE);
 }
 
 void

Prev by Date: [src/trunk]: src/doc xen: Enable no-execute bit feature for i386pae and amd64...
Next by Date: [src/trunk]: src/share/man/man1 Wrap the USD reference around .Rs/.Re.
Previous by Thread: [src/trunk]: src/doc xen: Enable no-execute bit feature for i386pae and amd64...
Next by Thread: [src/trunk]: src/share/man/man1 Wrap the USD reference around .Rs/.Re.
Indexes:

Home | Main Index | Thread Index | Old Index