d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename VM_NDOMAIN into MAXMEMDOM and move it into machine/param.h in

Browse Source 
order to match the MAXCPU concept.  The change should also be useful
for consolidation and consistency.

Sponsored by:	EMC / Isilon storage division
Obtained from:	jeff
Reviewed by:	alc
This commit is contained in:
Attilio Rao 2013-05-07 22:46:24 +00:00
parent 168ba1089a
commit 941646f5ec
18 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/include/param.h
View File

@ -71,6 +71,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif #endif
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define ALIGNBYTES _ALIGNBYTES #define ALIGNBYTES _ALIGNBYTES
#define ALIGN(p) _ALIGN(p) #define ALIGN(p) _ALIGN(p)
/* /*

7
sys/amd64/include/vmparam.h
View File

@ -120,13 +120,6 @@
*/ */
#define VM_NFREEORDER 13 #define VM_NFREEORDER 13
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Enable superpage reservations: 1 level. * Enable superpage reservations: 1 level.
*/ */

4
sys/arm/include/param.h
View File

@ -80,6 +80,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif /* SMP || KLD_MODULE */ #endif /* SMP || KLD_MODULE */
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define ALIGNBYTES _ALIGNBYTES #define ALIGNBYTES _ALIGNBYTES
#define ALIGN(p) _ALIGN(p) #define ALIGN(p) _ALIGN(p)
/* /*

7
sys/arm/include/vmparam.h
View File

@ -108,13 +108,6 @@
*/ */
#define VM_NFREEORDER 9 #define VM_NFREEORDER 9
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Disable superpage reservations. * Disable superpage reservations.
*/ */

4
sys/conf/NOTES
View File

@ -224,6 +224,10 @@ options SMP # Symmetric MultiProcessor Kernel
# A default value should be already present, for every architecture. # A default value should be already present, for every architecture.
options MAXCPU=32 options MAXCPU=32
# MAXMEMDOM defines the maximum number of memory domains that can boot in the
# system. A default value should already be defined by every architecture.
options MAXMEMDOM=1
# ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin # ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin
# if the thread that currently owns the mutex is executing on another # if the thread that currently owns the mutex is executing on another
# CPU. This behavior is enabled by default, so this option can be used # CPU. This behavior is enabled by default, so this option can be used

2
sys/conf/options
View File

@ -568,6 +568,7 @@ DIAGNOSTIC opt_global.h
INVARIANT_SUPPORT opt_global.h INVARIANT_SUPPORT opt_global.h
INVARIANTS opt_global.h INVARIANTS opt_global.h
MAXCPU opt_global.h MAXCPU opt_global.h
MAXMEMDOM opt_global.h
MAXPHYS opt_global.h MAXPHYS opt_global.h
MCLSHIFT opt_global.h MCLSHIFT opt_global.h
MUTEX_DEBUG opt_global.h MUTEX_DEBUG opt_global.h
@ -584,7 +585,6 @@ VFS_BIO_DEBUG opt_global.h
VM_KMEM_SIZE opt_vm.h VM_KMEM_SIZE opt_vm.h
VM_KMEM_SIZE_SCALE opt_vm.h VM_KMEM_SIZE_SCALE opt_vm.h
VM_KMEM_SIZE_MAX opt_vm.h VM_KMEM_SIZE_MAX opt_vm.h
VM_NDOMAIN opt_vm.h
VM_NRESERVLEVEL opt_vm.h VM_NRESERVLEVEL opt_vm.h
VM_LEVEL_0_ORDER opt_vm.h VM_LEVEL_0_ORDER opt_vm.h
NO_SWAPPING opt_vm.h NO_SWAPPING opt_vm.h

4
sys/i386/include/param.h
View File

@ -64,6 +64,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif /* SMP || KLD_MODULE */ #endif /* SMP || KLD_MODULE */
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define ALIGNBYTES _ALIGNBYTES #define ALIGNBYTES _ALIGNBYTES
#define ALIGN(p) _ALIGN(p) #define ALIGN(p) _ALIGN(p)
/* /*

7
sys/i386/include/vmparam.h
View File

@ -106,13 +106,6 @@
#define VM_NFREEORDER 11 #define VM_NFREEORDER 11
#endif #endif
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Enable superpage reservations: 1 level. * Enable superpage reservations: 1 level.
*/ */

4
sys/ia64/include/param.h
View File

