Page MenuHomeFreeBSD
Files F135961368

D26448.id77115.diff
No OneTemporary
Actions

D26448.id77115.diff
View Options

Index: sys/kern/subr_bus.c
===================================================================
--- sys/kern/subr_bus.c
+++ sys/kern/subr_bus.c
@@ -426,6 +426,9 @@
static void
devinit(void)
{
+ int reserve;
+ uma_zone_t z;
+
devctl_dev = make_dev_credf(MAKEDEV_ETERNAL, &dev_cdevsw, 0, NULL,
UID_ROOT, GID_WHEEL, 0600, "devctl");
mtx_init(&devsoftc.mtx, "dev mtx", "devd", MTX_DEF);
@@ -433,9 +436,24 @@
STAILQ_INIT(&devsoftc.devq);
knlist_init_mtx(&devsoftc.sel.si_note, &devsoftc.mtx);
if (devctl_queue_length > 0) {
- devsoftc.zone = uma_zcreate("DEVCTL", sizeof(struct dev_event_info),
- NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
- uma_prealloc(devsoftc.zone, devctl_queue_length);
+ /*
+ * Allocate a zone for the messages. We preallocate 2% of these
+ * and use those for a reserve. We allow it to grow the
+ * devctl_queue_length (and maybe a little more depending). This
+ * allows us to always have a reserve for a surge of messages
+ * even when memory is tight. We use this to try hard to
+ * allocating a message and only when there's a memory shortage
+ * and there's a surge of these messages will we start to
+ * recycle old messages.
+ */
+ z = devsoftc.zone = uma_zcreate("DEVCTL",
+ sizeof(struct dev_event_info), NULL, NULL, NULL, NULL,
+ UMA_ALIGN_PTR, 0);
+ reserve = max(devctl_queue_length / 50, 100); /* 2% reserve */
+ uma_zone_set_max(z, devctl_queue_length);
+ uma_zone_set_maxcache(z, 0);
+ uma_zone_reserve(z, reserve);
+ uma_prealloc(z, reserve);
}
devctl2_init();
}
@@ -598,15 +616,25 @@
mtx_lock(&devsoftc.mtx);
if (devctl_queue_length == 0)
goto out;
- if (devctl_queue_length == devsoftc.queued) {
+ dei = uma_zalloc(devsoftc.zone, M_NOWAIT);
+ if (dei == NULL)
+ dei = uma_zalloc(devsoftc.zone, M_NOWAIT | M_USE_RESERVE);
+ if (dei == NULL) {
+ /*
+ * Guard against no items in the queue. Normally, this won't
+ * happen, but if lots of events happen all at once and there's
+ * a chance we're out of allocated space but none have yet been
+ * queued when we get here, leaving nothing to steal. This can
+ * also happen with error injection. Fail safe by returning
+ * NULL in that case..
+ */
+ if (devsoftc.queued == 0)
+ goto out;
dei = STAILQ_FIRST(&devsoftc.devq);
STAILQ_REMOVE_HEAD(&devsoftc.devq, dei_link);
devsoftc.queued--;
- } else {
- /* dei can't be NULL -- we know we have at least one in the zone */
- dei = uma_zalloc(devsoftc.zone, M_NOWAIT);
- MPASS(dei != NULL);
}
+ MPASS(dei != NULL);
*dei->dei_data = '\0';
out:
mtx_unlock(&devsoftc.mtx);

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 15, 2:35 PM (9 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25329474
Default Alt Text
D26448.id77115.diff (2 KB)

Event Timeline