svn commit: r247742 - in user/attilio/vmc-playground/sys: conf vm
Attilio Rao
attilio at FreeBSD.org
Mon Mar 4 00:07:25 UTC 2013
Author: attilio
Date: Mon Mar 4 00:07:23 2013
New Revision: 247742
URL: http://svnweb.freebsd.org/changeset/base/247742
Log:
Remove the boot-time cache support and rely on UMA boot-time slab cache
for allocating the nodes before to have the possibility to carve
directly from the UMA subsystem.
Sponsored by: EMC / Isilon storage division
Reviewed by: alc
Modified:
user/attilio/vmc-playground/sys/conf/options
user/attilio/vmc-playground/sys/vm/vm_object.c
user/attilio/vmc-playground/sys/vm/vm_radix.c
user/attilio/vmc-playground/sys/vm/vm_radix.h
Modified: user/attilio/vmc-playground/sys/conf/options
==============================================================================
--- user/attilio/vmc-playground/sys/conf/options Mon Mar 4 00:07:19 2013 (r247741)
+++ user/attilio/vmc-playground/sys/conf/options Mon Mar 4 00:07:23 2013 (r247742)
@@ -591,7 +591,6 @@ VM_KMEM_SIZE_MAX opt_vm.h
VM_NDOMAIN opt_vm.h
VM_NRESERVLEVEL opt_vm.h
VM_LEVEL_0_ORDER opt_vm.h
-VM_RADIX_BOOT_CACHE opt_vm.h
NO_SWAPPING opt_vm.h
MALLOC_MAKE_FAILURES opt_vm.h
MALLOC_PROFILE opt_vm.h
Modified: user/attilio/vmc-playground/sys/vm/vm_object.c
==============================================================================
--- user/attilio/vmc-playground/sys/vm/vm_object.c Mon Mar 4 00:07:19 2013 (r247741)
+++ user/attilio/vmc-playground/sys/vm/vm_object.c Mon Mar 4 00:07:23 2013 (r247742)
@@ -295,6 +295,8 @@ vm_object_init(void)
NULL,
#endif
vm_object_zinit, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM|UMA_ZONE_NOFREE);
+
+ vm_radix_init();
}
void
Modified: user/attilio/vmc-playground/sys/vm/vm_radix.c
==============================================================================
--- user/attilio/vmc-playground/sys/vm/vm_radix.c Mon Mar 4 00:07:19 2013 (r247741)
+++ user/attilio/vmc-playground/sys/vm/vm_radix.c Mon Mar 4 00:07:23 2013 (r247742)
@@ -45,7 +45,6 @@
#include <sys/cdefs.h>
#include "opt_ddb.h"
-#include "opt_vm.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,10 +61,6 @@
#include <ddb/ddb.h>
#endif
-#ifndef VM_RADIX_BOOT_CACHE
-#define VM_RADIX_BOOT_CACHE 150
-#endif
-
/*
* Such sizes should permit to keep node children contained into a single
* cache-line, or to at least not span many of those.
@@ -102,27 +97,6 @@ struct vm_radix_node {
static uma_zone_t vm_radix_node_zone;
/*
- * Boot-time cache of struct vm_radix_node objects.
- * This cache is used to cater page allocations before the UMA zone is
- * actually setup and pre-allocated (ie. pmap_init()).
- */
-static u_int boot_cache_cnt;
-static struct vm_radix_node boot_cache[VM_RADIX_BOOT_CACHE];
-
-static struct vm_radix_node *
-vm_radix_carve_bootcache(void)
-{
- struct vm_radix_node *rnode;
-
- if (boot_cache_cnt == VM_RADIX_BOOT_CACHE)
- panic("%s: Increase VM_RADIX_BOOT_CACHE (%u)", __func__,
- VM_RADIX_BOOT_CACHE);
- rnode = &boot_cache[boot_cache_cnt];
- boot_cache_cnt++;
- return (rnode);
-}
-
-/*
* Allocate a radix node. Pre-allocation ensures that the request will be
* always successfully satisfied.
*/
@@ -131,26 +105,22 @@ vm_radix_node_get(vm_pindex_t owner, uin
{
struct vm_radix_node *rnode;
- if (__predict_false(boot_cache_cnt <= VM_RADIX_BOOT_CACHE))
- rnode = vm_radix_carve_bootcache();
- else {
- rnode = uma_zalloc(vm_radix_node_zone, M_NOWAIT | M_ZERO);
+ rnode = uma_zalloc(vm_radix_node_zone, M_NOWAIT | M_ZERO);
- /*
- * The required number of nodes might be already correctly
- * pre-allocated in vm_radix_init(). However, UMA can reserve
- * few nodes on per-cpu specific buckets, which will not be
- * accessible from the curcpu. The allocation could then
- * return NULL when the pre-allocation pool is close to be
- * exhausted. Anyway, in practice this should never be a
- * problem because a new node is not always required for
- * insert, thus the pre-allocation pool should already have
- * some extra-pages that indirectly deal with this situation.
- */
- if (rnode == NULL)
- panic("%s: uma_zalloc() returned NULL for a new node",
- __func__);
- }
+ /*
+ * The required number of nodes might be already correctly
+ * pre-allocated in vm_radix_init(). However, UMA can reserve
+ * few nodes on per-cpu specific buckets, which will not be
+ * accessible from the curcpu. The allocation could then
+ * return NULL when the pre-allocation pool is close to be
+ * exhausted. Anyway, in practice this should never be a
+ * problem because a new node is not always required for
+ * insert, thus the pre-allocation pool should already have
+ * some extra-pages that indirectly deal with this situation.
+ */
+ if (rnode == NULL)
+ panic("%s: uma_zalloc() returned NULL for a new node",
+ __func__);
rnode->rn_owner = owner;
rnode->rn_count = count;
rnode->rn_clev = clevel;
@@ -164,9 +134,6 @@ static __inline void
vm_radix_node_put(struct vm_radix_node *rnode)
{
- if (__predict_false(rnode > boot_cache &&
- rnode <= &boot_cache[VM_RADIX_BOOT_CACHE]))
- return;
uma_zfree(vm_radix_node_zone, rnode);
}
@@ -367,7 +334,23 @@ vm_radix_node_zone_dtor(void *mem, int s
* Pre-allocate intermediate nodes from the UMA slab zone.
*/
static void
-vm_radix_init(void *arg __unused)
+vm_radix_prealloc(void *arg __unused)
+{
+
+ if (!uma_zone_reserve_kva(vm_radix_node_zone, cnt.v_page_count))
+ panic("%s: unable to create new zone", __func__);
+ uma_prealloc(vm_radix_node_zone, cnt.v_page_count);
+}
+SYSINIT(vm_radix_prealloc, SI_SUB_KMEM, SI_ORDER_SECOND, vm_radix_prealloc,
+ NULL);
+
+/*
+ * Initialize the UMA slab zone.
+ * Until vm_radix_prealloc() is called, the zone will be served by the
+ * UMA boot-time pre-allocated pool of pages.
+ */
+void
+vm_radix_init(void)
{
vm_radix_node_zone = uma_zcreate("RADIX NODE",
@@ -378,12 +361,7 @@ vm_radix_init(void *arg __unused)
NULL,
#endif
NULL, NULL, VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- if (!uma_zone_reserve_kva(vm_radix_node_zone, cnt.v_page_count))
- panic("%s: unable to create new zone", __func__);
- uma_prealloc(vm_radix_node_zone, cnt.v_page_count);
- boot_cache_cnt = VM_RADIX_BOOT_CACHE + 1;
}
-SYSINIT(vm_radix_init, SI_SUB_KMEM, SI_ORDER_SECOND, vm_radix_init, NULL);
/*
* Inserts the key-value pair in to the trie.
Modified: user/attilio/vmc-playground/sys/vm/vm_radix.h
==============================================================================
--- user/attilio/vmc-playground/sys/vm/vm_radix.h Mon Mar 4 00:07:19 2013 (r247741)
+++ user/attilio/vmc-playground/sys/vm/vm_radix.h Mon Mar 4 00:07:23 2013 (r247742)
@@ -34,6 +34,7 @@
#ifdef _KERNEL
+void vm_radix_init(void);
void vm_radix_insert(struct vm_radix *rtree, vm_pindex_t index,
vm_page_t page);
vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index);
More information about the svn-src-user
mailing list