Module Name: src
Committed By: snj
Date: Sat Jan 30 19:00:46 UTC 2010
Modified Files:
src/sys/dev [netbsd-5]: cgd.c vnd.c
src/sys/dev/dkwedge [netbsd-5]: dk.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1269):
sys/dev/cgd.c: revision 1.69
sys/dev/vnd.c: revision 1.206
sys/dev/dkwedge/dk.c: revision 1.53
struct buf::b_iodone is not called at splbio() any more.
Make sure non-MPsafe iodone callbacks raise the SPL as appropriate.
Fix buffer corruption issue I noticed in dk(4), and probable similar
issues in vnd(4) and cgd(4).
To generate a diff of this commit:
cvs rdiff -u -r1.53.4.2 -r1.53.4.3 src/sys/dev/cgd.c
cvs rdiff -u -r1.187.4.3 -r1.187.4.4 src/sys/dev/vnd.c
cvs rdiff -u -r1.42.6.1 -r1.42.6.2 src/sys/dev/dkwedge/dk.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/cgd.c
diff -u src/sys/dev/cgd.c:1.53.4.2 src/sys/dev/cgd.c:1.53.4.3
--- src/sys/dev/cgd.c:1.53.4.2 Sat Apr 4 17:18:53 2009
+++ src/sys/dev/cgd.c Sat Jan 30 19:00:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.53.4.2 2009/04/04 17:18:53 snj Exp $ */
+/* $NetBSD: cgd.c,v 1.53.4.3 2010/01/30 19:00:46 snj Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.53.4.2 2009/04/04 17:18:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.53.4.3 2010/01/30 19:00:46 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -344,13 +344,13 @@
return 0;
}
-/* expected to be called at splbio() */
static void
cgdiodone(struct buf *nbp)
{
struct buf *obp = nbp->b_private;
struct cgd_softc *cs = getcgd_softc(obp->b_dev);
struct dk_softc *dksc = &cs->sc_dksc;
+ int s;
KDASSERT(cs);
@@ -385,10 +385,12 @@
obp->b_resid = 0;
if (obp->b_error != 0)
obp->b_resid = obp->b_bcount;
+ s = splbio();
disk_unbusy(&dksc->sc_dkdev, obp->b_bcount - obp->b_resid,
(obp->b_flags & B_READ));
biodone(obp);
dk_iodone(di, dksc);
+ splx(s);
}
/* XXX: we should probably put these into dksubr.c, mostly */
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.187.4.3 src/sys/dev/vnd.c:1.187.4.4
--- src/sys/dev/vnd.c:1.187.4.3 Sat Apr 4 17:20:00 2009
+++ src/sys/dev/vnd.c Sat Jan 30 19:00:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.187.4.3 2009/04/04 17:20:00 snj Exp $ */
+/* $NetBSD: vnd.c,v 1.187.4.4 2010/01/30 19:00:46 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.187.4.3 2009/04/04 17:20:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.187.4.4 2010/01/30 19:00:46 snj Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -862,6 +862,7 @@
struct vndxfer *vnx = VND_BUFTOXFER(bp);
struct vnd_softc *vnd = vnx->vx_vnd;
struct buf *obp = bp->b_private;
+ int s = splbio();
KASSERT(&vnx->vx_buf == bp);
KASSERT(vnd->sc_active > 0);
@@ -877,6 +878,7 @@
if (vnd->sc_active == 0) {
wakeup(&vnd->sc_tab);
}
+ splx(s);
obp->b_error = bp->b_error;
obp->b_resid = bp->b_resid;
buf_destroy(bp);
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.42.6.1 src/sys/dev/dkwedge/dk.c:1.42.6.2
--- src/sys/dev/dkwedge/dk.c:1.42.6.1 Sat Jan 9 01:25:10 2010
+++ src/sys/dev/dkwedge/dk.c Sat Jan 30 19:00:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.42.6.1 2010/01/09 01:25:10 snj Exp $ */
+/* $NetBSD: dk.c,v 1.42.6.2 2010/01/30 19:00:46 snj Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.42.6.1 2010/01/09 01:25:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.42.6.2 2010/01/30 19:00:46 snj Exp $");
#include "opt_dkwedge.h"
@@ -1101,7 +1101,6 @@
* dkiodone:
*
* I/O to a wedge has completed; alert the top half.
- * NOTE: Must be called at splbio()!
*/
static void
dkiodone(struct buf *bp)
@@ -1109,6 +1108,8 @@
struct buf *obp = bp->b_private;
struct dkwedge_softc *sc = dkwedge_lookup(obp->b_dev);
+ int s = splbio();
+
if (bp->b_error != 0)
obp->b_error = bp->b_error;
obp->b_resid = bp->b_resid;
@@ -1126,6 +1127,7 @@
/* Kick the queue in case there is more work we can do. */
dkstart(sc);
+ splx(s);
}
/*