@ -69,6 +69,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif #endif
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define ALIGNBYTES _ALIGNBYTES #define ALIGNBYTES _ALIGNBYTES
#define ALIGN(p) _ALIGN(p) #define ALIGN(p) _ALIGN(p)
/* /*

7
sys/ia64/include/vmparam.h
View File

@ -102,13 +102,6 @@
*/ */
#define VM_NFREEORDER 16 #define VM_NFREEORDER 16
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Disable superpage reservations. * Disable superpage reservations.
*/ */

4
sys/mips/include/param.h
View File

@ -101,6 +101,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif #endif
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
/* /*
* Round p (pointer or byte index) up to a correctly-aligned value for all * Round p (pointer or byte index) up to a correctly-aligned value for all
* data types (int, long, ...). The result is u_int and must be cast to * data types (int, long, ...). The result is u_int and must be cast to

7
sys/mips/include/vmparam.h
View File

@ -100,13 +100,6 @@
#define FREEBSD32_USRSTACK (((vm_offset_t)0x80000000) - PAGE_SIZE) #define FREEBSD32_USRSTACK (((vm_offset_t)0x80000000) - PAGE_SIZE)
#endif #endif
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Disable superpage reservations. (not sure if this is right * Disable superpage reservations. (not sure if this is right
* I copied it from ARM) * I copied it from ARM)

4
sys/powerpc/include/param.h
View File

@ -75,6 +75,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif /* SMP || KLD_MODULE */ #endif /* SMP || KLD_MODULE */
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define ALIGNBYTES _ALIGNBYTES #define ALIGNBYTES _ALIGNBYTES
#define ALIGN(p) _ALIGN(p) #define ALIGN(p) _ALIGN(p)
/* /*

7
sys/powerpc/include/vmparam.h
View File

@ -162,13 +162,6 @@ struct pmap_physseg {
*/ */
#define VM_NFREEORDER 11 #define VM_NFREEORDER 11
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Disable superpage reservations. * Disable superpage reservations.
*/ */

4
sys/sparc64/include/param.h
View File

@ -57,6 +57,10 @@
#define MAXCPU 1 #define MAXCPU 1
#endif /* SMP || KLD_MODULE */ #endif /* SMP || KLD_MODULE */
#ifndef MAXMEMDOM
#define MAXMEMDOM 1
#endif
#define INT_SHIFT 2 #define INT_SHIFT 2
#define PTR_SHIFT 3 #define PTR_SHIFT 3

7
sys/sparc64/include/vmparam.h
View File

@ -105,13 +105,6 @@
*/ */
#define VM_NFREEORDER 12 #define VM_NFREEORDER 12
/*
* Only one memory domain.
*/
#ifndef VM_NDOMAIN
#define VM_NDOMAIN 1
#endif
/* /*
* Enable superpage reservations: 1 level. * Enable superpage reservations: 1 level.
*/ */

20
sys/vm/vm_phys.c
View File

