 @@ -1,14 +1,14 @@
-/*	$NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $	*/
+/*	$NetBSD: swdmover.c,v 1.14 2017/01/07 21:11:14 christos Exp $	*/
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -39,27 +39,27 @@
  * swdmover.c: Software back-end providing the dmover functions
  * mentioned in dmover(9).
+ *
  * This module provides a fallback for cases where no hardware
  * data movers are present in a system, and also serves an an
  * example of how to write a dmover back-end.
+ *
  * Note that even through the software dmover doesn't require
  * interrupts to be blocked, we block them anyway to demonstrate
  * the locking protocol.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.14 2017/01/07 21:11:14 christos Exp $");
 #include <sys/param.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <dev/dmover/dmovervar.h>
 #include "ioconf.h"
 struct swdmover_function {
 	void	(*sdf_process)(struct dmover_request *);
 };
 @@ -137,42 +137,41 @@ swdmover_thread(void *arg)
 static void
 swdmover_func_zero_process(struct dmover_request *dreq)
+{
 	switch (dreq->dreq_outbuf_type) {
 	case DMOVER_BUF_LINEAR:
 		memset(dreq->dreq_outbuf.dmbuf_linear.l_addr, 0,
 		    dreq->dreq_outbuf.dmbuf_linear.l_len);
 		break;
 	case DMOVER_BUF_UIO:
+	    {
 		struct uio *uio = dreq->dreq_outbuf.dmbuf_uio;
-		char *cp;
+		char cp[1024];
 		size_t count, buflen;
 		int error;
 		if (uio->uio_rw != UIO_READ) {
 			/* XXXLOCK */
 			dreq->dreq_error = EINVAL;
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			break;
+		}
 		buflen = uio->uio_resid;
-		if (buflen > 1024)
+		if (buflen > sizeof(cp))
-			buflen = 1024;
+			buflen = sizeof(cp);
 		cp = alloca(buflen);
 		memset(cp, 0, buflen);
 		while ((count = uio->uio_resid) != 0) {
 			if (count > buflen)
 				count = buflen;
 			error = uiomove(cp, count, uio);
 			if (error) {
 				/* XXXLOCK */
 				dreq->dreq_error = error;
 				dreq->dreq_flags |= DMOVER_REQ_ERROR;
 				/* XXXUNLOCK */
 				break;
+			}
 @@ -199,42 +198,41 @@ static void
 swdmover_func_fill8_process(struct dmover_request *dreq)
+{
 	switch (dreq->dreq_outbuf_type) {
 	case DMOVER_BUF_LINEAR:
 		memset(dreq->dreq_outbuf.dmbuf_linear.l_addr,
 		    dreq->dreq_immediate[0],
 		    dreq->dreq_outbuf.dmbuf_linear.l_len);
 		break;
 	case DMOVER_BUF_UIO:
+	    {
 		struct uio *uio = dreq->dreq_outbuf.dmbuf_uio;
-		char *cp;
+		char cp[1024];
 		size_t count, buflen;
 		int error;
 		if (uio->uio_rw != UIO_READ) {
 			/* XXXLOCK */
 			dreq->dreq_error = EINVAL;
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			break;
+		}
 		buflen = uio->uio_resid;
-		if (buflen > 1024)
+		if (buflen > sizeof(cp))
-			buflen = 1024;
+			buflen = sizeof(cp);
 		cp = alloca(buflen);
 		memset(cp, dreq->dreq_immediate[0], buflen);
 		while ((count = uio->uio_resid) != 0) {
 			if (count > buflen)
 				count = buflen;
 			error = uiomove(cp, count, uio);
 			if (error) {
 				/* XXXLOCK */
 				dreq->dreq_error = error;
 				dreq->dreq_flags |= DMOVER_REQ_ERROR;
 				/* XXXUNLOCK */
 				break;
+			}
 @@ -324,45 +322,43 @@ swdmover_func_xor_process(struct dmover_
 					*dst8 ^= *src8;
+				}
 				dst8++;
+			}
+		}
 		break;
 	case DMOVER_BUF_UIO:
+	    {
 		struct uio *uio_out = dreq->dreq_outbuf.dmbuf_uio;
 		struct uio *uio_in = dreq->dreq_inbuf[0].dmbuf_uio;
 		struct uio *uio;
-		char *cp, *dst;
+		char cp[1024], dst[1024];
 		size_t count, buflen;
 		int error;
 		if (uio_in->uio_rw != UIO_WRITE ||
 		    uio_out->uio_rw != UIO_READ ||
 		    uio_in->uio_resid != uio_out->uio_resid) {
 			/* XXXLOCK */
 			dreq->dreq_error = EINVAL;
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			break;
+		}
 		buflen = uio_in->uio_resid;
-		if (buflen > 1024)
+		if (buflen > sizeof(cp))
-			buflen = 1024;
+			buflen = sizeof(cp);
 		cp = alloca(buflen);
 		dst = alloca(buflen);
 		/*
 		 * For each block, copy first input buffer into the destination
 		 * buffer and then read the rest, one by one, into a temporary
 		 * buffer and xor into the destination buffer.  After all of
 		 * the inputs have been xor'd in, move the destination buffer
 		 * out and loop.
 		 */
 		while ((count = uio_in->uio_resid) != 0) {
 			if (count > buflen)
 				count = buflen;
 			error = uiomove(dst, count, uio_in);
 			if (error) {
 @@ -430,44 +426,43 @@ swdmover_func_copy_process(struct dmover
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			break;
+		}
 		memcpy(dreq->dreq_outbuf.dmbuf_linear.l_addr,
 		    dreq->dreq_inbuf[0].dmbuf_linear.l_addr,
 		    dreq->dreq_outbuf.dmbuf_linear.l_len);
 		break;
 	case DMOVER_BUF_UIO:
+	    {
 		struct uio *uio_out = dreq->dreq_outbuf.dmbuf_uio;
 		struct uio *uio_in = dreq->dreq_inbuf[0].dmbuf_uio;
-		char *cp;
+		char cp[1024];
 		size_t count, buflen;
 		int error;
 		if (uio_in->uio_rw != UIO_WRITE ||
 		    uio_out->uio_rw != UIO_READ ||
 		    uio_in->uio_resid != uio_out->uio_resid) {
 			/* XXXLOCK */
 			dreq->dreq_error = EINVAL;
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			break;
+		}
 		buflen = uio_in->uio_resid;
-		if (buflen > 1024)
+		if (buflen > sizeof(cp))
-			buflen = 1024;
+			buflen = sizeof(cp);
 		cp = alloca(buflen);
 		while ((count = uio_in->uio_resid) != 0) {
 			if (count > buflen)
 				count = buflen;
 			error = uiomove(cp, count, uio_in);
 			if (error == 0)
 				error = uiomove(cp, count, uio_out);
 			if (error) {
 				/* XXXLOCK */
 				dreq->dreq_error = error;
 				dreq->dreq_flags |= DMOVER_REQ_ERROR;
 				/* XXXUNLOCK */
 				break;
 @@ -585,42 +580,41 @@ swdmover_func_iscsi_crc32c_process(struc
+	}
 	memcpy(&result, dreq->dreq_immediate, sizeof(result));
 	switch (dreq->dreq_inbuf_type) {
 	case DMOVER_BUF_LINEAR:
 		result = iscsi_crc32c(dreq->dreq_inbuf[0].dmbuf_linear.l_addr,
 		    dreq->dreq_inbuf[0].dmbuf_linear.l_len, result);
 		break;
 	case DMOVER_BUF_UIO:
+	    {
 		struct uio *uio_in = dreq->dreq_inbuf[0].dmbuf_uio;
-		uint8_t *cp;
+		uint8_t cp[1024];
 		size_t count, buflen;
 		int error;
 		if (uio_in->uio_rw != UIO_WRITE) {
 			/* XXXLOCK */
 			dreq->dreq_error = EINVAL;
 			dreq->dreq_flags |= DMOVER_REQ_ERROR;
 			/* XXXUNLOCK */
 			goto done;
+		}
 		buflen = uio_in->uio_resid;
-		if (buflen > 1024)
+		if (buflen > sizeof(cp))
-			buflen = 1024;
+			buflen = sizeof(cp);
 		cp = alloca(buflen);
 		while ((count = uio_in->uio_resid) != 0) {
 			if (count > buflen)
 				count = buflen;
 			error = uiomove(cp, count, uio_in);
 			if (error) {
 				/* XXXLOCK */
 				dreq->dreq_error = error;
 				dreq->dreq_flags |= DMOVER_REQ_ERROR;
 				/* XXXUNLOCK */
 				goto done;
 			} else
 				result = iscsi_crc32c(cp, count, result);