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

Change vmapbuf() and vunmapbuf() to use b_bufsize, not b_bcount.

Browse Source
This commit is contained in:
mycroft 1994-06-17 22:20:49 +00:00
parent 0948cd9d55
commit f9f1bab190
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/arch/i386/i386/vm_machdep.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* $Id: vm_machdep.c,v 1.25 1994/06/16 01:07:32 mycroft Exp $ * $Id: vm_machdep.c,v 1.26 1994/06/17 22:20:49 mycroft Exp $
*/ */
/* /*
@ -373,30 +373,28 @@ vmapbuf(bp)
register struct buf *bp; register struct buf *bp;
{ {
register int npf; register int npf;
register caddr_t addr; vm_offset_t addr, off, kva;
register long flags = bp->b_flags;
struct proc *p;
int off;
vm_offset_t kva;
register vm_offset_t pa; register vm_offset_t pa;
struct pmap *fpmap, *tpmap;
if ((flags & B_PHYS) == 0) if ((bp->b_flags & B_PHYS) == 0)
panic("vmapbuf"); panic("vmapbuf");
addr = bp->b_saveaddr = bp->b_data; addr = (vm_offset_t)(bp->b_saveaddr = bp->b_data);
off = (int)addr & PGOFSET; off = addr & PAGE_MASK;
p = bp->b_proc; addr = trunc_page(addr);
npf = btoc(round_page(bp->b_bcount + off)); npf = btoc(round_page(off + bp->b_bufsize));
kva = kmem_alloc_wait(phys_map, ctob(npf)); kva = kmem_alloc_wait(phys_map, ctob(npf));
bp->b_data = (caddr_t) (kva + off); bp->b_data = (caddr_t)(kva + off);
while (npf--) { fpmap = vm_map_pmap(&bp->b_proc->p_vmspace->vm_map);
pa = pmap_extract(&p->p_vmspace->vm_pmap, (vm_offset_t)addr); tpmap = vm_map_pmap(phys_map);
do {
pa = pmap_extract(fpmap, (vm_offset_t)addr);
if (pa == 0) if (pa == 0)
panic("vmapbuf: null page frame"); panic("vmapbuf: null page frame");
pmap_enter(vm_map_pmap(phys_map), kva, trunc_page(pa), pmap_enter(tpmap, kva, pa, VM_PROT_READ|VM_PROT_WRITE, TRUE);
VM_PROT_READ|VM_PROT_WRITE, TRUE);
addr += PAGE_SIZE; addr += PAGE_SIZE;
kva += PAGE_SIZE; kva += PAGE_SIZE;
} } while (--npf);
} }
/* /*
@ -406,15 +404,13 @@ vmapbuf(bp)
vunmapbuf(bp) vunmapbuf(bp)
register struct buf *bp; register struct buf *bp;
{ {
register int npf; register vm_offset_t addr;
register caddr_t addr = bp->b_data;
vm_offset_t kva;
if ((bp->b_flags & B_PHYS) == 0) if ((bp->b_flags & B_PHYS) == 0)
panic("vunmapbuf"); panic("vunmapbuf");
npf = btoc(round_page(bp->b_bcount + ((int)addr & PGOFSET))); addr = (vm_offset_t)bp->b_data;
kva = (vm_offset_t)((int)addr & ~PGOFSET); kmem_free_wakeup(phys_map, trunc_page(addr),
kmem_free_wakeup(phys_map, kva, ctob(npf)); round_page((addr & PAGE_MASK) + bp->b_bufsize));
bp->b_data = bp->b_saveaddr; bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = NULL; bp->b_saveaddr = NULL;
} }