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

- Extend the scope the vm object lock to cover calls to

Browse Source 
vm_page_is_valid().
 - Assert that the lock on the containing vm object is held in
   vm_page_is_valid().
This commit is contained in:
Alan Cox 2003-10-04 19:23:29 +00:00
parent 49c06616ae
commit bf0da100d6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_bio.c
View File

@ -380,6 +380,7 @@ vfs_buf_test_cache(struct buf *bp,
{
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
if (bp->b_flags & B_CACHE) {
int base = (foff + off) & PAGE_MASK;
if (vm_page_is_valid(m, base, size) == 0)
@ -2235,10 +2236,9 @@ inmem(struct vnode * vp, daddr_t blkno)
size = vp->v_mount->mnt_stat.f_iosize;
off = (vm_ooffset_t)blkno * (vm_ooffset_t)vp->v_mount->mnt_stat.f_iosize;
VM_OBJECT_LOCK(obj);
for (toff = 0; toff < vp->v_mount->mnt_stat.f_iosize; toff += tinc) {
VM_OBJECT_LOCK(obj);
m = vm_page_lookup(obj, OFF_TO_IDX(off + toff));
VM_OBJECT_UNLOCK(obj);
if (!m)
goto notinmem;
tinc = size;
@ -2248,9 +2248,11 @@ inmem(struct vnode * vp, daddr_t blkno)
(vm_offset_t) ((toff + off) & PAGE_MASK), tinc) == 0)
goto notinmem;
}
VM_OBJECT_UNLOCK(obj);
return 1;
notinmem:
VM_OBJECT_UNLOCK(obj);
return (0);
}
@ -2902,7 +2904,6 @@ allocbuf(struct buf *bp, int size)
bp->b_pages[bp->b_npages] = m;
++bp->b_npages;
}
VM_OBJECT_UNLOCK(obj);
/*
* Step 2. We've loaded the pages into the buffer,
@ -2941,6 +2942,7 @@ allocbuf(struct buf *bp, int size)
toff += tinc;
tinc = PAGE_SIZE;
}
VM_OBJECT_UNLOCK(obj);
/*
* Step 3, fixup the KVM pmap. Remember that

1
sys/vm/vm_page.c
View File

@ -1682,6 +1682,7 @@ vm_page_is_valid(vm_page_t m, int base, int size)
{
int bits = vm_page_bits(base, size);
VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
if (m->valid && ((m->valid & bits) == bits))
return 1;
else