Module Name: src
Committed By: maxv
Date: Sun Aug 12 13:31:16 UTC 2018
Modified Files:
src/sys/arch/amd64/include: frameasm.h
src/sys/arch/x86/include: pmap.h
Log Message:
Move the PCPU area from slot 384 to slot 510, to avoid creating too much
fragmentation in the slot space (384 is in the middle of the kernel half
of the VA).
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amd64/include/frameasm.h
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/x86/include/pmap.h
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/include/frameasm.h
diff -u src/sys/arch/amd64/include/frameasm.h:1.40 src/sys/arch/amd64/include/frameasm.h:1.41
--- src/sys/arch/amd64/include/frameasm.h:1.40 Fri Jul 13 14:11:02 2018
+++ src/sys/arch/amd64/include/frameasm.h Sun Aug 12 13:31:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.40 2018/07/13 14:11:02 martin Exp $ */
+/* $NetBSD: frameasm.h,v 1.41 2018/08/12 13:31:16 maxv Exp $ */
#ifndef _AMD64_MACHINE_FRAMEASM_H
#define _AMD64_MACHINE_FRAMEASM_H
@@ -130,7 +130,7 @@
#ifdef SVS
/* XXX: put this somewhere else */
-#define SVS_UTLS 0xffffc00000000000 /* PMAP_PCPU_BASE */
+#define SVS_UTLS 0xffffff0000000000 /* PMAP_PCPU_BASE */
#define UTLS_KPDIRPA 0
#define UTLS_SCRATCH 8
#define UTLS_RSP0 16
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.83 src/sys/arch/x86/include/pmap.h:1.84
--- src/sys/arch/x86/include/pmap.h:1.83 Sun Aug 12 10:50:35 2018
+++ src/sys/arch/x86/include/pmap.h Sun Aug 12 13:31:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.83 2018/08/12 10:50:35 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.84 2018/08/12 13:31:16 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -559,7 +559,7 @@ void pmap_free_ptps(struct vm_page *);
#ifdef __HAVE_PCPU_AREA
extern struct pcpu_area *pcpuarea;
-#define PDIR_SLOT_PCPU 384
+#define PDIR_SLOT_PCPU 510
#define PMAP_PCPU_BASE (VA_SIGN_NEG((PDIR_SLOT_PCPU * NBPD_L4)))
#endif
