Module Name: src
Committed By: pgoyette
Date: Sun Nov 20 02:38:24 UTC 2016
Modified Files:
src/sys/dev/scsipi: cd.c sd.c ss.c st.c
Log Message:
Avoid calling bufq_free() from critical code sections.
To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.317 -r1.318 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/scsipi/ss.c
cvs rdiff -u -r1.228 -r1.229 src/sys/dev/scsipi/st.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.331 src/sys/dev/scsipi/cd.c:1.332
--- src/sys/dev/scsipi/cd.c:1.331 Sun May 15 15:37:38 2016
+++ src/sys/dev/scsipi/cd.c Sun Nov 20 02:38:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.332 2016/11/20 02:38:24 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.332 2016/11/20 02:38:24 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -339,13 +339,13 @@ cddetach(device_t self, int flags)
/* Kill off any queued buffers. */
bufq_drain(cd->buf_queue);
- bufq_free(cd->buf_queue);
-
/* Kill off any pending commands. */
scsipi_kill_pending(cd->sc_periph);
splx(s);
+ bufq_free(cd->buf_queue);
+
mutex_destroy(&cd->sc_lock);
/* Detach from the disk list. */
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.317 src/sys/dev/scsipi/sd.c:1.318
--- src/sys/dev/scsipi/sd.c:1.317 Mon Aug 24 23:13:15 2015
+++ src/sys/dev/scsipi/sd.c Sun Nov 20 02:38:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $ */
+/* $NetBSD: sd.c,v 1.318 2016/11/20 02:38:24 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.318 2016/11/20 02:38:24 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -385,13 +385,13 @@ sddetach(device_t self, int flags)
/* Kill off any queued buffers. */
bufq_drain(sd->buf_queue);
- bufq_free(sd->buf_queue);
-
/* Kill off any pending commands. */
scsipi_kill_pending(sd->sc_periph);
splx(s);
+ bufq_free(sd->buf_queue);
+
/* Detach from the disk list. */
disk_detach(&sd->sc_dk);
disk_destroy(&sd->sc_dk);
Index: src/sys/dev/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.86 src/sys/dev/scsipi/ss.c:1.87
--- src/sys/dev/scsipi/ss.c:1.86 Fri Jul 25 08:10:39 2014
+++ src/sys/dev/scsipi/ss.c Sun Nov 20 02:38:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.86 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: ss.c,v 1.87 2016/11/20 02:38:24 pgoyette Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.86 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.87 2016/11/20 02:38:24 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,13 +212,13 @@ ssdetach(device_t self, int flags)
/* Kill off any queued buffers. */
bufq_drain(ss->buf_queue);
- bufq_free(ss->buf_queue);
-
/* Kill off any pending commands. */
scsipi_kill_pending(ss->sc_periph);
splx(s);
+ bufq_free(ss->buf_queue);
+
/* Nuke the vnodes for any open instances */
mn = SSUNIT(device_unit(self));
vdevgone(cmaj, mn, mn+SSNMINOR-1, VCHR);
Index: src/sys/dev/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.228 src/sys/dev/scsipi/st.c:1.229
--- src/sys/dev/scsipi/st.c:1.228 Thu Jul 14 04:00:46 2016
+++ src/sys/dev/scsipi/st.c Sun Nov 20 02:38:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.228 2016/07/14 04:00:46 msaitoh Exp $ */
+/* $NetBSD: st.c,v 1.229 2016/11/20 02:38:24 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.228 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.229 2016/11/20 02:38:24 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -445,13 +445,13 @@ stdetach(device_t self, int flags)
/* Kill off any queued buffers. */
bufq_drain(st->buf_queue);
- bufq_free(st->buf_queue);
-
/* Kill off any pending commands. */
scsipi_kill_pending(st->sc_periph);
splx(s);
+ bufq_free(st->buf_queue);
+
/* Nuke the vnodes for any open instances */
mn = STUNIT(device_unit(self));
vdevgone(bmaj, mn, mn+STNMINOR-1, VBLK);
