d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give dev_strategy() an explict cdev argument in preparation for removing

Browse Source 
buf->b-dev.

Put a bio between the buf passed to dev_strategy() and the device driver
strategy routine in order to not clobber fields in the buf.

Assert copyright on vfs_bio.c and update copyright message to canonical
text.  There is no legal difference between John Dysons two-clause
abbreviated BSD license and the canonical text.
This commit is contained in:
Poul-Henning Kamp 2004-10-29 07:16:37 +00:00
parent f62482315a
commit 6afb3b1c37
6 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/devfs/devfs_vnops.c
View File

@ -1274,7 +1274,7 @@ devfs_specstrategy(ap)
}
}
dev_strategy(bp);
dev_strategy(bp->b_dev, bp);
return (0);
}

4
sys/geom/geom_dev.c
View File

@ -333,7 +333,8 @@ g_dev_done(struct bio *bp2)
g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %jd",
bp2, bp, bp->bio_resid, (intmax_t)bp2->bio_completed);
}
bp->bio_resid = bp->bio_bcount - bp2->bio_completed;
bp->bio_resid = bp->bio_length - bp2->bio_completed;
bp->bio_completed = bp2->bio_completed;
g_destroy_bio(bp2);
biodone(bp);
}
@ -371,7 +372,6 @@ g_dev_strategy(struct bio *bp)
tsleep(&bp, PRIBIO, "gdstrat", hz / 10);
}
KASSERT(bp2 != NULL, ("XXX: ENOMEM in a bad place"));
bp2->bio_length = (off_t)bp->bio_bcount;
bp2->bio_done = g_dev_done;
g_trace(G_T_BIO,
"g_dev_strategy(%p/%p) offset %jd length %jd data %p cmd %d",

2
sys/kern/kern_physio.c
View File

@ -95,7 +95,7 @@ physio(struct cdev *dev, struct uio *uio, int ioflag)
goto doerror;
}
dev_strategy(bp);
dev_strategy(dev, bp);
if (uio->uio_rw == UIO_READ)
bwait(bp, PRIBIO, "physrd");
else

2
sys/kern/vfs_aio.c
View File

@ -1144,7 +1144,7 @@ aio_qphysio(struct proc *p, struct aiocblist *aiocbe)
splx(s);
/* Perform transfer. */
dev_strategy(bp);
dev_strategy(vp->v_rdev, bp);
notify = 0;
s = splbio();

62
sys/kern/vfs_bio.c
View File

@ -1,4 +1,5 @@
/*
/*-
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 1994,1997 John S. Dyson
* All rights reserved.
*
@ -6,10 +7,22 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice immediately at the beginning of the file, without modification,
* this list of conditions, and the following disclaimer.
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
@ -46,6 +59,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/vmmeter.h>
#include <sys/vnode.h>
#include <geom/geom.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
@ -3061,26 +3075,48 @@ bufwait(struct buf *bp)
* Call back function from struct bio back up to struct buf.
*/
static void
bufdonebio(struct bio *bp)
bufdonebio(struct bio *bip)
{
struct buf *bp;
/* Device drivers may or may not hold giant, hold it here. */
mtx_lock(&Giant);
bufdone(bp->bio_caller2);
bp = bip->bio_caller2;
bp->b_resid = bp->b_bcount - bip->bio_completed;
bp->b_resid = bip->bio_resid; /* XXX: remove */
bp->b_ioflags = bip->bio_flags;
bp->b_error = bip->bio_error;
if (bp->b_error)
bp->b_ioflags |= BIO_ERROR;
bufdone(bp);
mtx_unlock(&Giant);
g_destroy_bio(bip);
}
void
dev_strategy(struct buf *bp)
dev_strategy(struct cdev *dev, struct buf *bp)
{
struct cdevsw *csw;
struct cdev *dev;
struct bio *bip;
if ((!bp->b_iocmd) || (bp->b_iocmd & (bp->b_iocmd - 1)))
panic("b_iocmd botch");
bp->b_io.bio_done = bufdonebio;
bp->b_io.bio_caller2 = bp;
dev = bp->b_io.bio_dev;
for (;;) {
bip = g_new_bio();
if (bip != NULL)
break;
/* Try again later */
tsleep(&bp, PRIBIO, "dev_strat", hz/10);
}
bip->bio_cmd = bp->b_iocmd;
bip->bio_offset = bp->b_iooffset;
bip->bio_length = bp->b_bcount;
bip->bio_bcount = bp->b_bcount; /* XXX: remove */
bip->bio_data = bp->b_data;
bip->bio_done = bufdonebio;
bip->bio_caller2 = bp;
bip->bio_dev = dev;
KASSERT(dev->si_refcount > 0,
("dev_strategy on un-referenced struct cdev *(%s)",
devtoname(dev)));
@ -3093,7 +3129,7 @@ dev_strategy(struct buf *bp)
mtx_unlock(&Giant); /* XXX: too defensive ? */
return;
}
(*csw->d_strategy)(&bp->b_io);
(*csw->d_strategy)(bip);
dev_relthread(dev);
}

2
sys/sys/conf.h
View File

@ -265,7 +265,7 @@ int dev_named(struct cdev *_pdev, const char *_name);
void dev_depends(struct cdev *_pdev, struct cdev *_cdev);
void dev_ref(struct cdev *dev);
void dev_rel(struct vnode *vp);
void dev_strategy(struct buf *bp);
void dev_strategy(struct cdev *dev, struct buf *bp);
struct cdev *makebdev(int _maj, int _min);
struct cdev *make_dev(struct cdevsw *_devsw, int _minor, uid_t _uid, gid_t _gid,
int _perms, const char *_fmt, ...) __printflike(6, 7);