SCSI DMA correctness

safte.c

 /*      $OpenBSD: safte.c,v 1.46 2010/09/27 19:49:43 thib Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "bio.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/scsiio.h>
 #include <sys/malloc.h>
+#include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/queue.h>
 #include <sys/sensors.h>
 
 #if NBIO > 0
 #include <dev/biovar.h>
 #endif
 
 #include <scsi/scsi_all.h>
@@ skipping 73 matching lines @@
 safte_match(struct device *parent, void *match, void *aux)
 {
         struct scsi_inquiry_data *inqbuf;
         struct scsi_attach_args *sa = aux;
         struct scsi_inquiry_data *inq = sa->sa_inqbuf;
         struct scsi_inquiry *cmd;
         struct scsi_xfer *xs;
         struct safte_inq *si;
         int error, flags = 0, length;
 
-        inqbuf = malloc(sizeof(*inqbuf), M_TEMP, M_WAITOK | M_ZERO);
-        si = (struct safte_inq *)&inqbuf->extra;
-        memset(inqbuf->extra, ' ', sizeof(inqbuf->extra));
-
         if (inq == NULL)
                 return (0);
 
         /* match on dell enclosures */
         if ((inq->device & SID_TYPE) == T_PROCESSOR &&
             SCSISPC(inq->version) == 3)
                 return (2);
 
