Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some compatibility routines to allow mmap() to work non-UBCified

Browse Source 
filesystems (in the same non-coherent fashion that they worked before).
This commit is contained in:
chs 2001-12-18 07:49:36 +00:00
parent 03dd7ce1e8
commit 40bf5f0e12
3 changed files with 141 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/miscfs/genfs/genfs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfs.h,v 1.14 2001/12/06 04:27:41 chs Exp $ */
/* $NetBSD: genfs.h,v 1.15 2001/12/18 07:49:36 chs Exp $ */
int genfs_badop __P((void *));
int genfs_nullop __P((void *));
@ -26,3 +26,4 @@ int genfs_mmap __P((void *));
int genfs_getpages __P((void *));
int genfs_putpages __P((void *));
int genfs_null_putpages __P((void *));
int genfs_compat_getpages __P((void *));

3
sys/miscfs/genfs/genfs_node.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfs_node.h,v 1.2 2001/09/15 22:38:40 chs Exp $ */
/* $NetBSD: genfs_node.h,v 1.3 2001/12/18 07:49:36 chs Exp $ */
/*
* Copyright (c) 2001 Chuck Silvers.
@ -58,5 +58,6 @@ struct genfs_node {
void genfs_size(struct vnode *, off_t, off_t *);
void genfs_node_init(struct vnode *, struct genfs_ops *);
int genfs_gop_write(struct vnode *, struct vm_page **, int, int);
int genfs_compat_gop_write(struct vnode *, struct vm_page **, int, int);
#endif /* _MISCFS_GENFS_GENFS_NODE_H_ */

139
sys/miscfs/genfs/genfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfs_vnops.c,v 1.42 2001/12/06 04:27:41 chs Exp $ */
/* $NetBSD: genfs_vnops.c,v 1.43 2001/12/18 07:49:36 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.42 2001/12/06 04:27:41 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.43 2001/12/18 07:49:36 chs Exp $");
#include "opt_nfsserver.h"
@ -1464,3 +1464,138 @@ genfs_size(struct vnode *vp, off_t size, off_t *eobp)
bsize = 1 << vp->v_mount->mnt_fs_bshift;
*eobp = (size + bsize - 1) & ~(bsize - 1);
}
int
genfs_compat_getpages(void *v)
{
struct vop_getpages_args /* {
struct vnode *a_vp;
voff_t a_offset;
struct vm_page **a_m;
int *a_count;
int a_centeridx;
vm_prot_t a_access_type;
int a_advice;
int a_flags;
} */ *ap = v;
off_t origoffset;
struct vnode *vp = ap->a_vp;
struct uvm_object *uobj = &vp->v_uobj;
struct vm_page *pg, **pgs;
vaddr_t kva;
int i, error, orignpages, npages;
struct iovec iov;
struct uio uio;
struct ucred *cred = curproc->p_ucred;
boolean_t write = (ap->a_access_type & VM_PROT_WRITE) != 0;
error = 0;
origoffset = ap->a_offset;
orignpages = *ap->a_count;
pgs = ap->a_m;
if (write && (vp->v_flag & VONWORKLST) == 0) {
vn_syncer_add_to_worklist(vp, filedelay);
}
if (ap->a_flags & PGO_LOCKED) {
uvn_findpages(uobj, origoffset, ap->a_count, ap->a_m,
UFP_NOWAIT|UFP_NOALLOC|UFP_NORDONLY);
return ap->a_m[ap->a_centeridx] == NULL ? EBUSY : 0;
}
if (origoffset + (ap->a_centeridx << PAGE_SHIFT) >= vp->v_size) {
simple_unlock(&uobj->vmobjlock);
return EINVAL;
}
npages = orignpages;
uvn_findpages(uobj, origoffset, &npages, pgs, UFP_ALL);
simple_unlock(&uobj->vmobjlock);
kva = uvm_pagermapin(pgs, npages, UVMPAGER_MAPIN_WAITOK |
UVMPAGER_MAPIN_READ);
for (i = 0; i < npages; i++) {
pg = pgs[i];
if ((pg->flags & PG_FAKE) == 0) {
continue;
}
iov.iov_base = (char *)kva + (i << PAGE_SHIFT);
iov.iov_len = PAGE_SIZE;
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
uio.uio_offset = origoffset + (i << PAGE_SHIFT);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
uio.uio_resid = PAGE_SIZE;
uio.uio_procp = curproc;
error = VOP_READ(vp, &uio, 0, cred);
if (error) {
break;
}
}
uvm_pagermapout(kva, npages);
simple_lock(&uobj->vmobjlock);
uvm_lock_pageq();
for (i = 0; i < npages; i++) {
pg = pgs[i];
if (error && (pg->flags & PG_FAKE) != 0) {
pg->flags |= PG_RELEASED;
} else {
pmap_clear_modify(pg);
uvm_pageactivate(pg);
}
}
if (error) {
uvm_page_unbusy(pgs, npages);
}
uvm_unlock_pageq();
simple_unlock(&uobj->vmobjlock);
return error;
}
int
genfs_compat_gop_write(struct vnode *vp, struct vm_page **pgs, int npages,
int flags)
{
off_t offset;
struct iovec iov;
struct uio uio;
struct ucred *cred = curproc->p_ucred;
struct buf *bp;
vaddr_t kva;
int s, error;
offset = pgs[0]->offset;
kva = uvm_pagermapin(pgs, npages, UVMPAGER_MAPIN_WRITE |
UVMPAGER_MAPIN_WAITOK);
iov.iov_base = (void *)kva;
iov.iov_len = npages << PAGE_SHIFT;
uio.uio_iov = &iov;
uio.uio_iovcnt = npages;
uio.uio_offset = offset;
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
uio.uio_resid = npages << PAGE_SHIFT;
uio.uio_procp = curproc;
error = VOP_WRITE(vp, &uio, 0, cred);
s = splbio();
vp->v_numoutput++;
bp = pool_get(&bufpool, PR_WAITOK);
splx(s);
bp->b_flags = B_BUSY | B_WRITE | B_AGE;
bp->b_vp = vp;
bp->b_lblkno = offset >> vp->v_mount->mnt_fs_bshift;
bp->b_data = (char *)kva;
bp->b_bcount = npages << PAGE_SHIFT;
bp->b_bufsize = npages << PAGE_SHIFT;
bp->b_resid = 0;
LIST_INIT(&bp->b_dep);
if (error) {
bp->b_flags |= B_ERROR;
bp->b_error = error;
}
uvm_aio_aiodone(bp);
return error;
}