From 88382234bb540544a3550d1ddfb84e0d17eec971 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Sat, 17 Dec 2011 21:43:48 +0000 Subject: Remove arbitrary limits used by the zone system The zone allocator could limit the size of its zones to an arbitrary value set at zinit() time. There is no such parameter with the slab module. As a result of removing those limits, the kern/mach_param.h header becomes empty, and is simply removed altogether. * Makefrag.am (libkernel_a_SOURCES): Remove kern/mach_param.h. * i386/i386/fpu.c: Remove #include . * i386/i386/machine_task.c: Likewise. * i386/i386/pcb.c: Likewise. * ipc/ipc_init.c: Likewise. (ipc_space_max): Remove variable. (ipc_tree_entry_max): Likewise. (ipc_port_max): Likewise. (ipc_pset_max): Likewise. * ipc/ipc_init.h (IPC_ZONE_TYPE): Remove macro. (ipc_space_max): Remove extern declaration. (ipc_tree_entry_max): Likewise. (ipc_port_max): Likewise. (ipc_pset_max): Likewise. * ipc/ipc_hash.c (ipc_hash_init): Don't use ipc_tree_entry_max to compute ipc_hash_global_size. * ipc/ipc_marequest.c: Remove #include . (ipc_marequest_max): Remove variable. (ipc_marequest_init): Don't use ipc_marequest_max to compute ipc_marequest_size. (ipc_marequest_info): Return (unsigned int)-1 in maxp. * kern/act.c: Remove #include . * kern/mach_clock.c: Likewise. * kern/priority.c: Likewise. * kern/task.c: Likewise. * kern/thread.c: Likewise. * vm/memory_object_proxy.c: Likewise. * vm/vm_fault.c: Likewise. --- ipc/ipc_hash.c | 7 ++----- ipc/ipc_init.c | 6 ------ ipc/ipc_init.h | 8 -------- ipc/ipc_marequest.c | 11 +++-------- 4 files changed, 5 insertions(+), 27 deletions(-) (limited to 'ipc') diff --git a/ipc/ipc_hash.c b/ipc/ipc_hash.c index c2412890..a1ca225d 100644 --- a/ipc/ipc_hash.c +++ b/ipc/ipc_hash.c @@ -537,11 +537,8 @@ ipc_hash_init(void) /* if not configured, initialize ipc_hash_global_size */ - if (ipc_hash_global_size == 0) { - ipc_hash_global_size = ipc_tree_entry_max >> 8; - if (ipc_hash_global_size < 32) - ipc_hash_global_size = 32; - } + if (ipc_hash_global_size == 0) + ipc_hash_global_size = 256; /* make sure it is a power of two */ diff --git a/ipc/ipc_init.c b/ipc/ipc_init.c index 36d0f19e..ca7e7912 100644 --- a/ipc/ipc_init.c +++ b/ipc/ipc_init.c @@ -35,7 +35,6 @@ */ #include -#include #include #include #include @@ -57,11 +56,6 @@ static struct vm_map ipc_kernel_map_store; vm_map_t ipc_kernel_map = &ipc_kernel_map_store; vm_size_t ipc_kernel_map_size = 8 * 1024 * 1024; -int ipc_space_max = SPACE_MAX; -int ipc_tree_entry_max = ITE_MAX; -int ipc_port_max = PORT_MAX; -int ipc_pset_max = SET_MAX; - /* * Routine: ipc_bootstrap * Purpose: diff --git a/ipc/ipc_init.h b/ipc/ipc_init.h index b2f1dd4b..8dd64bb5 100644 --- a/ipc/ipc_init.h +++ b/ipc/ipc_init.h @@ -37,14 +37,6 @@ #ifndef _IPC_IPC_INIT_H_ #define _IPC_IPC_INIT_H_ -/* all IPC zones should be exhaustible */ -#define IPC_ZONE_TYPE ZONE_EXHAUSTIBLE - -extern int ipc_space_max; -extern int ipc_tree_entry_max; -extern int ipc_port_max; -extern int ipc_pset_max; - /* * Exported interfaces */ diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c index 2087c678..6036967f 100644 --- a/ipc/ipc_marequest.c +++ b/ipc/ipc_marequest.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -59,7 +58,6 @@ struct kmem_cache ipc_marequest_cache; -int ipc_marequest_max = IMAR_MAX; #define imar_alloc() ((ipc_marequest_t) kmem_cache_alloc(&ipc_marequest_cache)) #define imar_free(imar) kmem_cache_free(&ipc_marequest_cache, (vm_offset_t) (imar)) @@ -102,11 +100,8 @@ ipc_marequest_init(void) /* if not configured, initialize ipc_marequest_size */ - if (ipc_marequest_size == 0) { - ipc_marequest_size = ipc_marequest_max >> 8; - if (ipc_marequest_size < 16) - ipc_marequest_size = 16; - } + if (ipc_marequest_size == 0) + ipc_marequest_size = 16; /* make sure it is a power of two */ @@ -436,7 +431,7 @@ ipc_marequest_info(maxp, info, count) info[i].hib_count = bucket_count; } - *maxp = ipc_marequest_max; + *maxp = (unsigned int)-1; return ipc_marequest_size; } -- cgit v1.2.3