diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-11-05 08:11:55 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-11-05 08:11:55 +0000 |
| commit | 2a99f0caf858ed862bffc8dce3ea0303ce808bc4 (patch) | |
| tree | 06631c92ad630df81ad84420e90c6e114d28fda5 /sys/dev | |
| parent | c055fbad810e1f76a9a329f171d88f4c2b25b651 (diff) | |
Tweak softc initialization:
- move softintr_establish(), which allocates memory, into dtalloc()
- Use M_DEVBUF consistently for all memory chunks in the softc.
- Do not check for NULL before calling free(9).
Reviewed by Christian Ludwig, ok miod@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/dt/dt_dev.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sys/dev/dt/dt_dev.c b/sys/dev/dt/dt_dev.c index 86246852a3b..70273c4ae03 100644 --- a/sys/dev/dt/dt_dev.c +++ b/sys/dev/dt/dt_dev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dt_dev.c,v 1.39 2024/11/02 17:03:12 mpi Exp $ */ +/* $OpenBSD: dt_dev.c,v 1.40 2024/11/05 08:11:54 mpi Exp $ */ /* * Copyright (c) 2019 Martin Pieuchot <mpi@openbsd.org> @@ -206,11 +206,6 @@ dtopen(dev_t dev, int flags, int mode, struct proc *p) TAILQ_INIT(&sc->ds_pcbs); sc->ds_lastcpu = 0; sc->ds_evtcnt = 0; - sc->ds_si = softintr_establish(IPL_SOFTCLOCK, dt_deferred_wakeup, sc); - if (sc->ds_si == NULL) { - dtfree(sc); - return ENOMEM; - } SLIST_INSERT_HEAD(&dtdev_list, sc, ds_next); @@ -233,7 +228,6 @@ dtclose(dev_t dev, int flags, int mode, struct proc *p) SLIST_REMOVE(&dtdev_list, sc, dt_softc, ds_next); dt_ioctl_record_stop(sc); dt_pcb_purge(&sc->ds_pcbs); - softintr_disestablish(sc->ds_si); dtfree(sc); return 0; @@ -364,8 +358,8 @@ dtalloc(void) return NULL; for (i = 0; i < ncpusfound; i++) { - dtev = mallocarray(DT_EVTRING_SIZE, sizeof(*dtev), M_DT, - M_WAITOK|M_CANFAIL|M_ZERO); + dtev = mallocarray(DT_EVTRING_SIZE, sizeof(*dtev), M_DEVBUF, + M_WAITOK|M_CANFAIL|M_ZERO); if (dtev == NULL) break; sc->ds_cpu[i].dc_ring = dtev; @@ -375,6 +369,12 @@ dtalloc(void) return NULL; } + sc->ds_si = softintr_establish(IPL_SOFTCLOCK, dt_deferred_wakeup, sc); + if (sc->ds_si == NULL) { + dtfree(sc); + return NULL; + } + return sc; } @@ -384,10 +384,12 @@ dtfree(struct dt_softc *sc) struct dt_evt *dtev; int i; + if (sc->ds_si != NULL) + softintr_disestablish(sc->ds_si); + for (i = 0; i < ncpusfound; i++) { dtev = sc->ds_cpu[i].dc_ring; - if (dtev != NULL) - free(dtev, M_DT, DT_EVTRING_SIZE * sizeof(*dtev)); + free(dtev, M_DEVBUF, DT_EVTRING_SIZE * sizeof(*dtev)); } free(sc, M_DEVBUF, sizeof(*sc)); } |