Date: Sat, 16 May 2009 21:06:48 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192217 - in user/kmacy/ZFS_MFC/sys: amd64/include kern vm Message-ID: <200905162106.n4GL6mH7002644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat May 16 21:06:48 2009 New Revision: 192217 URL: http://svn.freebsd.org/changeset/base/192217 Log: bump kmem to 512GB Modified: user/kmacy/ZFS_MFC/sys/amd64/include/vmparam.h user/kmacy/ZFS_MFC/sys/kern/kern_malloc.c user/kmacy/ZFS_MFC/sys/vm/vm_kern.h Modified: user/kmacy/ZFS_MFC/sys/amd64/include/vmparam.h ============================================================================== --- user/kmacy/ZFS_MFC/sys/amd64/include/vmparam.h Sat May 16 20:57:08 2009 (r192216) +++ user/kmacy/ZFS_MFC/sys/amd64/include/vmparam.h Sat May 16 21:06:48 2009 (r192217) @@ -154,8 +154,8 @@ * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) * 0xffff804020101000 - 0xfffffeffffffffff unused * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings - * 0xffffff8000000000 - 0xfffffffe7fffffff unused (506GB) - * 0xfffffffe80000000 - 0xffffffffffffffff 6GB kernel map + * 0xffffff8000000000 - 0xfffffffe3fffffff unused (505GB) + * 0xfffffffe40000000 - 0xffffffffffffffff 512GB kernel map * * Within the kernel map: * @@ -163,7 +163,7 @@ */ #define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NPDEPG-1, NPTEPG-1) -#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-6, 0, 0) +#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-512, 0, 0) #define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0) #define DMAP_MAX_ADDRESS KVADDR(DMPML4I+1, 0, 0, 0) Modified: user/kmacy/ZFS_MFC/sys/kern/kern_malloc.c ============================================================================== --- user/kmacy/ZFS_MFC/sys/kern/kern_malloc.c Sat May 16 20:57:08 2009 (r192216) +++ user/kmacy/ZFS_MFC/sys/kern/kern_malloc.c Sat May 16 21:06:48 2009 (r192217) @@ -181,20 +181,20 @@ struct { */ static uma_zone_t mt_zone; -u_int vm_kmem_size; -SYSCTL_UINT(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0, +u_long vm_kmem_size; +SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0, "Size of kernel memory"); -u_int vm_kmem_size_min; -SYSCTL_UINT(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0, +u_long vm_kmem_size_min; +SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0, "Minimum size of kernel memory"); -u_int vm_kmem_size_max; -SYSCTL_UINT(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0, +u_long vm_kmem_size_max; +SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0, "Maximum size of kernel memory"); u_int vm_kmem_size_scale; -SYSCTL_UINT(_vm, OID_AUTO, kmem_size_scale, CTLFLAG_RD, &vm_kmem_size_scale, 0, +SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_scale, CTLFLAG_RD, &vm_kmem_size_scale, 0, "Scale factor for kernel memory size"); /* @@ -589,7 +589,7 @@ kmeminit(void *dummy) #if defined(VM_KMEM_SIZE_MIN) vm_kmem_size_min = VM_KMEM_SIZE_MIN; #endif - TUNABLE_INT_FETCH("vm.kmem_size_min", &vm_kmem_size_min); + TUNABLE_LONG_FETCH("vm.kmem_size_min", &vm_kmem_size_min); if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min) { vm_kmem_size = vm_kmem_size_min; } @@ -597,16 +597,16 @@ kmeminit(void *dummy) #if defined(VM_KMEM_SIZE_MAX) vm_kmem_size_max = VM_KMEM_SIZE_MAX; #endif - TUNABLE_INT_FETCH("vm.kmem_size_max", &vm_kmem_size_max); + TUNABLE_LONG_FETCH("vm.kmem_size_max", &vm_kmem_size_max); if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max) vm_kmem_size = vm_kmem_size_max; /* Allow final override from the kernel environment */ #ifndef BURN_BRIDGES - if (TUNABLE_INT_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0) + if (TUNABLE_LONG_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0) printf("kern.vm.kmem.size is now called vm.kmem_size!\n"); #endif - TUNABLE_INT_FETCH("vm.kmem_size", &vm_kmem_size); + TUNABLE_LONG_FETCH("vm.kmem_size", &vm_kmem_size); /* * Limit kmem virtual size to twice the physical memory. Modified: user/kmacy/ZFS_MFC/sys/vm/vm_kern.h ============================================================================== --- user/kmacy/ZFS_MFC/sys/vm/vm_kern.h Sat May 16 20:57:08 2009 (r192216) +++ user/kmacy/ZFS_MFC/sys/vm/vm_kern.h Sat May 16 21:06:48 2009 (r192217) @@ -69,6 +69,6 @@ extern vm_map_t kernel_map; extern vm_map_t kmem_map; extern vm_map_t exec_map; extern vm_map_t pipe_map; -extern u_int vm_kmem_size; +extern u_long vm_kmem_size; #endif /* _VM_VM_KERN_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905162106.n4GL6mH7002644>