-        if ((inq->device & SID_TYPE) != T_PROCESSOR ||
+        if ((inq->device & SID_TYPE) != T_PROCESSOR ||
             SCSISPC(inq->version) != 2 ||
             (inq->response_format & SID_ANSII) != 2)
                 return (0);
 
         length = inq->additional_length + SAFTE_EXTRA_OFFSET;
         if (length < SAFTE_INQ_LEN)
                 return (0);
-        if (length > sizeof(inqbuf))
-                length = sizeof(inqbuf);
+        if (length > sizeof(*inqbuf))
+                length = sizeof(*inqbuf);
+
+        inqbuf = dma_alloc(sizeof(*inqbuf), PR_NOWAIT | PR_ZERO);
+        if (inqbuf == NULL)
+                return (0);
+
+        memset(inqbuf->extra, ' ', sizeof(inqbuf->extra));
 
         if (cold)
                 flags |= SCSI_AUTOCONF;
         xs = scsi_xs_get(sa->sa_sc_link, flags | SCSI_DATA_IN);
         if (xs == NULL)
                 return (0);
         xs->cmdlen = sizeof(*cmd);
         xs->data = (void *)inqbuf;
         xs->datalen = length;
         xs->retries = 2;
         xs->timeout = 10000;
 
         cmd = (struct scsi_inquiry *)xs->cmd;
         cmd->opcode = INQUIRY;
         _lto2b(length, cmd->length);
 
         error = scsi_xs_sync(xs);
         scsi_xs_put(xs);
 
         if (error) {
-                free(inqbuf, M_TEMP);
+                dma_free(inqbuf, sizeof(*inqbuf));
                 return (0);
         }
 
+        si = (struct safte_inq *)&inqbuf->extra;
         if (memcmp(si->ident, SAFTE_IDENT, sizeof(si->ident)) == 0) {
-                free(inqbuf, M_TEMP);
+                dma_free(inqbuf, sizeof(*inqbuf));
                 return (2);
         }
 
-        free(inqbuf, M_TEMP);
+        dma_free(inqbuf, sizeof(*inqbuf));
         return (0);
 }
 
 void
 safte_attach(struct device *parent, struct device *self, void *aux)
 {
         struct safte_softc              *sc = (struct safte_softc *)self;
         struct scsi_attach_args         *sa = aux;
         int                             i = 0;
 
@@ skipping 36 matching lines @@
             bio_register(self, safte_ioctl) != 0) {
                 printf("%s: unable to register ioctl with bio\n", DEVNAME(sc));
                 sc->sc_nslots = 0;
         } else
                 i++;
 #endif
 
         if (i) /* if we're doing something, then preinit encbuf and sensors */
                 safte_read_encstat(sc);
         else {
-                free(sc->sc_encbuf, M_DEVBUF);
+                dma_free(sc->sc_encbuf, sc->sc_encbuflen);
                 sc->sc_encbuf = NULL;
         }
 }
 
 int
 safte_detach(struct device *self, int flags)
 {
         struct safte_softc              *sc = (struct safte_softc *)self;
         int                             i;
 
         rw_enter_write(&sc->sc_lock);
 
 #if NBIO > 0
         if (sc->sc_nslots > 0)
                 bio_unregister(self);
 #endif
 
         if (sc->sc_nsensors > 0) {
                 sensordev_deinstall(&sc->sc_sensordev);
                 sensor_task_unregister(sc->sc_sensortask);
 
                 for (i = 0; i < sc->sc_nsensors; i++)
                         sensor_detach(&sc->sc_sensordev,·
                             &sc->sc_sensors[i].se_sensor);
                 free(sc->sc_sensors, M_DEVBUF);
         }
 
         if (sc->sc_encbuf != NULL)
-                free(sc->sc_encbuf, M_DEVBUF);
+                dma_free(sc->sc_encbuf, sc->sc_encbuflen);
 
         rw_exit_write(&sc->sc_lock);
 
         return (0);
 }
 
 int
 safte_read_config(struct safte_softc *sc)
 {
-        struct safte_config *config;
+        struct safte_config *config = NULL;
         struct safte_readbuf_cmd *cmd;
         struct safte_sensor *s;
         struct scsi_xfer *xs;
-        int error, flags = 0, i, j;
-
-        config = malloc(sizeof(*config), M_TEMP, M_WAITOK);
+        int error = 0, flags = 0, i, j;
+
+        config = dma_alloc(sizeof(*config), PR_NOWAIT);
+        if (config == NULL)
+                return (1);
 
         if (cold)
                 flags |= SCSI_AUTOCONF;
         xs = scsi_xs_get(sc->sc_link, flags | SCSI_DATA_IN | SCSI_SILENT);
-        if (xs == NULL)
-                return (1);
+        if (xs == NULL) {
+                error = 1;
+                goto done;
+        }
         xs->cmdlen = sizeof(*cmd);
         xs->data = (void *)config;
         xs->datalen = sizeof(*config);
         xs->retries = 2;
         xs->timeout = 30000;
 
         cmd = (struct safte_readbuf_cmd *)xs->cmd;
         cmd->opcode = READ_BUFFER;
         cmd->flags |= SAFTE_RD_MODE;
         cmd->bufferid = SAFTE_RD_CONFIG;
         cmd->length = htobe16(sizeof(*config));
 
         error = scsi_xs_sync(xs);
         scsi_xs_put(xs);
 
         if (error != 0) {
-                free(config, M_TEMP);
-                return (1);
+                error = 1;
+                goto done;
         }
 
         DPRINTF(("%s: nfans: %d npwrsup: %d nslots: %d doorlock: %d ntemps: %d"
             " alarm: %d celsius: %d ntherm: %d\n", DEVNAME(sc), config->nfans,
             config->npwrsup, config->nslots, config->doorlock, config->ntemps,
             config->alarm, SAFTE_CFG_CELSIUS(config->therm),
             SAFTE_CFG_NTHERM(config->therm)));
 
         sc->sc_encbuflen = config->nfans * sizeof(u_int8_t) + /* fan status */
             config->npwrsup * sizeof(u_int8_t) + /* power supply status */
             config->nslots * sizeof(u_int8_t) + /* device scsi id (lun) */
             sizeof(u_int8_t) + /* door lock status */
             sizeof(u_int8_t) + /* speaker status */
             config->ntemps * sizeof(u_int8_t) + /* temp sensors */
             sizeof(u_int16_t); /* temp out of range sensors */
 
-        sc->sc_encbuf = malloc(sc->sc_encbuflen, M_DEVBUF, M_NOWAIT);
+        sc->sc_encbuf = dma_alloc(sc->sc_encbuflen, PR_NOWAIT);
         if (sc->sc_encbuf == NULL) {
-                free(config, M_TEMP);
-                return (1);
+                error = 1;
+                goto done;
         }
 
         sc->sc_nsensors = config->nfans + config->npwrsup + config->ntemps +·
                 (config->doorlock ? 1 : 0) + (config->alarm ? 1 : 0);
 
         sc->sc_sensors = malloc(sc->sc_nsensors * sizeof(struct safte_sensor),
             M_DEVBUF, M_NOWAIT | M_ZERO);
         if (sc->sc_sensors == NULL) {
-                free(sc->sc_encbuf, M_DEVBUF);
+                dma_free(sc->sc_encbuf, sc->sc_encbuflen);
                 sc->sc_encbuf = NULL;
                 sc->sc_nsensors = 0;
-                free(config, M_TEMP);
-                return (1);
+                error = 1;
+                goto done;
         }
 
         strlcpy(sc->sc_sensordev.xname, DEVNAME(sc),
             sizeof(sc->sc_sensordev.xname));
 
         s = sc->sc_sensors;
 
         for (i = 0; i < config->nfans; i++) {
                 s->se_type = SAFTE_T_FAN;
                 s->se_field = (u_int8_t *)(sc->sc_encbuf + i);
@@ skipping 53 matching lines @@
         for (i = 0; i < config->ntemps; i++) {
                 s->se_type = SAFTE_T_TEMP;
                 s->se_field = (u_int8_t *)(sc->sc_encbuf + j + i);
                 s->se_sensor.type = SENSOR_TEMP;
 
                 s++;
         }
         j += config->ntemps;
 
         sc->sc_temperrs = (u_int8_t *)(sc->sc_encbuf + j);
-
-        free(config, M_TEMP);
-        return (0);
+done:
+        dma_free(config, sizeof(*config));
+        return (error);
 }
 
 void
 safte_read_encstat(void *arg)
 {
         struct safte_readbuf_cmd *cmd;
         struct safte_sensor *s;
         struct safte_softc *sc = (struct safte_softc *)arg;
         struct scsi_xfer *xs;
         int error, i, flags = 0;
@@ skipping 172 matching lines @@
         rw_enter_read(&sc->sc_lock);
         for (slot = 0; slot < sc->sc_nslots; slot++) {
                 if (sc->sc_slots[slot] == blink->bb_target)
                         break;
         }
         rw_exit_read(&sc->sc_lock);
 
         if (slot >= sc->sc_nslots)
                 return (ENODEV);
 
-        op = malloc(sizeof(*op), M_TEMP, M_WAITOK|M_ZERO);
+        op = dma_alloc(sizeof(*op), PR_WAITOK | PR_ZERO);
 
         op->opcode = SAFTE_WRITE_SLOTOP;
         op->slot = slot;
         op->flags |= wantblink ? SAFTE_SLOTOP_IDENTIFY : 0;
 
         if (cold)
                 flags |= SCSI_AUTOCONF;
         xs = scsi_xs_get(sc->sc_link, flags | SCSI_DATA_OUT | SCSI_SILENT);
         if (xs == NULL) {
-                free(op, M_TEMP);
+                dma_free(op, sizeof(*op));
                 return (ENOMEM);
         }
         xs->cmdlen = sizeof(*cmd);
         xs->data = (void *)op;
         xs->datalen = sizeof(*op);
         xs->retries = 2;·
         xs->timeout = 30000;
 
         cmd = (struct safte_writebuf_cmd *)xs->cmd;
         cmd->opcode = WRITE_BUFFER;
         cmd->flags |= SAFTE_WR_MODE;
         cmd->length = htobe16(sizeof(struct safte_slotop));
 
         error = scsi_xs_sync(xs);
         scsi_xs_put(xs);
 
         if (error != 0) {
                 error = EIO;
         }
-        free(op, M_TEMP);
+        dma_free(op, sizeof(*op));
 
         return (error);
 }
 #endif /* NBIO > 0 */
 
 int64_t
 safte_temp2uK(u_int8_t measured, int celsius)
 {
         int64_t                         temp;
 
         temp = (int64_t)measured;
         temp += SAFTE_TEMP_OFFSET;
         temp *= 1000000; /* convert to micro (mu) degrees */
         if (!celsius)
                 temp = ((temp - 32000000) * 5) / 9; /* convert to Celsius */
 
         temp += 273150000; /* convert to kelvin */
 
         return (temp);
 }