@ -63,11 +63,11 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_phys.h> #include <vm/vm_phys.h>
/* /*
* VM_FREELIST_DEFAULT is split into VM_NDOMAIN lists, one for each * VM_FREELIST_DEFAULT is split into MAXMEMDOM lists, one for each
* domain. These extra lists are stored at the end of the regular * domain. These extra lists are stored at the end of the regular
* free lists starting with VM_NFREELIST. * free lists starting with VM_NFREELIST.
*/ */
#define VM_RAW_NFREELIST (VM_NFREELIST + VM_NDOMAIN - 1) #define VM_RAW_NFREELIST (VM_NFREELIST + MAXMEMDOM - 1)
struct vm_freelist { struct vm_freelist {
struct pglist pl; struct pglist pl;
@ -100,7 +100,7 @@ MALLOC_DEFINE(M_FICT_PAGES, "", "");
static struct vm_freelist static struct vm_freelist
vm_phys_free_queues[VM_RAW_NFREELIST][VM_NFREEPOOL][VM_NFREEORDER]; vm_phys_free_queues[VM_RAW_NFREELIST][VM_NFREEPOOL][VM_NFREEORDER];
static struct vm_freelist static struct vm_freelist
(*vm_phys_lookup_lists[VM_NDOMAIN][VM_RAW_NFREELIST])[VM_NFREEPOOL][VM_NFREEORDER]; (*vm_phys_lookup_lists[MAXMEMDOM][VM_RAW_NFREELIST])[VM_NFREEPOOL][VM_NFREEORDER];
static int vm_nfreelists = VM_FREELIST_DEFAULT + 1; static int vm_nfreelists = VM_FREELIST_DEFAULT + 1;
@ -116,7 +116,7 @@ static int sysctl_vm_phys_segs(SYSCTL_HANDLER_ARGS);
SYSCTL_OID(_vm, OID_AUTO, phys_segs, CTLTYPE_STRING | CTLFLAG_RD, SYSCTL_OID(_vm, OID_AUTO, phys_segs, CTLTYPE_STRING | CTLFLAG_RD,
NULL, 0, sysctl_vm_phys_segs, "A", "Phys Seg Info"); NULL, 0, sysctl_vm_phys_segs, "A", "Phys Seg Info");
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
static int sysctl_vm_phys_lookup_lists(SYSCTL_HANDLER_ARGS); static int sysctl_vm_phys_lookup_lists(SYSCTL_HANDLER_ARGS);
SYSCTL_OID(_vm, OID_AUTO, phys_lookup_lists, CTLTYPE_STRING | CTLFLAG_RD, SYSCTL_OID(_vm, OID_AUTO, phys_lookup_lists, CTLTYPE_STRING | CTLFLAG_RD,
NULL, 0, sysctl_vm_phys_lookup_lists, "A", "Phys Lookup Lists"); NULL, 0, sysctl_vm_phys_lookup_lists, "A", "Phys Lookup Lists");
@ -200,7 +200,7 @@ sysctl_vm_phys_segs(SYSCTL_HANDLER_ARGS)
return (error); return (error);
} }
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
/* /*
* Outputs the set of free list lookup lists. * Outputs the set of free list lookup lists.
*/ */
@ -255,7 +255,7 @@ _vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end, int flind, int domain)
#else #else
seg->first_page = PHYS_TO_VM_PAGE(start); seg->first_page = PHYS_TO_VM_PAGE(start);
#endif #endif
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
if (flind == VM_FREELIST_DEFAULT && domain != 0) { if (flind == VM_FREELIST_DEFAULT && domain != 0) {
flind = VM_NFREELIST + (domain - 1); flind = VM_NFREELIST + (domain - 1);
if (flind >= vm_nfreelists) if (flind >= vm_nfreelists)
@ -302,7 +302,7 @@ vm_phys_init(void)
{ {
struct vm_freelist *fl; struct vm_freelist *fl;
int flind, i, oind, pind; int flind, i, oind, pind;
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
int ndomains, j; int ndomains, j;
#endif #endif
@ -347,7 +347,7 @@ vm_phys_init(void)
TAILQ_INIT(&fl[oind].pl); TAILQ_INIT(&fl[oind].pl);
} }
} }
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
/* /*
* Build a free list lookup list for each domain. All of the * Build a free list lookup list for each domain. All of the
* memory domain lists are inserted at the VM_FREELIST_DEFAULT * memory domain lists are inserted at the VM_FREELIST_DEFAULT
@ -444,7 +444,7 @@ vm_phys_alloc_pages(int pool, int order)
KASSERT(order < VM_NFREEORDER, KASSERT(order < VM_NFREEORDER,
("vm_phys_alloc_pages: order %d is out of range", order)); ("vm_phys_alloc_pages: order %d is out of range", order));
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
domain = PCPU_GET(domain); domain = PCPU_GET(domain);
#else #else
domain = 0; domain = 0;
@ -925,7 +925,7 @@ vm_phys_alloc_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
int domain, flind, oind, order, pind; int domain, flind, oind, order, pind;
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
domain = PCPU_GET(domain); domain = PCPU_GET(domain);
#else #else
domain = 0; domain = 0;

8
sys/x86/acpica/srat.c
View File

@ -28,8 +28,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include "opt_vm.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -47,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <dev/acpica/acpivar.h> #include <dev/acpica/acpivar.h>
#if VM_NDOMAIN > 1 #if MAXMEMDOM > 1
struct cpu_info { struct cpu_info {
int enabled:1; int enabled:1;
int has_memory:1; int has_memory:1;
@ -265,7 +263,7 @@ renumber_domains(void)
domains[j] = domains[j - 1]; domains[j] = domains[j - 1];
domains[slot] = mem_info[i].domain; domains[slot] = mem_info[i].domain;
ndomain++; ndomain++;
if (ndomain > VM_NDOMAIN) { if (ndomain > MAXMEMDOM) {
printf("SRAT: Too many memory domains\n"); printf("SRAT: Too many memory domains\n");
return (EFBIG); return (EFBIG);
} }
@ -362,4 +360,4 @@ srat_set_cpus(void *dummy)
} }
} }
SYSINIT(srat_set_cpus, SI_SUB_CPU, SI_ORDER_ANY, srat_set_cpus, NULL); SYSINIT(srat_set_cpus, SI_SUB_CPU, SI_ORDER_ANY, srat_set_cpus, NULL);
#endif /* VM_NDOMAIN > 1 */ #endif /* MAXMEMDOM > 1 */