Page MenuHomeFreeBSD
Files F137486979

D23847.id68971.diff
No OneTemporary
Actions

D23847.id68971.diff
View Options

Index: head/sys/dev/drm2/ttm/ttm_tt.c
===================================================================
--- head/sys/dev/drm2/ttm/ttm_tt.c
+++ head/sys/dev/drm2/ttm/ttm_tt.c
@@ -285,24 +285,24 @@
obj = ttm->swap_storage;
- VM_OBJECT_WLOCK(obj);
vm_object_pip_add(obj, 1);
for (i = 0; i < ttm->num_pages; ++i) {
- rv = vm_page_grab_valid(&from_page, obj, i,
- VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY);
+ rv = vm_page_grab_valid_unlocked(&from_page, obj, i,
+ VM_ALLOC_NORMAL | VM_ALLOC_SBUSY | VM_ALLOC_IGN_SBUSY);
if (rv != VM_PAGER_OK) {
ret = -EIO;
goto err_ret;
}
to_page = ttm->pages[i];
if (unlikely(to_page == NULL)) {
+ vm_page_sunbusy(from_page);
ret = -ENOMEM;
goto err_ret;
}
pmap_copy_page(from_page, to_page);
+ vm_page_sunbusy(from_page);
}
vm_object_pip_wakeup(obj);
- VM_OBJECT_WUNLOCK(obj);
if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))
vm_object_deallocate(obj);
@@ -312,7 +312,6 @@
err_ret:
vm_object_pip_wakeup(obj);
- VM_OBJECT_WUNLOCK(obj);
return (ret);
}
Index: head/sys/dev/md/md.c
===================================================================
--- head/sys/dev/md/md.c
+++ head/sys/dev/md/md.c
@@ -1060,9 +1060,7 @@
vm_object_pip_add(sc->object, 1);
for (i = bp->bio_offset / PAGE_SIZE; i <= lastp; i++) {
len = ((i == lastp) ? lastend : PAGE_SIZE) - offs;
- VM_OBJECT_WLOCK(sc->object);
- m = vm_page_grab(sc->object, i, VM_ALLOC_SYSTEM);
- VM_OBJECT_WUNLOCK(sc->object);
+ m = vm_page_grab_unlocked(sc->object, i, VM_ALLOC_SYSTEM);
if (bp->bio_cmd == BIO_READ) {
if (vm_page_all_valid(m))
rv = VM_PAGER_OK;
Index: head/sys/kern/kern_exec.c
===================================================================
--- head/sys/kern/kern_exec.c
+++ head/sys/kern/kern_exec.c
@@ -984,14 +984,16 @@
object = imgp->vp->v_object;
if (object == NULL)
return (EACCES);
- VM_OBJECT_WLOCK(object);
#if VM_NRESERVLEVEL > 0
- vm_object_color(object, 0);
+ if ((object->flags & OBJ_COLORED) == 0) {
+ VM_OBJECT_WLOCK(object);
+ vm_object_color(object, 0);
+ VM_OBJECT_WUNLOCK(object);
+ }
#endif
- error = vm_page_grab_valid(&m, object, 0,
+ error = vm_page_grab_valid_unlocked(&m, object, 0,
VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) |
VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED);
- VM_OBJECT_WUNLOCK(object);
if (error != VM_PAGER_OK)
return (EIO);
Index: head/sys/kern/kern_sendfile.c
===================================================================
--- head/sys/kern/kern_sendfile.c
+++ head/sys/kern/kern_sendfile.c
@@ -350,6 +350,7 @@
{
vm_page_t *pa = sfio->pa;
int grabbed;
+ bool locked;
*nios = 0;
flags = (flags & SF_NODISKIO) ? VM_ALLOC_NOWAIT : 0;
@@ -358,9 +359,9 @@
* First grab all the pages and wire them. Note that we grab
* only required pages. Readahead pages are dealt with later.
*/
- VM_OBJECT_WLOCK(obj);
+ locked = false;
- grabbed = vm_page_grab_pages(obj, OFF_TO_IDX(off),
+ grabbed = vm_page_grab_pages_unlocked(obj, OFF_TO_IDX(off),
VM_ALLOC_NORMAL | VM_ALLOC_WIRED | flags, pa, npages);
if (grabbed < npages) {
for (int i = grabbed; i < npages; i++)
@@ -380,6 +381,10 @@
i++;
continue;
}
+ if (!locked) {
+ VM_OBJECT_WLOCK(obj);
+ locked = true;
+ }
/*
* Next page is invalid. Check if it belongs to pager. It
@@ -480,7 +485,8 @@
(*nios)++;
}
- VM_OBJECT_WUNLOCK(obj);
+ if (locked)
+ VM_OBJECT_WUNLOCK(obj);
if (*nios == 0 && npages != 0)
SFSTAT_INC(sf_noiocnt);
Index: head/sys/kern/vfs_bio.c
===================================================================
--- head/sys/kern/vfs_bio.c
+++ head/sys/kern/vfs_bio.c
@@ -3046,13 +3046,11 @@
* deadlocks once allocbuf() is called after
* pages are vfs_busy_pages().
*/
- VM_OBJECT_WLOCK(obj);
- (void)vm_page_grab_pages(obj,
+ (void)vm_page_grab_pages_unlocked(obj,
OFF_TO_IDX(bp->b_offset) + bp->b_npages,
VM_ALLOC_SYSTEM | VM_ALLOC_IGN_SBUSY |
VM_ALLOC_NOBUSY | VM_ALLOC_WIRED,
&bp->b_pages[bp->b_npages], desiredpages - bp->b_npages);
- VM_OBJECT_WUNLOCK(obj);
bp->b_npages = desiredpages;
}
@@ -5237,11 +5235,13 @@
}
end_pages:
- VM_OBJECT_WLOCK(object);
redo = false;
for (i = 0; i < count; i++) {
- vm_page_sunbusy(ma[i]);
- ma[i] = vm_page_grab(object, ma[i]->pindex, VM_ALLOC_NORMAL);
+ if (vm_page_busy_tryupgrade(ma[i]) == 0) {
+ vm_page_sunbusy(ma[i]);
+ ma[i] = vm_page_grab_unlocked(object, ma[i]->pindex,
+ VM_ALLOC_NORMAL);
+ }
/*
* Since the pages were only sbusy while neither the
@@ -5259,7 +5259,6 @@
if (!vm_page_all_valid(ma[i]))
redo = true;
}
- VM_OBJECT_WUNLOCK(object);
if (redo && error == 0)
goto again;
return (error != 0 ? VM_PAGER_ERROR : VM_PAGER_OK);
Index: head/sys/vm/vm_glue.c
===================================================================
--- head/sys/vm/vm_glue.c
+++ head/sys/vm/vm_glue.c
@@ -222,10 +222,8 @@
vm_pindex_t pindex;
pindex = OFF_TO_IDX(offset);
- VM_OBJECT_WLOCK(object);
- (void)vm_page_grab_valid(&m, object, pindex,
+ (void)vm_page_grab_valid_unlocked(&m, object, pindex,
VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED);
- VM_OBJECT_WUNLOCK(object);
return (m);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 24, 10:12 PM (13 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26067575
Default Alt Text
D23847.id68971.diff (5 KB)

Event Timeline