Page MenuHomeFreeBSD
Files F102559508

D32033.id95414.diff
No OneTemporary
Actions

D32033.id95414.diff
View Options

Index: sys/vm/vm_page.c
===================================================================
--- sys/vm/vm_page.c
+++ sys/vm/vm_page.c
@@ -1963,8 +1963,6 @@
* intends to allocate
* VM_ALLOC_NOBUSY do not exclusive busy the page
* VM_ALLOC_NODUMP do not include the page in a kernel core dump
- * VM_ALLOC_NOOBJ page is not associated with an object and
- * should not be exclusive busy
* VM_ALLOC_SBUSY shared busy the allocated page
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
@@ -1973,8 +1971,8 @@
vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req)
{
- return (vm_page_alloc_after(object, pindex, req, object != NULL ?
- vm_radix_lookup_le(&object->rtree, pindex) : NULL));
+ return (vm_page_alloc_after(object, pindex, req,
+ vm_radix_lookup_le(&object->rtree, pindex)));
}
vm_page_t
@@ -1983,8 +1981,7 @@
{
return (vm_page_alloc_domain_after(object, pindex, domain, req,
- object != NULL ? vm_radix_lookup_le(&object->rtree, pindex) :
- NULL));
+ vm_radix_lookup_le(&object->rtree, pindex)));
}
/*
@@ -2073,22 +2070,19 @@
vm_page_t m;
int flags, pool;
- KASSERT((object != NULL) == ((req & VM_ALLOC_NOOBJ) == 0) &&
- (object != NULL || (req & VM_ALLOC_SBUSY) == 0) &&
- ((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) !=
+ KASSERT(((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) !=
(VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)),
- ("inconsistent object(%p)/req(%x)", object, req));
- KASSERT(object == NULL || (req & VM_ALLOC_WAITOK) == 0,
+ ("invalid request %#x", req));
+ KASSERT((req & VM_ALLOC_WAITOK) == 0,
("Can't sleep and retry object insertion."));
KASSERT(mpred == NULL || mpred->pindex < pindex,
("mpred %p doesn't precede pindex 0x%jx", mpred,
(uintmax_t)pindex));
- if (object != NULL)
- VM_OBJECT_ASSERT_WLOCKED(object);
+ VM_OBJECT_ASSERT_WLOCKED(object);
flags = 0;
m = NULL;
- pool = object != NULL ? VM_FREEPOOL_DEFAULT : VM_FREEPOOL_DIRECT;
+ pool = VM_FREEPOOL_DEFAULT;
again:
#if VM_NRESERVLEVEL > 0
/*
@@ -2142,15 +2136,13 @@
/*
* Initialize the page. Only the PG_ZERO flag is inherited.
*/
- if ((req & VM_ALLOC_ZERO) != 0)
- flags |= (m->flags & PG_ZERO);
+ flags |= (m->flags & PG_ZERO);
if ((req & VM_ALLOC_NODUMP) != 0)
flags |= PG_NODUMP;
m->flags = flags;
m->a.flags = 0;
- m->oflags = object == NULL || (object->flags & OBJ_UNMANAGED) != 0 ?
- VPO_UNMANAGED : 0;
- if ((req & (VM_ALLOC_NOBUSY | VM_ALLOC_NOOBJ | VM_ALLOC_SBUSY)) == 0)
+ m->oflags = (object->flags & OBJ_UNMANAGED) != 0 ? VPO_UNMANAGED : 0;
+ if ((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) == 0)
m->busy_lock = VPB_CURTHREAD_EXCLUSIVE;
else if ((req & VM_ALLOC_SBUSY) != 0)
m->busy_lock = VPB_SHARERS_WORD(1);
@@ -2162,31 +2154,28 @@
}
m->a.act_count = 0;
- if (object != NULL) {
- if (vm_page_insert_after(m, object, pindex, mpred)) {
- if (req & VM_ALLOC_WIRED) {
- vm_wire_sub(1);
- m->ref_count = 0;
- }
- KASSERT(m->object == NULL, ("page %p has object", m));
- m->oflags = VPO_UNMANAGED;
- m->busy_lock = VPB_UNBUSIED;
- /* Don't change PG_ZERO. */
- vm_page_free_toq(m);
- if (req & VM_ALLOC_WAITFAIL) {
- VM_OBJECT_WUNLOCK(object);
- vm_radix_wait();
- VM_OBJECT_WLOCK(object);
- }
- return (NULL);
+ if (vm_page_insert_after(m, object, pindex, mpred)) {
+ if (req & VM_ALLOC_WIRED) {
+ vm_wire_sub(1);
+ m->ref_count = 0;
+ }
+ KASSERT(m->object == NULL, ("page %p has object", m));
+ m->oflags = VPO_UNMANAGED;
+ m->busy_lock = VPB_UNBUSIED;
+ /* Don't change PG_ZERO. */
+ vm_page_free_toq(m);
+ if (req & VM_ALLOC_WAITFAIL) {
+ VM_OBJECT_WUNLOCK(object);
+ vm_radix_wait();
+ VM_OBJECT_WLOCK(object);
}
+ return (NULL);
+ }
- /* Ignore device objects; the pager sets "memattr" for them. */
- if (object->memattr != VM_MEMATTR_DEFAULT &&
- (object->flags & OBJ_FICTITIOUS) == 0)
- pmap_page_set_memattr(m, object->memattr);
- } else
- m->pindex = pindex;
+ /* Ignore device objects; the pager sets "memattr" for them. */
+ if (object->memattr != VM_MEMATTR_DEFAULT &&
+ (object->flags & OBJ_FICTITIOUS) == 0)
+ pmap_page_set_memattr(m, object->memattr);
return (m);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 1:46 AM (4 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14636596
Default Alt Text
D32033.id95414.diff (4 KB)

Event Timeline