Page MenuHomeFreeBSD
Files F154500089

D24756.id.diff
No OneTemporary
Actions

D24756.id.diff
View Options

Index: head/sys/vm/uma_core.c
===================================================================
--- head/sys/vm/uma_core.c
+++ head/sys/vm/uma_core.c
@@ -192,6 +192,7 @@
static enum {
BOOT_COLD,
BOOT_KVA,
+ BOOT_PCPU,
BOOT_RUNNING,
BOOT_SHUTDOWN,
} booted = BOOT_COLD;
@@ -304,7 +305,6 @@
static int hash_expand(struct uma_hash *, struct uma_hash *);
static void hash_free(struct uma_hash *hash);
static void uma_timeout(void *);
-static void uma_startup3(void);
static void uma_shutdown(void);
static void *zone_alloc_item(uma_zone_t, void *, int, int);
static void zone_free_item(uma_zone_t, void *, void *, enum zfreeskip);
@@ -360,8 +360,6 @@
&uma_skip_cnt, "memory items skipped, not debugged");
#endif
-SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL);
-
SYSCTL_NODE(_vm, OID_AUTO, uma, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"Universal Memory Allocator");
@@ -2658,9 +2656,10 @@
(UMA_ZONE_INHERIT | UMA_ZFLAG_INHERIT));
out:
- if (__predict_true(booted >= BOOT_RUNNING)) {
+ if (booted >= BOOT_PCPU) {
zone_alloc_counters(zone, NULL);
- zone_alloc_sysctl(zone, NULL);
+ if (booted >= BOOT_RUNNING)
+ zone_alloc_sysctl(zone, NULL);
} else {
zone->uz_allocs = EARLY_COUNTER;
zone->uz_frees = EARLY_COUNTER;
@@ -2904,10 +2903,23 @@
}
/*
+ * Allocate counters as early as possible so that boot-time allocations are
+ * accounted more precisely.
+ */
+static void
+uma_startup_pcpu(void *arg __unused)
+{
+
+ zone_foreach_unlocked(zone_alloc_counters, NULL);
+ booted = BOOT_PCPU;
+}
+SYSINIT(uma_startup_pcpu, SI_SUB_COUNTER, SI_ORDER_ANY, uma_startup_pcpu, NULL);
+
+/*
* Finish our initialization steps.
*/
static void
-uma_startup3(void)
+uma_startup3(void *arg __unused)
{
#ifdef INVARIANTS
@@ -2915,7 +2927,6 @@
uma_dbg_cnt = counter_u64_alloc(M_WAITOK);
uma_skip_cnt = counter_u64_alloc(M_WAITOK);
#endif
- zone_foreach_unlocked(zone_alloc_counters, NULL);
zone_foreach_unlocked(zone_alloc_sysctl, NULL);
callout_init(&uma_callout, 1);
callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL);
@@ -2924,6 +2935,7 @@
EVENTHANDLER_REGISTER(shutdown_post_sync, uma_shutdown, NULL,
EVENTHANDLER_PRI_FIRST);
}
+SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL);
static void
uma_shutdown(void)

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 6:38 PM (1 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32376266
Default Alt Text
D24756.id.diff (2 KB)

Event Timeline